World properties can also be set in BladeEngine.properties. Added PLATFORM property.

Author: bladecoder

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

@@ -18,8 +18,9 @@
 import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engine.util.Config;
 
-@ActionDescription("Execute the actions inside the If/EndIf if the game property has the specified value. Properties are created by the user but the next always exists: SAVED_GAME_VERSION, PREVIOUS_SCENE, CURRENT_CHAPTER")
+@ActionDescription("Execute actions inside the If/EndIf if the game property has the specified value. Properties are created with the 'Property' action or set in the 'BladeEngine.properties' file. The next always exists: SAVED_GAME_VERSION, PREVIOUS_SCENE, CURRENT_CHAPTER, PLATFORM")
 public class IfPropertyAction extends AbstractIfAction {
 	@ActionProperty(required = true)
 	@ActionPropertyDescription("The property name")
@@ -31,7 +32,10 @@ public class IfPropertyAction extends AbstractIfAction {
 
 	@Override
 	public boolean run(VerbRunner cb) {
-		String valDest = World.getInstance().getCustomProperty(name); 
+		String valDest = World.getInstance().getCustomProperty(name);
+		
+		if(valDest == null)
+			valDest = Config.getProperty(name, null);
 
 		if (!ActionUtils.compareNullStr(value, valDest)) {
 			gotoElse((VerbRunner) cb);

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

@@ -18,7 +18,7 @@
 import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 
-@ActionDescription("Sets a global game property. Properties are created by the user but the next ones always exists: SAVED_GAME_VERSION, PREVIOUS_SCENE, CURRENT_CHAPTER")
+@ActionDescription("Sets a global game property. Properties are created by the user but the next ones always exists: SAVED_GAME_VERSION, PREVIOUS_SCENE, CURRENT_CHAPTER, PLATFORM")
 public class PropertyAction implements Action {
 	@ActionProperty(required = true)
 	@ActionPropertyDescription("Property name")

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

@@ -79,7 +79,7 @@ public static enum AssetState {
 	};
 
 	public static enum WorldProperties {
-		SAVED_GAME_VERSION, PREVIOUS_SCENE, CURRENT_CHAPTER
+		SAVED_GAME_VERSION, PREVIOUS_SCENE, CURRENT_CHAPTER, PLATFORM
 	};
 
 	private static final boolean CACHE_ENABLED = true;
@@ -852,6 +852,7 @@ public void loadChapter(String chapterName) throws IOException {
 			I18N.loadChapter(EngineAssetManager.MODEL_DIR + chapterName);
 
 			customProperties.put(WorldProperties.CURRENT_CHAPTER.toString(), chapterName);
+			customProperties.put(WorldProperties.PLATFORM.toString(), Gdx.app.getType().toString());
 		} else {
 			EngineLogger.error(
 					"ERROR LOADING CHAPTER: " + chapterName + EngineAssetManager.CHAPTER_EXT + " doesn't exists.");