added CNC Medium Tank

mods/cnc/sequences-vehicles.xml

@@ -49,4 +49,10 @@
 		<sequence name="slow-rotor" start="4" length="8" src="lrotor" />
 	</unit>
 
+	<!-- Medium Tank -->
+	<unit name="mtnk">
+		<sequence name="idle" start="0" length="32" />
+		<sequence name="turret" start="32" length="32" />
+	</unit>
+
 </sequences>

mods/cnc/sequences.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <sequences>
- <!-- allied gun turret -->
+  <!-- allied gun turret -->
   <unit name="gun">
     <sequence name="idle" start="0" length="32" />
     <sequence name="recoil" start="32" length="32" />
@@ -128,7 +128,6 @@
     <sequence name="die5" start="324" length="18" />
     <sequence name="die6" start="0" length="14" src="electro" />
   </unit>
-  
   <!-- build clock - hacked in -->
   <unit name="clock">
     <sequence name="idle" start="0" length="*" />
@@ -142,7 +141,7 @@
     <sequence name="select" start="12" length="6" x="12" y="12" />
     <sequence name="attackmove" start="18" length="8" x="12" y="12" />
     <sequence name="move-minimap" start="26" length="1" />
-	<sequence name="blocked-minimap" start="27" length="1" />
+    <sequence name="blocked-minimap" start="27" length="1" />
     <sequence name="repair" start="29" length="24" x="12" y="12" />
     <sequence name="deploy" start="53" length="9" x="12" y="12" />
     <sequence name="sell" start="62" length="24" x="12" y="12" />
@@ -161,19 +160,18 @@
     <sequence name="guard-minimap" start="152" length="1" />
     <sequence name="guard" start="153" length="1" x="12" y="12" />
     <sequence name="sell-vehicle" start="154" length="24" />
-    
     <!-- These are not defined uniquely in the cnc mouse shp-->
     <sequence name="capture" start="119" length="3" />
     <sequence name="capture-minimap" start="148" length="3" />
     <sequence name="repair2" start="29" length="24" />
-	  <sequence name="attack" start="18" length="8" x="12" y="12" />
+    <sequence name="attack" start="18" length="8" x="12" y="12" />
-	  <sequence name="attack-minimap" start="140" length="8" />
+    <sequence name="attack-minimap" start="140" length="8" />
-	  <sequence name="deploy-blocked" start="11" length="1" x="12" y="12" />
+    <sequence name="deploy-blocked" start="11" length="1" x="12" y="12" />
-	  <sequence name="enter-blocked" start="11" length="1" />
+    <sequence name="enter-blocked" start="11" length="1" />
-	  <sequence name="repair2-blocked" start="11" length="1" />
+    <sequence name="repair2-blocked" start="11" length="1" />
-	  <sequence name="ability-minimap" start="138" length="2" />
+    <sequence name="ability-minimap" start="138" length="2" />
-	  <sequence name="heal" start="1" length="4" x="12" y="12" />
+    <sequence name="heal" start="1" length="4" x="12" y="12" />
-	  <sequence name="heal-minimap" start="1" length="1" />
+    <sequence name="heal-minimap" start="1" length="1" />
   </cursor>
   <unit name="120mm">
     <sequence name="idle" start="0" length="1" />
@@ -274,7 +272,7 @@
     <sequence name="7" start="0" length="18" src="fball1" />
     <sequence name="8" start="0" length="22" src="art-exp1" />
   </unit>
-   <unit name="pips">
+  <unit name="pips">
     <sequence name="groups" start="8" length="10" />
     <sequence name="medic" start="20" length="1" />
     <sequence name="ready" start="3" length="1" />
@@ -287,13 +285,11 @@
     <sequence name="tag-fake" start="18" length="1" />
     <sequence name="tag-primary" start="2" length="1" />
   </unit>
-
   <unit name="hind">
     <sequence name="idle" start="0" length="32" />
     <sequence name="rotor" start="0" length="4" src="lrotor" />
     <sequence name="slow-rotor" start="4" length="8" src="lrotor" />
   </unit>
-
   <unit name="v2">
     <sequence name="idle" start="0" length="32" />
   </unit>
@@ -652,4 +648,4 @@
     <sequence name="open" start="0" length="5" />
     <sequence name="idle" start="5" length="11" />
   </unit>
