Added currentTarget to verbs.

bladecoder · bladecoder · commit 9d53240a97a6 · 2017-11-10T15:57:32.000+01:00
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/CheckInteractionVerbs.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/CheckInteractionVerbs.java
@@ -55,12 +55,13 @@ public void visit(BaseActor a) {
 							if(animations.size() == 0) {
 								EditorLogger.error("CheckInteractionVerbs: Actor with no animations! - "  + sa.getScene().getId() + "." + sa.getId());
 							}
-							
-							if(!hasUse)
-								EditorLogger.msg("CheckInteractionVerbs: Inventory item should has default 'use' - "  + sa.getScene().getId() + "." + sa.getId());
-							
-							if(animations.get(r.getInitAnimation()).source.contains("inventory"))
+														
+							if(animations.get(r.getInitAnimation()).source.contains("inventory")) {
+								if(!hasUse)
+									EditorLogger.msg("CheckInteractionVerbs: Inventory item should has default 'use' - "  + sa.getScene().getId() + "." + sa.getId());
+
 								return;
+							}
 						}
 					}
 				}
diff --git a/adventure-editor/src/main/resources/versions.properties b/adventure-editor/src/main/resources/versions.properties
@@ -5,4 +5,4 @@ buildToolsVersion=23.0.3
 libgdxVersion=1.9.7
 roboVMGradlePluginVersion=2.3.3
 roboVMVersion=2.3.3
