Merge remote-tracking branch 'darkademic/dev'

Author: Inq8

OpenRA.Mods.CA/Scripting/ActorCAGlobal.cs

@@ -0,0 +1,35 @@
+#region Copyright & License Information
+/**
+ * Copyright (c) The OpenRA Combined Arms Developers (see CREDITS).
+ * This file is part of OpenRA Combined Arms, which is free software.
+ * It is made available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version. For more information, see COPYING.
+ */
+#endregion
+
+using Eluant;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Scripting;
+
+namespace OpenRA.Mods.Common.Scripting
+{
+	[ScriptGlobal("ActorCA")]
+	public class ActorCAGlobal : ScriptGlobal
+	{
+		public ActorCAGlobal(ScriptContext context)
+			: base(context) { }
+
+		public int CostOrDefault(string type, int defaultCost = 0)
+		{
+			if (!Context.World.Map.Rules.Actors.TryGetValue(type, out var ai))
+				throw new LuaException($"Unknown actor type '{type}'");
+
+			var vi = ai.TraitInfoOrDefault<ValuedInfo>();
+			if (vi == null)
+				return defaultCost;
+
+			return vi.Cost;
+		}
+	}
+}

OpenRA.Mods.CA/Scripting/PlayerCAProperties.cs

@@ -0,0 +1,48 @@
+#region Copyright & License Information
+/**
+ * Copyright (c) The OpenRA Combined Arms Developers (see CREDITS).
+ * This file is part of OpenRA Combined Arms, which is free software.
+ * It is made available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version. For more information, see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Scripting;
+
+namespace OpenRA.Mods.Common.Scripting
+{
+	[ScriptPropertyGroup("PlayerCA")]
+	public class PlayerCAProperties : ScriptPlayerProperties
+	{
+		public PlayerCAProperties(ScriptContext context, Player player)
+			: base(context, player) { }
+
+		[Desc("Returns all living actors of the specified target types of this player.")]
+		public Actor[] GetActorsByTargetTypes(string[] targetTypes)
+		{
+			var result = new List<Actor>();
+
+			result.AddRange(Player.World.Actors
+				.Where(actor => actor.Owner == Player && !actor.IsDead && actor.IsInWorld &&
+					actor.GetEnabledTargetTypes().Any(t => targetTypes.Contains(t.ToString()))));
+
+			return result.ToArray();
+		}
+
+		[Desc("Returns all living actors of the specified armor type of this player.")]
+		public Actor[] GetActorsByArmorType(string armorType)
+		{
+			var result = new List<Actor>();
+
+			result.AddRange(Player.World.Actors
+				.Where(actor => actor.Owner == Player && !actor.IsDead && actor.IsInWorld &&
+					actor.Info.TraitInfos<ArmorInfo>().Any(ai => ai.Type == armorType)));
+
+			return result.ToArray();
+		}
+	}
+}

OpenRA.Mods.CA/Scripting/UtilsCAGlobal.cs

@@ -10,6 +10,7 @@
  */
 #endregion
 
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Widgets;
 using OpenRA.Scripting;
 
@@ -52,5 +53,17 @@ public string Hotkey(string hotkeyName)
 			var hotkey = reference.GetValue();
 			return hotkey.DisplayString();
 		}
+
+		[Desc("Returns whether a specified building type can be placed at a given cell location.")]
+		public bool CanPlaceBuilding(string type, CPos cell)
+		{
+			var ai = world.Map.Rules.Actors[type];
+			var bi = ai.TraitInfoOrDefault<BuildingInfo>();
+
+			if (bi == null)
+				return false;
+
+			return BuildingUtils.CanPlaceBuilding(world, cell, ai, bi, null);
+		}
 	}
 }

mods/ca/maps/ca01-crossrip/crossrip.lua

@@ -620,8 +620,8 @@ end
 GetPlayerArmyValue = function()
 	local value = 0
 	Utils.Do(Greece.GetActors(), function(a)
-		if a.HasProperty("Attack") and a.Type ~= "badr.bomber" and a.Type ~= "a10.bomber" then
-			value = value + Actor.Cost(a.Type)
+		if a.HasProperty("Attack") then
+			value = value + ActorCA.CostOrDefault(a.Type)
 		end
 	end)
 	return value

mods/ca/maps/ca02-displacement/displacement.lua

@@ -268,7 +268,7 @@ OncePerSecondChecks = function()
 			end
 		end
 
