From 3fe895a668cec018346a3c245eda1c44ef1770c6 Mon Sep 17 00:00:00 2001 From: Zukero Date: Tue, 22 Aug 2017 17:36:46 +0200 Subject: [PATCH] Icon for alignmentChange rewards and factionScore requirements --- .../gpl/rpg/atcontentstudio/img/alignment.png | Bin 0 -> 1891 bytes .../gpl/rpg/atcontentstudio/ui/DefaultIcons.java | 4 ++++ .../ui/gamedataeditors/DialogueEditor.java | 13 +++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 src/com/gpl/rpg/atcontentstudio/img/alignment.png 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 0000000000000000000000000000000000000000..ac5ade83a59790771792f8c1be7d9b7f2836b160 GIT binary patch literal 1891 zcmV-p2b}ncP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00zrRL_t(o!?l-va9m{-#((d7 z@7}u~*(BR-zSfqs9k3k+I|Ykc=zx_GP#Ne5q?4vv9E$@2<4ily(E&fG1r>=?#~E=D z3uq~hgM3JUTA{XsR>776t%39dO0wH@lk8@*&3@na^^dzrvt*N|jGUSK&%JlfbKdiw z=Q-!VS(;%W0Bj2%5GcQ{1uQ;J^Lnv?tAI}6IFJ+q1vo$gI0SS7tIx)-IMWZNL9pbo z9@yaV5cHU^;!-d@@W}-*Hv)V2fe_#^VgDO~w|le$JOSKO4)!CN1g-^!Ef0G6=g{|T zK=-|gj=qI1#?Xl#biNO*PNMq{p^tQ@)Y z!8Komd99F6gVyd-;Yff8Kw!-RWUs|QFwYa|5q@wiL8_>?0=EI#nFL@1TY>iVx5CCd zz~==ipyW(ZKsO#8RK2AjX@f-7|f za6tROdZ`|q@|lDNG?!Ze?u^U=XfJ2gs9@EH{9F&*zhyIgvjYqXLrL)YW>C!<{6CE# z98sCql4POnXW49%SJIh9>5|?Lyjv{;=U5hxEdMO5xe+W6-2Y2xyBYSq35CKmr?3NVb*9#jF2ex;RP3?zwoOs=b`;R4$xC?$p{LukOO*_=Pg-R}&iXL)2}qNs9X z8EC&?5ys`qPJ;vZeen59;Ke6l-drda;nusLKVDgU;?*Gg5(Q2;CH|htus$BABNk&< zCPQ}2nE{mc0btEVi(PUX#+5LaCkH(E z+J1i6wbPw|EDP3kz^PF<*bP0$p#LPSya_(tWD+|XMH-r%)(kif`7&skAgrse=i8wW zv&Nc+77Y3e{AzF*VB4f-WE#|z9Qu|np{{G2I|Gc#_(-lp}9x37X z&CMi~Vvfgy1O^<3wrG^JQY`g)c{~!KMoK`iMaQ}C{bVYhSBrrUs*PmV0ne84U8endX{< z{q$y??ZD0DMP|wX#_WYmmdIaraN+KMy3~x!0bj3${o6*cbyZLVpd|PdJ$8R;9{5y<1;zt<@p$wNp+T}JD6dcVvb)!6- zNwBtifIZ1vDqYg6fFGCtJp0uQXazO_t3Oj~8#grvSrj%nKBx&RlgKQ=i}5U4XkJcd zIh-vJ%cwN)pik17Riyu)JL+nnOTwXM+eiS82?|J-cfd~Is<0((K4!DZD>*;_Q}_V< dlcev=_CJ81qJL)#aTfpp002ovPDHLkV1gfXaMl0- literal 0 HcmV?d00001 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.");