Changeset 3318

Timestamp:

11/29/08 07:37:07 (5 weeks ago)

Author:

google frog

Message:

* Some terraform fixes.
* Dgun is now a separate mod option.

Location:

trunk/mods/ca

Files:

• LuaRules/Gadgets/unit_terraform.lua (modified) (2 diffs)
• ModOptions.lua (modified) (1 diff)
• gamedata/unitdefs_post.lua (modified) (3 diffs)

trunk/mods/ca/LuaRules/Gadgets/unit_terraform.lua

@@ -209 +209 @@
   if ((UnitDefs[unitDefID].isBuilding == true or UnitDefs[unitDefID].maxAcc == 0) and (not checkTerraform(UnitDefs[unitDefID].name))) then
     local ux, uy, uz  = Spring.GetUnitPosition(unitID)
-        structure[unitID] = { x = ux, z = uz , h = spGetGroundHeight(ux, uz), def = UnitDefs[unitDefID], 
-        minx = UnitDefs[unitDefID].minx, minz = UnitDefs[unitDefID].minz, maxx = UnitDefs[unitDefID].maxx, maxz = UnitDefs[unitDefID].maxz}
+        local face = spGetUnitBuildFacing(unitID)
+        if ((face == 0) or(face == 2)) then
+          structure[unitID] = { x = ux, z = uz , h = spGetGroundHeight(ux, uz), def = UnitDefs[unitDefID], 
+          minx = UnitDefs[unitDefID].minx, minz = UnitDefs[unitDefID].minz, maxx = UnitDefs[unitDefID].maxx, maxz = UnitDefs[unitDefID].maxz}
+        else
+          structure[unitID] = { x = ux, z = uz , h = spGetGroundHeight(ux, uz), def = UnitDefs[unitDefID], 
+          minx = UnitDefs[unitDefID].minz, minz = UnitDefs[unitDefID].minx, maxx = UnitDefs[unitDefID].maxz, maxz = UnitDefs[unitDefID].maxx}
+        end
   end
   
@@ -315 +321 @@
 function gadget:GameFrame(n)
  
-  if (n%150<1) then 
+  if (n%90<1) then 
         checkHeightChange()
   end

trunk/mods/ca/ModOptions.lua

@@ -69 +69 @@
   },
   {
+    key    = 'dgun',
+    name   = 'Enable Dgun',
+    desc   = "Gives the Commander a Dgun",
+    type   = 'bool',
+    def    = true,
+  },
+  {
     key = "specialair",
     name = "Special Air Units",

trunk/mods/ca/gamedata/unitdefs_post.lua

@@ -273 +273 @@
                 ud.maxdamage = 2000
                 ud.canattack = false
-                ud.candgun = false
-                ud.cloakcost = -1
         ud.explodeas = "BIG_UNIT"
-                ud.weapons = nil
+                ud.weapons = {[1] = nil ,[3] = nil ,[4] = nil ,} 
         ud.selfdestructas = "BIG_UNIT"
                 ud.maxvelocity = 1.5
@@ -304 +302 @@
                           ud.maxdamage = 4000
                           ud.energymake = 8
-                        ud.candgun = true
                         ud.explodeas = "COMMANDER_BLAST_CAT"
                         ud.selfdestructas = "COMMANDER_BLAST_CAT"
@@ -324 +321 @@
 end
 
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+-- Dgun
+-- 
+
+if (modOptions and modOptions.dgun) then
+  if tobool(modOptions.dgun) then
+        for name, ud in pairs(UnitDefs) do
+        local unitname = ud.unitname
+          if (unitname == "armcom" or unitname == "corcom") then 
+            ud.candgun = true
+            ud.weapons[1] = {def = "FAKELASER",} 
+                ud.weapons[3] = {def = "DISINTEGRATOR",} 
+          end
+        end
+  else
+        for name, ud in pairs(UnitDefs) do
+          local unitname = ud.unitname
+          if (unitname == "armcom" or unitname == "corcom") then 
+            ud.candgun = false
+                ud.weapons[3] = nil
+          end
+        end
+  end
+end
 
 --------------------------------------------------------------------------------