More beacon stuff.

Allow personality to decide beacon help amounts.
KJeff01 · Aug 26, 2020 · daa805c · daa805c
1 parent cab959b
commit daa805c
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 4 deletions.
diff --git a/multiplay/skirmish/Cobra.js b/multiplay/skirmish/Cobra.js
@@ -170,6 +170,9 @@ var subPersonalities =
 			"R-Wpn-Cannon-ROF02",
 		],
 		"canPlayBySelf": true,
+		"beaconArmyPercentage": 60,
+		"beaconArtilleryPercentage": 40,
+		"beaconVtolPercentage": 60,
 	},
 	AR:
 	{
@@ -190,6 +193,9 @@ var subPersonalities =
 			"R-Wpn-Flamer-ROF01",
 		],
 		"canPlayBySelf": false,
+		"beaconArmyPercentage": 60,
+		"beaconArtilleryPercentage": 40,
+		"beaconVtolPercentage": 60,
 	},
 	AB:
 	{
@@ -209,6 +215,9 @@ var subPersonalities =
 			"R-Wpn-Rocket02-MRL",
 		],
 		"canPlayBySelf": true,
+		"beaconArmyPercentage": 50,
+		"beaconArtilleryPercentage": 40,
+		"beaconVtolPercentage": 50,
 	},
 	AM:
 	{
@@ -228,6 +237,9 @@ var subPersonalities =
 			"R-Wpn-MG2Mk1",
 		],
 		"canPlayBySelf": true,
+		"beaconArmyPercentage": 50,
+		"beaconArtilleryPercentage": 50,
+		"beaconVtolPercentage": 40,
 	},
 	AA:
 	{
@@ -250,6 +262,9 @@ var subPersonalities =
 			"R-Wpn-Mortar-Damage03",
 		],
 		"canPlayBySelf": false,
+		"beaconArmyPercentage": 40,
+		"beaconArtilleryPercentage": 40,
+		"beaconVtolPercentage": 70,
 	},
 };
 

diff --git a/multiplay/skirmish/cobra_includes/production.js b/multiplay/skirmish/cobra_includes/production.js
@@ -121,7 +121,7 @@ function chooseRandomVTOLWeapon()
 		weaps = weaponStats.rockets_AA;
 	}
 	//Rare chance to make a bunker buster VTOL if we are a rocket personality.
-	if ((random(100) < 5) && personalityIsRocketMain() && (playerStructureUnitRatio(getMostHarmfulPlayer()) >= 0.20))
+	if ((random(100) < 5) && personalityIsRocketMain() && (playerStructureUnitRatio(getMostHarmfulPlayer()) >= 0.08))
 	{
 		weaps = weaponStats.rockets_AS;
 	}
@@ -195,7 +195,7 @@ function choosePersonalityWeapon(type)
 		}
 
 		// Allow small chance for Bunker Busters if main weapons lines are rockets.
-		if (!skip && ((random(100) < 8) && personalityIsRocketMain() && (playerStructureUnitRatio(getMostHarmfulPlayer()) >= 0.15)))
+		if (!skip && ((random(100) < 7) && personalityIsRocketMain() && (playerStructureUnitRatio(getMostHarmfulPlayer()) >= 0.10)))
 		{
 			weaponList = [];
 			skip = true;

diff --git a/multiplay/skirmish/cobra_includes/tactics.js b/multiplay/skirmish/cobra_includes/tactics.js
@@ -232,12 +232,47 @@ function artilleryTactics()
 		if (isDefined(obj))
 		{
 			var tempObj = getObject(obj.typeInfo, obj.playerInfo, obj.idInfo);
+
 			if (SENS_LEN)
 			{
 				orderDroidObj(sensors[0], DORDER_OBSERVE, tempObj);
 			}
+
 			for (var i = 0; i < ARTI_LEN; ++i)
 			{
+				//Send artillery to help at beacon, if possible
+				if ((beacon.endTime > gameTime) && (i < Math.floor(ARTI_LEN * subPersonalities[personality].beaconArtilleryPercentage)))
+				{
+					if (!beacon.wasVtol || (beacon.wasVtol && ARTILLERY_UNITS[i].weapons[0].canHitAir))
+					{
+						//Attack something in this area, if possible.
+						var xRand = (random(100) < 50) ? random(15) : -random(15);
+						var yRand = (random(100) < 50) ? random(15) : -random(15);
+						var xPos = beacon.x + xRand;
+						var yPos = beacon.y + yRand;
+
+						if (xPos < 2)
+						{
+							xPos = 2;
+						}
+						else if (xPos > mapWidth - 2)
+						{
+							xPos = mapWidth - 2;
+						}
+						if (yPos < 2)
+						{
+							yPos = 2;
+						}
+						else if (yPos > mapHeight - 2)
+						{
+							yPos = mapHeight - 2;
+						}
+
+						orderDroidLoc(ARTILLERY_UNITS[i], DORDER_SCOUT, xPos, yPos);
+						continue;
+					}
+				}
+
 				attackThisObject(ARTILLERY_UNITS[i].id, obj);
 			}
 		}
@@ -268,7 +303,7 @@ function groundTactics()
 				var id = UNITS[i].id;
 
 				//Send most of army to beacon explicitly
-				if ((beacon.endTime > gameTime) && (i < Math.floor(UNITS.length * 0.6)))
+				if ((beacon.endTime > gameTime) && (i < Math.floor(UNITS.length * subPersonalities[personality].beaconArmyPercentage)))
 				{
 					if (!beacon.wasVtol || (beacon.wasVtol && UNITS[i].weapons[0].canHitAir))
 					{
@@ -432,7 +467,7 @@ function vtolTactics()
 				var id = vtols[i].id;
 
 				if ((beacon.endTime > gameTime) &&
-					(i < Math.floor(LEN * 0.6)) &&
+					(i < Math.floor(LEN * subPersonalities[personality].beaconVtolPercentage)) &&
 					(!beacon.wasVtol || (beacon.wasVtol && vtols[i].weapons[0].canHitAir)))
 				{
 					var pos = {x: vtols[i].x, y: vtols[i].y};