Changeset 3324

Timestamp:

11/29/08 21:21:36 (5 weeks ago)

Author:

licho

Message:

• extra commanders given in planetwars to balance teams should start with boost too (untested)
• boost has external method AddBoost?(id, [boost], [maxBoost])

Location:

trunk/mods/ca/LuaRules/Gadgets

Files:

• planetwars.lua (modified) (1 diff)
• unit_start_boost.lua (modified) (4 diffs)

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

@@ -40 +40 @@
                                 tryy = GetGroundHeight(tryx, tryz)
                                 if TestBuildOrder(unitDefID, tryx, tryy, tryz, 'N') or spawnTries > 20 then
-                                        
+                                        local uid = nil
                                         if (unitDef.isBuilding == true or unitDef.maxAcc == 0) then -- structure
-                                                local uid = CreateUnit("armpwdeploy", tryx, tryy, tryz, 'N', teamnum - 1) -- todo determine side name
+                                                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,})
                                         else -- normal unit
-                                                local uid = CreateUnit(m.unitname, tryx, tryy, tryz, 'N', teamnum - 1)                                  
+                                                uid = CreateUnit(m.unitname, tryx, tryy, tryz, 'N', teamnum - 1)                                        
+                                        end
+                                        
+                                        if (m.unitname == 'armcom' or m.unitname == 'corcom') then
+                                                GG.boostHandler.AddBoost(uid)
                                         end
                                         

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

@@ -47 +47 @@
 
 local boost = {}
-local startMetal = {}
-
+local boostMax = {}
+local teamMetal = {}
 
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
+
+local function AddBoost(unitID, newBoost, newBoostMax)
+        local tm = teamMetal[Spring.GetUnitTeam(unitID)]
+        boost[unitID]  = newBoost or tm
+        boostMax[unitID] = newBoostMax or tm
+        SendToUnsynced("UpdateBoost", unitID, boost[unitID], boostMax[unitID])   
+end
+
+
+function gadget:Initialize() 
+  -- self linking
+  GG['boostHandler'] = {}
+  GG['boostHandler'].AddBoost = AddBoost
+end
+
 
 function gadget:UnitDestroyed(unitID) 
@@ -80 +95 @@
             boost[builderID] = boost[builderID] - BOOST_RATE
             Spring.SetUnitHealth(unitID, { health = progress*maxHealth,  build  = progress })
-                SendToUnsynced("UpdateBoost", builderID, boost[builderID], startMetal[builderID])   
+                SendToUnsynced("UpdateBoost", builderID, boost[builderID], boostMax[builderID])   
                 return false
           else 
@@ -99 +114 @@
                 if (teamID ~= gaiaID and (not teamLuaAI or teamLuaAI == "")) then
                         local metal = Spring.GetTeamResources(teamID, 'metal')
-                                
+                        teamMetal[teamID] = metal
                         --Spring.SendMessage("Initializing team "..teamID.." with "..metal)
                                 
@@ -111 +126 @@
                                 local defID = Spring.GetUnitDefID(unitID)
                                 if (defID ~= nil and UnitDefs[defID] ~= nil and UnitDefs[defID].isCommander and UnitDefs[defID].name ~= "chickenbroodqueen") then
-                                        boost[unitID]  = metal
-                                        startMetal[unitID] = metal
-                                        --Spring.SendMessage("for unit " ..unitID)
-                                        SendToUnsynced("UpdateBoost", unitID, metal, metal)   
+                                        AddBoost(unitID)
                                         break
                                 end