diff --git a/src/com/gpl/rpg/atcontentstudio/model/gamedata/Requirement.java b/src/com/gpl/rpg/atcontentstudio/model/gamedata/Requirement.java index 98ccbc8..6913cdd 100644 --- a/src/com/gpl/rpg/atcontentstudio/model/gamedata/Requirement.java +++ b/src/com/gpl/rpg/atcontentstudio/model/gamedata/Requirement.java @@ -26,10 +26,13 @@ public class Requirement extends JSONElement { countedItemTypes.add(RequirementType.inventoryRemove); countedItemTypes.add(RequirementType.inventoryKeep); countedItemTypes.add(RequirementType.usedItem); + countedItemTypes.add(RequirementType.wear); + countedItemTypes.add(RequirementType.wearRemove); COMPATIBLE_TYPES.put(RequirementType.inventoryRemove, countedItemTypes); COMPATIBLE_TYPES.put(RequirementType.inventoryKeep, countedItemTypes); COMPATIBLE_TYPES.put(RequirementType.usedItem, countedItemTypes); - + COMPATIBLE_TYPES.put(RequirementType.wear, countedItemTypes); + COMPATIBLE_TYPES.put(RequirementType.wearRemove, countedItemTypes); } //Available from parsed state @@ -55,7 +58,8 @@ public class Requirement extends JSONElement { consumedBonemeals, hasActorCondition, factionScore, - random + random, + wearRemove } public enum SkillID { @@ -166,6 +170,7 @@ public class Requirement extends JSONElement { case inventoryRemove: case usedItem: case wear: + case wearRemove: this.required_obj = proj.getItem(required_obj_id); break; case killedMonster: diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java index 07560c7..05856bf 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java @@ -735,6 +735,8 @@ public class DialogueEditor extends JSONElementEditor { case inventoryKeep: case inventoryRemove: case usedItem: + case wear: + case wearRemove: requirementObj = addItemBox(pane, project, "Item: ", (Item) requirement.required_obj, writable, listener); requirementObjId = null; requirementValue = addIntegerField(pane, "Quantity: ", requirement.required_value, false, writable, listener); @@ -770,11 +772,6 @@ public class DialogueEditor extends JSONElementEditor { 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; - requirementValue = null; - break; } requirementNegated = addBooleanBasedCheckBox(pane, "Negate this requirement.", requirement.negated, writable, listener); } diff --git a/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java index 93947f1..65d7536 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java @@ -688,6 +688,8 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe case inventoryKeep: case inventoryRemove: case usedItem: + case wear: + case wearRemove: requirementObj = addItemBox(pane, project, "Item: ", (Item) requirement.required_obj, writable, listener); requirementObjId = null; requirementValue = addIntegerField(pane, "Quantity: ", requirement.required_value, false, writable, listener); @@ -722,11 +724,6 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe 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; - requirementValue = null; - break; } } requirementNegated = addBooleanBasedCheckBox(pane, "Negate this requirement.", requirement.negated, writable, listener);