action refactor

bladecoder · Oct 3, 2014 · 6aae6d8 · 6aae6d8
1 parent f465ff2
commit 6aae6d8
Show file tree

Hide file tree

Showing 27 changed files with 105 additions and 139 deletions.
diff --git a/blade-engine/src/com/bladecoder/engine/actions/Action.java b/blade-engine/src/com/bladecoder/engine/actions/Action.java
@@ -21,18 +21,16 @@
 import com.bladecoder.engine.actions.Param;
 
 public interface Action {
-	public void run();
-
-	public void setParams(HashMap<String, String> params);
-
 	/**
-	 * If this method returns true, the verb must stops the execution and wait
-	 * for the action to call the cb.resume()
+	 * Execute the action
 	 * 
 	 * @param cb
-	 * @return
+	 * @return If returns true, the verb must stops the execution and wait
+	 * for the action to call the cb.resume()
 	 */
-	public boolean waitForFinish(ActionCallback cb);
+	public boolean run(ActionCallback cb);
+
+	public void setParams(HashMap<String, String> params);
 
 	public String getInfo();
 

diff --git a/blade-engine/src/com/bladecoder/engine/actions/BaseCallbackAction.java b/blade-engine/src/com/bladecoder/engine/actions/BaseCallbackAction.java
@@ -41,13 +41,10 @@ public void resume() {
 			cb2.resume();
 		}
 	}
