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

improve isNull check

Browse Source
This commit is contained in:
OMGeeky
2025-06-24 14:53:59 +02:00
parent 56242e85f2
commit 127ed76006
2 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/gpl/rpg/atcontentstudio/model/gamedata/Common.java
View File

@@ -270,21 +270,47 @@ public final class Common {
public Integer hp_boost_max = null; public Integer hp_boost_max = null;
public Integer ap_boost_min = null; public Integer ap_boost_min = null;
public Integer ap_boost_max = null; public Integer ap_boost_max = null;
public boolean isNull() {
if (ap_boost_min != null) return false;
if (ap_boost_max != null) return false;
if (hp_boost_min != null) return false;
if (hp_boost_max != null) return false;
return true;
}
} }
public static class DeathEffect extends BasicEffect { public static class DeathEffect extends BasicEffect {
//Available from parsed state //Available from parsed state
public List<TimedActorConditionEffect> conditions_source = null; public List<TimedActorConditionEffect> conditions_source = null;
@Override
public boolean isNull(){
if(!super.isNull()) return false;
if (conditions_source != null) return false;
return true;
}
} }
public static class HitEffect extends DeathEffect { public static class HitEffect extends DeathEffect {
//Available from parsed state //Available from parsed state
public List<TimedActorConditionEffect> conditions_target = null; public List<TimedActorConditionEffect> conditions_target = null;
@Override
public boolean isNull(){
if(!super.isNull()) return false;
if (conditions_target != null) return false;
return true;
}
} }
public static class HitReceivedEffect extends Common.HitEffect { public static class HitReceivedEffect extends Common.HitEffect {
//Available from parsed state //Available from parsed state
public BasicEffect target = new BasicEffect(); public BasicEffect target = new BasicEffect();
@Override
public boolean isNull(){
if(!super.isNull()) return false;
if (!target.isNull()) return false;
return true;
}
} }

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

@@ -212,38 +212,6 @@ public class NPCEditor extends JSONElementEditor {
} }
} }
public static boolean isNull(Common.HitEffect effect) {
if (effect.ap_boost_min != null) return false;
if (effect.ap_boost_max != null) return false;
if (effect.hp_boost_min != null) return false;
if (effect.hp_boost_max != null) return false;
if (effect.conditions_source != null) return false;
if (effect.conditions_target != null) return false;
return true;
}
public static boolean isNull(Common.HitReceivedEffect effect) {
if (effect.ap_boost_min != null) return false;
if (effect.ap_boost_max != null) return false;
if (effect.hp_boost_min != null) return false;
if (effect.hp_boost_max != null) return false;
if (effect.target.ap_boost_min != null) return false;
if (effect.target.ap_boost_max != null) return false;
if (effect.target.hp_boost_min != null) return false;
if (effect.target.hp_boost_max != null) return false;
if (effect.conditions_source != null) return false;
if (effect.conditions_target != null) return false;
return true;
}
public static boolean isNull(Common.DeathEffect effect) {
if (effect.ap_boost_min != null) return false;
if (effect.ap_boost_max != null) return false;
if (effect.hp_boost_min != null) return false;
if (effect.hp_boost_max != null) return false;
if (effect.conditions_source != null) return false;
return true;
}
public class NPCFieldUpdater implements FieldUpdateListener { public class NPCFieldUpdater implements FieldUpdateListener {
@@ -346,21 +314,21 @@ public class NPCEditor extends JSONElementEditor {
} }
if (updateHit) { if (updateHit) {
if (isNull(hitEffectPane.effect)) { if (hitEffectPane.effect.isNull()) {
npc.hit_effect = null; npc.hit_effect = null;
} else { } else {
npc.hit_effect = hitEffectPane.effect; npc.hit_effect = hitEffectPane.effect;
} }
} }
if (updateHitReceived) { if (updateHitReceived) {
if (isNull(hitEffectPane.effect)) { if (hitEffectPane.effect.isNull()) {
npc.hit_received_effect = null; npc.hit_received_effect = null;
} else { } else {
npc.hit_received_effect = hitReceivedEffectPane.effect; npc.hit_received_effect = hitReceivedEffectPane.effect;
} }
} }
if (updateDeath) { if (updateDeath) {
if (isNull(deathEffectPane. effect)) { if (deathEffectPane.effect.isNull()) {
npc.death_effect = null; npc.death_effect = null;
} else { } else {
npc.death_effect = deathEffectPane. effect; npc.death_effect = deathEffectPane. effect;