OMGeeky/ATCS
1
0
Fork 0
mirror of https://github.com/OMGeeky/ATCS.git synced 2025-12-26 23:57:25 +01:00
Code Issues Packages Projects Releases 15 Wiki Activity

use isImmunity & isClear & isInfinite more

Browse Source
This commit is contained in:
OMGeeky
2025-06-23 18:20:52 +02:00
parent f22052525c
commit 2ea425dda6
2 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

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

@@ -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);