Changeset 3321

Timestamp:

11/29/08 16:16:29 (5 weeks ago)

Author:

carrepairer

Message:

Reverting changes to boost in 3240 which broke it, to quickly deploy good stable. Also removing chicken faction.

Location:

trunk/mods/ca

Files:

• LuaRules/Gadgets/unit_start_boost.lua (modified) (4 diffs)
• gamedata/sidedata.lua (modified) (1 diff)

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

@@ -48 +48 @@
 local boost = {}
 local startMetal = {}
-local boostUnits = {}
-local teamsToBoost = {}
 
 
@@ -94 +92 @@
 local init = false
 
---[[
 function gadget:GameFrame(n)
   if (n > 1 and not init) then
@@ -110 +107 @@
                         Spring.SetTeamResource(teamID, 'ms', START_STORAGE)
                         Spring.SetTeamResource(teamID, 'es', START_STORAGE)
-                        
+
                         for _, unitID in pairs(Spring.GetTeamUnits(teamID)) do
                                 local defID = Spring.GetUnitDefID(unitID)
@@ -126 +123 @@
         end
   end
-end
---]]
-
-
-function gadget:UnitCreated(unitID, unitDefID, unitTeam)
-        
-        
-        --Spring.SendMessage("Initializing team "..unitTeam.." with "..metal)
-        
-        if teamsToBoost[unitTeam] then
-                local unitName = unitDefID and UnitDefs[unitDefID].name
-                if unitName and boostUnits[unitName] then
-                        local metal = Spring.GetTeamResources(unitTeam, 'metal')        
-                        
-                        Spring.SetTeamResource(unitTeam, 'energy', 0)
-                        Spring.SetTeamResource(unitTeam, 'metal', 0)
-                                
-                        --[[
-                        if Spring.GetModOptions().commtype ~= 'con' then        
-                                Spring.SetTeamResource(unitTeam, 'ms', START_STORAGE)
-                                Spring.SetTeamResource(unitTeam, 'es', START_STORAGE)
-                        end
-                        --]]
-                        
-                        boost[unitID]  = metal
-                        startMetal[unitID] = metal
-                        --Spring.SendMessage("for unit " ..unitID)
-                        SendToUnsynced("UpdateBoost", unitID, metal, metal) 
-                        
-                        teamsToBoost[unitTeam] = nil
-                        
-                end
-        end
-
-end
-
-function gadget:Initialize()
-
-        for _, teamID in pairs(Spring.GetTeamList()) do
-                local gaiaID = Spring.GetGaiaTeamID()
-                local teamLuaAI = Spring.GetTeamLuaAI(teamID)
-                if (teamID ~= gaiaID and (not teamLuaAI or teamLuaAI == "")) then
-                        teamsToBoost[teamID] = true
-                end
-        end
-
-        if Spring.GetModOptions().commtype == 'con' then
-                boostUnits = {
-                        armrectr        = 1,
-                        armch           = 1,
-                        arm_conveh      = 1,
-                        armcs           = 1,
-
-                        cornecro        = 1,
-                        corch           = 1,
-                        corned          = 1,
-                        corcs           = 1,
-
-                        --chicken_drone = 1,
-                }       
-        else
-                boostUnits = {
-                        armcom = 1,
-                        corcom = 1,
-                }
-        end
 end
 

trunk/mods/ca/gamedata/sidedata.lua

@@ -22 +22 @@
     startunit = 'corcom',
   },
+  --[[
   [4] = {
     name      = 'Chicken (random if disabled)',
     startunit = 'chickenbroodqueen',
   },
+  --]]
 }