Multi inventory support.

Author: bladecoder

CHANGELOG.md

@@ -2,10 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.9.14]
+
+- Multiinventory support.
+- EDITOR: Fix when adding custom actions.
+
 ## [0.9.13]
 
 - Added new buttons in the Tools menu to test the scene in Iphone/Ipad emulator and device.
-
 - Support for changing players in runtime: Added $PLAYER variable.
 - Added actor Tint attribute to allow lighting effects.
 - EDITOR: Disable not working HTML platform.

blade-engine/src/com/bladecoder/engine/actions/SetPlayerAction.java

@@ -16,17 +16,23 @@
 package com.bladecoder.engine.actions;
 
 import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.model.BaseActor;
 import com.bladecoder.engine.model.CharacterActor;
 import com.bladecoder.engine.model.Scene;
 import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
 
 @ActionDescription("Sets the scene player")
 public class SetPlayerAction implements Action {
 
 	@ActionProperty(type = Type.SCENE_CHARACTER_ACTOR, required = true)
 	@ActionPropertyDescription("The scene player")	
 	private SceneActorRef actor;
+	
+	@ActionProperty
+	@ActionPropertyDescription("The inventory 'id' for the player. If empty, the inventory will not change.")	
+	private String inventory;
 
 	@Override
 	public boolean run(VerbRunner cb) {		
@@ -35,6 +41,15 @@ public boolean run(VerbRunner cb) {
 		BaseActor a = s.getActor(actor.getActorId(), true);
 
 		s.setPlayer((CharacterActor)a);
+		
+		if(inventory != null) {
+			World w = World.getInstance();
+			w.getInventory().dispose();
+			w.setInventory(inventory);
+			w.getInventory().loadAssets();
+			EngineAssetManager.getInstance().finishLoading();
+			w.getInventory().retrieveAssets();
+		}
 
 		return false;
 	}

blade-engine/src/com/bladecoder/engine/actions/ShowInventoryAction.java

@@ -21,8 +21,7 @@
 @ActionDescription("Shows/Hide the inventory")
 public class ShowInventoryAction implements Action {
 	@ActionProperty(required = true, defaultValue = "true")
-	@ActionPropertyDescription("When 'true' sets the scene in 'cutmode'")
-
+	@ActionPropertyDescription("When 'true' shows the inventory button to show the inventory.")
 	private boolean value = true;
 
 	@Override

blade-engine/src/com/bladecoder/engine/model/World.java

@@ -53,6 +53,8 @@ public class World implements Serializable, AssetConsumer {
 
 	public static final String GAMESTATE_EXT = ".gamestate.v11";
 	private static final String GAMESTATE_FILENAME = "default" + GAMESTATE_EXT;
+	
+	private static final String DEFAULT_INVENTORY="DEFAULT";
 
 	private static final int SCREENSHOT_DEFAULT_WIDTH = 300;
 
@@ -79,8 +81,10 @@ public static enum WorldProperties {
 
 	private Scene currentScene;
 	private Dialog currentDialog;
-
-	private Inventory inventory;
+	
+	private HashMap<String, Inventory> inventories;
+	private String currentInventory;
+	
 	private TextManager textManager;
 
 	private boolean paused;
@@ -138,7 +142,9 @@ private World() {
 	private void init() {
 		// scenes = new HashMap<String, Scene>();
 		scenes = new HashMap<String, Scene>();
-		inventory = new Inventory();
+		inventories = new HashMap<String, Inventory>();
+		inventories.put(DEFAULT_INVENTORY, new Inventory());
+		currentInventory = DEFAULT_INVENTORY;
 		textManager = new TextManager();
 
 		timers = new Timers();
@@ -272,16 +278,16 @@ else if(customProperties.get(WorldProperties.SAVED_GAME_VERSION.toString()) != n
 	public void loadAssets() {
 		currentScene.loadAssets();
 
-		if (inventory.isDisposed())
-			inventory.loadAssets();
+		if (getInventory().isDisposed())
+			getInventory().loadAssets();
 
 		musicEngine.loadAssets();
 	}
 
 	@Override
 	public void retrieveAssets() {
-		if (inventory.isDisposed())
-			inventory.retrieveAssets();
+		if (getInventory().isDisposed())
+			getInventory().retrieveAssets();
 
 		getCurrentScene().retrieveAssets();
 
@@ -386,7 +392,7 @@ private void initCurrentScene() {
 	}
 
 	public Inventory getInventory() {
-		return inventory;
+		return inventories.get(currentInventory);
 	}
 
 	public TextManager getTextManager() {
@@ -430,6 +436,17 @@ public void setCurrentDialog(Dialog dialog) {
 				currentDialog = null;
 		}
 	}
+	
+	public void setInventory(String inventory) {
+		Inventory i = inventories.get(inventory);
+		
+		if(i == null) {
+			i = new Inventory();
+			inventories.put(inventory, i);
+		}
+		
+		currentInventory = inventory;
+	}
 
 	public void selectVisibleDialogOption(int i) {
 		if (currentDialog == null)
@@ -455,7 +472,7 @@ public void setHeight(int height) {
 	}
 
 	public void showInventory(boolean b) {
-		inventory.setVisible(b);
+		getInventory().setVisible(b);
 	}
 
 	public boolean isDisposed() {
@@ -490,7 +507,7 @@ public void dispose() {
 				cachedScene = null;
 			}
 
-			inventory.dispose();
+			getInventory().dispose();
 
 			spriteBatch.dispose();
 
@@ -894,7 +911,8 @@ public void write(Json json) {
 					Config.getProperty(Config.VERSION_PROP, null));
 			json.writeValue("scenes", scenes, scenes.getClass(), Scene.class);
 			json.writeValue("currentScene", currentScene.getId());
-			json.writeValue("inventory", inventory);
+			json.writeValue("inventories", inventories);
+			json.writeValue("currentInventory", currentInventory);
 			json.writeValue("timeOfGame", timeOfGame);
 			json.writeValue("cutmode", cutMode);
 			verbs.write(json);
@@ -975,7 +993,8 @@ public void read(Json json, JsonValue jsonData) {
 					EngineLogger.debug("LOAD WARNING: Scene not found in saved game: " + s.getId());
 			}
 
-			inventory = json.readValue("inventory", Inventory.class, jsonData);
+			inventories = json.readValue("inventories", HashMap.class, Inventory.class, jsonData);
+			currentInventory = json.readValue("currentInventory", String.class, jsonData);
 
 			timeOfGame = json.readValue("timeOfGame", long.class, 0L, jsonData);
 			cutMode = json.readValue("cutmode", boolean.class, false, jsonData);

gradle.properties

@@ -1,4 +1,4 @@
-version=0.9.13
+version=0.9.14
 libgdxVersion=1.9.3
 roboVMVersion=2.1.0
 roboVMGradlePluginVersion=2.1.0