Merge branch 'development' into data-restructure

Author: MaximDude

Data/Base.rte/AI/HumanBehaviors.lua

@@ -2128,6 +2128,7 @@ function HumanBehaviors.GetProjectileData(Owner)
 		PrjDat.vel = 100;
 		PrjDat.rng = math.huge;
 		PrjDat.pen = math.huge;
+		PrjData.blast = 0;
 	else
 		-- find muzzle velocity
 		PrjDat.vel = Weapon:GetAIFireVel();

Data/Base.rte/Activities.ini

@@ -134,6 +134,7 @@ AddActivity = GAScripted
 	CPUTeam = 1
 	MaxPlayerSupport = 1
 	LuaClassName = OneManArmyZeroG
+	SceneName = Zero-G Battle
 	DeployUnitsSwitchEnabled = 1
 	DefaultDeployUnits = 0
 
@@ -147,6 +148,7 @@ AddActivity = GAScripted
 	CPUTeam = 1
 	MaxPlayerSupport = 1
 	LuaClassName = OneManArmyZeroG
+	SceneName = Zero-G Battle
 	DeployUnitsSwitchEnabled = 1
 	DefaultDeployUnits = 0
 

Data/Base.rte/Activities/SiteScan.lua

@@ -11,6 +11,8 @@ end
 function SiteScan:StartActivity()
 	print("START! -- SiteScan:StartActivity()!");
 
+	self.GameOverPeriod = 0;
+	
 	-- Orbit Scene Scanning vars
 	self.ScanStage = { PRESCAN = 0, SCANNING = 1, POSTSCAN = 2, SCANSTAGECOUNT = 3 };
 	self.CurrentScanStage = self.ScanStage.PRESCAN;
@@ -57,6 +59,13 @@ end
 
 function SiteScan:EndActivity()
 	print("END! -- SiteScan:EndActivity()!");
+	for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
+		if self:PlayerActive(player) and self:PlayerHuman(player) then
+			FrameMan:ClearScreenText(self:ScreenOfPlayer(player));
+			self:GetBanner(GUIBanner.RED, player):ClearText();
+			self:GetBanner(GUIBanner.YELLOW, player):ClearText();
+		end
+	end
 end
 
 -----------------------------------------------------------------------------------------
@@ -86,7 +95,7 @@ function SiteScan:UpdateActivity()
 			for team = Activity.TEAM_1, Activity.MAXTEAMCOUNT - 1 do
 				if self:TeamActive(team) then
 					-- Time to do a scan step?
-					if self.ScanTimer[team]:IsPastRealMS(SceneMan:GetUnseenResolution(team).X * 2) then
+					if self.ScanTimer[team]:IsPastRealMS(SceneMan:GetUnseenResolution(team).X) then
 						-- Scan the column, find the end where the ray is blocked
 						SceneMan:CastSeeRay(team, Vector(self.ScanPosX[team], 0), Vector(0, SceneMan.Scene.Height), self.ScanEndPos, 50, SceneMan:GetUnseenResolution(team).Y / 2);
 						-- Adjust up a bit so one sees more of the sky than blackness
@@ -130,11 +139,8 @@ function SiteScan:UpdateActivity()
 				for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
 					if self:PlayerActive(player) and self:PlayerHuman(player) then
 						FrameMan:ClearScreenText(self:ScreenOfPlayer(player));
---[[
-						-- Create the landing crew and add to the override purchase list
-						self:SetOverridePurchaseList("Infantry Brain", player);
-						self:SetViewState(Activity.LZSELECT, player);
---]]
+						self:GetBanner(GUIBanner.RED, player):ClearText();
+						self:GetBanner(GUIBanner.YELLOW, player):ClearText();
 					end
 				end
 				self.WinnerTeam = self.ScanTeam;

Data/Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosive.ini

@@ -54,7 +54,7 @@ AddDevice = HDFirearm
 	AddToGroup = Tools
 	AddToGroup = Bombs
 	Description = Detonates all Remote Explosives that have been placed by your team.
-	Mass = 1.5
+	Mass = 0.5
 	HitsMOs = 0
 	GetsHitByMOs = 1
 	ScriptPath = Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosiveDetonator.lua
@@ -122,7 +122,7 @@ AddDevice = HDFirearm
 AddMOSRotating = MOSRotating
 	PresetName = Remote Explosive Active
 	Sharpness = 0
