Merge remote-tracking branch 'upstream/master'

sanguinariojoe · Feb 28, 2018 · c4119fe · c4119fe
2 parents aa38d1d + efb5b36
commit c4119fe
Show file tree

Hide file tree

Showing 23 changed files with 138 additions and 4 deletions.
diff --git a/poland.sdd/LuaIntro/Assets/music/my_pierwsza_brygada.ogg b/poland.sdd/LuaIntro/Assets/music/my_pierwsza_brygada.ogg
diff --git a/poland.sdd/LuaRules/Configs/side_morph_defs/pl.lua b/poland.sdd/LuaRules/Configs/side_morph_defs/pl.lua
@@ -132,7 +132,24 @@ local plDefs = {
         metal = 0,
         energy = 0,
     },
-
+--[[
+    plradar =
+    {
+        into = 'plfiat508_iii',
+        tech = 0,
+        time = 40,
+        metal = 0,
+        energy = 0,
+    },
+]]--
+    plfiat508_iii =
+    {
+        into = 'plradar',
+        tech = 0,
+        time = 40,
+        metal = 0,
+        energy = 0,
+    },
 }
 
 return plDefs
diff --git a/poland.sdd/LuaRules/Configs/side_sortie_defs/pl.lua b/poland.sdd/LuaRules/Configs/side_sortie_defs/pl.lua
@@ -0,0 +1,15 @@
+local plSorties = {
+	pl_sortie_recon = {
+		members = {
+			"plrwd8",
+		},
+		delay = 15,
+		name = "Recon Sortie",
+		description = "1 x RWD-8 Plane",
+		buildCostMetal = 1000,
+		buildPic = "plrwd8.png",
+	},
+
+}
+
+return plSorties
diff --git a/poland.sdd/features/corpses/PLFiat508_III_dead.tdf b/poland.sdd/features/corpses/PLFiat508_III_dead.tdf
@@ -0,0 +1,41 @@
+[PLFiat508_III_Abandoned]
+{
+  description=Abandoned Radio Vehicle;
+  damage=2501;
+  energy=50;
+  featureDead=PLFiat508_III_Burning;
+  footprintX=2;
+  footprintZ=2;
+  object=PLFiat508_III_dead.s3o;
+  reclaimable=1;
+	collisionVolumeType=cylX;
+	collisionVolumeScales=18 15 35;
+	collisionVolumeOffsets=0 -5 0;
+	[customParams]
+		{
+		cover_strength=2;
+		cover_radius=40;
+
+		}
+}
+
+[PLFiat508_III_Burning]
+{
+  description=Destroyed Radio Vehicle;
+  damage=2501;
+  energy=50;
+  footprintX=2;
+  footprintZ=2;
+  object=PLFiat508_III_wreck.s3o;
+  reclaimable=1;
+	collisionVolumeType=cylX;
+	collisionVolumeScales=18 15 35;
+	collisionVolumeOffsets=0 -5 0;
+	[customParams]
+		{
+		ceg_created=Burning;
+		cover_strength=2;
+		cover_radius=40;
+
+		}
+}
diff --git a/poland.sdd/features/misc/PLRWD8_ground.tdf b/poland.sdd/features/misc/PLRWD8_ground.tdf
@@ -0,0 +1,21 @@
+[plrwd8_ground]
+{
+  description=Scout Plane;
+  damage=100;
+  energy=50;
+  featureDead=Debris_Small;
+  footprintX=2;
+  footprintZ=2;
+  object=plrwd8_ground.s3o;
+  reclaimable=1;
+	collisionVolumeType=cylX;
+	collisionVolumeScales=18 15 35;
+	collisionVolumeOffsets=0 -5 0;
+	[customParams]
+		{
+		ceg_created=Burning;
+		cover_strength=2;
+		cover_radius=40;
+
+		}
+}
diff --git a/poland.sdd/gamedata/side_units/pl.lua b/poland.sdd/gamedata/side_units/pl.lua
@@ -6,7 +6,7 @@ local plunits =
 	"plvehicleyard",
 	--"plbarracks",
 	"plgunyard",
-	--"plradar",
+	"plradar",
 	"plstorage",
     "platminesign",
     "plapminesign",
