Changeset 3344

Timestamp:

12/01/08 19:29:39 (5 weeks ago)

Author:

licho

Message:

PW morphing takes unit owner directly as parameter

Location:

trunk/mods/ca/LuaRules/Gadgets

Files:

• planetwars.lua (modified) (3 diffs)
• unit_morph.lua (modified) (3 diffs)

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

@@ -43 +43 @@
                                         if (unitDef.isBuilding == true or unitDef.maxAcc == 0) then -- structure
                                                 uid = CreateUnit("armpwdeploy", tryx, tryy, tryz, 'N', teamnum - 1) -- todo determine side name
-                                                GG.morphHandler.AddExtraUnitMorph(uid, {into = m.unitname, time = 10, metal=0, energy=0,})
+                                                GG.morphHandler.AddExtraUnitMorph(uid, {into = m.unitname, time = 20, metal=0, energy=0,}, m.owner)
                                         else -- normal unit
                                                 uid = CreateUnit(m.unitname, tryx, tryy, tryz, 'N', teamnum - 1)                                        
@@ -78 +78 @@
         local err, success
         local modOptions = Spring.GetModOptions()
-                
+        
         if (modOptions) and modOptions.planetwars and modOptions.planetwars ~= '' then
                 optionsRaw = modOptions.planetwars
@@ -96 +96 @@
         if err then Spring.Echo('Planet Wars error: ' .. err) end
         --options did not load, remove
+        
         return false
 end

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

@@ -107 +107 @@
 local morphDefs  = {} --// make it global in Initialize()
 local extraUnitMorphDefs = {} -- stores mainly planetwars morphs
+local pwUnitOwners = {} -- stores owners of planetwars units
 local hostName = nil -- planetwars hostname
 local morphUnits = {} --// make it global in Initialize()
@@ -300 +301 @@
 
 
-local function AddExtraUnitMorph(unitID, morphDef)  -- adds extra unit morph (planetwars morphing)
+local function AddExtraUnitMorph(unitID, morphDef, owner)  -- adds extra unit morph (planetwars morphing)
         local unitDefID = Spring.GetUnitDefID(unitID)
         local ud = UnitDefs[unitDefID]
         local teamID = Spring.GetUnitTeam(unitID)
+        pwUnitOwners[unitID] = owner
         morphDef = BuildMorphDef(ud, morphDef)
         extraUnitMorphDefs[unitID] = morphDef
@@ -394 +396 @@
 
   local newUnit = Spring.CreateUnit(defName, px, py, pz, 0, unitTeam)
+
+  Spring.SetUnitPosition(newUnit, px, py, pz)  
   
   if (extraUnitMorphDefs[unitID] ~= nil and hostName ~= nil) then  -- send planetwars deployment message
-        local data = unitTeam..","..defName..","..math.floor(px)..","..math.floor(pz)..",".."S" -- todo determine and apply smart orientation of the structure
+        local data = (pwUnitOwners[unitID] or unitTeam)..","..defName..","..math.floor(px)..","..math.floor(pz)..",".."S" -- todo determine and apply smart orientation of the structure
         Spring.SendCommands("w "..hostName.." pwdeploy:"..data)
         extraUnitMorphDefs[unitID] = nil
-  end
-  
-  Spring.SetUnitPosition(newUnit, px, py, pz)
-  
-  local h = Spring.GetUnitHeading(unitID)
-  Spring.SetUnitRotation(newUnit, 0, -h * math.pi / 32768, 0)
+        pwUnitOwners[unitID] = nil
+  else  -- set rotation only if unit is not planetwars
+        local h = Spring.GetUnitHeading(unitID)
+        Spring.SetUnitRotation(newUnit, 0, -h * math.pi / 32768, 0)
+  end
+
 
   --//copy experience