From 97119b7101bbd26989c7b70b86c6b6b1dbf81899 Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Mon, 9 Oct 2017 18:52:08 +0200
Subject: [PATCH] Fixed copy-pasting bug and made wording more consistent.

---
 .../atcontentstudio/ui/gamedataeditors/ItemEditor.java |  2 +-
 .../atcontentstudio/ui/gamedataeditors/NPCEditor.java  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/ItemEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/ItemEditor.java
index 8107052..11434b6 100644
--- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/ItemEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/ItemEditor.java
@@ -496,7 +496,7 @@ public class ItemEditor extends JSONElementEditor {
 		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));
 		if (item.hit_received_effect == null) {
 			hitReceivedEffect = new Item.HitReceivedEffect();
diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/NPCEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/NPCEditor.java
index 888a9d0..e27101b 100644
--- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/NPCEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/NPCEditor.java
@@ -1546,7 +1546,7 @@ public class NPCEditor extends JSONElementEditor {
 			} else if (source == hitReceivedTargetConditionClear && (Boolean) value) {
 				selectedHitReceivedEffectTargetCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR;
 				selectedHitReceivedEffectTargetCondition.duration = null;
-				updateHitReceivedSourceTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
+				updateHitReceivedTargetTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
 				hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition);
 				updateHitReceived = true;
 			}  else if (source == hitReceivedTargetConditionApply && (Boolean) value) {
@@ -1555,7 +1555,7 @@ public class NPCEditor extends JSONElementEditor {
 				if (selectedHitReceivedEffectTargetCondition.duration == null || selectedHitReceivedEffectTargetCondition.duration == ActorCondition.DURATION_NONE) {
 					selectedHitReceivedEffectTargetCondition.duration = 1;
 				}
-				updateHitReceivedSourceTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
+				updateHitReceivedTargetTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
 				hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition);
 				updateHitReceived = true;
 			} else if (source == hitReceivedTargetConditionImmunity && (Boolean) value) {
@@ -1564,7 +1564,7 @@ public class NPCEditor extends JSONElementEditor {
 				if (selectedHitReceivedEffectTargetCondition.duration == null || selectedHitReceivedEffectTargetCondition.duration == ActorCondition.DURATION_NONE) {
 					selectedHitReceivedEffectTargetCondition.duration = 1;
 				}
-				updateHitReceivedSourceTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
+				updateHitReceivedTargetTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
 				hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition);
 				updateHitReceived = true;
 			} else if (source == hitReceivedTargetConditionMagnitude) {
@@ -1576,12 +1576,12 @@ public class NPCEditor extends JSONElementEditor {
 				if (selectedHitReceivedEffectTargetCondition.duration == null || selectedHitReceivedEffectTargetCondition.duration == ActorCondition.DURATION_NONE) {
 					selectedHitReceivedEffectTargetCondition.duration = 1;
 				}
-				updateHitReceivedSourceTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
+				updateHitReceivedTargetTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
 				hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition);
 				updateHitReceived = true;
 			} else if (source == hitReceivedTargetConditionForever && (Boolean) value) {
 				selectedHitReceivedEffectTargetCondition.duration = ActorCondition.DURATION_FOREVER;
-				updateHitReceivedSourceTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
+				updateHitReceivedTargetTimedConditionWidgets(selectedHitReceivedEffectTargetCondition);
 				hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition);
 				updateHitReceived = true;
 			} else if (source == hitReceivedTargetConditionDuration) {