Merge pull request #165 from cortex-command-community/4zk-content

5.2 additions v2: Electric Boogaloo

Author: garethyr

Data/Base.rte/Actors/Shared/Scripts/SelfHeal.lua

@@ -11,7 +11,11 @@ function Update(self)
 		if self.healing.wound then
 			if self.healing.timer:IsPastSimMS(self.healing.delay) then
 				self.healing.timer:Reset();
-				self.Health = math.min(self.Health + self.healing.wound.BurstDamage * math.sqrt(self.healing.part.DamageMultiplier), self.MaxHealth);
+				if self.healing.part.DamageMultiplier > 1 then
+					self.Health = math.min(self.Health + self.healing.wound.BurstDamage * math.sqrt(self.healing.part.DamageMultiplier), self.MaxHealth);
+				else
+					self.Health = math.min(self.Health + self.healing.wound.BurstDamage * self.healing.part.DamageMultiplier, self.MaxHealth);
+				end
 				self.healing.wound.ToDelete = true;
 				self.healing.wound = nil;
 				for wound in self.healing.part.Wounds do

Data/Base.rte/Constants.lua

@@ -14,5 +14,5 @@ rte.PxTravelledPerFrame = GetPPM() * TimerMan.DeltaTimeSecs;
 --Materials
 rte.airID = 0;
 rte.goldID = 2;
-rte.doorID = 4;	--Xenocronium
-rte.grassID = 128;
+rte.grassID = 128;
+rte.doorID = 181;

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

@@ -241,6 +241,7 @@ AddDevice = TDExplosive
 		MaxVelocity = 25
 		InheritsVel = 0
 		LifeVariation = 0.20
+		SpreadMode = 1
 	AddGib = Gib
 		GibParticle = PEmitter
 			CopyOf = Flame Hurt Short
@@ -249,7 +250,6 @@ AddDevice = TDExplosive
 		MaxVelocity = 40
 		InheritsVel = 0
 		LifeVariation = 0.20
-		SpreadMode = 1
 	AddGib = Gib
 		GibParticle = PEmitter
 			CopyOf = Ground Flame

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

@@ -65,10 +65,10 @@ AddDevice = HDFirearm
 		X = -2
 		Y = -5
 	EntryWound = AEmitter
-		CopyOf = Dent Metal
+		CopyOf = Dent Metal No Spark
 	ExitWound = AEmitter
-		CopyOf = Dent Metal
-	GoldValue = 10
+		CopyOf = Dent Metal No Spark
+	GoldValue = 5
 	AtomGroup = AtomGroup
 		AutoGenerate = 1
 		Material = Material
@@ -105,14 +105,30 @@ AddDevice = HDFirearm
 			Y = 1
 	RateOfFire = 60
 	ReloadTime = 400
+	AddGib = Gib
+		GibParticle = MOPixel
+			CopyOf = Spark Yellow 1
+		MinVelocity = 10
+		MaxVelocity = 15
+	AddGib = Gib
+		GibParticle = MOPixel
+			CopyOf = Spark Yellow 2
+		MinVelocity = 10
+		MaxVelocity = 15
 	AddGib = Gib
 		GibParticle = MOSParticle
 			CopyOf = Gib Metal Dark Micro A
+		MinVelocity = 0
+		MaxVelocity = 5
 	AddGib = Gib
 		GibParticle = MOSParticle
 			CopyOf = Gib Metal Dark Tiny A
-	GibWoundLimit = 3
-	GibImpulseLimit = 30
+		MinVelocity = 0
+		MaxVelocity = 5
+	GibWoundLimit = 1
+	GibImpulseLimit = 10
+	GibSound = SoundContainer
+		CopyOf = Device Impact
 
 
 ///////////////////////////////////////////////////////////////////////

Data/Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosiveDetonator.lua

@@ -18,27 +18,24 @@ function Update(self)
 	end
 	if self.Magazine then
 		if self:IsActivated() then
-			if self.fireOn == false then
-				if self.delayTimer:IsPastSimMS(self.detonateDelay) then
-					self.delayTimer:Reset();
-					self.actionPhase = self.actionPhase + 1;
-					self.blink = false;
-				else
-					self.Magazine.RoundCount = math.ceil(100 * (1 - 1 * self.delayTimer.ElapsedSimTimeMS/self.detonateDelay));
-				end
-				if self.actionPhase >= 1 then
+			if self.delayTimer:IsPastSimMS(self.detonateDelay) then
+				self.delayTimer:Reset();
+				self.actionPhase = self.actionPhase + 1;
+				self.blink = false;
+			else
+				self.Magazine.RoundCount = math.ceil(100 * (1 - 1 * self.delayTimer.ElapsedSimTimeMS/self.detonateDelay));
+			end
+			if self.actionPhase >= 1 then
 
-					if RemoteExplosiveTableA and RemoteExplosiveTableB then
-						for i = 1, #RemoteExplosiveTableA do
-							if MovableMan:IsParticle(RemoteExplosiveTableA[i]) and RemoteExplosiveTableB[i] == self.alliedTeam then
-								RemoteExplosiveTableA[i].Sharpness = 2;
-							end
+				if RemoteExplosiveTableA and RemoteExplosiveTableB then
+					for i = 1, #RemoteExplosiveTableA do
+						if MovableMan:IsParticle(RemoteExplosiveTableA[i]) and RemoteExplosiveTableB[i] == self.alliedTeam then
+							RemoteExplosiveTableA[i].Sharpness = 2;
 						end
 					end
-					self.detonateSound:Play(self.Pos);
-					self.fireOn = true;
-					self:Reload();
 				end
+				self.detonateSound:Play(self.Pos);
+				self:Reload();
 			end
 		else
 			self.delayTimer:Reset();

Data/Base.rte/Devices/Special/Medikit/Medikit.lua

@@ -1,6 +1,6 @@
 function Create(self)
-	self.baseStrength = 8;
-	self.maxStrength = self.baseStrength * 5;
+	self.baseStrength = 40;
+	self.maxStrength = self.baseStrength * 2;
 
 	self.confirmSound = CreateSoundContainer("Confirm", "Base.rte");
 	self.confirmSound.Immobile = false;
@@ -21,12 +21,8 @@ function OnFire(self)
 			target = ToActor(ToMOSRotating(mo):GetRootParent());
 		end
 		if target and (target.Health < target.MaxHealth or target.WoundCount > 0) then
-			local targetToughnessCoefficient = 1/(math.sqrt(math.abs(target.Mass - target.InventoryMass)) * 0.1 + target.Material.StructuralIntegrity * 0.01);
-			local strength = self.baseStrength + (self.maxStrength - self.baseStrength) * targetToughnessCoefficient;
-			local wounds = {};
-			if target.WoundCount > 0 then
-				strength = math.max(strength - target:RemoveWounds(math.ceil(strength), true, false, false), self.baseStrength);
-			end
+			local targetToughnessCoefficient = 1/(math.sqrt(math.abs(target.Mass - target.InventoryMass) * 0.01) + math.sqrt(target.Material.StructuralIntegrity * 0.01));
+			local strength = math.max(self.maxStrength - target:RemoveWounds(math.ceil(self.maxStrength * targetToughnessCoefficient), true, false, false), self.baseStrength) * targetToughnessCoefficient;
 			target.Health = math.min(target.Health + strength, target.MaxHealth);
 
 			target:FlashWhite(50);

Data/Base.rte/Devices/Tools/Constructor/Constructor.ini

@@ -1,6 +1,7 @@
 ////////////////////////////////////////////////////////////////////////
 // Constructor
 
+
 AddPieMenu = PieMenu
 	PresetName = Constructor Pie Menu
 	AddPieSlice = PieSlice
@@ -227,13 +228,9 @@ AddTerrainObject = TerrainObject
 AddEffect = MOPixel
 	PresetName = Particle Constructor Gather Material
 	Mass = 1
-	RestThreshold = -1
-	PinStrength = 1
-	LifeTime = 1000
+	RestThreshold = 1000
+	LifeTime = 150
 	Sharpness = 0
-	HitsMOs = 0
-	GetsHitByMOs = 0
-	ScriptPath = Base.rte/Devices/Tools/Constructor/ConstructorCollect.lua
 	IgnoreTerrain = 1
 	Color = Color
 		R = 255
@@ -242,51 +239,21 @@ AddEffect = MOPixel
 	Atom = Atom
 		Material = Material
 			CopyOf = Air
-		TrailColor = Color
-			R = 69
-			G = 241
-			B = 255
-		TrailLength = 1
 	ScreenEffect = ContentFile
-		FilePath = Base.rte/Effects/Glows/BlueTiny.png
+		FilePath = Base.rte/Effects/Glows/LightBlueTiny.png
 	EffectStartTime = 0
-	EffectStopTime = 1000
+	EffectStopTime = 100
 	EffectStartStrength = 1
-	EffectStopStrength = 0.5
+	EffectStopStrength = 0
 
 
 AddEffect = MOPixel
 	CopyOf = Particle Constructor Gather Material
 	PresetName = Particle Constructor Gather Material Big
 	ScreenEffect = ContentFile
 		FilePath = Base.rte/Effects/Glows/LightBlueSmaller3.png
-
-
-AddEffect = MOPixel
-	CopyOf = Particle Constructor Gather Material
-	PresetName = Particle Constructor Gather Material Gold
-	RestThreshold = 500
-	PinStrength = 0
-	LifeTime = 0
-	HitsMOs = 1
-	Color = Color
-		R = 249
-		G = 243
-		B = 56
-	Atom = Atom
-		Material = Material
-			CopyOf = Gold
-		TrailColor = Color
-			R = 248
-			G = 227
-			B = 90
-		TrailLength = 1
-	ScreenEffect = ContentFile
-		FilePath = Base.rte/Effects/Glows/YellowTiny.png
-	EffectStartTime = 0
-	EffectStopTime = 5000
-	EffectStartStrength = 1
-	EffectStopStrength = 0.5
+	LifeTime = 150
+	EffectStopTime = 150
 
 
 AddAmmo = Magazine
@@ -418,7 +385,7 @@ AddDevice = HDFirearm
 		SubPieMenu = PieMenu
 			CopyOf = Constructor Pie Menu
 	MuzzleOffset = Vector
-		X = 12
+		X = 11
 		Y = -1
 	AddGib = Gib
 		GibParticle = MOPixel