fix ordering of changed elements with optimized structure

Fix release workflow

.github/workflows/release.yml

@@ -2,55 +2,68 @@ name: Release Build
 
 on:
   release:
-    types: [created]
+    types: [ created ]
+  workflow_dispatch:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: Get Version
+      - name: Get Version
-      id: get_version
+        id: get_version
-      shell: bash
+        shell: bash
-      run: |
+        run: |
-        echo "Reading version from file:"
+          echo "Reading version from file:"
-        cat res/ATCS_latest
+          cat res/ATCS_latest
-        echo ""
+          echo ""
-        VERSION=$(tr -d '[:space:]' < "res/ATCS_latest")
+          VERSION=$(tr -d '[:space:]' < "res/ATCS_latest")
-        echo "Processed version: $VERSION"
+          echo "Processed version: $VERSION"
-        echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
-        echo "Environment variable set to: $VERSION"
+          echo "Environment variable set to: $VERSION"
 
-    - name: Set up JDK
+      - name: Set up JDK
-      uses: actions/setup-java@v2
+        uses: actions/setup-java@v2
-      with:
+        with:
-        java-version: '11'
+          java-version: '11'
-        distribution: 'temurin'
+          distribution: 'temurin'
 
-    - name: Build JAR
+      - name: Build JAR
-      shell: bash
+        shell: bash
-      run: |
+        run: |
-        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
+        uses: softprops/action-gh-release@v1
-      with:
+        env:
-        script-file: packaging/Windows/ATCS_Installer.nsi
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        arguments: /DVERSION="${{ env.VERSION }}"
+        with:
+          files: |
+            ./packaging/ATCS_${{ env.VERSION }}.zip
 
-    - name: Upload Release Assets
+      - name: 'Install makensis (apt)'
-      uses: softprops/action-gh-release@v1
+        run: sudo apt update && sudo apt install -y nsis nsis-pluginapi
-      env:
+        continue-on-error: true
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
-      with:
+      - name: Create Windows-Installer with NSIS
-        files: |
+        uses: joncloud/makensis-action@v4
-          ./packaging/ATCS_${{ env.VERSION }}.zip
+        with:
-          ./packaging/ATCS_${{ env.VERSION }}_Setup.exe
+          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

res/spritesheets.properties

@@ -45,6 +45,7 @@ atcs.spritesheet.items_weapons.category=item
 atcs.spritesheet.items_weapons_2.category=item
 atcs.spritesheet.items_weapons_3.category=item
 
+atcs.spritesheet.monsters_antison.category=monster
 atcs.spritesheet.monsters_armor1.category=monster
 atcs.spritesheet.monsters_arulirs.category=monster
 
@@ -132,3 +133,6 @@ atcs.spritesheet.monsters_newb_3.sizey=64
 atcs.spritesheet.monsters_newb_4.category=monster
 atcs.spritesheet.monsters_newb_4.sizex=32
 atcs.spritesheet.monsters_newb_4.sizey=64
+atcs.spritesheet.monsters_1x2.category=monster
+atcs.spritesheet.monsters_1x2.sizex=32
+atcs.spritesheet.monsters_1x2.sizey=64

src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataCategory.java

@@ -170,7 +170,7 @@ public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode
     @Override
     public void notifyCreated() {
         childrenAdded(new ArrayList<ProjectTreeNode>());
-        for (E node : dataMap.values()) {
+        for (E node : toList()) {
             node.notifyCreated();
         }
     }
@@ -232,7 +232,7 @@ public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode
             return;
         }
         List<Map> dataToSave = new ArrayList<Map>();