-		if DateTime.GameTime > DateTime.Minutes(15) and #Scrin.GetActorsByTypes({ "reac", "rea2", "sfac", "proc.scrin", "port", "wsph", "nerv", "grav", "scrt", "srep" }) == 0 then
+		if DateTime.GameTime > DateTime.Minutes(15) and not PlayerHasBuildings(Scrin) then
 			if ObjectiveDestroyScrinBase ~= nil and not Greece.IsObjectiveCompleted(ObjectiveDestroyScrinBase) then
 				Greece.MarkCompletedObjective(ObjectiveDestroyScrinBase)
 			end

mods/ca/maps/ca03-deliverance/deliverance-rules.yaml

@@ -8,7 +8,7 @@ World:
 		Briefing: We have been contacted by forces belonging to a group calling themselves the Global Defense Initiative. Though we have no knowledge of such an organization, we have reason to believe they can shed some light on everything that has been happening.\n\nA GDI base apparently materialized inside Soviet territory. Their commander was taken prisoner and they are soon to be overrun by Soviet forces.\n\nTake a detachment to find the base and—assuming this is not a Soviet ruse—defend it until reinforcements arrive.\n\nWith their commander captured and their chain of command in disarray due to the temporal and dimensional upheaval, the GDI forces have agreed to follow your orders. Once our position is secure, locate and rescue the GDI commander.\n\nWe don't know yet if we can trust these people, so remain vigilant. Hopefully we have found ourselves a new ally, and rescuing their commander is surely a good first step towards securing such an alliance.
 		LossVideo: battle.vqa
 	MapOptions:
-		ShortGameCheckboxEnabled: True
+		ShortGameCheckboxEnabled: False
 	ScriptLobbyDropdown@DIFFICULTY:
 		ID: difficulty
 		Label: dropdown-difficulty.label
@@ -209,7 +209,7 @@ MISS:
 		Name: Prison
 	TooltipDescription:
 		Description: Prisoners of war are kept here.
-		ValidRelationships: Ally
+		ValidRelationships: Ally, Enemy, Neutral
 	Health:
 		HP: 200000
 

mods/ca/maps/ca03-deliverance/deliverance.lua

@@ -325,7 +325,7 @@ OncePerSecondChecks = function()
 			UpdateReinforcementCountdown()
 		end
 
-		if PlayerForcesDefeated() or not GDICommanderAlive then
+		if Greece.HasNoRequiredUnits() or not GDICommanderAlive then
 			if ObjectiveFindBase ~= nil and not Greece.IsObjectiveCompleted(ObjectiveFindBase) then
 				Greece.MarkFailedObjective(ObjectiveFindBase)
 			end
@@ -466,15 +466,6 @@ RevealPrison = function()
 	end
 end
 
-PlayerForcesDefeated = function()
-	if ObjectiveFindBase ~= nil and not Greece.IsObjectiveCompleted(ObjectiveFindBase) then
-		local playerActors = Greece.GetActors()
-		return #playerActors == 0
-	else
-		return Greece.HasNoRequiredUnits()
-	end
-end
-
 InitUSSR = function()
 	if Difficulty == "easy" then
 		RebuildExcludes.USSR = { Types = { "tsla", "ftur" }, Actors = { NorthSAM1, NorthSAM2 } }

mods/ca/maps/ca06-machinations/machinations-rules.yaml

@@ -7,7 +7,7 @@ World:
 	MissionData:
 		Briefing: Intelligence gathered from the Nod naval base has put us hot on Nod's trail. The transports we captured were waiting to board a disguised cargo vessel which has now also been captured. Based on its navigational logs we have used our satellites and located what appears to be a research facility hidden in a disused quarry in North Africa.\n\nNod submarines will make a large scale landing difficult, but if we can establish a base on the coast we'll be able to launch an offensive from there.\n\nWith GDI's assistance we have been able to augment our harvesters and refineries to harvest the Tiberium crystals that are becoming widespread. Nod also has a harvesting operation in the area. Gather what resources you can without alerting Nod to our presence, build up your forces, then capture their research facility.
 	MapOptions:
-		ShortGameCheckboxEnabled: True
+		ShortGameCheckboxEnabled: False
 	ScriptLobbyDropdown@DIFFICULTY:
 		ID: difficulty
 		Label: dropdown-difficulty.label

mods/ca/maps/ca10-zenith/zenith-rules.yaml

