3/5/22 11:15 PM

- fixed Inventory.drop() - updated example / testing code
eboatwright · Mar 5, 2022 · afd047a · afd047a
1 parent b66c074
commit afd047a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/src/extras.js b/src/extras.js
@@ -846,11 +846,13 @@ class Inventory extends Component {
 
 		const index = this.getItemIndex(itemName);
 		this.inventory[index].amount -= 1;
-		if(this.inventory[index] <= 0)
-			this.inventory.splice(index, 1);
 
-		var item = this.inventory[index];
+		var item = this.inventory[index].item;
 		item.destroyed = false;
+
+		if(this.inventory[index].amount <= 0)
+			this.inventory.splice(index, 1);
+
 		return item;
 	}
 

diff --git a/src/jscii/extras/inventory.js b/src/jscii/extras/inventory.js
@@ -64,11 +64,13 @@ class Inventory extends Component {
 
 		const index = this.getItemIndex(itemName);
 		this.inventory[index].amount -= 1;
-		if(this.inventory[index] <= 0)
-			this.inventory.splice(index, 1);
 
-		var item = this.inventory[index];
+		var item = this.inventory[index].item;
 		item.destroyed = false;
+
+		if(this.inventory[index].amount <= 0)
+			this.inventory.splice(index, 1);
+
 		return item;
 	}
 

diff --git a/src/main.js b/src/main.js
@@ -71,12 +71,14 @@ class UIManager extends Entity {
 	}
 
 	update(level) {
-		if(keyJustDown("i") && this.inventory === undefined)
-			this.inventory = level.addEntity(new InventoryPanel());
-
-		if(keyJustDown("Escape")) {
-			this.inventory.destroy();
-			this.inventory = undefined;
+		if(this.inventory == undefined) {
+			if(keyJustDown("i"))
+				this.inventory = level.addEntity(new InventoryPanel());
+		} else {
+			if(keyJustDown("Escape")) {
+				this.inventory.destroy();
+				this.inventory = undefined;
+			}
 		}
 	}
 }
@@ -132,7 +134,6 @@ init = function() {
 
 	level.addEntity(new Player(playerPosition));
 	level.addEntity(new Item("item", playerPosition.minus(2), "ICE STAFF", new CharRenderer(null, "item", FWD_SLASH, LIGHT_BLUE, BLACK)));
-	level.addEntity(new Item("item", playerPosition.minus(3), "ICE STAFF", new CharRenderer(null, "item", FWD_SLASH, LIGHT_BLUE, BLACK)));
 
 	level.addEntity(new Text("hud", vector2(1, 1), "HP: X", WHITE, BLACK));
 	level.addEntity(new Seperator(vector2(0, 2), LIGHT_GRAY));