From 528ac7a7e3e271b4d922cbce424a33968ad894c3 Mon Sep 17 00:00:00 2001 From: Zukero Date: Sun, 20 Aug 2017 11:19:54 +0200 Subject: [PATCH] Added support for the new "factionScore" requirement type. --- .../gpl/rpg/atcontentstudio/model/gamedata/Requirement.java | 3 ++- .../atcontentstudio/ui/gamedataeditors/DialogueEditor.java | 5 +++++ src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/com/gpl/rpg/atcontentstudio/model/gamedata/Requirement.java b/src/com/gpl/rpg/atcontentstudio/model/gamedata/Requirement.java index 0321d1c..04400b3 100644 --- a/src/com/gpl/rpg/atcontentstudio/model/gamedata/Requirement.java +++ b/src/com/gpl/rpg/atcontentstudio/model/gamedata/Requirement.java @@ -53,7 +53,8 @@ public class Requirement extends JSONElement { usedItem, spentGold, consumedBonemeals, - hasActorCondition + hasActorCondition, + factionScore } public enum SkillID { diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java index ca8134e..927c851 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java @@ -699,6 +699,11 @@ public class DialogueEditor extends JSONElementEditor { requirementObjId = addTextField(pane, "Timer ID:", requirement.required_obj_id, writable, listener); requirementValue = addIntegerField(pane, "Timer value: ", requirement.required_value, false, writable, listener); break; + case factionScore: + requirementObj = null; + requirementObjId = addTextField(pane, "Faction ID:", requirement.required_obj_id, writable, listener); + requirementValue = addIntegerField(pane, "Minimum score: ", requirement.required_value, true, writable, listener); + break; case wear: requirementObj = addItemBox(pane, project, "Item: ", (Item) requirement.required_obj, writable, listener); requirementObjId = null; diff --git a/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java index 87a5c00..4b2666b 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java @@ -710,6 +710,11 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe requirementObjId = addTextField(pane, "Timer ID:", requirement.required_obj_id, writable, listener); requirementValue = addIntegerField(pane, "Timer value: ", requirement.required_value, false, writable, listener); break; + case factionScore: + requirementObj = null; + requirementObjId = addTextField(pane, "Faction ID:", requirement.required_obj_id, writable, listener); + requirementValue = addIntegerField(pane, "Minimum score: ", requirement.required_value, true, writable, listener); + break; case wear: requirementObj = addItemBox(pane, project, "Item: ", (Item) requirement.required_obj, writable, listener); requirementObjId = null;