Merge branch 'development' into pawnis-door-sounds

Author: Gacyr

.gitignore

@@ -49,6 +49,7 @@ Scenes.rte/
 Metagames.rte/
 Microsoft.VC90.CRT.manifest
 DedicatedServer.bat
+DedicatedServerDebug.bat
 
 Cortex Command Experimental Multiplayer Operations Guide.docx
 

Base.rte/AI/NativeCrabAI.lua

@@ -23,7 +23,7 @@ function NativeCrabAI:Create(Owner)
 	Members.AlarmTimer:SetSimTimeLimitMS(500)
 
 	-- check if this team is controlled by a human
-	if ActivityMan:GetActivity():IsPlayerTeam(Owner.Team) then
+	if ActivityMan:GetActivity():IsHumanTeam(Owner.Team) then
 		Members.isPlayerOwned = true
 		Members.PlayerInterferedTimer = Timer()
 		Members.PlayerInterferedTimer:SetSimTimeLimitMS(500)

Base.rte/AI/NativeDropShipAI.lua

@@ -36,7 +36,7 @@ function NativeDropShipAI:Create(Owner)
 
 	-- Check if this team is controlled by a human
 	if Owner.AIMode == Actor.AIMODE_DELIVER and Owner:IsInventoryEmpty() and
-		ActivityMan:GetActivity():IsPlayerTeam(Owner.Team)
+		ActivityMan:GetActivity():IsHumanTeam(Owner.Team)
 	then
 		Owner.AIMode = Actor.AIMODE_STAY	-- Stop the craft from returning to orbit immediately
 	end

Base.rte/AI/NativeHumanAI.lua

@@ -44,7 +44,7 @@ function NativeHumanAI:Create(Owner)
 	end
 
 	-- check if this team is controlled by a human
-	if ActivityMan:GetActivity():IsPlayerTeam(Owner.Team) then
+	if ActivityMan:GetActivity():IsHumanTeam(Owner.Team) then
 		Members.isPlayerOwned = true
 		Members.PlayerInterferedTimer = Timer()
 		Members.PlayerInterferedTimer:SetSimTimeLimitMS(500)

Base.rte/AI/NativeTurretAI.lua

@@ -21,7 +21,7 @@ function NativeTurretAI:Create(Owner)
 	Members.AlarmTimer:SetSimTimeLimitMS(500)
 
 	-- check if this team is controlled by a human
-	if ActivityMan:GetActivity():IsPlayerTeam(Owner.Team) then
+	if ActivityMan:GetActivity():IsHumanTeam(Owner.Team) then
 		Members.isPlayerOwned = true
 		Members.PlayerInterferedTimer = Timer()
 		Members.PlayerInterferedTimer:SetSimTimeLimitMS(500)

Base.rte/AI/RocketAI.lua

@@ -53,7 +53,7 @@ function Create(self)
 
 	-- Check if this team is controlled by a human
 	if self.AIMode == Actor.AIMODE_DELIVER and self:IsInventoryEmpty() and
-		ActivityMan:GetActivity():IsPlayerTeam(self.Team)
+		ActivityMan:GetActivity():IsHumanTeam(self.Team)
 	then
 		self.AIMode = Actor.AIMODE_STAY;	-- Stop the craft from returning to orbit immediately
 	end

Base.rte/Activities.ini

@@ -6,10 +6,9 @@ AddActivity = GATutorial
 	PresetName = Tutorial Mission
 	SceneName = Tutorial Bunker
 	InCampaignStage = 1
-	PlayerCount = 1
 	TeamOfPlayer1 = 0
 	TeamOfPlayer2 = 1
-	FundsOfTeam1 = 1500
+	Team1Funds = 1500
 	CPUTeam = 1
 	MaxPlayerSupport = 1
 
@@ -19,12 +18,10 @@ AddActivity = GAScripted
 	Description = Survive waves of AI-controlled enemies until they run out of gold, skirmish against human players, or both! Adjust the Difficulty to change AI funds and spawn frequency.
 	SceneName = Ketanot Hills
 	ScriptFile = Base.rte/Activities/SkirmishDefense.lua
-	PlayerCount = 3
 	TeamOfPlayer1 = 0
 	TeamOfPlayer2 = 1
 	TeamOfPlayer3 = 2
 	TeamOfPlayer4 = 3
-	TeamCount = 4
 	MinTeamsRequired = 2
 	LuaClassName = SkirmishDefense
 	DeployUnitsSwitchEnabled = 1
@@ -36,12 +33,10 @@ AddActivity = GAScripted
 	Description = Build a bunker and defend it against increasingly longer waves of AI-controlled enemies, with time to repair in between! Adjust the Difficulty to change wave difficulty.
 	SceneName = Ketanot Hills
 	ScriptFile = Base.rte/Activities/WaveDefense.lua
-	PlayerCount = 4
 	TeamOfPlayer1 = 0
 	TeamOfPlayer2 = 0
 	TeamOfPlayer3 = 0
 	TeamOfPlayer4 = 0
-	TeamCount = 2
 	CPUTeam = 1
 	MinTeamsRequired = 2
 	LuaClassName = WaveDefense
@@ -54,9 +49,7 @@ AddActivity = GAScripted
 	Description = Survive with only one actor and no backups!
 	SceneName = Ketanot Hills
 	ScriptFile = Base.rte/Activities/OneManArmy.lua
-	PlayerCount = 1
 	TeamOfPlayer1 = 0
-	TeamCount = 2
 	CPUTeam = 1
 	MaxPlayerSupport = 1
 	LuaClassName = OneManArmy