-</sequences>
+</sequences>

mods/cnc/vehicles.yaml

@@ -72,6 +72,32 @@ BGGY:
 		MuzzleFlash: yes
 	RenderUnitTurreted:
 	AutoTarget:
+	
+MTNK:
+	Inherits: ^Vehicle
+	Buildable:
+		Icon: mtnkicnh
+		TechLevel: 3
+		Prerequisites: weap
+		Owner: gdi
+		Cost: 800
+		Description: Medium Tank
+		LongDesc: General-Purpose GDI Tank.\n  Strong vs Tanks, Light Vehicles\n  Weak vs Infantry, Aircraft
+	Unit:
+		HP: 400
+		Armor: heavy
+		Crewed: yes
+		Sight: 3
+		Speed: 18
+	Mobile:
+		MovementType: Track
+	Turreted:
+		ROT: 5
+	AttackTurreted:
+		PrimaryWeapon: 120mm
+		Recoil: 3
+	RenderUnitTurreted:
+	AutoTarget:
 
 TRAN:
 	Inherits: ^Plane

mods/cnc/weapons.ini

@@ -3,6 +3,7 @@
 MachineGun
 Laser
 HighV
+120mm
 
 ; NOTE: WEAPON PROPERTIES ARE NOT EXPOSED BY TIBED; THESE ARE ALL MADE UP
 [MachineGun]
@@ -37,9 +38,21 @@ Speed=30
 Warhead=AP
 Report=rocket2
 
+[120mm]
+Damage=40
+ROF=80
+Range=4.75
+Projectile=Cannon
+Speed=40
+Warhead=AP
+Report=CANNON1
+Anim=GUNFIRE
+Burst=2
+
 [ProjectileTypes]
 Invisible
 HeatSeeker
+Cannon
 
 [Invisible]
 Inviso=yes
@@ -59,6 +72,9 @@ ROT=5
 Rotates=yes
 Translucent=yes
 
+[Cannon]
+Image=120MM
+
 
 [WarheadTypes]
 SA

openra-data.sln

@@ -5,7 +5,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mods", "mods", "{F0BAF862-1
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ra", "ra", "{59F0734D-2F86-4C26-8171-CF45EE01E97A}"
 	ProjectSection(SolutionItems) = preProject
-		mods\ra\campaignUnits.ini = mods\ra\campaignUnits.ini
 		mods\ra\defaults.yaml = mods\ra\defaults.yaml
 		mods\ra\merge-rules.yaml = mods\ra\merge-rules.yaml
 		mods\ra\mod.yaml = mods\ra\mod.yaml
@@ -13,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ra", "ra", "{59F0734D-2F86-
 		mods\ra\rules.ini = mods\ra\rules.ini
 		mods\ra\rules.yaml = mods\ra\rules.yaml
 		mods\ra\sequences.xml = mods\ra\sequences.xml
-		mods\ra\trees.ini = mods\ra\trees.ini
-		mods\ra\units.ini = mods\ra\units.ini
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aftermath", "aftermath", "{8DA16338-FA8F-4CCD-8731-CBFCF5E31A78}"
@@ -51,7 +48,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "globals", "globals", "{27CA
 		bogus.sno = bogus.sno
 		bogus.tem = bogus.tem
 		chrome.xml = chrome.xml
-		makedist.cmd = makedist.cmd
 		tileSet.til = tileSet.til
 	EndProjectSection
 EndProject
@@ -78,8 +74,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "remaps", "remaps", "{CA06F2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cnc", "cnc", "{65D8A06F-F2DF-4000-A4F7-AFDB4C282698}"
 	ProjectSection(SolutionItems) = preProject
-		mods\cnc\chrome-allies.png = mods\cnc\chrome-allies.png
+		mods\cnc\chrome-gdi.png = mods\cnc\chrome-gdi.png
-		mods\cnc\chrome-soviet.png = mods\cnc\chrome-soviet.png
+		mods\cnc\chrome-nod.png = mods\cnc\chrome-nod.png
 		mods\cnc\chrome.xml = mods\cnc\chrome.xml
 		mods\cnc\civilian.yaml = mods\cnc\civilian.yaml
 		mods\cnc\compat.yaml = mods\cnc\compat.yaml