Making the funnelweb a heavy shield support strider

LuaRules/Configs/drone_defs.lua

@@ -21,29 +21,6 @@ local carrierDefNames = {
 	},
 	--gunshipkrow = { {drone = UnitDefNames.dronelight.id, reloadTime = 15, maxDrones = 6, spawnSize = 2, range = 900, buildTime=3,
 			-- offsets = {0,0,0,colvolMidX=0, colvolMidY=0,colvolMidZ=0,aimX=0,aimY=0,aimZ=0}},
-	striderfunnelweb = {
-		spawnPieces = {"emitl", "emitr"},
-		{
-			drone = UnitDefNames.dronelight.id, 
-			reloadTime = 15, 
-			maxDrones = 6, 
-			spawnSize = 2, 
-			range = 800, 
-			buildTime = 6, 
-			maxBuild = 1,
-			offsets = {0, 35, 0, colvolMidX = 0, colvolMidY = 0, colvolMidZ = 0, aimX = 0, aimY = 0, aimZ = 0}
-		},
-		{
-			drone = UnitDefNames.droneheavyslow.id,
-			reloadTime = 25, 
-			maxDrones = 2, 
-			spawnSize = 1, 
-			range = 800, 
-			buildTime = 9, 
-			maxBuild = 1,
-			offsets = {0, 35, 0, colvolMidX = 0, colvolMidY = 0, colvolMidZ = 0, aimX = 0, aimY = 0, aimZ = 0}
-		},
-	},
 	nebula = {
 		spawnPieces = {"pad1", "pad2", "pad3", "pad4"},
 		{

LuaRules/Configs/lups_shield_fxs.lua

@@ -56,17 +56,27 @@ for unitDefID = 1, #UnitDefs do
 
 		local myShield = Spring.Utilities.CopyTable(ShieldSphereBase, true)
 		if radius > 250 then
-			myShield.shieldSize = "large"
+			if radius > 400 then
+				myShield.shieldSize = "huge"
+				--==  HQ  ==--
+				myShield.sizeDrift = 0.0;
+				myShield.marginHQ = 2.8
+				myShield.uvMul = 1.0
+				--== /HQ  ==--
+				myShield.hitResposeMult = 0.5
+			else
+				myShield.shieldSize = "large"
+				--==  HQ  ==--
+				myShield.sizeDrift = 0.008;
+				myShield.marginHQ = 2.8
+				myShield.uvMul = 1.0
+				--== /HQ  ==--
+				myShield.hitResposeMult = 0.6
+			end
 			myShield.drawBack = 0.55
 			myShield.drawBackCol = 0.3
 			myShield.drawBackMargin = 4.5
 			myShield.margin = 4
-			myShield.hitResposeMult = 0.6
-			--==  HQ  ==--
-			myShield.sizeDrift = 0.008;
-			myShield.marginHQ = 2.8
-			myShield.uvMul = 1.0
-			--== /HQ  ==--
 		else
 			myShield.shieldSize = "small"
 			if radius > 100 then
@@ -90,6 +100,7 @@ for unitDefID = 1, #UnitDefs do
 			myShield.margin = 1.8
 			myShield.hitResposeMult = 1
 		end
+		myShield.rechargeDelay = tonumber(ud.customParams.shield_recharge_delay) or 0
 
 		myShield.size = radius
 		myShield.radius = radius
@@ -100,6 +111,17 @@ for unitDefID = 1, #UnitDefs do
 			myShield.colormap1[1][4] = strengthMult*myShield.colormap1[1][4]
 			myShield.colormap1[2][4] = strengthMult*myShield.colormap1[2][4]
 		end
+
+		-- Very powerful non-chicken shields get a different look
+		local shieldPower = tonumber(ud.customParams.shield_power)
+		local decayFactor = 0.1
+		if shieldPower > 10000 then
+			myShield.texture = "bitmaps/PD/shieldblank.png"
+			myShield.colormap1 = {{0.4, 0.4, 1.3, 0.8}, {0.5, 0.1, 0.1, 0.3}}
+			myShield.colormap2 = {{0.0, 0.2, 0.2, 0.03}, {0.0, 0.2, 0.0, 0.02}}
+			myShield.hitResposeMult = 0.15
+			decayFactor = 0.05
+		end
 
 		local isChicken = false
 		if string.find(ud.name, "chicken_") then
@@ -138,6 +160,8 @@ for unitDefID = 1, #UnitDefs do
 			fx = fxTable,
 			search = searchSizes[radius],
 			shieldCapacity = tonumber(ud.customParams.shield_power),
+			damageMultShieldCapacity = tonumber(ud.customParams.shield_power_gfx_override or ud.customParams.shield_power),
+			decayFactor = decayFactor,
 			shieldPos = myShield.pos,
 			shieldRadius = radius,
 		}

LuaRules/Gadgets/lups_shield.lua

@@ -133,12 +133,13 @@ local function AddUnit(unitID, unitDefID)
 	end
 
 	local unitData = {
-		unitDefID  = unitDefID,
-		search     = def.search,
-		capacity   = def.shieldCapacity,
-		radius     = def.shieldRadius,
-		fxTable    = fxTable,
-		allyTeamID = Spring.GetUnitAllyTeam(unitID)
+		unitDefID   = unitDefID,
+		search      = def.search,
+		capacity    = def.damageMultShieldCapacity,
+		decayFactor = def.decayFactor,
+		radius      = def.shieldRadius,
+		fxTable     = fxTable,
+		allyTeamID  = Spring.GetUnitAllyTeam(unitID)
 	}
 
 	if highEnoughQuality then
@@ -247,7 +248,6 @@ local function DoAddShieldHitData(unitData, hitFrame, dmg, theta, phi)
 	unitData.needsUpdate = true
 end
 
-local DECAY_FACTOR = 0.1
 local MIN_DAMAGE = 1
 
 local function GetShieldHitPositions(unitID)
@@ -263,7 +263,7 @@ local function ProcessHitTable(unitData, gameFrame)
 	for i = #hitData, 1, -1 do
 		local hitInfo = hitData[i]
 		if hitInfo then
-			local mult = math.exp(-DECAY_FACTOR*(gameFrame - hitInfo.hitFrame))
+			local mult = math.exp(-unitData.decayFactor*(gameFrame - hitInfo.hitFrame))
 			--Spring.Echo(gameFrame, hitInfo.dmg, mult, hitInfo.dmg * mult)
 			hitInfo.dmg = hitInfo.dmg * mult
 			hitInfo.hitFrame = gameFrame

LuaRules/Gadgets/unit_regeneration.lua

@@ -27,10 +27,10 @@ for id, def in pairs(UnitDefs) do
 end
 
 local currentFrame
-function gadget:GameFrame (frame)
+function gadget:GameFrame(frame)
 	currentFrame = frame
-	if ((frame % 15) == 7) then
-		local setParam = ((frame % 30) == 7)
+	if ((frame % 15) == 8) then
+		local setParam = ((frame % 30) == 8)
 		for i = 1, unitCount do
 			local unitID = unitList[i]
 			local data = units[unitID]
@@ -42,7 +42,7 @@ function gadget:GameFrame (frame)
 					spSetUnitHealth(unitID, health + amount)
 				end
 			end
-			if setParam then
+			if setParam and data.idleFrame - frame > -70 then
 				spSetUnitRulesParam(unitID, "idleRegenTimer", data.idleFrame - frame, losTable)
 			end
 		end

LuaRules/Gadgets/unit_shield_charge.lua

@@ -34,6 +34,7 @@ local spGetUnitIsStunned  = Spring.GetUnitIsStunned
 local spUseUnitResource   = Spring.UseUnitResource
 local spGetUnitRulesParam = Spring.GetUnitRulesParam
 local spSetUnitRulesParam = Spring.SetUnitRulesParam
+local losTable = {inlos = true}
 
 local unitMap = {}
 local unitList = {}
@@ -53,6 +54,7 @@ for unitDefID = 1, #UnitDefs do
 					chargePerUpdate = PERIOD*tonumber(shieldWep.customParams.shield_rate)/TEAM_SLOWUPDATE_RATE,
 					perSecondCost = tonumber(shieldWep.customParams.shield_drain),
 					startPower = shieldWep.customParams.shieldstartingpower and tonumber(shieldWep.customParams.shieldstartingpower),
+					rechargeDelay = shieldWep.customParams.shield_recharge_delay and tonumber(shieldWep.customParams.shield_recharge_delay),
 				}
 			else
 				shieldUnitDefID[unitDefID] = {
@@ -90,6 +92,7 @@ function gadget:GameFrame(n)
 	end
 
 	local updatePriority = (n % TEAM_SLOWUPDATE_RATE == 0)
+	local setParam = ((n % 30) == 8)
 
 	for i = 1, unitCount do
 		local data = unitList[i]
@@ -98,8 +101,17 @@ function gadget:GameFrame(n)
 		local enabled, charge = IsShieldEnabled(unitID)
 
 		local def = data.def
-		if enabled and charge < def.maxCharge and spGetUnitRulesParam(unitID, "shieldChargeDisabled") ~= 1 then
-
+		local hitTime = Spring.GetUnitRulesParam(unitID, "shieldHitFrame") or -999999
+		local currTime = Spring.GetGameFrame()
+		local inCooldown = false
+		if def.rechargeDelay then
+			local remainingTime = hitTime + def.rechargeDelay * 30 - currTime
+			inCooldown = (remainingTime >= 0)
+			if (setParam or currTime - hitTime < 3) and remainingTime > -70 then
+				spSetUnitRulesParam(unitID, "shieldRegenTimer", remainingTime, losTable)
+			end
+		end
+		if enabled and charge < def.maxCharge and not inCooldown and spGetUnitRulesParam(unitID, "shieldChargeDisabled") ~= 1 then
 			-- Get changed charge rate based on slow
 			local newChargeRate = GetChargeRate(unitID)
 			if data.oldChargeRate ~= newChargeRate then

LuaRules/Gadgets/unit_shield_link.lua

@@ -117,34 +117,36 @@ function gadget:UnitCreated(unitID, unitDefID)
 
 	if shieldWeaponDefID then
 		local shieldWep = WeaponDefs[shieldWeaponDefID]
-		--local x,y,z = spGetUnitPosition(unitID)
-		local allyTeamID = spGetUnitAllyTeam(unitID)
-		if not (allyTeamShields[allyTeamID] and allyTeamShields[allyTeamID][unitID]) then -- not need to redo table if already have table (UnitFinished() will call this function 2nd time)
-			allyTeamShields[allyTeamID] = allyTeamShields[allyTeamID] or {}
-			allyTeamShieldList[allyTeamID] = allyTeamShieldList[allyTeamID] or {count = 0}
-
-			local shieldRegen = shieldWep.shieldPowerRegen
-			if shieldRegen == 0 and shieldWep.customParams and shieldWep.customParams.shield_rate then
-				shieldRegen = tonumber(shieldWep.customParams.shield_rate)
+		if not shieldWep.customParams.unlinked then 
+			--local x,y,z = spGetUnitPosition(unitID)
+			local allyTeamID = spGetUnitAllyTeam(unitID)
+			if not (allyTeamShields[allyTeamID] and allyTeamShields[allyTeamID][unitID]) then -- not need to redo table if already have table (UnitFinished() will call this function 2nd time)
+				allyTeamShields[allyTeamID] = allyTeamShields[allyTeamID] or {}
+				allyTeamShieldList[allyTeamID] = allyTeamShieldList[allyTeamID] or {count = 0}
+
+				local shieldRegen = shieldWep.shieldPowerRegen
+				if shieldRegen == 0 and shieldWep.customParams and shieldWep.customParams.shield_rate then
+					shieldRegen = tonumber(shieldWep.customParams.shield_rate)
+				end
+
+				local shieldUnit = {
+					shieldMaxCharge  = shieldWep.shieldPower,
+					shieldNum    = shieldNum,
+					shieldRadius = shieldWep.shieldRadius,
+					shieldRegen  = shieldRegen,
+					shieldRank   = ((shieldWep.shieldRadius > 400) and 3) or ((shieldWep.shieldRadius > 200) and 2) or 1,
+					unitDefID    = unitDefID,
+					neighbors    = {},
+					neighborList = {count = 0},
+					allyTeamID   = allyTeamID,
+					enabled      = false,
+					oldEnabled   = false,
+					oldFastEnabled = false,
+				}
+				AddDataThingToIterable(unitID, shieldUnit, allyTeamShields[allyTeamID], allyTeamShieldList[allyTeamID])
 			end
-
-			local shieldUnit = {
-				shieldMaxCharge  = shieldWep.shieldPower,
-				shieldNum    = shieldNum,
-				shieldRadius = shieldWep.shieldRadius,
-				shieldRegen  = shieldRegen,
-				shieldRank   = ((shieldWep.shieldRadius > 200) and 2) or 1,
-				unitDefID    = unitDefID,
-				neighbors    = {},
-				neighborList = {count = 0},
-				allyTeamID   = allyTeamID,
-				enabled      = false,
-				oldEnabled   = false,
-				oldFastEnabled = false,
-			}
-			AddDataThingToIterable(unitID, shieldUnit, allyTeamShields[allyTeamID], allyTeamShieldList[allyTeamID])
+			QueueLinkUpdate(allyTeamID,unitID)
 		end
-		QueueLinkUpdate(allyTeamID,unitID)
 	end
 end
 

LuaUI/Configs/lang/units.en.json

@@ -706,8 +706,8 @@
 	},
 	"striderfunnelweb" : {
 		"name" : "Funnelweb",
-		"description" : "Drone/Shield Support Strider",
-		"helptext" : "The slow all-terrain Funnelweb features an area shield and a powerful drone complement."
+		"description" : "Shield Support Strider",
+		"helptext" : "The slow all-terrain Funnelweb features an extremely powerful wide-area shield and high nano power for post-battle utility. It is otherwise unarmed."
 	},
 	"cloakriot" : {
 		"name" : "Reaver",

LuaUI/Configs/lupsUnitFXs.lua

@@ -106,9 +106,10 @@ effectUnitDefs = {
 	},
 
 	striderfunnelweb = {
-	--{class='ShieldJitter', options={delay=0, life=math.huge, pos={0,25,-10}, size=400, strength = .002, precision=50, repeatEffect=true, quality = 4, onActive = true}},
-	{class='Bursts', options=MergeTable(staticshieldBursts, {piece="aimpoint"})},
-	{class='ShieldSphere', options=staticshieldBall},
+		{class='Bursts', options=MergeTable(staticshieldBursts, {piece="emitl", pos={0,9.8,0}, shieldRechargeDelay = tonumber(WeaponDefNames["striderfunnelweb_shield"].customParams.shield_recharge_delay), colormap = { {0.3, 0.3, 1, 0.8} }})},
+		{class='Bursts', options=MergeTable(staticshieldBursts, {piece="emitr", pos={0,9.8,0}, shieldRechargeDelay = tonumber(WeaponDefNames["striderfunnelweb_shield"].customParams.shield_recharge_delay), colormap = { {0.3, 0.3, 1, 0.8} }})},
+		{class='ShieldSphere', options={piece="emitl", life=math.huge, size=10, pos={0,9.8,0}, colormap1 = {{0.4, 0.1, 0.95, 1.0}}, rechargingColor1 = {0.95, 0.4, 0.4, 1.0}, rechargingColor2 = {0.95, 0.1, 0.4, 0.2}, shieldRechargeDelay = 30*tonumber(WeaponDefNames["striderfunnelweb_shield"].customParams.shield_recharge_delay), shieldRechargeSize = 7, repeatEffect=true}},	
+		{class='ShieldSphere', options={piece="emitr", life=math.huge, size=10, pos={0,9.8,0}, colormap1 = {{0.4, 0.1, 0.95, 1.0}}, rechargingColor1 = {0.95, 0.4, 0.4, 1.0}, rechargingColor2 = {0.95, 0.1, 0.4, 0.2}, shieldRechargeDelay = 30*tonumber(WeaponDefNames["striderfunnelweb_shield"].customParams.shield_recharge_delay), shieldRechargeSize = 7, repeatEffect=false}},	
 	},
 
 	--// ENERGY STORAGE //--------------------

LuaUI/Widgets/gui_chili_selections_and_cursortip.lua

@@ -627,6 +627,13 @@ local function GetUnitRegenString(unitID, ud)
 end
 
 local function GetUnitShieldRegenString(unitID, ud)
+	if ud.customParams.shield_recharge_delay or true then
+		local shieldRegen = spGetUnitRulesParam(unitID, "shieldRegenTimer")
+		if shieldRegen and shieldRegen > 0 then
+			return "  (" .. math.ceil(shieldRegen / 30) .. "s)"
+		end
+	end
+
 	local mult = spGetUnitRulesParam(unitID,"totalReloadSpeedChange") or 1 * (1 - (spGetUnitRulesParam(unitID, "shieldChargeDisabled") or 0))
 	if mult == 0 then
 		return ""

LuaUI/Widgets/gui_contextmenu.lua

@@ -437,8 +437,17 @@ local function weapons2Table(cells, ws, unitID)
 		cells[#cells+1] = regen .. " HP/s"
 		cells[#cells+1] = ' - Regen cost:'
 		cells[#cells+1] = drain .. " E/s"
+		local rechargeDelay = tonumber(wd.shieldrechargedelay or wd.customParams.shield_recharge_delay)
+		if rechargeDelay and rechargeDelay > 0 then
+			cells[#cells+1] = ' - Regen delay:'
+			cells[#cells+1] = rechargeDelay .. " s"
+		end
 		cells[#cells+1] = ' - Radius:'
 		cells[#cells+1] = wd.shieldRadius .. " elmo"
+		if wd.customParams.unlinked then
+			cells[#cells+1] = ' - Does not link with other shields'
+			cells[#cells+1] = ''
+		end
 	else
 		-- calculate damages
 

gamedata/unitdefs_post.lua

@@ -193,6 +193,7 @@ for name, ud in pairs(UnitDefs) do
 					hasShield = true
 					ud.customparams.shield_radius = wd.shieldradius
 					ud.customparams.shield_power = wd.shieldpower
+					ud.customparams.shield_recharge_delay = (wd.customparams or {}).shield_recharge_delay or wd.shieldrechargedelay
 					ud.customparams.shield_rate = (wd.customparams or {}).shield_rate or wd.shieldpowerregen
 					break
 				end