@@ -19,7 +19,7 @@ World:
 	MissionData:
 		Briefing: Despite my assurances, the Soviets have begun a large scale offensive towards our Temple Prime facility. Stalin always was a short-sighted fool.\n\nTo ensure the safety of the temple, we must take the Soviet nuclear arsenal out of the equation. My informants tell me that the Soviets plan to launch their missiles to wipe out the bulk of our defense forces, and then roll in with their tanks to clean up any survivors.\n\nThe Soviet missile silos are located on a heavily fortified island. We are not in an ideal position to strike, but with the Soviet army moving south we should be able to set up a staging area on the coast and storm the island before the Soviets can send reinforcements.
 	MapOptions:
-		ShortGameCheckboxEnabled: True
+		ShortGameCheckboxEnabled: False
 	ScriptLobbyDropdown@DIFFICULTY:
 		ID: difficulty
 		Label: dropdown-difficulty.label

mods/ca/maps/ca12-supremacy/map.yaml

@@ -83,9 +83,9 @@ Actors:
 	Actor3: proc.td
 		Location: 102,114
 		Owner: Nod2
-		Health: 45
 		FreeActor@SHARV: False
 		FreeActor: False
+		Health: 45
 	Actor4: hand
 		Location: 88,111
 		Owner: Nod2
@@ -97,7 +97,7 @@ Actors:
 	Actor6: obli
 		Location: 100,109
 		Owner: Nod2
-		Health: 28
+		Health: 45
 	Actor7: hq
 		Location: 89,125
 		Owner: Nod2
@@ -131,7 +131,7 @@ Actors:
 	Actor15: obli
 		Owner: Nod3
 		Location: 25,34
-		Health: 28
+		Health: 45
 	Actor16: hq
 		Owner: Nod3
 		Location: 16,35
@@ -377,44 +377,44 @@ Actors:
 		SubCell: 1
 		Facing: 745
 	Actor77: n1
-		Owner: Nod2
 		SubCell: 3
 		Location: 22,34
+		Owner: Nod3
 		Facing: 618
 	Actor78: n1
-		Owner: Nod2
 		Location: 22,34
 		SubCell: 1
+		Owner: Nod3
 		Facing: 531
 	Actor79: n1
-		Owner: Nod2
 		SubCell: 3
 		Location: 19,30
+		Owner: Nod3
 		Facing: 7
 	Actor80: n1
-		Owner: Nod2
 		SubCell: 3
 		Location: 12,31
 		Facing: 0
+		Owner: Nod3
 	Actor81: n1
-		Owner: Nod2
 		Location: 12,31
 		SubCell: 1
 		Facing: 0
+		Owner: Nod3
 	Actor82: n1
-		Owner: Nod2
 		SubCell: 3
 		Location: 17,31
 		Facing: 0
+		Owner: Nod3
 	Actor83: n1
-		Owner: Nod2
 		SubCell: 3
 		Location: 22,37
+		Owner: Nod3
 		Facing: 808
 	Actor84: n1
-		Owner: Nod2
 		SubCell: 3
 		Location: 21,40
+		Owner: Nod3
 		Facing: 642
 	Helipad1: hpad.td
 		Location: 7,38
@@ -455,8 +455,8 @@ Actors:
 	Actor94: mlrs
 		Owner: Nod3
 		Location: 12,37
-		Facing: 896
 		TurretFacing: 0
+		Facing: 896
 	Banshee2: scrn
 		Owner: Nod3
 		Location: 6,42
@@ -2167,17 +2167,17 @@ Actors:
 		Facing: 491
 	Actor634: bh
 		Owner: Nod3
-		Facing: 384
 		SubCell: 3
 		Location: 15,37
+		Facing: 384
 	Actor635: ftnk
 		Location: 95,112
-		Facing: 904
 		Owner: Nod2
+		Facing: 904
 	Actor636: bggy
 		Owner: Nod3
-		Facing: 384
 		Location: 10,42
+		Facing: 384
 	Actor637: bike
 		Owner: Nod3
 		Location: 16,43
@@ -3256,6 +3256,12 @@ Actors:
 		Owner: GDI
 		Facing: 512
 		Location: 100,70
+	Actor893: camera
+		Owner: GDI
+		Location: 9,40
+	Actor894: camera
+		Owner: GDI
+		Location: 93,123
 
 Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, supremacy-rules.yaml