Compare commits

..

5 Commits

4 changed files with 56 additions and 51 deletions

View File

@@ -3,10 +3,11 @@ name: Release Build
on: on:
release: release:
types: [ created ] types: [ created ]
workflow_dispatch:
jobs: jobs:
build: build:
runs-on: windows-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@@ -35,22 +36,34 @@ jobs:
cd packaging cd packaging
chmod +x package.sh chmod +x package.sh
echo "Building JAR and ZIP for version: ${{ env.VERSION }}" echo "Building JAR and ZIP for version: ${{ env.VERSION }}"
./package.sh -windows ./package.sh
echo "Created artifacts:" echo "Created artifacts:"
ls -la common/ATCS.jar ls -la common/ATCS.jar
ls -la ATCS_${{ env.VERSION }}.zip ls -la ATCS_${{ env.VERSION }}.zip
- name: Install NSIS - name: Upload Release Assets (zip)
uses: joncloud/makensis-action@v4
with:
script-file: packaging/Windows/ATCS_Installer.nsi
arguments: /DVERSION="${{ env.VERSION }}"
- name: Upload Release Assets
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
files: | files: |
./packaging/ATCS_${{ env.VERSION }}.zip ./packaging/ATCS_${{ env.VERSION }}.zip
./packaging/ATCS_${{ env.VERSION }}_Setup.exe
- name: 'Install makensis (apt)'
run: sudo apt update && sudo apt install -y nsis nsis-pluginapi
continue-on-error: true
- name: Create Windows-Installer with NSIS
uses: joncloud/makensis-action@v4
with:
script-file: packaging/Windows/ATCS_Installer.nsi
arguments: -DVERSION="${{ env.VERSION }}"
continue-on-error: true
- name: Upload Release Assets (exe)
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: ./packaging/ATCS_${{ env.VERSION }}_Setup.exe
continue-on-error: true

View File

@@ -1 +1 @@
v0.6.24 v0.6.23

View File

@@ -38,7 +38,6 @@ public class NPC extends JSONElement {
public Integer attack_damage_min = null; public Integer attack_damage_min = null;
public String spawngroup_id = null; public String spawngroup_id = null;
public String faction_id = null; public String faction_id = null;
public Integer spriteFlipChance = null;
public String dialogue_id = null; public String dialogue_id = null;
public String droplist_id = null; public String droplist_id = null;
public Integer attack_cost = null; public Integer attack_cost = null;
@@ -156,7 +155,6 @@ public class NPC extends JSONElement {
} }
this.spawngroup_id = (String) npcJson.get("spawnGroup"); this.spawngroup_id = (String) npcJson.get("spawnGroup");
this.faction_id = (String) npcJson.get("faction"); this.faction_id = (String) npcJson.get("faction");
this.spriteFlipChance = JSONElement.getInteger((Number) npcJson.get("spriteFlipChance"));
this.dialogue_id = (String) npcJson.get("phraseID"); this.dialogue_id = (String) npcJson.get("phraseID");
this.droplist_id = (String) npcJson.get("droplistID"); this.droplist_id = (String) npcJson.get("droplistID");
this.attack_cost = JSONElement.getInteger((Number) npcJson.get("attackCost")); this.attack_cost = JSONElement.getInteger((Number) npcJson.get("attackCost"));
@@ -246,7 +244,6 @@ public class NPC extends JSONElement {
} }
clone.droplist_id = this.droplist_id; clone.droplist_id = this.droplist_id;
clone.faction_id = this.faction_id; clone.faction_id = this.faction_id;
clone.spriteFlipChance = this.spriteFlipChance;
if (this.hit_effect != null) { if (this.hit_effect != null) {
clone.hit_effect = new HitEffect(); clone.hit_effect = new HitEffect();
copyHitEffectValues(clone.hit_effect, this.hit_effect, clone); copyHitEffectValues(clone.hit_effect, this.hit_effect, clone);
@@ -305,7 +302,6 @@ public class NPC extends JSONElement {
writeMinMaxToMap(npcJson, "attackDamage", this.attack_damage_min, attack_damage_max, 0); writeMinMaxToMap(npcJson, "attackDamage", this.attack_damage_min, attack_damage_max, 0);
if (this.spawngroup_id != null) npcJson.put("spawnGroup", this.spawngroup_id); if (this.spawngroup_id != null) npcJson.put("spawnGroup", this.spawngroup_id);
if (this.faction_id != null) npcJson.put("faction", this.faction_id); if (this.faction_id != null) npcJson.put("faction", this.faction_id);
if (this.spriteFlipChance != null) npcJson.put("spriteFlipChance", this.spriteFlipChance);
if (this.dialogue != null) { if (this.dialogue != null) {
npcJson.put("phraseID", this.dialogue.id); npcJson.put("phraseID", this.dialogue.id);
} else if (this.dialogue_id != null) { } else if (this.dialogue_id != null) {

View File

@@ -37,7 +37,6 @@ public class NPCEditor extends JSONElementEditor {
private JTextField nameField; private JTextField nameField;
private JTextField spawnGroupField; private JTextField spawnGroupField;
private JTextField factionField; private JTextField factionField;
private JSpinner spriteFlipChanceField;
private JSpinner experienceField; private JSpinner experienceField;
private MyComboBox dialogueBox; private MyComboBox dialogueBox;
private MyComboBox droplistBox; private MyComboBox droplistBox;
@@ -129,7 +128,6 @@ public class NPCEditor extends JSONElementEditor {
nameField = addTranslatableTextField(pane, "Display name: ", npc.name, npc.writable, listener); nameField = addTranslatableTextField(pane, "Display name: ", npc.name, npc.writable, listener);
spawnGroupField = addTextField(pane, "Spawn group ID: ", npc.spawngroup_id, npc.writable, listener); spawnGroupField = addTextField(pane, "Spawn group ID: ", npc.spawngroup_id, npc.writable, listener);
factionField = addTextField(pane, "Faction ID: ", npc.faction_id, npc.writable, listener); factionField = addTextField(pane, "Faction ID: ", npc.faction_id, npc.writable, listener);
spriteFlipChanceField = addIntegerField(pane, "Icon Flip Chance: ", npc.spriteFlipChance, false, npc.writable, listener);
experienceField = addIntegerField(pane, "Experience reward: ", npc.getMonsterExperience(), false, false, listener); experienceField = addIntegerField(pane, "Experience reward: ", npc.getMonsterExperience(), false, false, listener);
dialogueBox = addDialogueBox(pane, npc.getProject(), "Initial phrase: ", npc.dialogue, npc.writable, listener); dialogueBox = addDialogueBox(pane, npc.getProject(), "Initial phrase: ", npc.dialogue, npc.writable, listener);
droplistBox = addDroplistBox(pane, npc.getProject(), "Droplist / Shop inventory: ", npc.droplist, npc.writable, listener); droplistBox = addDroplistBox(pane, npc.getProject(), "Droplist / Shop inventory: ", npc.droplist, npc.writable, listener);
@@ -207,8 +205,6 @@ public class NPCEditor extends JSONElementEditor {
npc.spawngroup_id = (String) value; npc.spawngroup_id = (String) value;
} else if (source == factionField) { } else if (source == factionField) {
npc.faction_id = (String) value; npc.faction_id = (String) value;
} else if (source == spriteFlipChanceField) {
npc.spriteFlipChance = (Integer) value;
} else if (source == dialogueBox) { } else if (source == dialogueBox) {
if (npc.dialogue != null) { if (npc.dialogue != null) {
npc.dialogue.removeBacklink(npc); npc.dialogue.removeBacklink(npc);