Merge

core/src/main/kotlin/com/last/commit/map/Collectible.kt

@@ -1,16 +1,15 @@
 package com.last.commit.map
 
 import GameState
-import Position
 import com.badlogic.gdx.math.Rectangle
+import com.badlogic.gdx.math.Vector2
 import com.last.commit.audio.GameSoundEffect
 import com.last.commit.inventory.InventoryItem
 
 class Collectible(
     name: String,
     val pos: Position,
-    width: Float,
+    val size: Vector2,
-    height: Float,
     val requiredItem: String
 ) : Interactable {
 

core/src/main/kotlin/com/last/commit/map/MapState.kt

@@ -75,8 +75,10 @@ class MapState(val map: TiledMap) {
         
         return if (obj is RectangleMapObject) {
             val itemName: String? = obj.properties.get("item", String::class.java)
+            val requiredItem = obj.properties.get("requiredItem", String::class.java) ?: ""
+
             if (itemName != null) {
-                 Collectible(itemName, Position(coords, gridCoords), size)
+                 Collectible(itemName, Position(coords, gridCoords), size, requiredItem)
             } else {
                 null
             }