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

extract some code into updateConditionEffect (ITEM & NPC)

Browse Source
This commit is contained in:
OMGeeky
2025-06-23 14:03:13 +02:00
parent 967bbf918b
commit e9fecee876
3 changed files with 25 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/gpl/rpg/atcontentstudio/ui/Editor.java
View File

@@ -1106,4 +1106,21 @@ public abstract class Editor extends JPanel implements ProjectElementListener {
} }
protected <E extends Common.ConditionEffect, T extends OrderedListenerListModel<?, E>> void updateConditionEffect(ActorCondition value,
GameDataElement backlink,
E selectedHitEffectTargetCondition,
T hitTargetConditionsModel) {
if (selectedHitEffectTargetCondition.condition != null) {
selectedHitEffectTargetCondition.condition.removeBacklink(backlink);
}
selectedHitEffectTargetCondition.condition = value;
if (selectedHitEffectTargetCondition.condition != null) {
selectedHitEffectTargetCondition.condition_id = selectedHitEffectTargetCondition.condition.id;
selectedHitEffectTargetCondition.condition.addBacklink(backlink);
} else {
selectedHitEffectTargetCondition.condition_id = null;
}
hitTargetConditionsModel.itemChanged(selectedHitEffectTargetCondition);
}
} }

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

@@ -1312,17 +1312,7 @@ public class ItemEditor extends JSONElementEditor {
} else if (source == equipConditionsList) { } else if (source == equipConditionsList) {
updateEquip = true; updateEquip = true;
} else if (source == equipConditionBox) { } else if (source == equipConditionBox) {
if (selectedEquipEffectCondition.condition != null) { updateConditionEffect((ActorCondition) value, item, selectedEquipEffectCondition, equipConditionsModel);
selectedEquipEffectCondition.condition.removeBacklink(item);
}
selectedEquipEffectCondition.condition = (ActorCondition) value;
if (selectedEquipEffectCondition.condition != null) {
selectedEquipEffectCondition.condition_id = selectedEquipEffectCondition.condition.id;
selectedEquipEffectCondition.condition.addBacklink(item);
} else {
selectedEquipEffectCondition.condition_id = null;
}
equipConditionsModel.itemChanged(selectedEquipEffectCondition);
} else if (source == equipConditionMagnitude) { } else if (source == equipConditionMagnitude) {
selectedEquipEffectCondition.magnitude = (Integer) value; selectedEquipEffectCondition.magnitude = (Integer) value;
equipConditionsModel.itemChanged(selectedEquipEffectCondition); equipConditionsModel.itemChanged(selectedEquipEffectCondition);
@@ -1353,17 +1343,7 @@ public class ItemEditor extends JSONElementEditor {
} else if (source == hitSourceConditionsList) { } else if (source == hitSourceConditionsList) {
updateHit = true; updateHit = true;
} else if (source == hitSourceConditionBox) { } else if (source == hitSourceConditionBox) {
if (selectedHitEffectSourceCondition.condition != null) { updateConditionEffect((ActorCondition)value, item, selectedHitEffectSourceCondition, hitSourceConditionsModel);
selectedHitEffectSourceCondition.condition.removeBacklink(item);
}
selectedHitEffectSourceCondition.condition = (ActorCondition) value;
if (selectedHitEffectSourceCondition.condition != null) {
selectedHitEffectSourceCondition.condition_id = selectedHitEffectSourceCondition.condition.id;
selectedHitEffectSourceCondition.condition.addBacklink(item);
} else {
selectedHitEffectSourceCondition.condition_id = null;
}
hitSourceConditionsModel.itemChanged(selectedHitEffectSourceCondition);
updateHit = true; updateHit = true;
} else if (source == hitSourceConditionClear && (Boolean) value) { } else if (source == hitSourceConditionClear && (Boolean) value) {
selectedHitEffectSourceCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR; selectedHitEffectSourceCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR;
@@ -1417,17 +1397,7 @@ public class ItemEditor extends JSONElementEditor {
} else if (source == hitTargetConditionsList) { } else if (source == hitTargetConditionsList) {
updateHit = true; updateHit = true;
} else if (source == hitTargetConditionBox) { } else if (source == hitTargetConditionBox) {
if (selectedHitEffectTargetCondition.condition != null) { updateConditionEffect((ActorCondition)value, item, selectedHitEffectTargetCondition, hitTargetConditionsModel);
selectedHitEffectTargetCondition.condition.removeBacklink(item);
}
selectedHitEffectTargetCondition.condition = (ActorCondition) value;
if (selectedHitEffectTargetCondition.condition != null) {
selectedHitEffectTargetCondition.condition_id = selectedHitEffectTargetCondition.condition.id;
selectedHitEffectTargetCondition.condition.addBacklink(item);
} else {
selectedHitEffectTargetCondition.condition_id = null;
}
hitTargetConditionsModel.itemChanged(selectedHitEffectTargetCondition);
updateHit = true; updateHit = true;
} else if (source == hitTargetConditionClear && (Boolean) value) { } else if (source == hitTargetConditionClear && (Boolean) value) {
selectedHitEffectTargetCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR; selectedHitEffectTargetCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR;
@@ -1497,17 +1467,7 @@ public class ItemEditor extends JSONElementEditor {
} else if (source == killSourceConditionsList) { } else if (source == killSourceConditionsList) {
updateKill = true; updateKill = true;
} else if (source == killSourceConditionBox) { } else if (source == killSourceConditionBox) {
if (selectedKillEffectCondition.condition != null) { updateConditionEffect((ActorCondition) value, item, selectedKillEffectCondition, killSourceConditionsModel);
selectedKillEffectCondition.condition.removeBacklink(item);
}
selectedKillEffectCondition.condition = (ActorCondition) value;
if (selectedKillEffectCondition.condition != null) {
selectedKillEffectCondition.condition_id = selectedKillEffectCondition.condition.id;
selectedKillEffectCondition.condition.addBacklink(item);
} else {
selectedKillEffectCondition.condition_id = null;
}
killSourceConditionsModel.itemChanged(selectedKillEffectCondition);
updateKill = true; updateKill = true;
} else if (source == killSourceConditionClear && (Boolean) value) { } else if (source == killSourceConditionClear && (Boolean) value) {
selectedKillEffectCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR; selectedKillEffectCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR;
@@ -1593,17 +1553,7 @@ public class ItemEditor extends JSONElementEditor {
} else if (source == hitReceivedSourceConditionsList) { } else if (source == hitReceivedSourceConditionsList) {
updateHitReceived = true; updateHitReceived = true;
} else if (source == hitReceivedSourceConditionBox) { } else if (source == hitReceivedSourceConditionBox) {
if (selectedHitReceivedEffectSourceCondition.condition != null) { updateConditionEffect((ActorCondition) value, item, selectedHitReceivedEffectSourceCondition, hitReceivedSourceConditionsModel);
selectedHitReceivedEffectSourceCondition.condition.removeBacklink(item);
}
selectedHitReceivedEffectSourceCondition.condition = (ActorCondition) value;
if (selectedHitReceivedEffectSourceCondition.condition != null) {
selectedHitReceivedEffectSourceCondition.condition_id = selectedHitReceivedEffectSourceCondition.condition.id;
selectedHitReceivedEffectSourceCondition.condition.addBacklink(item);
} else {
selectedHitReceivedEffectSourceCondition.condition_id = null;
}
hitReceivedSourceConditionsModel.itemChanged(selectedHitReceivedEffectSourceCondition);
updateHitReceived = true; updateHitReceived = true;
} else if (source == hitReceivedSourceConditionClear && (Boolean) value) { } else if (source == hitReceivedSourceConditionClear && (Boolean) value) {
selectedHitReceivedEffectSourceCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR; selectedHitReceivedEffectSourceCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR;
@@ -1657,17 +1607,7 @@ public class ItemEditor extends JSONElementEditor {
} else if (source == hitReceivedTargetConditionsList) { } else if (source == hitReceivedTargetConditionsList) {
updateHitReceived = true; updateHitReceived = true;
} else if (source == hitReceivedTargetConditionBox) { } else if (source == hitReceivedTargetConditionBox) {
if (selectedHitReceivedEffectTargetCondition.condition != null) { updateConditionEffect((ActorCondition) value, item, selectedHitReceivedEffectTargetCondition, hitReceivedTargetConditionsModel);
selectedHitReceivedEffectTargetCondition.condition.removeBacklink(item);
}
selectedHitReceivedEffectTargetCondition.condition = (ActorCondition) value;
if (selectedHitReceivedEffectTargetCondition.condition != null) {
selectedHitReceivedEffectTargetCondition.condition_id = selectedHitReceivedEffectTargetCondition.condition.id;
selectedHitReceivedEffectTargetCondition.condition.addBacklink(item);
} else {
selectedHitReceivedEffectTargetCondition.condition_id = null;
}
hitReceivedTargetConditionsModel.itemChanged(selectedHitReceivedEffectTargetCondition);
updateHitReceived = true; updateHitReceived = true;
} else if (source == hitReceivedTargetConditionClear && (Boolean) value) { } else if (source == hitReceivedTargetConditionClear && (Boolean) value) {
selectedHitReceivedEffectTargetCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR; selectedHitReceivedEffectTargetCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR;

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

@@ -1134,17 +1134,7 @@ public class NPCEditor extends JSONElementEditor {
} else if (source == hitTargetConditionsList) { } else if (source == hitTargetConditionsList) {
updateHit = true; updateHit = true;
} else if (source == hitTargetConditionBox) { } else if (source == hitTargetConditionBox) {
if (selectedHitEffectTargetCondition.condition != null) { updateConditionEffect((ActorCondition) value, npc, selectedHitEffectTargetCondition, hitTargetConditionsListModel);
selectedHitEffectTargetCondition.condition.removeBacklink(npc);
}
selectedHitEffectTargetCondition.condition = (ActorCondition) value;
if (selectedHitEffectTargetCondition.condition != null) {
selectedHitEffectTargetCondition.condition_id = selectedHitEffectTargetCondition.condition.id;
selectedHitEffectTargetCondition.condition.addBacklink(npc);
} else {
selectedHitEffectTargetCondition.condition_id = null;
}
hitTargetConditionsListModel.itemChanged(selectedHitEffectTargetCondition);
} else if (source == hitTargetConditionClear && (Boolean) value) { } else if (source == hitTargetConditionClear && (Boolean) value) {
selectedHitEffectTargetCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR; selectedHitEffectTargetCondition.magnitude = ActorCondition.MAGNITUDE_CLEAR;
selectedHitEffectTargetCondition.duration = null; selectedHitEffectTargetCondition.duration = null;
@@ -1282,17 +1272,7 @@ public class NPCEditor extends JSONElementEditor {
} else if (source == hitReceivedTargetConditionsList) { } else if (source == hitReceivedTargetConditionsList) {
updateHitReceived = true; updateHitReceived = true;
} else if (source == hitReceivedTargetConditionBox) { } else if (source == hitReceivedTargetConditionBox) {
if (selectedHitReceivedEffectTargetCondition.condition != null) { updateConditionEffect((ActorCondition) value, npc, selectedHitReceivedEffectTargetCondition, hitReceivedTargetConditionsListModel);
selectedHitReceivedEffectTargetCondition.condition.removeBacklink(npc);
}
selectedHitReceivedEffectTargetCondition.condition = (ActorCondition) value;
if (selectedHitReceivedEffectTargetCondition.condition != null) {
selectedHitReceivedEffectTargetCondition.condition_id = selectedHitReceivedEffectTargetCondition.condition.id;
selectedHitReceivedEffectTargetCondition.condition.addBacklink(npc);
} else {
selectedHitReceivedEffectTargetCondition.condition_id = null;
}
hitReceivedTargetConditionsListModel.itemChanged(selectedHitReceivedEffectTargetCondition);
} 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;