fixed flames; fixed ftur 'rotation'; fixed repair cursor hotspot

mods/ra/merge-rules.yaml

@@ -0,0 +1,50 @@
+Player:
+	ProductionQueue:
+	PlaceBuilding:
+	
+World:
+	WaterPaletteRotation:
+	ChronoshiftPaletteEffect:
+	LightPaletteRotator:
+
+MGG:
+	GeneratesGap:
+		Range: 10
+
+GAP:
+	GeneratesGap:
+		Range: 10
+
+MINP:
+	Mine:
+		Damage: 1000
+		Warhead: APMine
+		TriggeredBy: Foot, Wheel, Track
+		AvoidFriendly: yes
+		
+MINV:
+	Mine:
+		Damage: 1200
+		Warhead: ATMine
+		TriggeredBy: Wheel, Track
+		AvoidFriendly: yes
+
+BR1:
+	Bridge:
+		SouthOffset:0,2
+BR2:
+	Bridge:
+		NorthOffset:3,0
+BR3:
+	Bridge:
+		Long: yes
+		NorthOffset: 2,0
+		SouthOffset: 0,1
+		
+BRIDGE1:
+	Bridge:
+		UseAlternateNames: yes
+		
+BRIDGE2:
+	Bridge:
+		UseAlternateNames: yes

mods/ra/rules.ini

@@ -2232,7 +2232,7 @@ Arm=10
 High=yes
 Shadow=no
 Proximity=yes
-Animates=yes
+Trail=smokey
 Ranged=yes
 Inaccurate=yes
 Image=V2
@@ -2244,7 +2244,7 @@ Arm=2
 High=yes
 Shadow=no
 Proximity=yes
-Animates=yes
+Trail=smokey
 Ranged=yes
 Inaccurate=yes
 AA=yes
@@ -2259,7 +2259,7 @@ Arm=3
 High=yes
 Shadow=no
 Proximity=yes
-Animates=yes
+Trail=smokey
 Ranged=yes
 AA=yes
 Image=DRAGON
@@ -2273,7 +2273,7 @@ Arm=3
 High=yes
 Shadow=no
 Proximity=yes
-Animates=yes
+Trail=smokey
 Ranged=yes
 AA=yes
 AG=no
@@ -2351,7 +2351,7 @@ Frames=4
 
 ; wizard's fireball
 [Fireball]
-Animates=yes
+Trail=fb2
 Image=FB1
 Frames=8
 

mods/ra/rules.yaml

@@ -930,6 +930,7 @@ FTUR:
 		Description: Flame Turret
 		LongDesc: Anti-Infantry base defense.\n  Strong vs Infantry\n  Weak vs Aircraft
 	Turreted:
+		ROT: 10
 	Building:
 		Power: -20
 		Footprint: x
@@ -941,6 +942,7 @@ FTUR:
 	RenderBuilding:
 	AttackTurreted:
 		PrimaryWeapon: FireballLauncher
+		PrimaryOffset: 0,0,12,8
 	AutoTarget:
 	IronCurtainable:
 

mods/ra/sequences.xml

@@ -375,7 +375,7 @@
     <sequence name="select" start="15" length="6" x="12" y="12" />
     <sequence name="attackmove" start="21" length="8" x="12" y="12" />
     <sequence name="move-minimap" start="29" length="6" />
-    <sequence name="repair" start="35" length="24" />
+    <sequence name="repair" start="35" length="24" x="12" y="12" />
     <sequence name="deploy" start="59" length="9" x="12" y="12" />
     <sequence name="sell" start="68" length="12" x="12" y="12" />
     <sequence name="default-minimap" start="80" length="1" />
@@ -1034,4 +1034,7 @@
     <sequence name="bottom-left" start="2" length="1" />
     <sequence name="bottom-right" start="3" length="1" />
   </unit>
+  <unit name="fb2">
+    <sequence name="idle" start="0" length="4" />
+  </unit>
 </sequences>

mods/ra/units.ini

@@ -312,6 +312,8 @@ Dimensions=1,1
 Footprint=x
 SelectionPriority=3
 LongDesc=Anti-Infantry base defense.\n  Strong vs Infantry\n  Weak vs Aircraft
+PrimaryOffset=0,0,12,8
+ROT=10
 [SAM]
 Description=SAM Site
 Traits=Building, Turreted, RenderBuildingTurreted, AttackTurreted, AutoTarget, IronCurtainable