Merge pull request #2 from Anarchid/master

Allow Shard to exist. Inflict newline police. Resistance is futile.
EvolutionRTS · Jun 16, 2014 · 18380ad · 18380ad
2 parents 4224c6c + ce062be
commit 18380ad
Show file tree

Hide file tree

Showing 2 changed files with 138 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Declare files that will always have CRLF line endings on checkout.
+*.lua text eol=crlf
diff --git a/LuaRules/Gadgets/mex_placement.lua b/LuaRules/Gadgets/mex_placement.lua
@@ -1 +1,136 @@
-function gadget:GetInfo()  return {    name      = "Mex Placement",    desc      = "Controls mex placement and income",    author    = "Google Frog, smoth", --     date      = "21 April 2012",    license   = "GNU GPL, v2 or later",    layer     = -10,    enabled   = true  --  loaded by default?  }endinclude("LuaRules/Configs/customcmds.h.lua")---------------------------------------------------------------------------------- SYNCED--------------------------------------------------------------------------------if (not gadgetHandler:IsSyncedCode()) then	returnend---------------------------------------------------------------------------------- Command Definition----------------------------------------------------------------------------------local mexDefID = UnitDefNames["emetalextractor"].idlocal mexUnitDef				= UnitDefNames["emetalextractor"]local referenceLandMexId		= mexUnitDef.id	local referenceUnderWaterMexId	= UnitDefNames["euwmetalextractor"].idlocal mexDefIDs = {						[referenceLandMexId]			= referenceLandMexId,					[referenceUnderWaterMexId]	= referenceUnderWaterMexId,				}				local cmdMex = {	id      = CMD_AREA_MEX,	type    = CMDTYPE.ICON_AREA,	tooltip = 'Define an area to make mexes in',	name    = 'Mex',	cursor  = 'Repair',	action  = 'areamex',	params  = {}, }local canMex = {}for udid, ud in ipairs(UnitDefs) do 	for _, targetId in ipairs(ud.buildOptions) do 		if mexDefIDs[targetId] then			canMex[udid] = true			--Spring.Echo(ud.name)		end	endend---------------------------------------------------------------------------------- Variables--------------------------------------------------------------------------------local spotByID = {}local spotData = {}local metalSpots = {}local metalSpotsByPos = {}---------------------------------------------------------------------------------- Command Handling--------------------------------------------------------------------------------local sameOrder = {}function gadget:AllowCommand_GetWantedCommand()		return {[-mexDefID] = true, [CMD.INSERT] = true}endfunction gadget:AllowCommand_GetWantedUnitDefID()	return trueendfunction gadget:AllowCommand(unitID, unitDefID, teamID, cmdID, cmdParams, cmdOptions)	if (mexDefIDs[-cmdID] or (cmdID == CMD.INSERT and cmdParams and mexDefIDs[-cmdParams[2]])) and metalSpots then		local x = cmdParams[1]		local z = cmdParams[3]		--Spring.MarkerAddPoint(x,0,z,x .. ", " .. z)		return x and z and metalSpotsByPos[x] and metalSpotsByPos[x][z]	end	return trueendfunction gadget:Initialize()	metalSpots = GG.metalSpots	metalSpotsByPos = GG.metalSpotsByPos	-- register command	gadgetHandler:RegisterCMDID(CMD_AREA_MEX)	-- load active units	for _, unitID in ipairs(Spring.GetAllUnits()) do		local unitDefID = Spring.GetUnitDefID(unitID)		gadget:UnitCreated(unitID, unitDefID)	endend---------------------------------------------------------------------------------- Unit Tracker--------------------------------------------------------------------------------function gadget:UnitCreated(unitID, unitDefID, unitTeam)	if canMex[unitDefID] then		Spring.InsertUnitCmdDesc(unitID, cmdMex)	end		if mexDefIDs[unitID] then		local x,_,z = Spring.GetUnitPosition(unitID)		if metalSpots then			local spotID = metalSpotsByPos[x] and metalSpotsByPos[x][z]			if spotID then				spotByID[unitID] = spotID				spotData[spotID] = {unitID = unitID}				Spring.SetUnitRulesParam(unitID, "mexIncome", metalSpots[spotID].metal)				--GG.UnitEcho(unitID,spotID)			end		else			local metal = GG.IntegrateMetal(x, z)			Spring.SetUnitRulesParam(unitID, "mexIncome", metal)		end	endendfunction gadget:UnitDestroyed(unitID, unitDefID, unitTeam)	if mexDefIDs[unitID] and spotByID[unitID] then		spotData[spotByID[unitID]] = nil		spotByID[unitID] = nil	endend
+function gadget:GetInfo()
+  return {
+    name      = "Mex Placement",
+    desc      = "Controls mex placement and income",
+    author    = "Google Frog, smoth", -- 
+    date      = "21 April 2012",
+    license   = "GNU GPL, v2 or later",
+    layer     = -10,
+    enabled   = true  --  loaded by default?
+  }
+end
+
+include("LuaRules/Configs/customcmds.h.lua")
+
+--------------------------------------------------------------------------------
+-- SYNCED
+--------------------------------------------------------------------------------
+if (not gadgetHandler:IsSyncedCode()) then
+	return
+end
+
+--------------------------------------------------------------------------------
+-- Command Definition
+--------------------------------------------------------------------------------
+
+--local mexDefID = UnitDefNames["emetalextractor"].id
+
+local mexUnitDef				= UnitDefNames["emetalextractor"]
+local referenceLandMexId		= mexUnitDef.id	
+local referenceUnderWaterMexId	= UnitDefNames["euwmetalextractor"].id
+
+local mexDefIDs = {	
+					[referenceLandMexId]			= referenceLandMexId,
+					[referenceUnderWaterMexId]	= referenceUnderWaterMexId,
+				}
+
+local cmdMex = {
+	id      = CMD_AREA_MEX,
+	type    = CMDTYPE.ICON_AREA,
+	tooltip = 'Define an area to make mexes in',
+	name    = 'Mex',
+	cursor  = 'Repair',
+	action  = 'areamex',
+	params  = {}, 
+}
+
+local canMex = {}
+for udid, ud in ipairs(UnitDefs) do 
+	for _, targetId in ipairs(ud.buildOptions) do 
+		if mexDefIDs[targetId] then
+			canMex[udid] = true
+			--Spring.Echo(ud.name)
+		end
+	end
+end
+
+
+--------------------------------------------------------------------------------
+-- Variables
+--------------------------------------------------------------------------------
+
+local spotByID = {}
+local spotData = {}
+
+local metalSpots = {}
+local metalSpotsByPos = {}
+
+--------------------------------------------------------------------------------
+-- Command Handling
+--------------------------------------------------------------------------------
+
+local sameOrder = {}
+
+function gadget:AllowCommand_GetWantedCommand()	
+	return {[-mexDefID] = true, [CMD.INSERT] = true}
+end
+
+function gadget:AllowCommand_GetWantedUnitDefID()
+	return true
+end
+
+function gadget:AllowCommand(unitID, unitDefID, teamID, cmdID, cmdParams, cmdOptions)
+	if (mexDefIDs[-cmdID] or (cmdID == CMD.INSERT and cmdParams and mexDefIDs[-cmdParams[2]])) and metalSpots then
+		local _,_,_,isAI = Spring.GetTeamInfo(teamID)
+		local x = cmdParams[1]
+		local z = cmdParams[3]
+		--Spring.MarkerAddPoint(x,0,z,x .. ", " .. z)
+		return x and z and isAI or (metalSpotsByPos[x] and metalSpotsByPos[x][z])
+	end
+	return true
+end
+
+function gadget:Initialize()
+	metalSpots = GG.metalSpots
+	metalSpotsByPos = GG.metalSpotsByPos
+	-- register command
+	gadgetHandler:RegisterCMDID(CMD_AREA_MEX)
+	-- load active units
+	for _, unitID in ipairs(Spring.GetAllUnits()) do
+		local unitDefID = Spring.GetUnitDefID(unitID)
+		gadget:UnitCreated(unitID, unitDefID)
+	end
+end
+
+--------------------------------------------------------------------------------
+-- Unit Tracker
+--------------------------------------------------------------------------------
+
+function gadget:UnitCreated(unitID, unitDefID, unitTeam)
+	if canMex[unitDefID] then
+		Spring.InsertUnitCmdDesc(unitID, cmdMex)
+	end
+
+	if mexDefIDs[unitID] then
+		local x,_,z = Spring.GetUnitPosition(unitID)
+		if metalSpots then
+			local spotID = metalSpotsByPos[x] and metalSpotsByPos[x][z]
+			if spotID then
+				spotByID[unitID] = spotID
+				spotData[spotID] = {unitID = unitID}
+				Spring.SetUnitRulesParam(unitID, "mexIncome", metalSpots[spotID].metal)
+				--GG.UnitEcho(unitID,spotID)
+			end
+		else
+			local metal = GG.IntegrateMetal(x, z)
+			Spring.SetUnitRulesParam(unitID, "mexIncome", metal)
+		end
+	end
+end
+
+function gadget:UnitDestroyed(unitID, unitDefID, unitTeam)
+	if mexDefIDs[unitID] and spotByID[unitID] then
+		spotData[spotByID[unitID]] = nil
+		spotByID[unitID] = nil
+	end
+end