mirror of
https://github.com/OMGeeky/ATCS.git
synced 2025-12-26 15:57:22 +01:00
Merge branch 'pulls/1195352/15'
Miss effect added, add comments to start script
This commit is contained in:
Nut.andor
@@ -67,22 +67,22 @@ Section install
|
||||
FileWrite $9 '$\r$\n'
|
||||
FileWrite $9 'set "ATCS_DIR=%~dp0"$\r$\n'
|
||||
FileWrite $9 'set "MAX_MEM=1024M"$\r$\n'
|
||||
FileWrite $9 'set "CP=%ATCS_DIR%lib\*"$\r$\n'
|
||||
FileWrite $9 'REM required minimum java version is 11$\r$\n'
|
||||
FileWrite $9 'set "JAVA=$R0"$\r$\n'
|
||||
FileWrite $9 'set "JAVA_OPTS="$\r$\n'
|
||||
FileWrite $9 'set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"$\r$\n'
|
||||
FileWrite $9 'set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"$\r$\n'
|
||||
FileWrite $9 'set "MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio"$\r$\n'
|
||||
FileWrite $9 '$\r$\n'
|
||||
FileWrite $9 'if exist "%ENV_FILE%" ($\r$\n'
|
||||
FileWrite $9 ' call "%ENV_FILE%"$\r$\n'
|
||||
FileWrite $9 ') else ($\r$\n'
|
||||
FileWrite $9 ' echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%"$\r$\n'
|
||||
FileWrite $9 ' echo REM required minimum java version is 11$\r$\n'
|
||||
FileWrite $9 ' echo REM set "JAVA=%JAVA%">>"%ENV_FILE%"$\r$\n'
|
||||
FileWrite $9 ' echo REM set "JAVA_OPTS=%JAVA_OPTS%">>"%ENV_FILE%"$\r$\n'
|
||||
FileWrite $9 ' echo.>>"%ENV_FILE%"$\r$\n'
|
||||
FileWrite $9 ')$\r$\n'
|
||||
FileWrite $9 '$\r$\n'
|
||||
FileWrite $9 'start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -jar ATCS.jar$\r$\n'
|
||||
FileWrite $9 'start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -jar "%ATCS_DIR%\ATCS.jar"$\r$\n'
|
||||
FileClose $9
|
||||
|
||||
WriteUninstaller "$INSTDIR\Uninstall.exe"
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
set "ATCS_DIR=%~dp0"
|
||||
set "MAX_MEM=1024M"
|
||||
REM required minimum java version is 11
|
||||
set "JAVA=java.exe"
|
||||
set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"
|
||||
set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"
|
||||
@@ -10,6 +11,7 @@ if exist "%ENV_FILE%" (
|
||||
call "%ENV_FILE%"
|
||||
) else (
|
||||
echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%"
|
||||
echo REM required minimum java version is 11
|
||||
echo REM set "JAVA=%JAVA%">>"%ENV_FILE%"
|
||||
echo REM set "JAVA_OPTS=%JAVA_OPTS%">>"%ENV_FILE%"
|
||||
echo.>>"%ENV_FILE%"
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
#!/bin/bash
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# get the directory of this script
|
||||
ATCS_DIR="$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")")"
|
||||
echo "ATCS_DIR: '${ATCS_DIR}'"
|
||||
|
||||
MAX_MEM="512M"
|
||||
JAVA="java"
|
||||
JAVA="java" # minimum required version is Java 11
|
||||
JAVA_OPTS='-DFONT_SCALE=1.0 -Dswing.aatext=true'
|
||||
|
||||
ENV_FILE="${ATCS_DIR}/ATCS.env"
|
||||
@@ -13,7 +15,7 @@ if [ -f "${ENV_FILE}" ]; then
|
||||
else
|
||||
{
|
||||
echo "#MAX_MEM=\"${MAX_MEM}\""
|
||||
echo "#JAVA=\"${JAVA}\""
|
||||
echo "#JAVA=\"${JAVA}\" # minimum required version is Java 11"
|
||||
echo "#JAVA_OPTS=\"${JAVA_OPTS}\""
|
||||
echo ""
|
||||
}>"${ENV_FILE}"
|
||||
|
||||
@@ -13,8 +13,8 @@ else
|
||||
fi
|
||||
|
||||
# --- Configuration ---
|
||||
PACKAGING_DIR=$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")")
|
||||
ATCS_SOURCE_DIR=$(dirname "${PACKAGING_DIR}")
|
||||
PACKAGING_DIR=$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")") # Directory of this script
|
||||
ATCS_SOURCE_DIR=$(dirname "${PACKAGING_DIR}") # Parent directory of this script, assumed to be ATCS source root
|
||||
TEMP_DIR="${PACKAGING_DIR}/tmp"
|
||||
JAR_LOCATION="${PACKAGING_DIR}/ATCS.jar" # Output JAR location as per script
|
||||
MANIFEST_LOCATION="${PACKAGING_DIR}/Manifest.txt"
|
||||
|
||||
@@ -1 +1 @@
|
||||
v0.6.23
|
||||
v0.6.24
|
||||
@@ -36,6 +36,8 @@ public class Item extends JSONElement {
|
||||
public String description = null;
|
||||
public HitEffect hit_effect = null;
|
||||
public HitReceivedEffect hit_received_effect = null;
|
||||
public HitEffect miss_effect = null;
|
||||
public HitReceivedEffect miss_received_effect = null;
|
||||
public DeathEffect kill_effect = null;
|
||||
public EquipEffect equip_effect = null;
|
||||
|
||||
@@ -193,6 +195,16 @@ public class Item extends JSONElement {
|
||||
this.hit_received_effect = parseHitReceivedEffect(hitReceivedEffect);
|
||||
}
|
||||
|
||||
Map missEffect = (Map) itemJson.get("missEffect");
|
||||
if (missEffect != null) {
|
||||
this.miss_effect = parseHitEffect(missEffect);
|
||||
}
|
||||
|
||||
Map missReceivedEffect = (Map) itemJson.get("missReceivedEffect");
|
||||
if (missReceivedEffect != null) {
|
||||
this.miss_received_effect = parseHitReceivedEffect(missReceivedEffect);
|
||||
}
|
||||
|
||||
Map killEffect = (Map) itemJson.get("killEffect");
|
||||
if (killEffect == null) {
|
||||
killEffect = (Map) itemJson.get("useEffect");
|
||||
@@ -225,6 +237,8 @@ public class Item extends JSONElement {
|
||||
|
||||
linkEffects(this.hit_effect, proj, this);
|
||||
linkEffects(this.hit_received_effect, proj, this);
|
||||
linkEffects(this.miss_effect, proj, this);
|
||||
linkEffects(this.miss_received_effect, proj, this);
|
||||
linkEffects(this.kill_effect, proj, this);
|
||||
this.state = State.linked;
|
||||
}
|
||||
@@ -294,6 +308,14 @@ public class Item extends JSONElement {
|
||||
clone.hit_received_effect = new HitReceivedEffect();
|
||||
copyHitReceivedEffectValues(clone.hit_received_effect, this.hit_received_effect, clone);
|
||||
}
|
||||
if (this.miss_effect != null) {
|
||||
clone.miss_effect = new HitEffect();
|
||||
copyHitEffectValues(clone.miss_effect, this.miss_effect, clone);
|
||||
}
|
||||
if (this.miss_received_effect != null) {
|
||||
clone.miss_received_effect = new HitReceivedEffect();
|
||||
copyHitReceivedEffectValues(clone.miss_received_effect, this.miss_received_effect, clone);
|
||||
}
|
||||
if (this.kill_effect != null) {
|
||||
clone.kill_effect = new DeathEffect();
|
||||
copyDeathEffectValues(clone.kill_effect, this.kill_effect, clone);
|
||||
@@ -317,6 +339,18 @@ public class Item extends JSONElement {
|
||||
actorConditionElementChanged(this.hit_effect.conditions_source, oldOne, newOne, this);
|
||||
actorConditionElementChanged(this.hit_effect.conditions_target, oldOne, newOne, this);
|
||||
}
|
||||
if (this.hit_received_effect != null) {
|
||||
actorConditionElementChanged(this.hit_received_effect.conditions_source, oldOne, newOne, this);
|
||||
actorConditionElementChanged(this.hit_received_effect.conditions_target, oldOne, newOne, this);
|
||||
}
|
||||
if (this.miss_effect != null) {
|
||||
actorConditionElementChanged(this.miss_effect.conditions_source, oldOne, newOne, this);
|
||||
actorConditionElementChanged(this.miss_effect.conditions_target, oldOne, newOne, this);
|
||||
}
|
||||
if (this.miss_received_effect != null) {
|
||||
actorConditionElementChanged(this.miss_received_effect.conditions_source, oldOne, newOne, this);
|
||||
actorConditionElementChanged(this.miss_received_effect.conditions_target, oldOne, newOne, this);
|
||||
}
|
||||
|
||||
if (this.kill_effect != null) {
|
||||
actorConditionElementChanged(this.kill_effect.conditions_source, oldOne, newOne, this);
|
||||
@@ -381,6 +415,8 @@ public class Item extends JSONElement {
|
||||
}
|
||||
writeHitEffectToMap(itemJson, this.hit_effect, "hitEffect");
|
||||
writeHitReceivedEffectToMap(itemJson, this.hit_received_effect, "hitReceivedEffect");
|
||||
writeHitEffectToMap(itemJson, this.miss_effect, "missEffect");
|
||||
writeHitReceivedEffectToMap(itemJson, this.miss_received_effect, "missReceivedEffect");
|
||||
|
||||
String key;
|
||||
if (this.category != null && this.category.action_type != null && this.category.action_type == ItemCategory.ActionType.equip) {
|
||||
|
||||
@@ -26,7 +26,7 @@ public class CommonEditor {
|
||||
private static final long serialVersionUID = 7987880146189575234L;
|
||||
|
||||
@Override
|
||||
public Component getListCellRendererComponent(@SuppressWarnings("rawtypes") JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
|
||||
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
|
||||
Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
|
||||
if (c instanceof JLabel) {
|
||||
JLabel label = (JLabel) c;
|
||||
@@ -68,7 +68,7 @@ public class CommonEditor {
|
||||
private static final long serialVersionUID = 7987880146189575234L;
|
||||
|
||||
@Override
|
||||
public Component getListCellRendererComponent(@SuppressWarnings("rawtypes") JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
|
||||
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
|
||||
Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
|
||||
if (c instanceof JLabel) {
|
||||
JLabel label = (JLabel) c;
|
||||
@@ -90,7 +90,7 @@ public class CommonEditor {
|
||||
}
|
||||
}
|
||||
|
||||
public static class HitRecievedEffectPane<EFFECT extends Common.HitReceivedEffect, LIST_MODEL_SOURCE, ELEMENT extends Common.TimedActorConditionEffect, MODEL extends OrderedListenerListModel<LIST_MODEL_SOURCE, ELEMENT>> extends HitEffectPane<EFFECT, LIST_MODEL_SOURCE, ELEMENT, MODEL> {
|
||||
public static class HitReceivedEffectPane<EFFECT extends Common.HitReceivedEffect> extends HitEffectPane<EFFECT> {
|
||||
/// this should just be a convenience field, to access it, without casting. DO NOT SET WITHOUT ALSO SETTING THE FIELD IN THE SUPER-CLASS!
|
||||
EFFECT effect;
|
||||
private JSpinner hitReceivedEffectHPMinTarget;
|
||||
@@ -98,13 +98,14 @@ public class CommonEditor {
|
||||
private JSpinner hitReceivedEffectAPMinTarget;
|
||||
private JSpinner hitReceivedEffectAPMaxTarget;
|
||||
|
||||
public HitRecievedEffectPane(String title, Supplier<ELEMENT> sourceNewSupplier, Editor editor, String applyToHint, String applyToTargetHint) {
|
||||
super(title, sourceNewSupplier, editor, applyToHint, applyToTargetHint);
|
||||
public HitReceivedEffectPane(String title, Editor editor, String applyToHint, String applyToTargetHint) {
|
||||
super(title, editor, applyToHint, applyToTargetHint);
|
||||
}
|
||||
|
||||
void createHitReceivedEffectPaneContent(FieldUpdateListener listener, boolean writable, EFFECT e, MODEL sourceConditionsModelInput, MODEL targetConditionsModelInput) {
|
||||
@Override
|
||||
public void createPaneContent(FieldUpdateListener listener, boolean writable, EFFECT e) {
|
||||
effect = e;
|
||||
createHitEffectPaneContent(listener, writable, e, sourceConditionsModelInput, targetConditionsModelInput);
|
||||
super.createPaneContent(listener, writable, e);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -144,32 +145,35 @@ public class CommonEditor {
|
||||
}
|
||||
}
|
||||
|
||||
public static class HitEffectPane<EFFECT extends Common.HitEffect, LIST_MODEL_SOURCE, ELEMENT extends Common.TimedActorConditionEffect, MODEL extends OrderedListenerListModel<LIST_MODEL_SOURCE, ELEMENT>> extends DeathEffectPane<EFFECT, LIST_MODEL_SOURCE, ELEMENT, MODEL> {
|
||||
public static class HitEffectPane<EFFECT extends Common.HitEffect>
|
||||
|
||||
extends DeathEffectPane<EFFECT> {
|
||||
/// this should just be a convenience field, to access it, without casting. DO NOT SET WITHOUT ALSO SETTING THE FIELD IN THE SUPER-CLASS!
|
||||
public EFFECT effect;
|
||||
|
||||
protected final String applyToTargetHint;
|
||||
private JList hitTargetConditionsList;
|
||||
private final ConditionEffectEditorPane<LIST_MODEL_SOURCE, ELEMENT, MODEL> hitTargetConditionPane;
|
||||
private JList<Common.TimedActorConditionEffect> hitTargetConditionsList;
|
||||
private final ConditionEffectEditorPane<Common.HitEffect, TargetTimedConditionsListModel> hitTargetConditionPane;
|
||||
|
||||
/*
|
||||
* create a new HitEffectPane with the selections (probably passed in from last time)
|
||||
*/
|
||||
public HitEffectPane(String title, Supplier<ELEMENT> sourceNewSupplier, Editor editor, String applyToHint, String applyToTargetHint) {
|
||||
super(title, sourceNewSupplier, editor, applyToHint);
|
||||
public HitEffectPane(String title, Editor editor, String applyToHint, String applyToTargetHint) {
|
||||
super(title, editor, applyToHint);
|
||||
hitTargetConditionPane = new ConditionEffectEditorPane<>(editor);
|
||||
|
||||
if (applyToTargetHint == null || applyToTargetHint == "") {
|
||||
if (applyToTargetHint == null || applyToTargetHint.isEmpty()) {
|
||||
this.applyToTargetHint = "";
|
||||
} else {
|
||||
this.applyToTargetHint = String.format(" (%s)", applyToTargetHint);
|
||||
}
|
||||
}
|
||||
|
||||
void createHitEffectPaneContent(FieldUpdateListener listener, boolean writable, EFFECT e, MODEL sourceConditionsModelInput, MODEL targetConditionsListModel) {
|
||||
@Override
|
||||
public void createPaneContent(FieldUpdateListener listener, boolean writable, EFFECT e) {
|
||||
effect = e;
|
||||
hitTargetConditionPane.conditionsModel = targetConditionsListModel;
|
||||
createDeathEffectPaneContent(listener, writable, e, sourceConditionsModelInput);
|
||||
hitTargetConditionPane.conditionsModel = new TargetTimedConditionsListModel(e);
|
||||
super.createPaneContent(listener, writable, e);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -178,8 +182,8 @@ public class CommonEditor {
|
||||
|
||||
String titleTarget = String.format("Actor Conditions applied to the target%s: ", applyToTargetHint);
|
||||
CommonEditor.TimedConditionsCellRenderer cellRendererTarget = new CommonEditor.TimedConditionsCellRenderer();
|
||||
BasicLambdaWithArg<ELEMENT> selectedSetTarget = (value) -> hitTargetConditionPane.selectedCondition = value;
|
||||
BasicLambdaWithReturn<ELEMENT> selectedGetTarget = () -> hitTargetConditionPane.selectedCondition;
|
||||
BasicLambdaWithArg<Common.TimedActorConditionEffect> selectedSetTarget = (value) -> hitTargetConditionPane.selectedCondition = value;
|
||||
BasicLambdaWithReturn<Common.TimedActorConditionEffect> selectedGetTarget = () -> hitTargetConditionPane.selectedCondition;
|
||||
BasicLambda selectedResetTarget = () -> hitTargetConditionPane.selectedCondition = null;
|
||||
BasicLambdaWithArg<JPanel> updatePaneTarget = (editorPane) -> hitTargetConditionPane.updateEffectTimedConditionEditorPane(
|
||||
editorPane, hitTargetConditionPane.selectedCondition, listener);
|
||||
@@ -212,8 +216,8 @@ public class CommonEditor {
|
||||
}
|
||||
}
|
||||
|
||||
public static class DeathEffectPane<EFFECT extends Common.DeathEffect, LIST_MODEL_SOURCE, ELEMENT extends Common.TimedActorConditionEffect, MODEL extends OrderedListenerListModel<LIST_MODEL_SOURCE, ELEMENT>> {
|
||||
protected final Supplier<ELEMENT> conditionSupplier;
|
||||
public static class DeathEffectPane<EFFECT extends Common.DeathEffect> {
|
||||
protected final Supplier<Common.TimedActorConditionEffect> conditionSupplier;
|
||||
protected final String title;
|
||||
protected final String applyToHint;
|
||||
|
||||
@@ -224,28 +228,27 @@ public class CommonEditor {
|
||||
private JSpinner effectHPMax;
|
||||
private JSpinner effectAPMin;
|
||||
private JSpinner effectAPMax;
|
||||
private JList<ELEMENT> sourceConditionsList;
|
||||
private JList<Common.TimedActorConditionEffect> sourceConditionsList;
|
||||
|
||||
private final ConditionEffectEditorPane<LIST_MODEL_SOURCE, ELEMENT, MODEL> sourceConditionPane;
|
||||
private final ConditionEffectEditorPane<Common.DeathEffect, SourceTimedConditionsListModel> sourceConditionPane;
|
||||
|
||||
|
||||
/*
|
||||
* create a new DeatchEffectPane with the selections (probably passed in from last time)
|
||||
*/
|
||||
public DeathEffectPane(String title, Supplier<ELEMENT> conditionSupplier, Editor editor, String applyToHint) {
|
||||
public DeathEffectPane(String title, Editor editor, String applyToHint) {
|
||||
this.title = title;
|
||||
this.conditionSupplier = conditionSupplier;
|
||||
this.conditionSupplier = Common.TimedActorConditionEffect::new;
|
||||
this.sourceConditionPane = new ConditionEffectEditorPane<>(editor);
|
||||
if (applyToHint == null || applyToHint == "") {
|
||||
if (applyToHint == null || applyToHint.isEmpty()) {
|
||||
this.applyToHint = "";
|
||||
} else {
|
||||
this.applyToHint = String.format(" (%s)", applyToHint);
|
||||
}
|
||||
}
|
||||
|
||||
void createDeathEffectPaneContent(FieldUpdateListener listener, boolean writable, EFFECT e, MODEL sourceConditionsModel) {
|
||||
public void createPaneContent(FieldUpdateListener listener, boolean writable, EFFECT e) {
|
||||
effect = e;
|
||||
sourceConditionPane.conditionsModel = sourceConditionsModel;
|
||||
sourceConditionPane.conditionsModel = new SourceTimedConditionsListModel(e);
|
||||
|
||||
effectPane = new CollapsiblePanel(title);
|
||||
effectPane.setLayout(new JideBoxLayout(effectPane, JideBoxLayout.PAGE_AXIS));
|
||||
@@ -269,8 +272,8 @@ public class CommonEditor {
|
||||
protected void addLists(FieldUpdateListener listener, boolean writable) {
|
||||
String titleSource = String.format("Actor Conditions applied to the source%s: ", applyToHint);
|
||||
TimedConditionsCellRenderer cellRendererSource = new TimedConditionsCellRenderer();
|
||||
BasicLambdaWithArg<ELEMENT> selectedSetSource = (value) -> sourceConditionPane.selectedCondition = value;
|
||||
BasicLambdaWithReturn<ELEMENT> selectedGetSource = () -> sourceConditionPane.selectedCondition;
|
||||
BasicLambdaWithArg<Common.TimedActorConditionEffect> selectedSetSource = (value) -> sourceConditionPane.selectedCondition = value;
|
||||
BasicLambdaWithReturn<Common.TimedActorConditionEffect> selectedGetSource = () -> sourceConditionPane.selectedCondition;
|
||||
BasicLambda selectedResetSource = () -> sourceConditionPane.selectedCondition = null;
|
||||
BasicLambdaWithArg<JPanel> updatePaneSource = (editorPane) -> sourceConditionPane.updateEffectTimedConditionEditorPane(
|
||||
editorPane, sourceConditionPane.selectedCondition, listener);
|
||||
@@ -309,9 +312,9 @@ public class CommonEditor {
|
||||
}
|
||||
}
|
||||
|
||||
static class ConditionEffectEditorPane<LIST_MODEL_SOURCE, ELEMENT extends Common.TimedActorConditionEffect, MODEL extends OrderedListenerListModel<LIST_MODEL_SOURCE, ELEMENT>> {
|
||||
static class ConditionEffectEditorPane<LIST_MODEL_SOURCE, MODEL extends OrderedListenerListModel<LIST_MODEL_SOURCE, Common.TimedActorConditionEffect> > {
|
||||
private final Editor editor;
|
||||
ELEMENT selectedCondition;
|
||||
Common.TimedActorConditionEffect selectedCondition;
|
||||
|
||||
MODEL conditionsModel;
|
||||
Editor.MyComboBox conditionBox;
|
||||
@@ -328,7 +331,7 @@ public class CommonEditor {
|
||||
this.editor = editor;
|
||||
}
|
||||
|
||||
public void updateEffectTimedConditionWidgets(ELEMENT condition) {
|
||||
public void updateEffectTimedConditionWidgets(Common.TimedActorConditionEffect condition) {
|
||||
boolean writable = editor.target.writable;
|
||||
|
||||
boolean immunity = condition.isImmunity();
|
||||
@@ -352,7 +355,7 @@ public class CommonEditor {
|
||||
conditionForever.setEnabled(!clear && writable);
|
||||
}
|
||||
|
||||
public void updateEffectTimedConditionEditorPane(JPanel pane, ELEMENT condition, final FieldUpdateListener listener) {
|
||||
public void updateEffectTimedConditionEditorPane(JPanel pane, Common.TimedActorConditionEffect condition, final FieldUpdateListener listener) {
|
||||
pane.removeAll();
|
||||
if (conditionBox != null) {
|
||||
editor.removeElementListener(conditionBox);
|
||||
@@ -495,7 +498,7 @@ public class CommonEditor {
|
||||
}
|
||||
|
||||
private void setDurationToDefaultIfNone() {
|
||||
if (selectedCondition.duration == null || selectedCondition.duration == ActorCondition.DURATION_NONE) {
|
||||
if (selectedCondition.duration == null || selectedCondition.duration.equals(ActorCondition.DURATION_NONE)) {
|
||||
selectedCondition.duration = 1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,9 +76,11 @@ public class ItemEditor extends JSONElementEditor {
|
||||
private JRadioButton equipConditionImmunity;
|
||||
private JSpinner equipConditionMagnitude;
|
||||
|
||||
private CommonEditor.HitEffectPane hitEffectPane = new CommonEditor.HitEffectPane("Effect on every hit: ", TimedActorConditionEffect::new, this, null, null);
|
||||
private CommonEditor.DeathEffectPane killEffectPane = new CommonEditor.DeathEffectPane(killLabel, TimedActorConditionEffect::new, this, null);
|
||||
private CommonEditor.HitRecievedEffectPane hitReceivedEffectPane = new CommonEditor.HitRecievedEffectPane("Effect on every hit received: ", TimedActorConditionEffect::new, this, null, null);
|
||||
private final CommonEditor.HitEffectPane<HitEffect> hitEffectPane = new CommonEditor.HitEffectPane<>("Effect on every hit: ", this, null, "npc");
|
||||
private final CommonEditor.DeathEffectPane<DeathEffect> killEffectPane = new CommonEditor.DeathEffectPane<>(killLabel, this, null);
|
||||
private final CommonEditor.HitReceivedEffectPane<HitReceivedEffect> hitReceivedEffectPane = new CommonEditor.HitReceivedEffectPane<>("Effect on every hit received: ", this, "player", "npc");
|
||||
private final CommonEditor.HitEffectPane<HitEffect> missEffectPane = new CommonEditor.HitEffectPane<>("Effect on every miss: ", this, "player", "npc");
|
||||
private final CommonEditor.HitReceivedEffectPane<HitReceivedEffect> missReceivedEffectPane = new CommonEditor.HitReceivedEffectPane<>("Effect on every miss received: ", this, "player", "npc");
|
||||
|
||||
public ItemEditor(Item item) {
|
||||
super(item, item.getDesc(), item.getIcon());
|
||||
@@ -86,7 +88,6 @@ public class ItemEditor extends JSONElementEditor {
|
||||
addEditorTab(json_view_id, getJSONView());
|
||||
}
|
||||
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
@Override
|
||||
public void insertFormViewDataField(JPanel pane) {
|
||||
|
||||
@@ -111,11 +112,7 @@ public class ItemEditor extends JSONElementEditor {
|
||||
|
||||
equipEffectPane = new CollapsiblePanel("Effect when equipped: ");
|
||||
equipEffectPane.setLayout(new JideBoxLayout(equipEffectPane, JideBoxLayout.PAGE_AXIS));
|
||||
if (item.equip_effect == null) {
|
||||
equipEffect = new Item.EquipEffect();
|
||||
} else {
|
||||
equipEffect = item.equip_effect;
|
||||
}
|
||||
equipEffect = Objects.requireNonNullElseGet(item.equip_effect, Item.EquipEffect::new);
|
||||
equipDmgMin = addIntegerField(equipEffectPane, "Attack Damage min: ", equipEffect.damage_boost_min, true, item.writable, listener);
|
||||
equipDmgMax = addIntegerField(equipEffectPane, "Attack Damage max: ", equipEffect.damage_boost_max, true, item.writable, listener);
|
||||
equipSetDM = addIntegerField(equipEffectPane, "Damage modifier %: ", equipEffect.damage_modifier, 100, false, item.writable, listener);
|
||||
@@ -164,33 +161,38 @@ public class ItemEditor extends JSONElementEditor {
|
||||
}
|
||||
|
||||
HitEffect hitEffect = Objects.requireNonNullElseGet(item.hit_effect, HitEffect::new);
|
||||
hitEffectPane.createHitEffectPaneContent(listener, item.writable, hitEffect,
|
||||
new CommonEditor.SourceTimedConditionsListModel(hitEffect),
|
||||
new CommonEditor.TargetTimedConditionsListModel(hitEffect));
|
||||
hitEffectPane.createPaneContent(listener, item.writable, hitEffect);
|
||||
pane.add(hitEffectPane.effectPane, JideBoxLayout.FIX);
|
||||
|
||||
DeathEffect killEffect = Objects.requireNonNullElseGet(item.kill_effect, DeathEffect::new);
|
||||
killEffectPane.createDeathEffectPaneContent(listener, item.writable, killEffect,
|
||||
new CommonEditor.SourceTimedConditionsListModel(killEffect));
|
||||
killEffectPane.createPaneContent(listener, item.writable, killEffect);
|
||||
pane.add(killEffectPane.effectPane, JideBoxLayout.FIX);
|
||||
|
||||
HitReceivedEffect hitReceivedEffect = Objects.requireNonNullElseGet(item.hit_received_effect,
|
||||
HitReceivedEffect::new);
|
||||
hitReceivedEffectPane.createHitReceivedEffectPaneContent(listener, item.writable, hitReceivedEffect,
|
||||
new CommonEditor.SourceTimedConditionsListModel(
|
||||
hitReceivedEffect),
|
||||
new CommonEditor.TargetTimedConditionsListModel(
|
||||
hitReceivedEffect));
|
||||
pane.add(killEffectPane.effectPane, JideBoxLayout.FIX);
|
||||
HitReceivedEffect hitReceivedEffect = Objects.requireNonNullElseGet(item.hit_received_effect, HitReceivedEffect::new);
|
||||
hitReceivedEffectPane.createPaneContent(listener, item.writable, hitReceivedEffect);
|
||||
pane.add(hitReceivedEffectPane.effectPane, JideBoxLayout.FIX);
|
||||
|
||||
HitEffect missEffect = Objects.requireNonNullElseGet(item.miss_effect, HitEffect::new);
|
||||
missEffectPane.createPaneContent(listener, item.writable, missEffect);
|
||||
pane.add(missEffectPane.effectPane, JideBoxLayout.FIX);
|
||||
|
||||
HitReceivedEffect missReceivedEffect = Objects.requireNonNullElseGet(item.miss_received_effect, HitReceivedEffect::new);
|
||||
missReceivedEffectPane.createPaneContent(listener, item.writable, missReceivedEffect);
|
||||
pane.add(missReceivedEffectPane.effectPane, JideBoxLayout.FIX);
|
||||
|
||||
if (item.category == null || item.category.action_type == null || item.category.action_type == ItemCategory.ActionType.none) {
|
||||
equipEffectPane.setVisible(false);
|
||||
hitEffectPane.effectPane.setVisible(false);
|
||||
hitReceivedEffectPane.effectPane.setVisible(false);
|
||||
missEffectPane.effectPane.setVisible(false);
|
||||
missReceivedEffectPane.effectPane.setVisible(false);
|
||||
killEffectPane.effectPane.setVisible(false);
|
||||
} else if (item.category.action_type == ItemCategory.ActionType.use) {
|
||||
equipEffectPane.setVisible(false);
|
||||
hitEffectPane.effectPane.setVisible(false);
|
||||
hitReceivedEffectPane.effectPane.setVisible(false);
|
||||
missEffectPane.effectPane.setVisible(false);
|
||||
missReceivedEffectPane.effectPane.setVisible(false);
|
||||
killEffectPane.effectPane.setVisible(true);
|
||||
killEffectPane.effectPane.setTitle(useLabel);
|
||||
killEffectPane.effectPane.revalidate();
|
||||
@@ -198,6 +200,9 @@ public class ItemEditor extends JSONElementEditor {
|
||||
} else if (item.category.action_type == ItemCategory.ActionType.equip) {
|
||||
equipEffectPane.setVisible(true);
|
||||
hitEffectPane.effectPane.setVisible(true);
|
||||
hitReceivedEffectPane.effectPane.setVisible(true);
|
||||
missEffectPane.effectPane.setVisible(true);
|
||||
missReceivedEffectPane.effectPane.setVisible(true);
|
||||
killEffectPane.effectPane.setVisible(true);
|
||||
killEffectPane.effectPane.setTitle(killLabel);
|
||||
killEffectPane.effectPane.revalidate();
|
||||
@@ -294,8 +299,8 @@ public class ItemEditor extends JSONElementEditor {
|
||||
@Override
|
||||
public void valueChanged(JComponent source, Object value) {
|
||||
Item item = (Item) target;
|
||||
boolean updatePrice, updateEquip, updateHit, updateKill, updateHitReceived;
|
||||
updatePrice = updateEquip = updateHit = updateKill = updateHitReceived = false;
|
||||
boolean updatePrice, updateEquip, updateHit, updateMiss, updateKill, updateHitReceived, updateMissReceived;
|
||||
updatePrice = updateEquip = updateHit = updateMiss = updateKill = updateHitReceived = updateMissReceived = false;
|
||||
if (source == idField) {
|
||||
//Events caused by cancel an ID edition. Dismiss.
|
||||
if (skipNext) {
|
||||
@@ -362,10 +367,14 @@ public class ItemEditor extends JSONElementEditor {
|
||||
item.equip_effect = null;
|
||||
hitEffectPane.effectPane.setVisible(false);
|
||||
item.hit_effect = null;
|
||||
missEffectPane.effectPane.setVisible(false);
|
||||
item.miss_effect = null;
|
||||
killEffectPane.effectPane.setVisible(false);
|
||||
item.kill_effect = null;
|
||||
hitReceivedEffectPane.effectPane.setVisible(false);
|
||||
item.hit_received_effect = null;
|
||||
missReceivedEffectPane.effectPane.setVisible(false);
|
||||
item.miss_received_effect = null;
|
||||
ItemEditor.this.revalidate();
|
||||
ItemEditor.this.repaint();
|
||||
} else if (item.category.action_type == ItemCategory.ActionType.use) {
|
||||
@@ -373,10 +382,14 @@ public class ItemEditor extends JSONElementEditor {
|
||||
item.equip_effect = null;
|
||||
hitEffectPane.effectPane.setVisible(false);
|
||||
item.hit_effect = null;
|
||||
missEffectPane.effectPane.setVisible(false);
|
||||
item.miss_effect = null;
|
||||
killEffectPane.effectPane.setVisible(true);
|
||||
updateKill = true;
|
||||
hitReceivedEffectPane.effectPane.setVisible(false);
|
||||
item.hit_received_effect = null;
|
||||
missReceivedEffectPane.effectPane.setVisible(false);
|
||||
item.miss_received_effect = null;
|
||||
updateHitReceived = true;
|
||||
updateEquip = true;
|
||||
killEffectPane.effectPane.setTitle(useLabel);
|
||||
@@ -385,9 +398,11 @@ public class ItemEditor extends JSONElementEditor {
|
||||
} else if (item.category.action_type == ItemCategory.ActionType.equip) {
|
||||
equipEffectPane.setVisible(true);
|
||||
hitEffectPane.effectPane.setVisible(true);
|
||||
missEffectPane.effectPane.setVisible(true);
|
||||
killEffectPane.effectPane.setVisible(true);
|
||||
updateKill = true;
|
||||
hitReceivedEffectPane.effectPane.setVisible(true);
|
||||
missReceivedEffectPane.effectPane.setVisible(true);
|
||||
updateHitReceived = true;
|
||||
updateEquip = true;
|
||||
killEffectPane.effectPane.setTitle(killLabel);
|
||||
@@ -469,12 +484,18 @@ public class ItemEditor extends JSONElementEditor {
|
||||
} else if (hitEffectPane.valueChanged(source, value, item)) {
|
||||
updatePrice = true;
|
||||
updateHit = true;
|
||||
} else if (missEffectPane.valueChanged(source, value, item)) {
|
||||
updatePrice = true;
|
||||
updateMiss = true;
|
||||
} else if (killEffectPane.valueChanged(source, value, item)) {
|
||||
updatePrice = true;
|
||||
updateKill = true;
|
||||
} else if (hitReceivedEffectPane.valueChanged(source, value, item)) {
|
||||
updatePrice = true;
|
||||
updateHitReceived = true;
|
||||
} else if (missReceivedEffectPane.valueChanged(source, value, item)) {
|
||||
updatePrice = true;
|
||||
updateMissReceived = true;
|
||||
}
|
||||
|
||||
if (updateEquip) {
|
||||
@@ -491,6 +512,13 @@ public class ItemEditor extends JSONElementEditor {
|
||||
item.hit_effect = hitEffectPane.effect;
|
||||
}
|
||||
}
|
||||
if (updateMiss) {
|
||||
if (missEffectPane.effect.isNull()) {
|
||||
item.miss_effect = null;
|
||||
} else {
|
||||
item.miss_effect = missEffectPane.effect;
|
||||
}
|
||||
}
|
||||
if (updateKill) {
|
||||
if (killEffectPane.effect.isNull()) {
|
||||
item.kill_effect = null;
|
||||
@@ -505,6 +533,13 @@ public class ItemEditor extends JSONElementEditor {
|
||||
item.hit_received_effect = hitReceivedEffectPane.effect;
|
||||
}
|
||||
}
|
||||
if (updateMissReceived) {
|
||||
if (missReceivedEffectPane.effect.isNull()) {
|
||||
item.miss_received_effect = null;
|
||||
} else {
|
||||
item.miss_received_effect = missReceivedEffectPane.effect;
|
||||
}
|
||||
}
|
||||
if (updatePrice && !manualPriceBox.isSelected()) {
|
||||
baseCostField.setValue(item.computePrice());
|
||||
}
|
||||
|
||||
@@ -60,10 +60,9 @@ public class NPCEditor extends JSONElementEditor {
|
||||
private JSpinner blockChance;
|
||||
private JSpinner dmgRes;
|
||||
|
||||
private CommonEditor.HitEffectPane hitEffectPane = new CommonEditor.HitEffectPane("Effect on every hit: ", TimedActorConditionEffect::new, this, null, null);
|
||||
private CommonEditor.HitRecievedEffectPane hitReceivedEffectPane = new CommonEditor.HitRecievedEffectPane("Effect on every hit received: ", TimedActorConditionEffect::new, this, "NPC",
|
||||
"Attacker");
|
||||
private CommonEditor.DeathEffectPane deathEffectPane = new CommonEditor.DeathEffectPane("Effect when killed: ", TimedActorConditionEffect::new, this, "Killer");
|
||||
private final CommonEditor.HitEffectPane<HitEffect> hitEffectPane = new CommonEditor.HitEffectPane<>("Effect on every hit: ", this, null, "player");
|
||||
private final CommonEditor.HitReceivedEffectPane<HitReceivedEffect> hitReceivedEffectPane = new CommonEditor.HitReceivedEffectPane<>("Effect on every hit received: ", this, "npc", "player");
|
||||
private final CommonEditor.DeathEffectPane<DeathEffect> deathEffectPane = new CommonEditor.DeathEffectPane<>("Effect when killed: ", this, null);
|
||||
|
||||
private JPanel dialogueGraphPane;
|
||||
private DialogueGraphView dialogueGraphView;
|
||||
@@ -118,7 +117,6 @@ public class NPCEditor extends JSONElementEditor {
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
@Override
|
||||
public void insertFormViewDataField(JPanel pane) {
|
||||
final NPC npc = (NPC) target;
|
||||
@@ -153,23 +151,15 @@ public class NPCEditor extends JSONElementEditor {
|
||||
dmgRes = addIntegerField(combatTraitPane, "Damage resistance: ", npc.damage_resistance, false, npc.writable, listener);
|
||||
|
||||
HitEffect hitEffect = Objects.requireNonNullElseGet(npc.hit_effect, HitEffect::new);
|
||||
hitEffectPane.createHitEffectPaneContent(listener, npc.writable, hitEffect,
|
||||
new CommonEditor.SourceTimedConditionsListModel(hitEffect),
|
||||
new CommonEditor.TargetTimedConditionsListModel(hitEffect));
|
||||
hitEffectPane.createPaneContent(listener, npc.writable, hitEffect);
|
||||
combatTraitPane.add(hitEffectPane.effectPane, JideBoxLayout.FIX);
|
||||
|
||||
HitReceivedEffect hitReceivedEffect = Objects.requireNonNullElseGet(npc.hit_received_effect,
|
||||
HitReceivedEffect::new);
|
||||
hitReceivedEffectPane.createHitReceivedEffectPaneContent(listener, npc.writable, hitReceivedEffect,
|
||||
new CommonEditor.SourceTimedConditionsListModel(
|
||||
hitReceivedEffect),
|
||||
new CommonEditor.TargetTimedConditionsListModel(
|
||||
hitReceivedEffect));
|
||||
HitReceivedEffect hitReceivedEffect = Objects.requireNonNullElseGet(npc.hit_received_effect, HitReceivedEffect::new);
|
||||
hitReceivedEffectPane.createPaneContent(listener, npc.writable, hitReceivedEffect);
|
||||
combatTraitPane.add(hitReceivedEffectPane.effectPane, JideBoxLayout.FIX);
|
||||
|
||||
DeathEffect deathEffect = Objects.requireNonNullElseGet(npc.death_effect, DeathEffect::new);
|
||||
deathEffectPane.createDeathEffectPaneContent(listener, npc.writable, deathEffect,
|
||||
new CommonEditor.SourceTimedConditionsListModel(deathEffect));
|
||||
deathEffectPane.createPaneContent(listener, npc.writable, deathEffect);
|
||||
combatTraitPane.add(deathEffectPane.effectPane, JideBoxLayout.FIX);
|
||||
|
||||
pane.add(combatTraitPane, JideBoxLayout.FIX);
|
||||
|
||||
Reference in New Issue
Block a user