-	Mass = 2
+	Mass = 1
 	HitsMOs = 0
 	GetsHitByMOs = 0
 	OrientToVel = 0.8
@@ -224,7 +224,7 @@ AddDevice = TDExplosive
 	AddToGroup = Bombs
 	AddToGroup = Tools - Breaching
 	Description = Manually placed C4 explosives that are automatically set to operate on your team's frequency. Place the explosive against the target surface and detonate using the detonator tool. Excellent for destroying doors!
-	Mass = 2
+	Mass = 1
 	HitsMOs = 1
 	GetsHitByMOs = 1
 	ScriptPath = Base.rte/Devices/Shared/Scripts/TrajectoryGuide.lua
@@ -326,7 +326,7 @@ AddDevice = TDExplosive
 	AddToGroup = Bombs
 	AddToGroup = Tools - Breaching
 	Description = A pair of manually placed C4 explosives that are automatically set to operate on your team's frequency. Place an explosive against the target surface, then detonate it using the detonator tool. Excellent for destroying doors!
-	Mass = 6
+	Mass = 4
 	HitsMOs = 1
 	GetsHitByMOs = 1
 	ScriptPath = Base.rte/Devices/Shared/Scripts/GrenadeBandolier.lua

Data/Base.rte/Effects/Pyro/Flame/Flame.lua

@@ -1,5 +1,10 @@
 function Create(self)
-	
+	if self.PresetName:find("Short") then
+		self.isShort = true;
+	end
+	if self.Throttle == nil then
+		self.Throttle = 0;
+	end
 end
 
 function Update(self)
@@ -46,7 +51,6 @@ function Update(self)
 				particle.Lifetime = self.Lifetime * RangeRand(0.6, 0.9);
 				particle.Vel = self.Vel + Vector(0, -3) + Vector(math.random(), 0):RadRotate(math.random() * math.pi * 2);
 				particle.Pos = Vector(self.Pos.X, self.Pos.Y - 1);
-				particle.isShort = true;
 				MovableMan:AddParticle(particle);
 			end
 		end

Data/Base.rte/Scenes/ZeroGBattle.ini

@@ -6,8 +6,8 @@ AddScene = Scene
 	PresetName = Zero-G Battle
 	Description = Float freely in the void.
 	LocationOnPlanet = Vector
-		X = 99
-		Y = 99
+		X = 999999
+		Y = 999999
 	MetagamePlayable = 0
 	Terrain = SLTerrain
 		CopyOf = Null Terrain

Data/Coalition.rte/Devices/Explosives/TimedExplosive/TimedExplosive.ini

@@ -16,7 +16,7 @@ AddSoundContainer = SoundContainer
 AddEffect = MOSRotating
 	PresetName = Timed Explosive Active
 	Sharpness = 0
-	Mass = 3
+	Mass = 1.5
 	HitsMOs = 0
 	GetsHitByMOs = 0
 	OrientToVel = 0.8
@@ -122,7 +122,7 @@ AddDevice = TDExplosive
 	AddToGroup = Bombs
 	AddToGroup = Tools - Breaching
 	Description = Destructive plantable explosive charge.  After planting, run for your life, as it explodes after 10 seconds. Excellent for destroying doors!
-	Mass = 3
+	Mass = 1.5
 	RestThreshold = -1
 	HitsMOs = 1
 	GetsHitByMOs = 1
@@ -212,7 +212,7 @@ AddDevice = TDExplosive
 	AddToGroup = Bombs
 	AddToGroup = Tools - Breaching
 	Description = A pair of destructive plantable explosive charges.  After planting, run for your life, as they explode after 10 seconds. Excellent for destroying doors!
-	Mass = 9
+	Mass = 5
 	HitsMOs = 1
 	GetsHitByMOs = 1
 	ScriptPath = Base.rte/Devices/Shared/Scripts/GrenadeBandolier.lua
@@ -225,7 +225,7 @@ AddDevice = TDExplosive
 	AddCustomValue = NumberValue
 		ReplenishDelay = 0
 	AddCustomValue = NumberValue
-		BandolierMass = 3
+		BandolierMass = 2
 	SpriteFile = ContentFile
 		FilePath = Coalition.rte/Devices/Explosives/TimedExplosive/TimedExplosive.png
 	IconFile = ContentFile