-
-	@Override
-	public boolean waitForFinish(ActionCallback cb) {
+
+	public void setVerbCb(ActionCallback cb) {
 		this.verbCb = cb;
-
-		return wait;
-	}	
+	}
 
 	public void setWait(boolean wait) {
 		this.wait = wait;

diff --git a/blade-engine/src/com/bladecoder/engine/actions/CameraAction.java b/blade-engine/src/com/bladecoder/engine/actions/CameraAction.java
@@ -17,9 +17,6 @@
 
 import java.util.HashMap;
 
-import com.bladecoder.engine.actions.BaseCallbackAction;
-import com.bladecoder.engine.actions.Param;
-
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonValue;
@@ -28,7 +25,6 @@
 import com.bladecoder.engine.model.SceneCamera;
 import com.bladecoder.engine.model.SpriteActor;
 import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.util.EngineLogger;
 
 public class CameraAction extends BaseCallbackAction {
 	public static final String INFO = "Set/Animates the camera position and zoom. Also can stablish the follow character parameter";
@@ -73,8 +69,8 @@ public void setParams(HashMap<String, String> params) {
 	}
 
 	@Override
-	public void run() {
-		EngineLogger.debug("CAMERA_ACTION");
+	public boolean run(ActionCallback cb) {
+		setVerbCb(cb);
 
 		float scale = EngineAssetManager.getInstance().getScale();
 
@@ -103,6 +99,8 @@ public void run() {
 		} else {
 			camera.startAnimation(pos.x * scale, pos.y * scale, zoom, duration, getWait()?this:null);
 		}
+
+		return getWait();
 	}
 
 

diff --git a/blade-engine/src/com/bladecoder/engine/actions/CancelVerbAction.java b/blade-engine/src/com/bladecoder/engine/actions/CancelVerbAction.java
@@ -50,7 +50,8 @@ public void setParams(HashMap<String, String> params) {
 	}
 
 	@Override
-	public void run() {
+	public boolean run(ActionCallback cb) {
+
 		if(actorId != null) {
 			Actor actor = World.getInstance().getCurrentScene().getActor(actorId, true);
 
@@ -59,6 +60,8 @@ public void run() {
 			Scene s = World.getInstance().getCurrentScene();
 			s.getVerbManager().cancelVerb(verb, s.getState(), target);
 		}
+
+		return false;
 	}
 
 	@Override
@@ -71,9 +74,4 @@ public Param[] getParams() {
 		return PARAMS;
 	}
 
-	@Override
-	public boolean waitForFinish(ActionCallback cb) {
-		return false;
-	}
-
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/DialogOptionAction.java b/blade-engine/src/com/bladecoder/engine/actions/DialogOptionAction.java
@@ -62,15 +62,15 @@ public void setParams(HashMap<String, String> params) {
 	}
 
 	@Override
-	public void run() {
+	public boolean run(ActionCallback cb) {
 
 		SpriteActor actor = (SpriteActor) World.getInstance().getCurrentScene()
 				.getActor(actorId, false);
 		Dialog d = actor.getDialog(dialog);
 
 		if (d == null) {
 			EngineLogger.error("DialogOptionAction: Dialog '" + dialog + "' not found");
-			return;
+			return false;
 		}
 
 		DialogOption o = null;
@@ -80,7 +80,7 @@ public void run() {
 
 			if (o == null) {
 				EngineLogger.error("DialogOptionAction: Option '" + option + "' not found");
-				return;
+				return false;
 			}
 		}
 
@@ -91,6 +91,8 @@ public void run() {
 			World.getInstance().setCurrentDialog(actor.getDialog(dialog));
 			d.setCurrentOption(o);
 		}
+
+		return false;
 	}
 
 
@@ -103,9 +105,4 @@ public String getInfo() {
 	public Param[] getParams() {
 		return PARAMS;
 	}
-
-	@Override
-	public boolean waitForFinish(ActionCallback cb) {
-		return false;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/DropItemAction.java b/blade-engine/src/com/bladecoder/engine/actions/DropItemAction.java
@@ -46,14 +46,14 @@ public void setParams(HashMap<String, String> params) {
 	}
 
 	@Override
-	public void run() {
+	public boolean run(ActionCallback cb) {
 		float scale =  EngineAssetManager.getInstance().getScale();
 
 		Actor actor = World.getInstance().getInventory().getItem(itemId);
 
 		if(actor==null) {
 			EngineLogger.error(MessageFormat.format("DropItemAction -  Item not found: {0}", itemId));
-			return;
+			return false;
 		}
 
 		World.getInstance().getInventory().removeItem(itemId);
@@ -66,6 +66,8 @@ public void run() {
 
 		if(pos != null)
 			((SpriteActor)actor).setPosition(pos.x * scale, pos.y * scale);
+
+		return false;
 	}
 
 	@Override
@@ -77,9 +79,4 @@ public String getInfo() {
 	public Param[] getParams() {
 		return PARAMS;
 	}
-
-	@Override
-	public boolean waitForFinish(ActionCallback cb) {
-		return false;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/FrameAnimationAction.java b/blade-engine/src/com/bladecoder/engine/actions/FrameAnimationAction.java
@@ -21,7 +21,6 @@
 import com.bladecoder.engine.actions.Action;
 import com.bladecoder.engine.actions.BaseCallbackAction;
 import com.bladecoder.engine.actions.Param;
-
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.Param.Type;
@@ -99,7 +98,8 @@ public void setParams(HashMap<String, String> params) {
 	}
 
 	@Override
-	public void run() {
+	public boolean run(ActionCallback cb) {
+		setVerbCb(cb);
 		EngineLogger.debug(MessageFormat.format("SET_FRAMEANIMATION_ACTION: {0}", fa));
 
 		float scale =  EngineAssetManager.getInstance().getScale();
@@ -113,6 +113,8 @@ else if (setPos == SET_POS_RELATIVE) {
 		}
 
 		actor.startFrameAnimation(fa, repeat, count, getWait()?this:null);
+
+		return getWait();
 	}
 
 	@Override

diff --git a/blade-engine/src/com/bladecoder/engine/actions/GotoAction.java b/blade-engine/src/com/bladecoder/engine/actions/GotoAction.java
@@ -19,7 +19,6 @@
 
 import com.bladecoder.engine.actions.BaseCallbackAction;
 import com.bladecoder.engine.actions.Param;
-
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Json;
@@ -44,7 +43,9 @@ public class GotoAction extends BaseCallbackAction {
 	private String targetId;
 
 	@Override
-	public void run() {
+	public boolean run(ActionCallback cb) {
+		setVerbCb(cb);
+
 		float scale = EngineAssetManager.getInstance().getScale();
 
 		SpriteActor actor = (SpriteActor) World.getInstance().getCurrentScene().getActor(actorId, false);
@@ -59,6 +60,8 @@ public void run() {
 			}
 		} else 
 			actor.goTo(new Vector2(pos.x * scale, pos.y * scale), getWait()?this:null);
+
+		return getWait();
 	}
 
 	@Override

diff --git a/blade-engine/src/com/bladecoder/engine/actions/LeaveAction.java b/blade-engine/src/com/bladecoder/engine/actions/LeaveAction.java
@@ -37,13 +37,16 @@ public class LeaveAction implements Action {
 	String chapter;
 
 	@Override
-	public void run() {
+	public boolean run(ActionCallback cb) {
+
 		EngineLogger.debug("LEAVE ACTION");
 
 		if(chapter == null || chapter.isEmpty())
 			World.getInstance().setCurrentScene(scene);
 		else
 			World.getInstance().loadXMLChapter(chapter, scene);
+
+		return false;
 	}
 
 	@Override
@@ -63,8 +66,4 @@ public Param[] getParams() {
 		return PARAMS;
 	}
 
-	@Override
-	public boolean waitForFinish(ActionCallback cb) {
-		return false;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/LookAtAction.java b/blade-engine/src/com/bladecoder/engine/actions/LookAtAction.java
@@ -63,7 +63,8 @@ public void setParams(HashMap<String, String> params) {
 	}
 
 	@Override
-	public void run() {
+	public boolean run(ActionCallback cb) {
+
 		EngineLogger.debug("LOOKAT ACTION");
 		Actor actor = (Actor) World.getInstance().getCurrentScene().getActor(actorId, true);
 
@@ -81,6 +82,8 @@ else if(actor!=null && player != null) {
 		if(text !=null)
 			World.getInstance().getTextManager().addSubtitle(text, TextManager.POS_SUBTITLE,
 					TextManager.POS_SUBTITLE, false, Text.Type.RECTANGLE, Color.BLACK, null);
+
+		return false;
 	}
 
 
@@ -93,9 +96,4 @@ public String getInfo() {
 	public Param[] getParams() {
 		return PARAMS;
 	}
-
-	@Override
-	public boolean waitForFinish(ActionCallback cb) {
-		return false;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/MusicAction.java b/blade-engine/src/com/bladecoder/engine/actions/MusicAction.java
@@ -37,13 +37,16 @@ public void setParams(HashMap<String, String> params) {
 	}
 
 	@Override
-	public void run() {
+	public boolean run(ActionCallback cb) {
+
 		boolean p = Boolean.parseBoolean(play);
 
 		if (p)
 			World.getInstance().getCurrentScene().playMusic();
 		else
 			World.getInstance().getCurrentScene().stopMusic();
+
+		return false;
 	}
 
 	@Override
@@ -55,9 +58,4 @@ public String getInfo() {
 	public Param[] getParams() {
 		return PARAMS;
 	}
-
-	@Override
-	public boolean waitForFinish(ActionCallback cb) {
-		return false;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/PickUpAction.java b/blade-engine/src/com/bladecoder/engine/actions/PickUpAction.java
@@ -47,7 +47,8 @@ public void setParams(HashMap<String, String> params) {
 	}
 
 	@Override
-	public void run() {
+	public boolean run(ActionCallback cb) {
+
 		Actor actor = null;
 
 		Scene scn;
@@ -75,6 +76,8 @@ public void run() {
 
 			World.getInstance().getInventory().addItem(a);
 		}
+
+		return false;
 	}
 
 
@@ -88,8 +91,4 @@ public Param[] getParams() {
 		return PARAMS;
 	}
 
-	@Override
-	public boolean waitForFinish(ActionCallback cb) {
-		return false;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/PosAnimationAction.java b/blade-engine/src/com/bladecoder/engine/actions/PosAnimationAction.java
@@ -19,7 +19,6 @@
 
 import com.bladecoder.engine.actions.BaseCallbackAction;
 import com.bladecoder.engine.actions.Param;
-
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonValue;
@@ -78,14 +77,17 @@ public void setParams(HashMap<String, String> params) {
 	}
 
 	@Override
-	public void run() {
+	public boolean run(ActionCallback cb) {
+		setVerbCb(cb);
 		EngineLogger.debug("SET_POSANIMATION_ACTION");
 
 		float scale = EngineAssetManager.getInstance().getScale();
 
 		SpriteActor actor = (SpriteActor) World.getInstance().getCurrentScene().getActor(actorId, false);
 
 		actor.startPosAnimation(repeat, count, speed, pos.x * scale, pos.y * scale, getWait()?this:null);
+
+		return getWait();
 	}
 
 	@Override