Clean up property names + defaults of smudge smoke

2020-08-23 13:13:34 +02:00
parent 7395a3ed2d
commit 6337067032
8 changed files with 89 additions and 21 deletions
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -1038,7 +1038,7 @@ ATWR:
 	-RenderRangeCircle:
 	WithRangeCircle:
 		Range: 7c0
-		Color: FFFF0080	
+		Color: FFFF0080
 	WithBuildingBib:
 		HasMinibib: true
 	Turreted:
--- a/mods/cnc/rules/world.yaml
+++ b/mods/cnc/rules/world.yaml
@@ -179,10 +179,15 @@ World:
 	SmudgeLayer@SCORCH:
 		Type: Scorch
 		Sequence: scorches
-		SmokePercentage: 50
+		SmokeChance: 50
+		SmokeImage: smoke_m
+		SmokeSequences: idle
 	SmudgeLayer@CRATER:
 		Type: Crater
 		Sequence: craters
+		SmokeChance: 25
+		SmokeImage: smoke_m
+		SmokeSequences: idle
 	ResourceLayer:
 	ResourceClaimLayer:
 	WarheadDebugOverlay:
--- a/mods/d2k/rules/world.yaml
+++ b/mods/d2k/rules/world.yaml
@@ -151,11 +151,9 @@ World:
 	SmudgeLayer@Rock:
 		Type: RockCrater
 		Sequence: rockcraters
-		SmokePercentage: 0
 	SmudgeLayer@Sand:
 		Type: SandCrater
 		Sequence: sandcraters
-		SmokePercentage: 0
 	MapCreeps:
 		CheckboxLabel: Worms
 		CheckboxDescription: Worms roam the map and devour unprepared forces
--- a/mods/ra/rules/world.yaml
+++ b/mods/ra/rules/world.yaml
@@ -200,10 +200,15 @@ World:
 	SmudgeLayer@SCORCH:
 		Type: Scorch
 		Sequence: scorches
-		SmokePercentage: 50
+		SmokeChance: 50
+		SmokeImage: smoke_m
+		SmokeSequences: idle
 	SmudgeLayer@CRATER:
 		Type: Crater
 		Sequence: craters
+		SmokeChance: 25
+		SmokeImage: smoke_m
+		SmokeSequences: idle
 	ResourceLayer:
 	ResourceClaimLayer:
 	WarheadDebugOverlay:
--- a/mods/ts/rules/world.yaml
+++ b/mods/ts/rules/world.yaml
@@ -254,29 +254,29 @@ World:
 	SmudgeLayer@SMALLSCORCH:
 		Type: SmallScorch
 		Sequence: smallscorches
-		SmokeType: smallfire
-		SmokePercentage: 50
+		SmokeImage: smallfire
+		SmokeSequences: idle
+		SmokeChance: 50
 	SmudgeLayer@MEDIUMSCORCH:
 		Type: MediumScorch
 		Sequence: mediumscorches
-		SmokeType: mediumfire
-		SmokePercentage: 75
+		SmokeImage: mediumfire
+		SmokeSequences: idle
+		SmokeChance: 75
 	SmudgeLayer@LARGESCORCH:
 		Type: LargeScorch
 		Sequence: largescorches
-		SmokeType: largefire
-		SmokePercentage: 100
+		SmokeImage: largefire
+		SmokeSequences: idle
+		SmokeChance: 100
 	SmudgeLayer@SMALLCRATER:
 		Type: SmallCrater
-		SmokeType: smallsmoke
 		Sequence: smallcraters
 	SmudgeLayer@MEDIUMCRATER:
 		Type: MediumCrater
-		SmokeType: smallsmoke
 		Sequence: mediumcraters
 	SmudgeLayer@LARGECRATER:
 		Type: LargeCrater
-		SmokeType: largesmoke
 		Sequence: largecraters
 	ResourceLayer:
 	BridgeLayer: