Merge pull request #17 from cortex-command-community/Factions-Refactor

Factions refactor

Author: garethyr

Base.rte/Actors.ini

@@ -15,16 +15,10 @@ IncludeFile = Base.rte/Actors/Brains/Brains.ini
 IncludeFile = Base.rte/Actors/Brainbot/Brainbot.ini
 
 
-// Drones
+// Mecha
 
-IncludeFile = Base.rte/Actors/Drones/AntiAir/AntiAirDrone.ini
-IncludeFile = Base.rte/Actors/Drones/Medic/MedicDrone.ini
-
-
-// Undead
-
-IncludeFile = Base.rte/Actors/Undead/Skeletons/Skeletons.ini
-IncludeFile = Base.rte/Actors/Undead/Zombies/Zombies.ini
+IncludeFile = Base.rte/Actors/Mecha/AntiAir/AntiAirDrone.ini
+IncludeFile = Base.rte/Actors/Mecha/Medic/MedicDrone.ini
 
 
 // Wildlife

Base.rte/Actors/Brainbot/Brainbot.ini

@@ -9,7 +9,9 @@ AddActor = Attachable
 	GetsHitByMOs = 1
 	SpriteFile = ContentFile
 		FilePath = Base.rte/Actors/Brainbot/HeadBrainA.bmp
-	FrameCount = 1
+	FrameCount = 4
+	SpriteAnimMode = 1
+	SpriteAnimDuration = 500
 	SpriteOffset = Vector
 		X = -7
 		Y = -8

Base.rte/Actors/Brainbot/HeadBrainA.bmp …se.rte/Actors/Brainbot/HeadBrainA000.bmpBase.rte/Actors/Brainbot/HeadBrainA.bmp renamed to Base.rte/Actors/Brainbot/HeadBrainA000.bmp Base.rte/Actors/Brainbot/HeadBrainA.bmp renamed to Base.rte/Actors/Brainbot/HeadBrainA000.bmp

@@ -10,7 +10,7 @@ AddEffect = AEmitter
 	HitsMOs = 1
 	GetsHitByMOs = 1
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Actors/Drones/AntiAir/SAM.bmp
+		FilePath = Base.rte/Actors/Mecha/AntiAir/SAM.bmp
 	FrameCount = 1
 	OrientToVel = 0.1
 	SpriteOffset = Vector
@@ -164,7 +164,7 @@ AddEffect = AEmitter
 	HitsMOs = 1
 	GetsHitByMOs = 1
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Actors/Drones/AntiAir/SAM.bmp
+		FilePath = Base.rte/Actors/Mecha/AntiAir/SAM.bmp
 	FrameCount = 1
 	OrientToVel = 0.25
 	SpriteOffset = Vector
@@ -337,7 +337,7 @@ AddDevice = HDFirearm
 	GetsHitByMOs = 1
 	Buyable = 0
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Actors/Drones/AntiAir/DroneGun.bmp
+		FilePath = Base.rte/Actors/Mecha/AntiAir/DroneGun.bmp
 	FrameCount = 1
 	SpriteOffset = Vector
 		X = -10
@@ -390,12 +390,7 @@ AddDevice = HDFirearm
 			X = 0
 			Y = 0
 		AtomGroup = AtomGroup
-			AutoGenerate = 1
-			Material = Material
-				CopyOf = Air
-			Resolution = 0
-			Depth = 0
-		DeepCheck = 0
+			CopyOf = Atom Group Null
 		JointStrength = 200
 		JointStiffness = 1
 		JointOffset = Vector
@@ -416,17 +411,11 @@ AddDevice = HDFirearm
 		CopyOf = Muzzle Flash SMG
 	FireSound = Sound
 		AddSample = ContentFile
-			FilePath = Base.rte/Devices/Weapons/Rifles/Sounds/AK-47000.wav
+			FilePath = Base.rte/Devices/Weapons/BattleRifle/Sounds/BattleRifleFire000.wav
 		AddSample = ContentFile
-			FilePath = Base.rte/Devices/Weapons/Rifles/Sounds/AK-47001.wav
+			FilePath = Base.rte/Devices/Weapons/BattleRifle/Sounds/BattleRifleFire001.wav
 		AddSample = ContentFile
-			FilePath = Base.rte/Devices/Weapons/Rifles/Sounds/AK-47002.wav
-		AddSample = ContentFile
-			FilePath = Base.rte/Devices/Weapons/Rifles/Sounds/AK-47003.wav
-		AddSample = ContentFile
-			FilePath = Base.rte/Devices/Weapons/Rifles/Sounds/AK-47004.wav
-		AddSample = ContentFile
-			FilePath = Base.rte/Devices/Weapons/Rifles/Sounds/AK-47005.wav
+			FilePath = Base.rte/Devices/Weapons/BattleRifle/Sounds/BattleRifleFire002.wav
 	EmptySound = Sound
 		AddSample = ContentFile
 			FilePath = Base.rte/Sounds/EmptyClick3.wav
@@ -511,12 +500,7 @@ AddActor = Turret
 		X = -1
 		Y = -1
 	AtomGroup = AtomGroup
-		AutoGenerate = 1
-		Material = Material
-			CopyOf = Military Stuff
-		Resolution = 4
-		Depth = 0
-	DeepCheck = 0
+		CopyOf = Atom Group Null
 	JointStrength = 10000
 	JointStiffness = 0.9
 	JointOffset = Vector
@@ -535,7 +519,7 @@ AddActor = Leg
 	HitsMOs = 1
 	GetsHitByMOs = 1
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Actors/Drones/AntiAir/LegFGMediumA.bmp
+		FilePath = Base.rte/Actors/Mecha/AntiAir/LegFGMediumA.bmp
 	FrameCount = 5
 	SpriteOffset = Vector
 		X = -6
@@ -588,7 +572,7 @@ AddActor = Leg
 	HitsMOs = 1
 	GetsHitByMOs = 1
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Actors/Drones/AntiAir/LegBGMediumA.bmp
+		FilePath = Base.rte/Actors/Mecha/AntiAir/LegBGMediumA.bmp
 	FrameCount = 5
 	SpriteOffset = Vector
 		X = -6
@@ -644,9 +628,9 @@ AddActor = ACrab
 	GoldValue = 225
 	HitsMOs = 1
 	GetsHitByMOs = 1
-	ScriptPath = Base.rte/Actors/Drones/AntiAir/AntiAirDrone.lua
+	ScriptPath = Base.rte/Actors/Mecha/AntiAir/AntiAirDrone.lua
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Actors/Drones/AntiAir/AntiAirDrone.bmp
+		FilePath = Base.rte/Actors/Mecha/AntiAir/AntiAirDrone.bmp
 	FrameCount = 3
 	SpriteOffset = Vector
 		X = -11
@@ -770,13 +754,13 @@ AddActor = ACrab
 			X = 6
 			Y = 6
 	RWalkLimbPath = LimbPath
-		CopyOf = AA Drone Walk Path Left
+		CopyOf = Anti-Air Drone Walk Path Left
 		PresetName = Anti-Air Drone Walk Path Right
 		StartOffset = Vector
 			X = -2
 			Y = -12
 	RDislodgeLimbPath = LimbPath
-		CopyOf = AA Drone Dislodge Path Left
+		CopyOf = Anti-Air Drone Dislodge Path Left
 		PresetName = Anti-Air Drone Dislodge Path Right
 		StartOffset = Vector
 			X = 2