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

reformat CommonEditor

Browse Source
This commit is contained in:
OMGeeky
2025-06-24 15:38:55 +02:00
parent 62ed795fed
commit 6dcd8599b3
1 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/CommonEditor.java
View File

@@ -27,8 +27,7 @@ public class CommonEditor {
@Override @Override
public Component getListCellRendererComponent(@SuppressWarnings("rawtypes") JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { public Component getListCellRendererComponent(@SuppressWarnings("rawtypes") JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
if (c instanceof JLabel) { if (c instanceof JLabel label) {
JLabel label = ((JLabel) c);
Common.TimedActorConditionEffect effect = (Common.TimedActorConditionEffect) value; Common.TimedActorConditionEffect effect = (Common.TimedActorConditionEffect) value;
if (effect.condition != null) { if (effect.condition != null) {
@@ -39,13 +38,16 @@ public class CommonEditor {
if (clear) { if (clear) {
label.setIcon(new ImageIcon(effect.condition.getIcon())); label.setIcon(new ImageIcon(effect.condition.getIcon()));
label.setText(effect.chance + "% chances to clear actor condition " + effect.condition.getDesc()); label.setText(
effect.chance + "% chances to clear actor condition " + effect.condition.getDesc());
} else if (immunity) { } else if (immunity) {
label.setIcon(new OverlayIcon(effect.condition.getIcon(), DefaultIcons.getImmunityIcon())); label.setIcon(new OverlayIcon(effect.condition.getIcon(), DefaultIcons.getImmunityIcon()));
label.setText(effect.chance + "% chances to give immunity to " + effect.condition.getDesc() + (forever ? " forever" : " for " + effect.duration + " rounds")); label.setText(
effect.chance + "% chances to give immunity to " + effect.condition.getDesc() + (forever ? " forever" : " for " + effect.duration + " rounds"));
} else { } else {
label.setIcon(new ImageIcon(effect.condition.getIcon())); label.setIcon(new ImageIcon(effect.condition.getIcon()));
label.setText(effect.chance + "% chances to give actor condition " + effect.condition.getDesc() + " x" + effect.magnitude + (forever ? " forever" : " for " + effect.duration + " rounds")); label.setText(
effect.chance + "% chances to give actor condition " + effect.condition.getDesc() + " x" + effect.magnitude + (forever ? " forever" : " for " + effect.duration + " rounds"));
} }
} else { } else {
label.setText("New, undefined actor condition effect."); label.setText("New, undefined actor condition effect.");
@@ -61,8 +63,7 @@ public class CommonEditor {
@Override @Override
public Component getListCellRendererComponent(@SuppressWarnings("rawtypes") JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { public Component getListCellRendererComponent(@SuppressWarnings("rawtypes") JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
if (c instanceof JLabel) { if (c instanceof JLabel label) {
JLabel label = ((JLabel) c);
Common.ActorConditionEffect effect = (Common.ActorConditionEffect) value; Common.ActorConditionEffect effect = (Common.ActorConditionEffect) value;
if (effect.condition != null) { if (effect.condition != null) {
@@ -97,13 +98,18 @@ public class CommonEditor {
effect = e; effect = e;
createHitEffectPaneContent(listener, writable, e, sourceConditionsModelInput, targetConditionsModelInput); createHitEffectPaneContent(listener, writable, e, sourceConditionsModelInput, targetConditionsModelInput);
} }
@Override @Override
protected void addFields(FieldUpdateListener listener, boolean writable) { protected void addFields(FieldUpdateListener listener, boolean writable) {
super.addFields(listener, writable); super.addFields(listener, writable);
hitReceivedEffectHPMinTarget = addIntegerField(effectPane, "HP bonus min%s: ".formatted(applyToTargetHint), effect.target.hp_boost_min, true, writable, listener); hitReceivedEffectHPMinTarget = addIntegerField(effectPane, "HP bonus min%s: ".formatted(applyToTargetHint),
hitReceivedEffectHPMaxTarget = addIntegerField(effectPane, "HP bonus max%s: ".formatted(applyToTargetHint), effect.target.hp_boost_max, true, writable, listener); effect.target.hp_boost_min, true, writable, listener);
hitReceivedEffectAPMinTarget = addIntegerField(effectPane, "AP bonus min%s: ".formatted(applyToTargetHint), effect.target.ap_boost_min, true, writable, listener); hitReceivedEffectHPMaxTarget = addIntegerField(effectPane, "HP bonus max%s: ".formatted(applyToTargetHint),
hitReceivedEffectAPMaxTarget = addIntegerField(effectPane, "AP bonus max%s: ".formatted(applyToTargetHint), effect.target.ap_boost_max, true, writable, listener); effect.target.hp_boost_max, true, writable, listener);
hitReceivedEffectAPMinTarget = addIntegerField(effectPane, "AP bonus min%s: ".formatted(applyToTargetHint),
effect.target.ap_boost_min, true, writable, listener);
hitReceivedEffectAPMaxTarget = addIntegerField(effectPane, "AP bonus max%s: ".formatted(applyToTargetHint),
effect.target.ap_boost_max, true, writable, listener);
} }
@@ -180,21 +186,14 @@ public class CommonEditor {
BasicLambdaWithArg<ELEMENT> selectedSetTarget = (value) -> selectedHitEffectTargetCondition = value; BasicLambdaWithArg<ELEMENT> selectedSetTarget = (value) -> selectedHitEffectTargetCondition = value;
BasicLambdaWithReturn<ELEMENT> selectedGetTarget = () -> selectedHitEffectTargetCondition; BasicLambdaWithReturn<ELEMENT> selectedGetTarget = () -> selectedHitEffectTargetCondition;
BasicLambda selectedResetTarget = () -> selectedHitEffectTargetCondition = null; BasicLambda selectedResetTarget = () -> selectedHitEffectTargetCondition = null;
BasicLambdaWithArg<JPanel> updatePaneTarget = (editorPane) -> updateHitTargetTimedConditionEditorPane(editorPane, selectedHitEffectTargetCondition, listener, this.editor); BasicLambdaWithArg<JPanel> updatePaneTarget = (editorPane) -> updateHitTargetTimedConditionEditorPane(
editorPane, selectedHitEffectTargetCondition, listener, this.editor);
var resultTarget = UiUtils.getCollapsibleItemList(listener, var resultTarget = UiUtils.getCollapsibleItemList(listener, hitTargetConditionsListModel,
hitTargetConditionsListModel, selectedResetTarget, selectedSetTarget, selectedGetTarget,
selectedResetTarget, (x) -> {
selectedSetTarget, }, updatePaneTarget, writable, this.conditionSupplier,
selectedGetTarget, cellRendererTarget, titleTarget, (x) -> null);
(x) -> {
},
updatePaneTarget,
writable,
this.conditionSupplier,
cellRendererTarget,
titleTarget,
(x) -> null);
hitTargetConditionsList = resultTarget.list; hitTargetConditionsList = resultTarget.list;
CollapsiblePanel hitTargetConditionsPane = resultTarget.collapsiblePanel; CollapsiblePanel hitTargetConditionsPane = resultTarget.collapsiblePanel;
if (effect == null || effect.conditions_target == null || effect.conditions_target.isEmpty()) { if (effect == null || effect.conditions_target == null || effect.conditions_target.isEmpty()) {
@@ -212,13 +211,16 @@ public class CommonEditor {
boolean writable = e.target.writable; boolean writable = e.target.writable;
Project proj = e.target.getProject(); Project proj = e.target.getProject();
hitTargetConditionBox = e.addActorConditionBox(pane, proj, "Actor Condition: ", condition.condition, writable, listener); hitTargetConditionBox = e.addActorConditionBox(pane, proj, "Actor Condition: ", condition.condition,
hitTargetConditionChance = e.addDoubleField(pane, "Chance: ", condition.chance, writable, listener); writable, listener);
hitTargetConditionChance = Editor.addDoubleField(pane, "Chance: ", condition.chance, writable, listener);
hitTargetConditionClear = new JRadioButton("Clear active condition"); hitTargetConditionClear = new JRadioButton("Clear active condition");
pane.add(hitTargetConditionClear, JideBoxLayout.FIX); pane.add(hitTargetConditionClear, JideBoxLayout.FIX);
hitTargetConditionApply = new JRadioButton("Apply condition with magnitude"); hitTargetConditionApply = new JRadioButton("Apply condition with magnitude");
pane.add(hitTargetConditionApply, JideBoxLayout.FIX); pane.add(hitTargetConditionApply, JideBoxLayout.FIX);
hitTargetConditionMagnitude = addIntegerField(pane, "Magnitude: ", condition.magnitude == null ? null : condition.magnitude >= 0 ? condition.magnitude : 0, 1, false, writable, listener); hitTargetConditionMagnitude = addIntegerField(pane, "Magnitude: ",
condition.magnitude == null ? null : condition.magnitude >= 0 ? condition.magnitude : 0,
1, false, writable, listener);
hitTargetConditionImmunity = new JRadioButton("Give immunity to condition"); hitTargetConditionImmunity = new JRadioButton("Give immunity to condition");
pane.add(hitTargetConditionImmunity, JideBoxLayout.FIX); pane.add(hitTargetConditionImmunity, JideBoxLayout.FIX);
@@ -229,7 +231,8 @@ public class CommonEditor {
hitTargetConditionTimed = new JRadioButton("For a number of rounds"); hitTargetConditionTimed = new JRadioButton("For a number of rounds");
pane.add(hitTargetConditionTimed, JideBoxLayout.FIX); pane.add(hitTargetConditionTimed, JideBoxLayout.FIX);
hitTargetConditionDuration = addIntegerField(pane, "Duration: ", condition.duration, 1, false, writable, listener); hitTargetConditionDuration = addIntegerField(pane, "Duration: ", condition.duration, 1, false, writable,
listener);
hitTargetConditionForever = new JRadioButton("Forever"); hitTargetConditionForever = new JRadioButton("Forever");
pane.add(hitTargetConditionForever, JideBoxLayout.FIX); pane.add(hitTargetConditionForever, JideBoxLayout.FIX);
@@ -242,32 +245,32 @@ public class CommonEditor {
hitTargetConditionClear.addActionListener(new ActionListener() { hitTargetConditionClear.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
listener.valueChanged(hitTargetConditionClear, new Boolean(hitTargetConditionClear.isSelected())); listener.valueChanged(hitTargetConditionClear, hitTargetConditionClear.isSelected());
} }
}); });
hitTargetConditionApply.addActionListener(new ActionListener() { hitTargetConditionApply.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
listener.valueChanged(hitTargetConditionApply, new Boolean(hitTargetConditionApply.isSelected())); listener.valueChanged(hitTargetConditionApply, hitTargetConditionApply.isSelected());
} }
}); });
hitTargetConditionImmunity.addActionListener(new ActionListener() { hitTargetConditionImmunity.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
listener.valueChanged(hitTargetConditionImmunity, new Boolean(hitTargetConditionImmunity.isSelected())); listener.valueChanged(hitTargetConditionImmunity, hitTargetConditionImmunity.isSelected());
} }
}); });
hitTargetConditionTimed.addActionListener(new ActionListener() { hitTargetConditionTimed.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
listener.valueChanged(hitTargetConditionTimed, new Boolean(hitTargetConditionTimed.isSelected())); listener.valueChanged(hitTargetConditionTimed, hitTargetConditionTimed.isSelected());
} }
}); });
hitTargetConditionForever.addActionListener(new ActionListener() { hitTargetConditionForever.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
listener.valueChanged(hitTargetConditionForever, new Boolean(hitTargetConditionForever.isSelected())); listener.valueChanged(hitTargetConditionForever, hitTargetConditionForever.isSelected());
} }
}); });
pane.revalidate(); pane.revalidate();
@@ -298,7 +301,8 @@ public class CommonEditor {
if (source == hitTargetConditionsList) { if (source == hitTargetConditionsList) {
updateHit = true; updateHit = true;
} else if (source == hitTargetConditionBox) { } else if (source == hitTargetConditionBox) {
editor.updateConditionEffect((ActorCondition) value, backlink, selectedHitEffectTargetCondition, hitTargetConditionsListModel); editor.updateConditionEffect((ActorCondition) value, backlink, selectedHitEffectTargetCondition,
hitTargetConditionsListModel);
} 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;
@@ -409,10 +413,14 @@ public class CommonEditor {
} }
protected void addFields(FieldUpdateListener listener, boolean writable) { protected void addFields(FieldUpdateListener listener, boolean writable) {
effectHPMin = addIntegerField(effectPane, "HP bonus min%s: ".formatted(applyToHint), effect.hp_boost_min, true, writable, listener); effectHPMin = addIntegerField(effectPane, "HP bonus min%s: ".formatted(applyToHint), effect.hp_boost_min,
effectHPMax = addIntegerField(effectPane, "HP bonus max%s: ".formatted(applyToHint), effect.hp_boost_max, true, writable, listener); true, writable, listener);
effectAPMin = addIntegerField(effectPane, "AP bonus min%s: ".formatted(applyToHint), effect.ap_boost_min, true, writable, listener); effectHPMax = addIntegerField(effectPane, "HP bonus max%s: ".formatted(applyToHint), effect.hp_boost_max,
effectAPMax = addIntegerField(effectPane, "AP bonus max%s: ".formatted(applyToHint), effect.ap_boost_max, true, writable, listener); true, writable, listener);
effectAPMin = addIntegerField(effectPane, "AP bonus min%s: ".formatted(applyToHint), effect.ap_boost_min,
true, writable, listener);
effectAPMax = addIntegerField(effectPane, "AP bonus max%s: ".formatted(applyToHint), effect.ap_boost_max,
true, writable, listener);
} }
protected void addLists(FieldUpdateListener listener, boolean writable) { protected void addLists(FieldUpdateListener listener, boolean writable) {
@@ -421,21 +429,12 @@ public class CommonEditor {
BasicLambdaWithArg<ELEMENT> selectedSetSource = (value) -> selectedEffectSourceCondition = value; BasicLambdaWithArg<ELEMENT> selectedSetSource = (value) -> selectedEffectSourceCondition = value;
BasicLambdaWithReturn<ELEMENT> selectedGetSource = () -> selectedEffectSourceCondition; BasicLambdaWithReturn<ELEMENT> selectedGetSource = () -> selectedEffectSourceCondition;
BasicLambda selectedResetSource = () -> selectedEffectSourceCondition = null; BasicLambda selectedResetSource = () -> selectedEffectSourceCondition = null;
BasicLambdaWithArg<JPanel> updatePaneSource = (editorPane) -> updateEffectSourceTimedConditionEditorPane(editorPane, selectedEffectSourceCondition, listener, editor); BasicLambdaWithArg<JPanel> updatePaneSource = (editorPane) -> updateEffectSourceTimedConditionEditorPane(
editorPane, selectedEffectSourceCondition, listener, editor);
var resultSource = UiUtils.getCollapsibleItemList(listener, var resultSource = UiUtils.getCollapsibleItemList(listener, this.sourceConditionsModel, selectedResetSource,
this.sourceConditionsModel, selectedSetSource, selectedGetSource, (x) -> {
selectedResetSource, }, updatePaneSource, writable, conditionSupplier, cellRendererSource, titleSource, (x) -> null);
selectedSetSource,
selectedGetSource,
(x) -> {
},
updatePaneSource,
writable,
conditionSupplier,
cellRendererSource,
titleSource,
(x) -> null);
sourceConditionsList = resultSource.list; sourceConditionsList = resultSource.list;
CollapsiblePanel sourceConditionsPane = resultSource.collapsiblePanel; CollapsiblePanel sourceConditionsPane = resultSource.collapsiblePanel;
if (effect == null || effect.conditions_source == null || effect.conditions_source.isEmpty()) { if (effect == null || effect.conditions_source == null || effect.conditions_source.isEmpty()) {
@@ -453,14 +452,17 @@ public class CommonEditor {
boolean writable = e.target.writable; boolean writable = e.target.writable;
Project proj = e.target.getProject(); Project proj = e.target.getProject();
sourceConditionBox = e.addActorConditionBox(pane, proj, "Actor Condition: ", condition.condition, writable, listener); sourceConditionBox = e.addActorConditionBox(pane, proj, "Actor Condition: ", condition.condition, writable,
sourceConditionChance = e.addDoubleField(pane, "Chance: ", condition.chance, writable, listener); listener);
sourceConditionChance = Editor.addDoubleField(pane, "Chance: ", condition.chance, writable, listener);
sourceConditionClear = new JRadioButton("Clear active condition"); sourceConditionClear = new JRadioButton("Clear active condition");
pane.add(sourceConditionClear, JideBoxLayout.FIX); pane.add(sourceConditionClear, JideBoxLayout.FIX);
sourceConditionApply = new JRadioButton("Apply condition with magnitude"); sourceConditionApply = new JRadioButton("Apply condition with magnitude");
pane.add(sourceConditionApply, JideBoxLayout.FIX); pane.add(sourceConditionApply, JideBoxLayout.FIX);
sourceConditionMagnitude = addIntegerField(pane, "Magnitude: ", condition.magnitude == null ? null : condition.magnitude >= 0 ? condition.magnitude : 0, 1, false, writable, listener); sourceConditionMagnitude = addIntegerField(pane, "Magnitude: ",
condition.magnitude == null ? null : condition.magnitude >= 0 ? condition.magnitude : 0,
1, false, writable, listener);
sourceConditionImmunity = new JRadioButton("Give immunity to condition"); sourceConditionImmunity = new JRadioButton("Give immunity to condition");
pane.add(sourceConditionImmunity, JideBoxLayout.FIX); pane.add(sourceConditionImmunity, JideBoxLayout.FIX);
@@ -471,7 +473,8 @@ public class CommonEditor {
sourceConditionTimed = new JRadioButton("For a number of rounds"); sourceConditionTimed = new JRadioButton("For a number of rounds");
pane.add(sourceConditionTimed, JideBoxLayout.FIX); pane.add(sourceConditionTimed, JideBoxLayout.FIX);
sourceConditionDuration = addIntegerField(pane, "Duration: ", condition.duration, 1, false, writable, listener); sourceConditionDuration = addIntegerField(pane, "Duration: ", condition.duration, 1, false, writable,
listener);
sourceConditionForever = new JRadioButton("Forever"); sourceConditionForever = new JRadioButton("Forever");
pane.add(sourceConditionForever, JideBoxLayout.FIX); pane.add(sourceConditionForever, JideBoxLayout.FIX);
@@ -484,32 +487,32 @@ public class CommonEditor {
sourceConditionClear.addActionListener(new ActionListener() { sourceConditionClear.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
listener.valueChanged(sourceConditionClear, new Boolean(sourceConditionClear.isSelected())); listener.valueChanged(sourceConditionClear, sourceConditionClear.isSelected());
} }
}); });
sourceConditionApply.addActionListener(new ActionListener() { sourceConditionApply.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
listener.valueChanged(sourceConditionApply, new Boolean(sourceConditionApply.isSelected())); listener.valueChanged(sourceConditionApply, sourceConditionApply.isSelected());
} }
}); });
sourceConditionImmunity.addActionListener(new ActionListener() { sourceConditionImmunity.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
listener.valueChanged(sourceConditionImmunity, new Boolean(sourceConditionImmunity.isSelected())); listener.valueChanged(sourceConditionImmunity, sourceConditionImmunity.isSelected());
} }
}); });
sourceConditionTimed.addActionListener(new ActionListener() { sourceConditionTimed.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
listener.valueChanged(sourceConditionTimed, new Boolean(sourceConditionTimed.isSelected())); listener.valueChanged(sourceConditionTimed, sourceConditionTimed.isSelected());
} }
}); });
sourceConditionForever.addActionListener(new ActionListener() { sourceConditionForever.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
listener.valueChanged(sourceConditionForever, new Boolean(sourceConditionForever.isSelected())); listener.valueChanged(sourceConditionForever, sourceConditionForever.isSelected());
} }
}); });
pane.revalidate(); pane.revalidate();