From ebdcc6c603e750104ef813106ec54e1273e28d46 Mon Sep 17 00:00:00 2001 From: Zukero Date: Thu, 29 May 2014 00:57:17 +0200 Subject: [PATCH] Added res/raw/actorconditions_debug.json, now loaded instead of the usual ones when AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES == true. --- .../res/raw/actorconditions_debug.json | 27 +++++++++++++++++++ .../res/values/loadresources_debug.xml | 5 ++++ .../AndorsTrail/resource/ResourceLoader.java | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 AndorsTrail/res/raw/actorconditions_debug.json diff --git a/AndorsTrail/res/raw/actorconditions_debug.json b/AndorsTrail/res/raw/actorconditions_debug.json new file mode 100644 index 000000000..901f33eff --- /dev/null +++ b/AndorsTrail/res/raw/actorconditions_debug.json @@ -0,0 +1,27 @@ +[ + { + "id": "chaotic_grip", + "iconID": "actorconditions_1:96", + "name": "Chaotic grip", + "category": "mental", + "abilityEffect": { + "increaseBlockChance": -10, + "increaseDamageResistance": -1 + } + }, + { + "id": "chaotic_curse", + "iconID": "actorconditions_1:89", + "name": "Chaotic curse", + "category": "mental", + "abilityEffect": { + "increaseMaxAP": -1, + "increaseAttackDamage": { + "min": -1, + "max": -1 + }, + "increaseBlockChance": -10, + "increaseDamageResistance": -1 + } + } +] diff --git a/AndorsTrail/res/values/loadresources_debug.xml b/AndorsTrail/res/values/loadresources_debug.xml index f61ef49cc..54f8cb236 100644 --- a/AndorsTrail/res/values/loadresources_debug.xml +++ b/AndorsTrail/res/values/loadresources_debug.xml @@ -1,5 +1,10 @@ + + + @raw/actorconditions_debug + + @raw/itemlist_money @raw/itemlist_weapons diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java index bc4d37a02..dbf5626ce 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java @@ -20,7 +20,7 @@ import java.util.Collection; public final class ResourceLoader { private static final int itemCategoriesResourceId = R.array.loadresource_itemcategories; - private static final int actorConditionsResourceId = R.array.loadresource_actorconditions; + private static final int actorConditionsResourceId = AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ? R.array.loadresource_actorconditions_debug : R.array.loadresource_actorconditions; private static final int itemsResourceId = AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ? R.array.loadresource_items_debug : R.array.loadresource_items; private static final int droplistsResourceId = AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ? R.array.loadresource_droplists_debug : R.array.loadresource_droplists; private static final int questsResourceId = AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ? R.array.loadresource_quests_debug : R.array.loadresource_quests;