@@ -29,7 +29,7 @@ local plunits =
     "plgunyard",
     "plvehicleyard",
     "pltankyard",
-    --"plradar",
+    "plradar",
     --"plsupplydepot",
     "plstorage",
     "pltankobstacle",
@@ -51,6 +51,7 @@ local plunits =
         "pl_armoredcar_platoon",
 		"plsokol1000heavy",
 		"plsokol1000scout",
+		"plfiat508_iii",
     },
 
     pltankyard =
@@ -60,7 +61,12 @@ local plunits =
         "plr35",
         "pl7tp",
     },
-
+
+	plradar =
+	{
+		"pl_sortie_recon",
+	},
+
 }
 
 return plunits
diff --git a/poland.sdd/objects3d/PL/PLFiat508_III.s3o b/poland.sdd/objects3d/PL/PLFiat508_III.s3o
diff --git a/poland.sdd/objects3d/PL/PLRWD8.s3o b/poland.sdd/objects3d/PL/PLRWD8.s3o
diff --git a/poland.sdd/objects3d/PL/plradar.s3o b/poland.sdd/objects3d/PL/plradar.s3o
diff --git a/poland.sdd/objects3d/PLFiat508_III_dead.s3o b/poland.sdd/objects3d/PLFiat508_III_dead.s3o
diff --git a/poland.sdd/objects3d/PLFiat508_III_wreck.s3o b/poland.sdd/objects3d/PLFiat508_III_wreck.s3o
diff --git a/poland.sdd/objects3d/PLRWD8_ground.s3o b/poland.sdd/objects3d/PLRWD8_ground.s3o
diff --git a/poland.sdd/unitpics/PL.xcf b/poland.sdd/unitpics/PL.xcf
diff --git a/poland.sdd/unitpics/plfiat508_iii.png b/poland.sdd/unitpics/plfiat508_iii.png
diff --git a/poland.sdd/unitpics/plradar.png b/poland.sdd/unitpics/plradar.png
diff --git a/poland.sdd/unitpics/plrwd8.png b/poland.sdd/unitpics/plrwd8.png
diff --git a/poland.sdd/units/pl/aircraft/PLRWD8.lua b/poland.sdd/units/pl/aircraft/PLRWD8.lua
@@ -0,0 +1,16 @@
+local PLRWD8 = Recon:New{
+	name			= "RWD 8",
+	maxDamage		= 75,
+
+	maxAcc			= 0.480,
+
+	customParams = {
+		enginesound		= "po2-",
+		enginesoundnr	= 11,
+	},
+}
+
+
+return lowerkeys({
+	["PLRWD8"] = PLRWD8,
+})
diff --git a/poland.sdd/units/pl/vehicles/PLFiat508_III.lua b/poland.sdd/units/pl/vehicles/PLFiat508_III.lua
@@ -0,0 +1,18 @@
+local PL_Fiat508_III = Truck:New{
+	name					= "Polski Fiat 508/III",
+	decription				= "Mobile Long Range Radio Station",
+	trackOffset				= 4,
+	trackWidth				= 11,
+	corpse					= "PLFiat508_III_Abandoned",
+	objectName				= "PL/PLFiat508_III.s3o",
+}
+
+local PL_Radar = Radar:New{
+	name					= "Long-range radio communication post",
+	corpse					= "PLFiat508_III_Abandoned",
+}
+
+return lowerkeys({
+	["PLFiat508_III"] = PL_Fiat508_III,
+	["plradar"] = PL_Radar,
+})
diff --git a/poland.sdd/unittextures/PLFiat508_III.dds b/poland.sdd/unittextures/PLFiat508_III.dds
diff --git a/poland.sdd/unittextures/PLFiat508_III_2.dds b/poland.sdd/unittextures/PLFiat508_III_2.dds
diff --git a/poland.sdd/unittextures/PLFiat508_III_dead.dds b/poland.sdd/unittextures/PLFiat508_III_dead.dds
diff --git a/poland.sdd/unittextures/PLRWD8.dds b/poland.sdd/unittextures/PLRWD8.dds
diff --git a/poland.sdd/unittextures/PLRWD8_2.dds b/poland.sdd/unittextures/PLRWD8_2.dds