diff --git a/AndorsTrail/res/raw/actorconditions_graveyard1.json b/AndorsTrail/res/raw/actorconditions_graveyard1.json index b1c09a35e..d1c69f7b8 100644 --- a/AndorsTrail/res/raw/actorconditions_graveyard1.json +++ b/AndorsTrail/res/raw/actorconditions_graveyard1.json @@ -1,72 +1,72 @@ -[ - { - "id":"contagion2", - "iconID":"actorconditions_1:62", - "name":"Spore contagion", - "category":"blood", - "roundEffect":{ - "visualEffectID":"greenSplash", - "increaseCurrentHP":{ - "min":-1, - "max":-3 - } - } - }, - { - "id":"petrification", - "iconID":"actorconditions_1:9", - "name":"Petrification", - "category":"physical", - "isStacking":1, - "abilityEffect":{ - "increaseMaxAP":-1, - "increaseMoveCost":0, - "increaseUseItemCost":0, - "increaseReequipCost":0, - "increaseAttackCost":0 - } - }, - { - "id":"vulnerability", - "iconID":"actorconditions_1:66", - "name":"Vulnerability", - "category":"physical", - "roundEffect":{ - "visualEffectID":"blueSwirl" - }, - "abilityEffect":{ - "increaseDamageResistance":-1 - } - }, - { - "id":"flesh_rot", - "iconID":"actorconditions_1:82", - "name":"Flesh rot", - "category":"physical", - "isStacking":1, - "roundEffect":{ - "visualEffectID":"redSplash", - "increaseCurrentHP":{ - "min":-1, - "max":-1 - } - }, - "abilityEffect":{ - "increaseBlockChance":-5 - } - }, - { - "id":"putrefaction", - "iconID":"actorconditions_1:21", - "name":"Putrefaction", - "category":"physical", - "isStacking":1, - "roundEffect":{ - "visualEffectID":"redSplash" - }, - "abilityEffect":{ - "increaseMaxHP":0, - "increaseMaxAP":-1 - } - } +[ + { + "id":"contagion2", + "iconID":"actorconditions_1:62", + "name":"Spore contagion", + "category":"blood", + "roundEffect":{ + "visualEffectID":"greenSplash", + "increaseCurrentHP":{ + "min":-1, + "max":-3 + } + } + }, + { + "id":"petrification", + "iconID":"actorconditions_1:9", + "name":"Petrification", + "category":"physical", + "isStacking":1, + "abilityEffect":{ + "increaseMaxAP":-1, + "increaseMoveCost":0, + "increaseUseItemCost":0, + "increaseReequipCost":0, + "increaseAttackCost":0 + } + }, + { + "id":"vulnerability", + "iconID":"actorconditions_1:66", + "name":"Vulnerability", + "category":"physical", + "roundEffect":{ + "visualEffectID":"redSplash" + }, + "abilityEffect":{ + "increaseDamageResistance":-1 + } + }, + { + "id":"flesh_rot", + "iconID":"actorconditions_1:82", + "name":"Flesh rot", + "category":"physical", + "isStacking":1, + "roundEffect":{ + "visualEffectID":"redSplash", + "increaseCurrentHP":{ + "min":-1, + "max":-1 + } + }, + "abilityEffect":{ + "increaseBlockChance":-5 + } + }, + { + "id":"putrefaction", + "iconID":"actorconditions_1:21", + "name":"Putrefaction", + "category":"physical", + "isStacking":1, + "roundEffect":{ + "visualEffectID":"greenSplash" + }, + "abilityEffect":{ + "increaseMaxHP":0, + "increaseMaxAP":-1 + } + } ] \ No newline at end of file diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java index 892151fc8..bd5f9c6c5 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java @@ -115,13 +115,15 @@ public final class StartScreenActivity extends FragmentActivity implements OnNew if (currentFragment != null) { if (ui_visible) { - development_version.setText( + if (!AndorsTrailApplication.IS_RELEASE_VERSION) { + development_version.setText( development_version.getText() // + // "\nMax Heap: " + Runtime.getRuntime().maxMemory() / (1024 * 1024) + "MB"+ // "\nUsed Heap: " + Runtime.getRuntime().totalMemory() / (1024 * 1024) + "MB"+ // "\nTile size: " + (int) (32 * getResources().getDisplayMetrics().density) ); + } getSupportFragmentManager().beginTransaction() .show(currentFragment)