-        for (E element : dataMap.values()) {
+        for (E element : toList()) {
             if (element.jsonFile.equals(jsonFile)) {
                 dataToSave.add(element.toJson());
             }

src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataSet.java

@@ -13,9 +13,9 @@ import javax.swing.tree.TreeNode;
 import java.awt.*;
 import java.io.File;
 import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Enumeration;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 public class GameDataSet implements ProjectTreeNode, Serializable {
@@ -159,7 +159,9 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
             }
 
         } else if (parent.type != GameSource.Type.referenced) {
-            for (File f : baseFolder.listFiles()) {
+            List<File> files = new ArrayList<File>(Arrays.stream(baseFolder.listFiles()).collect(Collectors.toList()));
+            Collections.sort(files,Comparator.comparing(x->x.getName()));
+            for (File f : files) {
                 if (f.getName().startsWith("actorconditions_")) {
                     ActorCondition.fromJson(f, actorConditions);
                 } else if (f.getName().startsWith("conversationlist_")) {

src/com/gpl/rpg/atcontentstudio/model/gamedata/NPC.java

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

src/com/gpl/rpg/atcontentstudio/model/gamedata/Requirement.java

@@ -64,7 +64,8 @@ public class Requirement extends JSONElement {
         date,
         dateEquals,
         time,
-        timeEquals
+        timeEquals,
+        skillIncrease
     }
 
     public enum SkillID {
@@ -166,6 +167,7 @@ public class Requirement extends JSONElement {
             case dateEquals:
             case time:
             case timeEquals:
+            case skillIncrease:
                 break;
         }
         if (this.required_obj != null) this.required_obj.addBacklink((GameDataElement) this.parent);

src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java

@@ -610,6 +610,17 @@ public class DialogueEditor extends JSONElementEditor {
                     requirementObjId = addTextField(pane, "Time type HHMMSS:", requirement.required_obj_id, writable, listener);
                     requirementValue = addIntegerField(pane, "Exact time value: ", requirement.required_value, true, writable, listener);
                     break;
+                case skillIncrease:
+                    skillId = null;
+                    try {
+                        skillId = requirement.required_obj_id == null ? null : Requirement.SkillID.valueOf(requirement.required_obj_id);
+                    } catch (IllegalArgumentException e) {
+                    }
+                    requirementObj = null;
+                    requirementSkill = addEnumValueBox(pane, "Skill ID:", Requirement.SkillID.values(), skillId, writable, listener);
+                    requirementObjId = null;//addTextField(pane, "Skill ID:", requirement.required_obj_id, writable, listener);
+                    requirementValue = addIntegerField(pane, "Level up: ", requirement.required_value, false, writable, listener);
+                    break;
             }
             requirementNegated = addBooleanBasedCheckBox(pane, "Negate this requirement.", requirement.negated, writable, listener);
         }
@@ -843,7 +854,7 @@ public class DialogueEditor extends JSONElementEditor {
             if (req.required_obj.getIcon() != null) {
                 label.setIcon(new ImageIcon(req.required_obj.getIcon()));
             }
-        } else if (req.type == Requirement.RequirementType.skillLevel) {
+        } else if (req.type == Requirement.RequirementType.skillLevel || req.type == Requirement.RequirementType.skillIncrease) {
             label.setIcon(new ImageIcon(DefaultIcons.getSkillIcon()));
         } else if (req.type == Requirement.RequirementType.spentGold) {
             label.setIcon(new ImageIcon(DefaultIcons.getGoldIcon()));
@@ -1008,7 +1019,7 @@ public class DialogueEditor extends JSONElementEditor {
                     selectedRequirement.required_obj.removeBacklink(dialogue);
                     selectedRequirement.required_obj = null;
                 }
-                if (selectedRequirement.type == Requirement.RequirementType.skillLevel) {
+                if (selectedRequirement.type == Requirement.RequirementType.skillLevel || selectedRequirement.type == Requirement.RequirementType.skillIncrease) {
                     selectedRequirement.required_obj_id = value == null ? null : value.toString();
                 }
                 requirementsListModel.itemChanged(selectedRequirement);

src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/NPCEditor.java

@@ -37,7 +37,7 @@ public class NPCEditor extends JSONElementEditor {
     private JTextField nameField;
     private JTextField spawnGroupField;
     private JTextField factionField;
-    private JSpinner spriteFlipChanceField;
+    private JSpinner horizontalFlipChanceField;
     private JSpinner experienceField;
     private MyComboBox dialogueBox;
     private MyComboBox droplistBox;
@@ -129,7 +129,7 @@ public class NPCEditor extends JSONElementEditor {
         nameField = addTranslatableTextField(pane, "Display name: ", npc.name, 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);
-        spriteFlipChanceField = addIntegerField(pane, "Icon Flip Chance: ", npc.spriteFlipChance, false, npc.writable, listener);
+        horizontalFlipChanceField = addIntegerField(pane, "Horizontal flip chance: ", npc.horizontalFlipChance, false, npc.writable, listener);
         experienceField = addIntegerField(pane, "Experience reward: ", npc.getMonsterExperience(), false, false, 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);
@@ -207,8 +207,8 @@ public class NPCEditor extends JSONElementEditor {
                 npc.spawngroup_id = (String) value;
             } else if (source == factionField) {
                 npc.faction_id = (String) value;
-            } else if (source == spriteFlipChanceField) {
+            } else if (source == horizontalFlipChanceField) {
-                npc.spriteFlipChance = (Integer) value;
+                npc.horizontalFlipChance = (Integer) value;
             } else if (source == dialogueBox) {
                 if (npc.dialogue != null) {
                     npc.dialogue.removeBacklink(npc);

src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java

@@ -674,6 +674,16 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
                     requirementObjId = addTextField(pane, "Time type HHMMSS:", requirement.required_obj_id, writable, listener);
                     requirementValue = addIntegerField(pane, "Exact time value: ", requirement.required_value, true, writable, listener);
                     break;
+                case skillIncrease:
+                    skillId = null;
+                    try {
+                        skillId = requirement.required_obj_id == null ? null : Requirement.SkillID.valueOf(requirement.required_obj_id);
+                    } catch (IllegalArgumentException e) {
+                    }
+                    requirementObj = addEnumValueBox(pane, "Skill ID:", Requirement.SkillID.values(), skillId, writable, listener);
+                    requirementObjId = null;//addTextField(pane, "Skill ID:", requirement.required_obj_id, writable, listener);
+                    requirementValue = addIntegerField(pane, "Level: ", requirement.required_value, false, writable, listener);
+                    break;
             }
         }
         requirementNegated = addBooleanBasedCheckBox(pane, "Negate this requirement.", requirement.negated, writable, listener);
@@ -1921,7 +1931,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
             } else if (source == requirementObj) {
                 if (selectedMapObject instanceof KeyArea) {
                     KeyArea area = (KeyArea) selectedMapObject;
-                    if (area.requirement.type == Requirement.RequirementType.skillLevel) {
+                    if (area.requirement.type == Requirement.RequirementType.skillLevel || area.requirement.type == Requirement.RequirementType.skillIncrease) {
                         area.requirement.required_obj_id = value == null ? null : value.toString();
                     } else {
                         area.requirement.required_obj = (GameDataElement) value;
@@ -1938,7 +1948,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
                     }
                 } else if (selectedMapObject instanceof ReplaceArea) {
                     ReplaceArea area = (ReplaceArea) selectedMapObject;
-                    if (area.requirement.type == Requirement.RequirementType.skillLevel) {
+                    if (area.requirement.type == Requirement.RequirementType.skillLevel || area.requirement.type == Requirement.RequirementType.skillIncrease) {
                         area.requirement.required_obj_id = value == null ? null : value.toString();
                     } else {
                         area.requirement.required_obj = (GameDataElement) value;