Merge pull request #2811 from robertthepie/MicroModelFixes

More April Hats
beyond-all-reason · Apr 1, 2024 · 0373916 · 0373916
2 parents c12be80 + 1235e0c
commit 0373916
Show file tree

Hide file tree

Showing 19 changed files with 14 additions and 1 deletion.
diff --git a/gamedata/alldefs_post.lua b/gamedata/alldefs_post.lua
@@ -109,6 +109,14 @@ function UnitDef_Post(name, uDef)
 			uDef.objectname = "apf/armbull.s3o"
 		elseif name == "armllt" then
 			uDef.objectname = "apf/armllt.s3o"
+		elseif name == "armwin" then
+			uDef.objectname = "apf/armwin.s3o"
+		elseif name == "armham" then
+			uDef.objectname = "apf/armham.s3o"
+		elseif name == "corwin" then
+			uDef.objectname = "apf/corwin.s3o"
+		elseif name == "corthud" then
+			uDef.objectname = "apf/corthud.s3o"
 		end
 	end
 

diff --git a/luarules/gadgets/unit_on_create_fix.lua b/luarules/gadgets/unit_on_create_fix.lua
@@ -27,12 +27,16 @@ for k, v in pairs({
 	correap=6,
 	corllt=8,
 	corhllt=8,
-	cordemon=3,
+	cordemon=4,
 	armpw=7,
 	armcv=5,
 	armrock=6,
 	armbull=6,
 	armllt=6,
+	corwin=7,
+	armwin=6,
+	armham=5,
+	corthud=6,
 }) do
 	local tmp = UnitDefNames[k]
 	if tmp and tmp.id then
@@ -47,6 +51,7 @@ function gadget:UnitCreated(unitID, unitDefID, teamID, builderID)
 		local pieceID = Spring.GetUnitPieceMap(unitID)
 		for i = 1, amountToFix do if i~=s then
 				Spring.SetUnitPieceVisible(unitID, pieceID["h"..i], false)
+		else Spring.SetUnitPieceMatrix(unitID, pieceID["h"..i], { 1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1})
 			end
 		end
 	end

diff --git a/objects3d/apf/armbull.s3o b/objects3d/apf/armbull.s3o
diff --git a/objects3d/apf/armcv.s3o b/objects3d/apf/armcv.s3o
diff --git a/objects3d/apf/armham.s3o b/objects3d/apf/armham.s3o
diff --git a/objects3d/apf/armllt.s3o b/objects3d/apf/armllt.s3o
diff --git a/objects3d/apf/armpw.s3o b/objects3d/apf/armpw.s3o
diff --git a/objects3d/apf/armrock.s3o b/objects3d/apf/armrock.s3o
diff --git a/objects3d/apf/armwin.s3o b/objects3d/apf/armwin.s3o
diff --git a/objects3d/apf/corack.s3o b/objects3d/apf/corack.s3o
diff --git a/objects3d/apf/corak.s3o b/objects3d/apf/corak.s3o
diff --git a/objects3d/apf/corck.s3o b/objects3d/apf/corck.s3o
diff --git a/objects3d/apf/cordemon.s3o b/objects3d/apf/cordemon.s3o
diff --git a/objects3d/apf/corhllt.s3o b/objects3d/apf/corhllt.s3o
diff --git a/objects3d/apf/corllt.s3o b/objects3d/apf/corllt.s3o
diff --git a/objects3d/apf/correap.s3o b/objects3d/apf/correap.s3o
diff --git a/objects3d/apf/corstorm.s3o b/objects3d/apf/corstorm.s3o
diff --git a/objects3d/apf/corthud.s3o b/objects3d/apf/corthud.s3o
diff --git a/objects3d/apf/corwin.s3o b/objects3d/apf/corwin.s3o