@@ -69,9 +62,7 @@ AddActivity = GAScripted
 	Description = Build a base, then kill all the enemies!
 	SceneName = Ketanot Hills
 	ScriptFile = Base.rte/Activities/Massacre.lua
-	PlayerCount = 1
 	TeamOfPlayer1 = 0
-	TeamCount = 2
 	CPUTeam = 1
 	LuaClassName = Massacre
 	DeployUnitsSwitchEnabled = 1
@@ -83,9 +74,7 @@ AddActivity = GAScripted
 	Description = Build a base, then survive until the time is up!
 	SceneName = Ketanot Hills
 	ScriptFile = Base.rte/Activities/Survival.lua
-	PlayerCount = 1
 	TeamOfPlayer1 = 0
-	TeamCount = 2
 	CPUTeam = 1
 	LuaClassName = Survival
 	DeployUnitsSwitchEnabled = 1
@@ -99,7 +88,6 @@ AddActivity = GAScripted
 	ScriptFile = Base.rte/Activities/BrainVsBrain.lua
 	InCampaignStage = 1
 	LuaClassName = BrainvsBrain
-	TeamCount = 2
 	Team1Name = Red Team
 	Team2Name = Green Team
 	MinTeamsRequired = 1
@@ -110,9 +98,7 @@ AddActivity = GAScripted
 	Description = Build a base, then dig up as much gold as you can!
 	SceneName = Ketanot Hills
 	ScriptFile = Base.rte/Activities/Harvester.lua
-	PlayerCount = 1
 	TeamOfPlayer1 = 0
-	TeamCount = 2
 	CPUTeam = 1
 	LuaClassName = Harvester
 	DeployUnitsSwitchEnabled = 1
@@ -127,7 +113,6 @@ AddActivity = GAScripted
 	InCampaignStage = 1
 	LuaClassName = BunkerBreach
 	CPUTeam = 1
-	TeamCount = 1
 	Team1Name = Players
 	Team2Name = AI
 	MinTeamsRequired = 1
@@ -149,7 +134,6 @@ AddActivity = GAScripted
 	InCampaignStage = 1
 	LuaClassName = Siege
 	CPUTeam = 0
-	TeamCount = 2
 	Team1Name = AI
 	Team2Name = Players
 	MinTeamsRequired = 1
@@ -169,9 +153,7 @@ AddActivity = GAScripted
 	Description = Keep your rocket alive until time is up!
 	SceneName = Ketanot Hills
 	ScriptFile = Base.rte/Activities/KeepieUppie.lua
-	PlayerCount = 1
 	TeamOfPlayer1 = 0
-	TeamCount = 2
 	CPUTeam = 1
 	MaxPlayerSupport = 1
 	LuaClassName = KeepieUppie
@@ -184,9 +166,7 @@ AddActivity = GAScripted
 	Description = Survive with only one actor and no backups! Enemy will only use diggers, but the harder the difficulty the less potent weaponry you start out with and the longer you have to survive.
 	SceneName = Fredeleig Plains
 	ScriptFile = Base.rte/Activities/OneManArmyDiggers.lua
-	PlayerCount = 1
 	TeamOfPlayer1 = 0
-	TeamCount = 2
 	CPUTeam = 1
 	MaxPlayerSupport = 1
 	LuaClassName = OneManArmy
@@ -205,7 +185,6 @@ AddActivity = GAScripted
 	TeamOfPlayer2 = 0
 	TeamOfPlayer3 = 0
 	TeamOfPlayer4 = 0
-	TeamCount = 1
 	MinTeamsRequired = 1
 	Team1Funds = 100000
 	DeployUnitsSwitchEnabled = 1
@@ -220,7 +199,6 @@ AddActivity = GAScripted
 	TeamOfPlayer2 = 0
 	TeamOfPlayer3 = 0
 	TeamOfPlayer4 = 0
-	TeamCount = 1
 	MinTeamsRequired = 1
 	Team1Funds = 100000
 	DeployUnitsSwitchEnabled = 1

Base.rte/Scripts/Examples/MetaFightBehaviorExample.lua

@@ -65,9 +65,9 @@ function MetaScript:PauseScript()
 	end
 end
 
-function MetaScript:CraftEnteredOrbit()
+function MetaScript:CraftEnteredOrbit(orbitedCraft)
 	if SettingsMan.PrintDebugInfo then
 		print (self.PresetName.." Orbited")
-		print (self.OrbitedCraft)
+		print (orbitedCraft)
 	end
 end

Base.rte/Scripts/Global/ConstantGoldIncome.lua

@@ -8,7 +8,7 @@ function ConstantGoldIncomeScript:UpdateScript()
 		for team = Activity.TEAM_1, Activity.MAXTEAMCOUNT - 1 do
 			local activity = ActivityMan:GetActivity();
 			if activity then
-				if activity:IsPlayerTeam(team) then
+				if activity:IsHumanTeam(team) then
 					activity:SetTeamFunds(activity:GetTeamFunds(team) + (self.updateInterval / 1000 * self.goldPerSecond), team);
 				end
 			end

Missions.rte/Activities/Maginot.lua

@@ -377,9 +377,9 @@ end
 -- Craft Entered Orbit
 -----------------------------------------------------------------------------------------
 
-function MaginotMission:CraftEnteredOrbit()
+function MaginotMission:CraftEnteredOrbit(orbitedCraft)
 	--If a craft leaves with the brain robot...
-	if self.OrbitedCraft:HasObjectInGroup("Brains") then
+	if orbitedCraft:HasObjectInGroup("Brains") then
 		--Team 1 wins!
 		self.WinnerTeam = Activity.TEAM_1
 		ActivityMan:EndActivity()