OMGeeky/ATCS
1
0
Fork 0
mirror of https://github.com/OMGeeky/ATCS.git synced 2026-02-13 21:19:09 +01:00
Code Issues Packages Projects Releases 15 Wiki Activity

Fixed copy-pasting bug and made wording more consistent.

Browse Source
This commit is contained in:
Zukero
2017-10-09 18:52:08 +02:00
parent 104029124b
commit 97119b7101
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/ItemEditor.java
View File

@@ -496,7 +496,7 @@ public class ItemEditor extends JSONElementEditor {
pane.add(killEffectPane, JideBoxLayout.FIX); pane.add(killEffectPane, JideBoxLayout.FIX);
hitReceivedEffectPane = new CollapsiblePanel("Effect on every received hit: "); hitReceivedEffectPane = new CollapsiblePanel("Effect on every hit received: ");
hitReceivedEffectPane.setLayout(new JideBoxLayout(hitReceivedEffectPane, JideBoxLayout.PAGE_AXIS)); hitReceivedEffectPane.setLayout(new JideBoxLayout(hitReceivedEffectPane, JideBoxLayout.PAGE_AXIS));
if (item.hit_received_effect == null) { if (item.hit_received_effect == null) {
hitReceivedEffect = new Item.HitReceivedEffect(); hitReceivedEffect = new Item.HitReceivedEffect();

10
src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/NPCEditor.java
View File

@@ -1546,7 +1546,7 @@ public class NPCEditor extends JSONElementEditor {
} else if (source == hitReceivedTargetConditionClear && (Boolean) value) { } else if (source == hitReceivedTargetConditionClear && (Boolean) value) {
selectedHitReceivedEffectTargetCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR; selectedHitReceivedEffectTargetCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR;
selectedHitReceivedEffectTargetCondition.duration = null; selectedHitReceivedEffectTargetCondition.duration = null;
updateHitReceivedSourceTimedConditionWidgets(selectedHitReceivedEffectTargetCondition); updateHitReceivedTargetTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition); hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition);
updateHitReceived = true; updateHitReceived = true;
} else if (source == hitReceivedTargetConditionApply && (Boolean) value) { } else if (source == hitReceivedTargetConditionApply && (Boolean) value) {
@@ -1555,7 +1555,7 @@ public class NPCEditor extends JSONElementEditor {
if (selectedHitReceivedEffectTargetCondition.duration == null || selectedHitReceivedEffectTargetCondition.duration == ActorCondition.DURATION_NONE) { if (selectedHitReceivedEffectTargetCondition.duration == null || selectedHitReceivedEffectTargetCondition.duration == ActorCondition.DURATION_NONE) {
selectedHitReceivedEffectTargetCondition.duration = 1; selectedHitReceivedEffectTargetCondition.duration = 1;
} }
updateHitReceivedSourceTimedConditionWidgets(selectedHitReceivedEffectTargetCondition); updateHitReceivedTargetTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition); hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition);
updateHitReceived = true; updateHitReceived = true;
} else if (source == hitReceivedTargetConditionImmunity && (Boolean) value) { } else if (source == hitReceivedTargetConditionImmunity && (Boolean) value) {
@@ -1564,7 +1564,7 @@ public class NPCEditor extends JSONElementEditor {
if (selectedHitReceivedEffectTargetCondition.duration == null || selectedHitReceivedEffectTargetCondition.duration == ActorCondition.DURATION_NONE) { if (selectedHitReceivedEffectTargetCondition.duration == null || selectedHitReceivedEffectTargetCondition.duration == ActorCondition.DURATION_NONE) {
selectedHitReceivedEffectTargetCondition.duration = 1; selectedHitReceivedEffectTargetCondition.duration = 1;
} }
updateHitReceivedSourceTimedConditionWidgets(selectedHitReceivedEffectTargetCondition); updateHitReceivedTargetTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition); hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition);
updateHitReceived = true; updateHitReceived = true;
} else if (source == hitReceivedTargetConditionMagnitude) { } else if (source == hitReceivedTargetConditionMagnitude) {
@@ -1576,12 +1576,12 @@ public class NPCEditor extends JSONElementEditor {
if (selectedHitReceivedEffectTargetCondition.duration == null || selectedHitReceivedEffectTargetCondition.duration == ActorCondition.DURATION_NONE) { if (selectedHitReceivedEffectTargetCondition.duration == null || selectedHitReceivedEffectTargetCondition.duration == ActorCondition.DURATION_NONE) {
selectedHitReceivedEffectTargetCondition.duration = 1; selectedHitReceivedEffectTargetCondition.duration = 1;
} }
updateHitReceivedSourceTimedConditionWidgets(selectedHitReceivedEffectTargetCondition); updateHitReceivedTargetTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition); hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition);
updateHitReceived = true; updateHitReceived = true;
} else if (source == hitReceivedTargetConditionForever && (Boolean) value) { } else if (source == hitReceivedTargetConditionForever && (Boolean) value) {
selectedHitReceivedEffectTargetCondition.duration = ActorCondition.DURATION_FOREVER; selectedHitReceivedEffectTargetCondition.duration = ActorCondition.DURATION_FOREVER;
updateHitReceivedSourceTimedConditionWidgets(selectedHitReceivedEffectTargetCondition); updateHitReceivedTargetTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition); hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition);
updateHitReceived = true; updateHitReceived = true;
} else if (source == hitReceivedTargetConditionDuration) { } else if (source == hitReceivedTargetConditionDuration) {