Merge pull request #9541 from reaperrr/rename-rendertraits-xy

Rename WithTurret, WithBarrel and WithReloadingTurret to include 'Sprite' in trait name
2015-12-05 00:24:37 +01:00
parent b45ae48c59 35c4aca983
commit e5bafe835f
23 changed files with 130 additions and 58 deletions
--- a/mods/ra/maps/allies-03b/map.yaml
+++ b/mods/ra/maps/allies-03b/map.yaml
@@ -1388,7 +1388,7 @@ Rules:
 		-Huntable:
 		-Targetable:
 		-Armament:
-		-WithTurret:
+		-WithSpriteTurret:
 		-WithMuzzleOverlay:
 		Cargo:
 			Types: ~disabled
--- a/mods/ra/maps/monster-tank-madness/map.yaml
+++ b/mods/ra/maps/monster-tank-madness/map.yaml
@@ -2209,7 +2209,7 @@ Rules:
 			MuzzleSequence: muzzle
 		AttackTurreted:
 		WithMuzzleOverlay:
-		WithTurret:
+		WithSpriteTurret:
 		AutoTarget:
 		Explodes:
 			Weapon: MiniNuke
--- a/mods/ra/rules/ships.yaml
+++ b/mods/ra/rules/ships.yaml
@@ -149,7 +149,7 @@ DD:
 	AttackTurreted:
 	SelectionDecorations:
 		VisualBounds: 38,38
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	DetectCloaked:
 		CloakTypes: Underwater
@@ -204,9 +204,9 @@ CA:
 	WithMuzzleOverlay:
 	SelectionDecorations:
 		VisualBounds: 44,44
-	WithTurret@PRIMARY:
+	WithSpriteTurret@PRIMARY:
 		Turret: primary
-	WithTurret@SECONDARY:
+	WithSpriteTurret@SECONDARY:
 		Turret: secondary
 	AutoTarget:

@@ -277,7 +277,7 @@ PT:
 	WithMuzzleOverlay:
 	SelectionDecorations:
 		VisualBounds: 36,36
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	DetectCloaked:
 		CloakTypes: Underwater
--- a/mods/ra/rules/vehicles.yaml
+++ b/mods/ra/rules/vehicles.yaml
@@ -61,7 +61,7 @@ V2RL:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: 1TNK.Husk
@@ -98,7 +98,7 @@ V2RL:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: 2TNK.Husk
@@ -137,7 +137,7 @@ V2RL:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: 3TNK.Husk
@@ -185,7 +185,7 @@ V2RL:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: 4TNK.Husk
@@ -344,7 +344,7 @@ JEEP:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	Cargo:
 		Types: Infantry
@@ -608,7 +608,7 @@ FTRK:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SelectionDecorations:
 		VisualBounds: 28,28
@@ -738,7 +738,7 @@ STNK:
 	Turreted:
 		ROT: 5
 	AttackTurreted:
-	WithTurret:
+	WithSpriteTurret:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 4