-version=1.3.3
+version=1.3.4-SNAPSHOT
diff --git a/blade-engine/src/com/bladecoder/engine/actions/IfAttrAction.java b/blade-engine/src/com/bladecoder/engine/actions/IfAttrAction.java
@@ -91,7 +91,7 @@ public boolean run(VerbRunner cb) {
 			}
 		} else if (attr.equals(ActorAttribute.TARGET)) {
 
-			if (!ActionUtils.compareNullStr(value, cb.getTarget())) {
+			if (!ActionUtils.compareNullStr(value, cb.getCurrentTarget())) {
 				gotoElse((VerbRunner) cb);
 			}
 		} else if (attr.equals(ActorAttribute.IN_SCENE)) {
diff --git a/blade-engine/src/com/bladecoder/engine/actions/RunVerbAction.java b/blade-engine/src/com/bladecoder/engine/actions/RunVerbAction.java
@@ -44,12 +44,13 @@ public class RunVerbAction extends BaseCallbackAction implements VerbRunner {
 
 	private String state;
 	private int ip = -1;
+	private String currentTarget;
 
 	@Override
 	public boolean run(VerbRunner cb) {
 		setVerbCb(cb);
 		
-		run();
+		run(cb.getCurrentTarget());
 		
 		return getWait();
 	}
@@ -134,7 +135,7 @@ public void cancel() {
 	}
 
 	@Override
-	public String getTarget() {
+	public String getCurrentTarget() {
 		return target;
 	}
 
@@ -156,8 +157,9 @@ public ArrayList<Action> getActions() {
 	}
 
 	@Override
-	public void run() {
+	public void run(String currentTarget) {
 		ip = 0;
+		this.currentTarget = currentTarget;
 		
 		Scene s = World.getInstance().getCurrentScene();
 
@@ -186,13 +188,16 @@ public void setIP(int ip) {
 	public void write(Json json) {
 		json.writeValue("ip", ip);
 		json.writeValue("state", state);
+		if(currentTarget != null)
+			json.writeValue("currentTarget", currentTarget);
 		super.write(json);
 	}
 
 	@Override
 	public void read(Json json, JsonValue jsonData) {
 		ip = json.readValue("ip", int.class, -1, jsonData);
 		state = json.readValue("state", String.class, jsonData);
+		currentTarget = json.readValue("currentTarget", String.class, (String)null, jsonData);
 		super.read(json, jsonData);
 	}
 
diff --git a/blade-engine/src/com/bladecoder/engine/ink/InkManager.java b/blade-engine/src/com/bladecoder/engine/ink/InkManager.java
@@ -135,7 +135,7 @@ private void continueMaximally() {
 		}
 
 		if (actions.size() > 0) {
-			run();
+			run(null);
 		} else {
 
 			if (hasChoices()) {
@@ -354,7 +354,7 @@ public ArrayList<Action> getActions() {
 	}
 
 	@Override
-	public void run() {
+	public void run(String currentTarget) {
 		ip = 0;
 		nextStep();
 	}
@@ -382,7 +382,7 @@ public void cancel() {
 	}
 
 	@Override
-	public String getTarget() {
+	public String getCurrentTarget() {
 		return null;
 	}
 
diff --git a/blade-engine/src/com/bladecoder/engine/model/InteractiveActor.java b/blade-engine/src/com/bladecoder/engine/model/InteractiveActor.java
@@ -112,14 +112,14 @@ public void update(float delta) {
 
 				Verb v = getVerb("exit");
 				if (v != null)
-					v.run();
+					v.run(null);
 			} else if (hit && !playerInside) {
 				// the player enters
 				playerInside = true;
 
 				Verb v = getVerb("enter");
 				if (v != null)
-					v.run();
+					v.run(null);
 			}
 		}
 	}
diff --git a/blade-engine/src/com/bladecoder/engine/model/Verb.java b/blade-engine/src/com/bladecoder/engine/model/Verb.java
@@ -47,6 +47,7 @@ public class Verb implements VerbRunner, Serializable {
 	private final ArrayList<Action> actions = new ArrayList<Action>();
 
 	private int ip = -1;
+	private String currentTarget;
 
 	public Verb() {
 	}
@@ -106,10 +107,23 @@ public void add(Action a) {
 	public ArrayList<Action> getActions() {
 		return actions;
 	}
+	
+	public String getCurrentTarget() {
+		return currentTarget;
+	}
 
-	public void run() {
-		if (EngineLogger.debugMode())
-			EngineLogger.debug(">>> Running verb: " + id);
+	public void run(String currentTarget) {
+		this.currentTarget = currentTarget;
+		
+		if (EngineLogger.debugMode()) {
+			StringBuilder sb = new StringBuilder(">>> Running verb: ").append("id");
+			
+			if(currentTarget != null) {
+				sb.append(" currentTarget: " + currentTarget);
+			}
+			
+			EngineLogger.debug(sb.toString());
+		}
 
 		ip = 0;
 		nextStep();
@@ -172,16 +186,26 @@ public void write(Json json) {
 
 		if (SerializationHelper.getInstance().getMode() == Mode.MODEL) {
 			json.writeValue("id", id);
-			json.writeValue("target", target);
-			json.writeValue("state", state);
-			json.writeValue("icon", icon);
+			
+			if(target != null)
+				json.writeValue("target", target);
+			
+			if(state != null)
+				json.writeValue("state", state);
+			
+			if(icon != null)
+				json.writeValue("icon", icon);
+				
 			json.writeArrayStart("actions");
 			for (Action a : actions) {
 				ActionUtils.writeJson(a, json);
 			}
 			json.writeArrayEnd();
 		} else {
 			json.writeValue("ip", ip);
+			
+			if(currentTarget != null)
+				json.writeValue("currentTarget", currentTarget);
 
 			json.writeArrayStart("actions");
 			for (Action a : actions) {
@@ -200,9 +224,10 @@ public void read(Json json, JsonValue jsonData) {
 
 		if (SerializationHelper.getInstance().getMode() == Mode.MODEL) {
 			id = json.readValue("id", String.class, jsonData);
-			target = json.readValue("target", String.class, jsonData);
-			state = json.readValue("state", String.class, jsonData);
-			icon = json.readValue("icon", String.class, jsonData);
+			target = json.readValue("target", String.class, (String)null, jsonData);
+			state = json.readValue("state", String.class, (String)null, jsonData);
+			icon = json.readValue("icon", String.class, (String)null, jsonData);
+			
 			actions.clear();
 			JsonValue actionsValue = jsonData.get("actions");
 			for (int i = 0; i < actionsValue.size; i++) {
@@ -219,6 +244,7 @@ public void read(Json json, JsonValue jsonData) {
 			}
 		} else {
 			// MUTABLE
+			currentTarget = json.readValue("currentTarget", String.class, (String)null, jsonData);
 			ip = json.readValue("ip", Integer.class, jsonData);
 
 			JsonValue actionsValue = jsonData.get("actions");
diff --git a/blade-engine/src/com/bladecoder/engine/model/VerbManager.java b/blade-engine/src/com/bladecoder/engine/model/VerbManager.java
@@ -100,7 +100,7 @@ public void runVerb(String verb, String state, String target) {
 		}
 
 		if (v != null) {
-			v.run();
+			v.run(target);
 		} else {
 			EngineLogger.error(MessageFormat.format("Verb ''{0}'' not found for target ''{1}''", verb, target));
 		}
diff --git a/blade-engine/src/com/bladecoder/engine/model/VerbRunner.java b/blade-engine/src/com/bladecoder/engine/model/VerbRunner.java
@@ -37,8 +37,9 @@ public interface VerbRunner extends ActionCallback {
 	
 	/**
 	 * Run the verb
+	 * @param currentTarget the target for the 'use' verb.
 	 */
-	public void run();
+	public void run(String currentTarget);
 
 	/**
 	 * Return the current action pointer
@@ -58,8 +59,8 @@ public interface VerbRunner extends ActionCallback {
 	
 	
 	/**
-	 * The target actor in 'use' verb.
+	 * The target in 'use' verb.
 	 * @return The target actor 'id'
 	 */
-	public String getTarget();
+	public String getCurrentTarget();
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=1.3.3
+version=1.3.4-SNAPSHOT
 libgdxVersion=1.9.7
 roboVMVersion=2.3.3
 roboVMGradlePluginVersion=2.3.3

Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,13 @@ public void visit(BaseActor a) {`
`55`	`55`	`if(animations.size() == 0) {`
`56`	`56`	`EditorLogger.error("CheckInteractionVerbs: Actor with no animations! - " + sa.getScene().getId() + "." + sa.getId());`
`57`	`57`	`}`
`58`		`-`
`59`		`- if(!hasUse)`
`60`		`- EditorLogger.msg("CheckInteractionVerbs: Inventory item should has default 'use' - " + sa.getScene().getId() + "." + sa.getId());`
`61`		`-`
`62`		`- if(animations.get(r.getInitAnimation()).source.contains("inventory"))`
	`58`	`+`
	`59`	`+ if(animations.get(r.getInitAnimation()).source.contains("inventory")) {`
	`60`	`+ if(!hasUse)`
	`61`	`+ EditorLogger.msg("CheckInteractionVerbs: Inventory item should has default 'use' - " + sa.getScene().getId() + "." + sa.getId());`
	`62`	`+`
`63`	`63`	`return;`
	`64`	`+ }`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public boolean run(VerbRunner cb) {`
`91`	`91`	`}`
`92`	`92`	`} else if (attr.equals(ActorAttribute.TARGET)) {`
`93`	`93`
`94`		`- if (!ActionUtils.compareNullStr(value, cb.getTarget())) {`
	`94`	`+ if (!ActionUtils.compareNullStr(value, cb.getCurrentTarget())) {`
`95`	`95`	`gotoElse((VerbRunner) cb);`
`96`	`96`	`}`
`97`	`97`	`} else if (attr.equals(ActorAttribute.IN_SCENE)) {`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ private void continueMaximally() {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`if (actions.size() > 0) {`
`138`		`- run();`
	`138`	`+ run(null);`
`139`	`139`	`} else {`
`140`	`140`
`141`	`141`	`if (hasChoices()) {`
`@@ -354,7 +354,7 @@ public ArrayList<Action> getActions() {`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`@Override`
`357`		`- public void run() {`
	`357`	`+ public void run(String currentTarget) {`
`358`	`358`	`ip = 0;`
`359`	`359`	`nextStep();`
`360`	`360`	`}`
`@@ -382,7 +382,7 @@ public void cancel() {`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`@Override`
`385`		`- public String getTarget() {`
	`385`	`+ public String getCurrentTarget() {`
`386`	`386`	`return null;`
`387`	`387`	`}`
`388`	`388`
Original file line number	Diff line number	Diff line change
`@@ -112,14 +112,14 @@ public void update(float delta) {`
`112`	`112`
`113`	`113`	`Verb v = getVerb("exit");`
`114`	`114`	`if (v != null)`
`115`		`- v.run();`
	`115`	`+ v.run(null);`
`116`	`116`	`} else if (hit && !playerInside) {`
`117`	`117`	`// the player enters`
`118`	`118`	`playerInside = true;`
`119`	`119`
`120`	`120`	`Verb v = getVerb("enter");`
`121`	`121`	`if (v != null)`
`122`		`- v.run();`
	`122`	`+ v.run(null);`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public void runVerb(String verb, String state, String target) {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if (v != null) {`
`103`		`- v.run();`
	`103`	`+ v.run(target);`
`104`	`104`	`} else {`
`105`	`105`	`EngineLogger.error(MessageFormat.format("Verb ''{0}'' not found for target ''{1}''", verb, target));`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version=1.3.3`
	`1`	`+version=1.3.4-SNAPSHOT`
`2`	`2`	`libgdxVersion=1.9.7`
`3`	`3`	`roboVMVersion=2.3.3`
`4`	`4`	`roboVMGradlePluginVersion=2.3.3`