diff --git a/src/com/gpl/rpg/atcontentstudio/img/alignment.png b/src/com/gpl/rpg/atcontentstudio/img/alignment.png new file mode 100644 index 0000000..ac5ade8 Binary files /dev/null and b/src/com/gpl/rpg/atcontentstudio/img/alignment.png differ diff --git a/src/com/gpl/rpg/atcontentstudio/ui/DefaultIcons.java b/src/com/gpl/rpg/atcontentstudio/ui/DefaultIcons.java index a7512be..bbe9d40 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/DefaultIcons.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/DefaultIcons.java @@ -247,6 +247,10 @@ public class DefaultIcons { public static Image getTimerImage() { return getImage(TIMER_RES); } public static Image getTimerIcon() { return getIcon(TIMER_RES); } + private static String ALIGNMENT_RES = "/com/gpl/rpg/atcontentstudio/img/alignment.png"; + public static Image getAlignmentImage() { return getImage(ALIGNMENT_RES); } + public static Image getAlignmentIcon() { return getIcon(ALIGNMENT_RES); } + private static String STATUS_RED_RES = "/com/gpl/rpg/atcontentstudio/img/status_red.png"; public static Image getStatusRedImage() { return getImage(STATUS_RED_RES); } public static Image getStatusRedIcon() { return getIcon(STATUS_RED_RES); } diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java index 927c851..4f92cd9 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java @@ -427,9 +427,13 @@ public class DialogueEditor extends JSONElementEditor { rewardValue = addQuestStageBox(pane, ((Dialogue)target).getProject(), "Quest stage: ", reward.reward_value, writable, listener, (Quest) reward.reward_obj, rewardObj); break; case skillIncrease: + Requirement.SkillID skillId = null; + try { + skillId = reward.reward_obj_id == null ? null : Requirement.SkillID.valueOf(reward.reward_obj_id); + } catch(IllegalArgumentException e) {} rewardMap = null; - rewardObjId = addTextField(pane, "Skill ID: ", reward.reward_obj_id, writable, listener); - rewardObjIdCombo = null; + rewardObjId = null;// addTextField(pane, "Skill ID: ", reward.reward_obj_id, writable, listener); + rewardObjIdCombo = addEnumValueBox(pane, "Skill ID: ", Requirement.SkillID.values(), skillId, writable, listener); rewardObj = null; rewardValue = null; break; @@ -814,9 +818,11 @@ public class DialogueEditor extends JSONElementEditor { break; case alignmentChange: label.setText("Change alignment for faction "+rewardObjDesc+" : "+reward.reward_value); + label.setIcon(new ImageIcon(DefaultIcons.getAlignmentIcon())); break; case createTimer: label.setText("Create timer "+rewardObjDesc); + label.setIcon(new ImageIcon(DefaultIcons.getTimerIcon())); break; case deactivateMapObjectGroup: label.setText("Deactivate map object group "+rewardObjDesc+" on map "+reward.map_name); @@ -848,6 +854,7 @@ public class DialogueEditor extends JSONElementEditor { break; case skillIncrease: label.setText("Increase skill "+rewardObjDesc+" level"); + label.setIcon(new ImageIcon(DefaultIcons.getSkillIcon())); break; case spawnAll: label.setText("Respawn all monsters in spawnarea area "+rewardObjDesc+" on map "+reward.map_name); @@ -1090,6 +1097,8 @@ public class DialogueEditor extends JSONElementEditor { label.setIcon(new ImageIcon(DefaultIcons.getBonemealIcon())); } else if (req.type == Requirement.RequirementType.timerElapsed) { label.setIcon(new ImageIcon(DefaultIcons.getTimerIcon())); + } else if (req.type == Requirement.RequirementType.factionScore) { + label.setIcon(new ImageIcon(DefaultIcons.getAlignmentIcon())); } if (req.type == null) { label.setText("New, undefined requirement.");