Change GameActor Num dest output, add Decap Head and Tempest Staff mo…

…del defs
Lemon-King · Oct 30, 2023 · ef4bef8 · ef4bef8
1 parent 73231e5
commit ef4bef8
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 7 deletions.
diff --git a/resources/pakdata/modeldef/paladinplayer.xml b/resources/pakdata/modeldef/paladinplayer.xml
@@ -34,7 +34,7 @@
         <Animation key="PSST" frames="13" model="0" comment="Stand: Staff"/>
         <Animation key="PSSA" frames="13" model="0" comment="Stand: Sword/Axe"/>
     </Group>
-    <Group class="HX2PaladinPlayer_Head">
+    <Group class="HX2PaladinPlayerHead">
         <Path folder="models" />
         <Model file="h_pal.md3" model="0" />
         <Skin file="h_pal_skin0.png" model="0" />
@@ -44,6 +44,6 @@
         <Flag name="USEACTORPITCH" />
         <Flag name="USEACTORROLL" />
 
-        <Animation key="PHED" frames="1" model="0" comment="Decap Head"/>
+        <Animation key="HX2H" frames="1" model="0" comment="Decap Head"/>
     </Group>
 </XMLModelDef>
diff --git a/resources/pakdata/modeldef/succubusplayer.xml b/resources/pakdata/modeldef/succubusplayer.xml
@@ -35,7 +35,7 @@
         <Animation key="PDE" frames="20" model="0" comment="Death"/>
         <Animation key="PDD" frames="28" model="0" comment="Death: Decap"/>
     </Group>
-    <Group class="HX2SuccubusPlayer_Head">
+    <Group class="HX2SuccubusPlayerHead">
         <Path folder="models" />
         <Model file="h_suc.md3" model="0" />
         <Skin file="h_suc_skin0.png" model="0" />
@@ -45,6 +45,6 @@
         <Flag name="USEACTORPITCH" />
         <Flag name="USEACTORROLL" />
 
-        <Animation key="PSHD" frames="1" model="0" comment="Decap Head"/>
+        <Animation key="HX2H" frames="1" model="0" comment="Decap Head"/>
     </Group>
 </XMLModelDef>
diff --git a/resources/pakdata/modeldef/succubustempest.xml b/resources/pakdata/modeldef/succubustempest.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<XMLModelDef>
+    <Group class="SWeapTempestStaffPiece1">
+        <Path folder="models" />
+        <Model file="w_l41_c5.md3" model="0" />
+        <Skin file="w_l41_c5_skin0.png" model="0" />
+
+        <Scale value="1 1 1" />
+        <Offset value="0 0 35" />
+
+        <Flag name="USEACTORPITCH" />
+        <Flag name="USEACTORROLL" />
+        <Flag name="ROTATING" />
+
+        <Animation key="PKUP" frames="1" model="0" comment="Pickup Item"/>
+    </Group>
+    <Group class="SWeapTempestStaffPiece2">
+        <Path folder="models" />
+        <Model file="w_l42_c5.md3" model="0" />
+        <Skin file="w_l42_c5_skin0.png" model="0" />
+
+        <Scale value="1 1 1" />
+        <Offset value="0 0 35" />
+
+        <Flag name="USEACTORPITCH" />
+        <Flag name="USEACTORROLL" />
+        <Flag name="ROTATING" />
+
+        <Animation key="PKUP" frames="1" model="0" comment="Pickup Item"/>
+    </Group>
+    <Group class="SWeapTempestStaff">
+        <Path folder="models" />
+        <Model file="sucwp4.md3" model="0" />
+        <Skin file="sucwp4_skin0.png" model="0" />
+
+        <Scale value="-1 1 1" />
+
+        <Flag name="USEACTORPITCH" />
+        <Flag name="USEACTORROLL" />
+        <Flag name="SCALEWEAPONFOV" />
+
+        <Animation key="000" frames="16" model="0" comment="Fire"/>
+        <Animation key="100" frames="16" model="0" comment="Ready Idle"/>
+        <Animation key="200" frames="16" model="0" comment="Ready"/>
+        <Animation key="300" frames="16" model="0" comment="Powered Idle"/>
+        <Animation key="400" frames="16" model="0" comment="Powered"/>
+        <Animation key="500" frames="12" model="0" comment="Selected / Deselect"/>
+    </Group>
+</XMLModelDef>
diff --git a/src/main/java/lemon/hxdd/AppSettings.java b/src/main/java/lemon/hxdd/AppSettings.java
@@ -41,7 +41,7 @@ public AppSettings() {
 
         prop_defaults.put("USE_DEVELOPMENT_RESOURCES", "false");
 
-        prop_defaults.put("OPTION_TITLE_ARTWORK", "heretic");
+        prop_defaults.put("OPTION_TITLE_ARTWORK", "heretic.shadows");
         prop_defaults.put("OPTION_TITLE_MUSIC", "heretic");
         prop_defaults.put("OPTION_USE_STEAM_ARTWORK", "false");
         prop_defaults.put("OPTION_KORAX_LOCALIZATION", "en");

diff --git a/src/main/java/lemon/hxdd/builder/GameActorNums.java b/src/main/java/lemon/hxdd/builder/GameActorNums.java
@@ -96,12 +96,16 @@ public void Create() {
             CreateXGT(actorsJSON, type);
 
             try {
+                File pathTarget = new File(this.pathTemp + "/gameinfo/");
+                if (!pathTarget.exists()) {
+                    pathTarget.mkdirs();
+                }
+
                 Map<String, String> actorMap = (Map)p_hxdd;
                 SortedSet<String> keys = new TreeSet<>(actorMap.keySet());
 
                 String mapInfoFileName = "mapinfo." + type;
-
-                PrintWriter file_mapinfo = new PrintWriter(this.pathTemp + "/" + mapInfoFileName);
+                PrintWriter file_mapinfo = new PrintWriter(this.pathTemp + "/gameinfo/" + mapInfoFileName);
 
                 AddGeneratedByTag(file_mapinfo);
                 if (Objects.equals(type, "doomednums")) {