From 2ea425dda64723714512b2dd940d869afe96d519 Mon Sep 17 00:00:00 2001 From: OMGeeky Date: Mon, 23 Jun 2025 18:20:52 +0200 Subject: [PATCH] use isImmunity & isClear & isInfinite more --- .../ui/gamedataeditors/ItemEditor.java | 24 +++++++------- .../ui/gamedataeditors/NPCEditor.java | 32 +++++++++---------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/ItemEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/ItemEditor.java index c5959e0..afee997 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/ItemEditor.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/ItemEditor.java @@ -537,9 +537,9 @@ public class ItemEditor extends JSONElementEditor { public void updateHitSourceTimedConditionWidgets(Common.TimedActorConditionEffect condition) { - boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE); - boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE); - boolean forever = condition.duration != null && condition.duration == ActorCondition.DURATION_FOREVER; + boolean immunity = condition.isImmunity(); + boolean clear = condition.isClear(); + boolean forever = condition.isInfinite(); hitSourceConditionClear.setSelected(clear); hitSourceConditionApply.setSelected(!clear && !immunity); @@ -728,9 +728,9 @@ public class ItemEditor extends JSONElementEditor { public void updateKillSourceTimedConditionWidgets(Common.TimedActorConditionEffect condition) { - boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE); - boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE); - boolean forever = condition.duration != null && condition.duration == ActorCondition.DURATION_FOREVER; + boolean immunity = condition.isImmunity(); + boolean clear = condition.isClear(); + boolean forever = condition.isInfinite(); killSourceConditionClear.setSelected(clear); killSourceConditionApply.setSelected(!clear && !immunity); @@ -872,9 +872,9 @@ public class ItemEditor extends JSONElementEditor { public void updateHitReceivedSourceTimedConditionWidgets(Common.TimedActorConditionEffect condition) { - boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE); - boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE); - boolean forever = condition.duration != null && condition.duration == ActorCondition.DURATION_FOREVER; + boolean immunity = condition.isImmunity(); + boolean clear = condition.isClear(); + boolean forever = condition.isInfinite(); hitReceivedSourceConditionClear.setSelected(clear); hitReceivedSourceConditionApply.setSelected(!clear && !immunity); @@ -968,9 +968,9 @@ public class ItemEditor extends JSONElementEditor { public void updateHitReceivedTargetTimedConditionWidgets(Common.TimedActorConditionEffect condition) { - boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE); - boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE); - boolean forever = condition.duration != null && condition.duration == ActorCondition.DURATION_FOREVER; + boolean immunity = condition.isImmunity(); + boolean clear = condition.isClear(); + boolean forever = condition.isInfinite(); hitReceivedTargetConditionClear.setSelected(clear); hitReceivedTargetConditionApply.setSelected(!clear && !immunity); diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/NPCEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/NPCEditor.java index 32dada8..fe336aa 100644 --- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/NPCEditor.java +++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/NPCEditor.java @@ -487,9 +487,9 @@ public class NPCEditor extends JSONElementEditor { public void updateHitSourceTimedConditionWidgets(Common.TimedActorConditionEffect condition) { - boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE); - boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE); - boolean forever = condition.duration != null && condition.duration == ActorCondition.DURATION_FOREVER; + boolean immunity = condition.isImmunity(); + boolean clear = condition.isClear(); + boolean forever = condition.isInfinite(); hitSourceConditionClear.setSelected(clear); hitSourceConditionApply.setSelected(!clear && !immunity); @@ -576,10 +576,9 @@ public class NPCEditor extends JSONElementEditor { } public void updateHitTargetTimedConditionWidgets(Common.TimedActorConditionEffect condition) { - - boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE); - boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE); - boolean forever = condition.duration != null && condition.duration == ActorCondition.DURATION_FOREVER; + boolean immunity = condition.isImmunity(); + boolean clear = condition.isClear(); + boolean forever = condition.isInfinite(); hitTargetConditionClear.setSelected(clear); hitTargetConditionApply.setSelected(!clear && !immunity); @@ -667,10 +666,9 @@ public class NPCEditor extends JSONElementEditor { } public void updateHitReceivedSourceTimedConditionWidgets(Common.TimedActorConditionEffect condition) { - - boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE); - boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE); - boolean forever = condition.duration != null && condition.duration == ActorCondition.DURATION_FOREVER; + boolean immunity = condition.isImmunity(); + boolean clear = condition.isClear(); + boolean forever = condition.isInfinite(); hitReceivedSourceConditionClear.setSelected(clear); hitReceivedSourceConditionApply.setSelected(!clear && !immunity); @@ -758,9 +756,9 @@ public class NPCEditor extends JSONElementEditor { public void updateHitReceivedTargetTimedConditionWidgets(Common.TimedActorConditionEffect condition) { - boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE); - boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE); - boolean forever = condition.duration != null && condition.duration == ActorCondition.DURATION_FOREVER; + boolean immunity = condition.isImmunity(); + boolean clear = condition.isClear(); + boolean forever = condition.isInfinite(); hitReceivedTargetConditionClear.setSelected(clear); hitReceivedTargetConditionApply.setSelected(!clear && !immunity); @@ -848,9 +846,9 @@ public class NPCEditor extends JSONElementEditor { public void updateDeathSourceTimedConditionWidgets(Common.TimedActorConditionEffect condition) { - boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE); - boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE); - boolean forever = condition.duration != null && condition.duration == ActorCondition.DURATION_FOREVER; + boolean immunity = condition.isImmunity(); + boolean clear = condition.isClear(); + boolean forever = condition.isInfinite(); deathSourceConditionClear.setSelected(clear); deathSourceConditionApply.setSelected(!clear && !immunity);