Recon comm fixes:

* fix Disruptor Bomb + Personal Shield incompatibility * fix not retaining the peashooter after picking an adv. weapon
ZeroK-RTS · Sep 30, 2016 · 045c9d6 · Anarchid · Sep 30, 2016 · sprunk
1 parent c1fa11f
commit 045c9d6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/LuaRules/Gadgets/unit_commander_upgrade.lua b/LuaRules/Gadgets/unit_commander_upgrade.lua
@@ -92,7 +92,7 @@ end
 local function ApplyWeaponData(unitID, weapon1, weapon2, shield, rangeMult)
 	if (not weapon2) and weapon1 then
 		local unitDefID = Spring.GetUnitDefID(unitID)
-		local weaponName = UnitDefs[unitDefID].name .. "_" .. weapon1
+		local weaponName = "0_" .. weapon1
 		local wd = WeaponDefNames[weaponName]
 		if wd and wd.customParams and wd.customParams.manualfire then
 			weapon2 = weapon1

diff --git a/gamedata/modularcomms/moduledefs.lua b/gamedata/modularcomms/moduledefs.lua
@@ -577,7 +577,7 @@ upgrades = {
 		description = "Generates a small bubble shield",
 		func = function(unitDef)
 				if unitDef.customparams.dynamic_comm then
-					DynamicApplyWeapon(unitDef, "commweapon_personal_shield", 16)
+					DynamicApplyWeapon(unitDef, "commweapon_personal_shield", #unitDef.weapons + 1)
 				else
 					ApplyWeapon(unitDef, "commweapon_personal_shield", 4)
 				end
@@ -600,7 +600,7 @@ upgrades = {
 				--ApplyWeapon(unitDef, "commweapon_areashield", 2)
 
 				if unitDef.customparams.dynamic_comm then
-					DynamicApplyWeapon(unitDef, "commweapon_areashield", 16)
+					DynamicApplyWeapon(unitDef, "commweapon_areashield", #unitDef.weapons) -- not +1 so as to replace personal
 				else
 					ReplaceWeapon(unitDef, "commweapon_personal_shield", "commweapon_areashield")
 				end