Initial 3do to s3o.

ZeroK-RTS · Apr 15, 2022 · fde6131 · fde6131
1 parent f70bfde
commit fde6131
Show file tree

Hide file tree

Showing 47 changed files with 9 additions and 9 deletions.
diff --git a/Objects3d/ARMcybr.3do b/Objects3d/ARMcybr.3do
diff --git a/Objects3d/Armtick.3do b/Objects3d/Armtick.3do
diff --git a/Objects3d/Armtick.s3o b/Objects3d/Armtick.s3o
diff --git a/Objects3d/Armtick_dead.3do b/Objects3d/Armtick_dead.3do
diff --git a/Objects3d/Armtick_dead.s3o b/Objects3d/Armtick_dead.s3o
diff --git a/Objects3d/armartic.3do b/Objects3d/armartic.3do
diff --git a/Objects3d/armartic.s3o b/Objects3d/armartic.s3o
diff --git a/Objects3d/armcom.3do b/Objects3d/armcom.3do
diff --git a/Objects3d/armcom.s3o b/Objects3d/armcom.s3o
diff --git a/Objects3d/armcom1dark.3do b/Objects3d/armcom1dark.3do
diff --git a/Objects3d/armcom1dark.s3o b/Objects3d/armcom1dark.s3o
diff --git a/Objects3d/armcom2.3do b/Objects3d/armcom2.3do
diff --git a/Objects3d/armcom2.s3o b/Objects3d/armcom2.s3o
diff --git a/Objects3d/armcom3.3do b/Objects3d/armcom3.3do
diff --git a/Objects3d/armcom3.s3o b/Objects3d/armcom3.s3o
diff --git a/Objects3d/armcom4.3do b/Objects3d/armcom4.3do
diff --git a/Objects3d/armcom4.s3o b/Objects3d/armcom4.s3o
diff --git a/Objects3d/armcom5.3do b/Objects3d/armcom5.3do
diff --git a/Objects3d/armcom5.s3o b/Objects3d/armcom5.s3o
diff --git a/Objects3d/armcrabe.3do b/Objects3d/armcrabe.3do
diff --git a/Objects3d/armcrabe.s3o b/Objects3d/armcrabe.s3o
diff --git a/Objects3d/armcrabe_dead.3do b/Objects3d/armcrabe_dead.3do
diff --git a/Objects3d/armcrabe_dead.s3o b/Objects3d/armcrabe_dead.s3o
diff --git a/Objects3d/armcybr.s3o b/Objects3d/armcybr.s3o
diff --git a/Objects3d/corgrav.3do b/Objects3d/corgrav.3do
diff --git a/Objects3d/corgrav.s3o b/Objects3d/corgrav.s3o
diff --git a/Objects3d/corgrav_dead.3do b/Objects3d/corgrav_dead.3do
diff --git a/Objects3d/corgrav_dead.s3o b/Objects3d/corgrav_dead.s3o
diff --git a/Objects3d/lazer.3do b/Objects3d/lazer.3do
diff --git a/Objects3d/lazer.s3o b/Objects3d/lazer.s3o
diff --git a/Objects3d/noruas.3do b/Objects3d/noruas.3do
diff --git a/Objects3d/noruas.s3o b/Objects3d/noruas.s3o
diff --git a/Objects3d/roost.3do b/Objects3d/roost.3do
diff --git a/Objects3d/roost.s3o b/Objects3d/roost.s3o
diff --git a/Objects3d/subtacmissile.3do b/Objects3d/subtacmissile.3do
diff --git a/Objects3d/subtacmissile.s3o b/Objects3d/subtacmissile.s3o
diff --git a/units/armcom1.lua b/units/armcom1.lua
@@ -53,7 +53,7 @@ return { armcom1 = {
   metalStorage           = 500,
   movementClass          = [[AKBOT2]],
   noChaseCategory        = [[TERRAFORM SATELLITE FIXEDWING GUNSHIP HOVER SHIP SWIM SUB LAND FLOAT SINK TURRET]],
-  objectName             = [[ARMCOM]],
+  objectName             = [[armcom.s3o]],
   script                 = [[armcom.lua]],
   selfDestructAs         = [[ESTOR_BUILDINGEX]],
 

diff --git a/units/bomberheavy.lua b/units/bomberheavy.lua
@@ -47,7 +47,7 @@ return { bomberheavy = {
   mygravity           = 1,
   noAutoFire          = false,
   noChaseCategory     = [[TERRAFORM FIXEDWING SATELLITE GUNSHIP SUB]],
-  objectName          = [[ARMCYBR]],
+  objectName          = [[armcybr.s3o]],
   refuelTime          = 20,
   script              = [[bomberheavy.lua]],
   selfDestructAs      = [[GUNSHIPEX]],

diff --git a/units/cloakbomb.lua b/units/cloakbomb.lua
@@ -36,7 +36,7 @@ return { cloakbomb = {
   maxVelocity            = 4.2,
   movementClass          = [[TKBOT2]],
   noChaseCategory        = [[FIXEDWING LAND SINK TURRET SHIP SWIM GUNSHIP FLOAT SUB HOVER]],
-  objectName             = [[ARMTICK]],
+  objectName             = [[armtick.s3o]],
   pushResistant          = 0,
   script                 = [[cloakbomb.lua]],
   selfDestructAs         = [[cloakbomb_DEATH]],

diff --git a/units/roost.lua b/units/roost.lua
@@ -24,7 +24,7 @@ return { roost = {
   maxVelocity       = 0,
   metalMake         = 2.5,
   noAutoFire        = false,
-  objectName        = [[roost]],
+  objectName        = [[roost.s3o]],
   script            = [[roost.lua]],
   selfDestructAs    = [[NOWEAPON]],
 

diff --git a/units/spidercrabe.lua b/units/spidercrabe.lua
@@ -40,7 +40,7 @@ return { spidercrabe = {
   movementClass          = [[TKBOT4]],
   moveState              = 0,
   noChaseCategory        = [[FIXEDWING GUNSHIP]],
-  objectName             = [[ARMCRABE]],
+  objectName             = [[armcrabe.s3o]],
   pushResistant          = 0,
   script                 = [[spidercrabe.lua]],
   selfDestructAs         = [[BIG_UNIT]],

diff --git a/units/striderantiheavy.lua b/units/striderantiheavy.lua
@@ -38,7 +38,7 @@ return { striderantiheavy = {
   minCloakDistance       = 120,
   movementClass          = [[AKBOT2]],
   noChaseCategory        = [[TERRAFORM SATELLITE FIXEDWING GUNSHIP HOVER SHIP SWIM SUB LAND FLOAT SINK TURRET]],
-  objectName             = [[noruas]],
+  objectName             = [[noruas.s3o]],
   script                 = [[striderantiheavy.lua]],
   selfDestructAs         = [[ESTOR_BUILDING]],
 

diff --git a/units/subtacmissile.lua b/units/subtacmissile.lua
@@ -41,7 +41,7 @@ return { subtacmissile = {
   movementClass          = [[UBOAT3]],
   moveState              = 0,
   noAutoFire             = false,
-  objectName             = [[SUBTACMISSILE]],
+  objectName             = [[subtacmissile.s3o]],
   selfDestructAs         = [[BIG_UNITEX]],
   script                 = [[subtacmissile.lua]],
   sightDistance          = 660,

diff --git a/units/turretemp.lua b/units/turretemp.lua
@@ -38,7 +38,7 @@ return { turretemp = {
   maxSlope                      = 36,
   maxWaterDepth                 = 0,
   noChaseCategory               = [[FIXEDWING LAND SHIP SWIM GUNSHIP SUB HOVER]],
-  objectName                    = [[armartic]],
+  objectName                    = [[armartic.s3o]],
   script                        = [[turretemp.lua]],
   selfDestructAs                = [[MEDIUM_BUILDINGEX]],
 

diff --git a/units/turretimpulse.lua b/units/turretimpulse.lua
@@ -33,7 +33,7 @@ return { turretimpulse = {
   maxWaterDepth                 = 0,
   noAutoFire                    = false,
   noChaseCategory               = [[FIXEDWING LAND SINK TURRET SHIP SATELLITE SWIM GUNSHIP FLOAT SUB HOVER]],
-  objectName                    = [[CORGRAV]],
+  objectName                    = [[corgrav.s3o]],
   onoffable                     = true,
   script                        = [[turretimpulse.lua]],
   selfDestructAs                = [[MEDIUM_BUILDINGEX]],

diff --git a/unittextures/3do2s3o_atlas_1.tga b/unittextures/3do2s3o_atlas_1.tga
diff --git a/unittextures/3do2s3o_atlas_2.tga b/unittextures/3do2s3o_atlas_2.tga