Move TS lighting overrides to map.yaml.

2016-03-09 22:06:50 +00:00
parent 20e8bc249d
commit dd677ae916
20 changed files with 45 additions and 47 deletions
--- a/mods/ts/maps/arivruns/map.yaml
+++ b/mods/ts/maps/arivruns/map.yaml
@@ -1293,4 +1293,7 @@ Actors:
 		Owner: Neutral
 		Location: 115,-15

-Rules: rules.yaml
+Rules:
+	World:
+		GlobalLightingPaletteEffect:
+			Ambient: 0.72
--- a/mods/ts/maps/arivruns/rules.yaml
+++ b/mods/ts/maps/arivruns/rules.yaml
@@ -1,3 +0,0 @@
-World:
-	GlobalLightingPaletteEffect:
-		Ambient: 0.72
--- a/mods/ts/maps/cliffsin/map.yaml
+++ b/mods/ts/maps/cliffsin/map.yaml
@@ -1499,4 +1499,7 @@ Actors:
 		Location: 123,87
 		Owner: Neutral

-Rules: rules.yaml
+Rules:
+	World:
+		GlobalLightingPaletteEffect:
+			Ambient: 0.68
--- a/mods/ts/maps/cliffsin/rules.yaml
+++ b/mods/ts/maps/cliffsin/rules.yaml
@@ -1,3 +0,0 @@
-World:
-	GlobalLightingPaletteEffect:
-		Ambient: 0.68
--- a/mods/ts/maps/gdi4a/map.yaml
+++ b/mods/ts/maps/gdi4a/map.yaml
@@ -1737,3 +1737,9 @@ Actors:
 		Location: 111,13

 Rules: rules.yaml
+	World:
+		GlobalLightingPaletteEffect:
+			Red: 1.1
+			Green: 1.1
+			Blue: 1
+			Ambient: 0.55
--- a/mods/ts/maps/gdi4a/rules.yaml
+++ b/mods/ts/maps/gdi4a/rules.yaml
@@ -4,10 +4,5 @@ World:
 	-MPStartLocations:
 	MusicPlaylist:
 		BackgroundMusic: intro
-	GlobalLightingPaletteEffect:
-		Red: 1.1
-		Green: 1.1
-		Blue: 1
-		Ambient: 0.55
 	LuaScript:
 		Scripts: map.lua
--- a/mods/ts/maps/karasjok/map.yaml
+++ b/mods/ts/maps/karasjok/map.yaml
@@ -1554,4 +1554,10 @@ Actors:
 		Location: 134,73
 		Owner: Neutral

-Rules: rules.yaml
+Rules:
+	World:
+		GlobalLightingPaletteEffect:
+			Red: 0.5
+			Green: 0.7
+			Blue: 0.7
+			Ambient: 0.78
--- a/mods/ts/maps/karasjok/rules.yaml
+++ b/mods/ts/maps/karasjok/rules.yaml
@@ -1,6 +0,0 @@
-World:
-	GlobalLightingPaletteEffect:
-		Red: 0.5
-		Blue: 0.7
-		Green: 0.7
-		Ambient: 0.78
--- a/mods/ts/maps/rivrrad4/map.yaml
+++ b/mods/ts/maps/rivrrad4/map.yaml
@@ -868,4 +868,7 @@ Actors:
 		Location: 254,39
 		Owner: Neutral

-Rules: rules.yaml
+Rules:
+	World:
+		GlobalLightingPaletteEffect:
+			Ambient: 0.85
--- a/mods/ts/maps/rivrrad4/rules.yaml
+++ b/mods/ts/maps/rivrrad4/rules.yaml
@@ -1,3 +0,0 @@
-World:
-	GlobalLightingPaletteEffect:
-		Ambient: 0.85
--- a/mods/ts/maps/springs/map.yaml
+++ b/mods/ts/maps/springs/map.yaml
@@ -853,4 +853,7 @@ Actors:
 		Owner: Neutral
 		Location: 95,3

-Rules: rules.yaml
+Rules:
+	World:
+		GlobalLightingPaletteEffect:
+			Ambient: 0.62
--- a/mods/ts/maps/springs/rules.yaml
+++ b/mods/ts/maps/springs/rules.yaml
@@ -1,3 +0,0 @@
-World:
-	GlobalLightingPaletteEffect:
-		Ambient: 0.62
--- a/mods/ts/maps/t_garden/map.yaml
+++ b/mods/ts/maps/t_garden/map.yaml
@@ -830,4 +830,7 @@ Actors:
 		Location: 99,74
 		Owner: Neutral

-Rules: rules.yaml
+Rules:
+	World:
+		GlobalLightingPaletteEffect:
+			Ambient: 0.79
--- a/mods/ts/maps/t_garden/rules.yaml
+++ b/mods/ts/maps/t_garden/rules.yaml
@@ -1,6 +0,0 @@
-World:
-	GlobalLightingPaletteEffect:
-		Red: 1
-		Blue: 1
-		Green: 1
-		Ambient: 0.79
--- a/mods/ts/maps/tactical/map.yaml
+++ b/mods/ts/maps/tactical/map.yaml
@@ -800,4 +800,7 @@ Actors:
 		Location: 167,83
 		Owner: Neutral

-Rules: rules.yaml
+Rules:
+	World:
+		GlobalLightingPaletteEffect:
+			Ambient: 0.85
--- a/mods/ts/maps/tactical/rules.yaml
+++ b/mods/ts/maps/tactical/rules.yaml
@@ -1,3 +0,0 @@
-World:
-	GlobalLightingPaletteEffect:
-		Ambient: 0.85
--- a/mods/ts/maps/terrace/map.yaml
+++ b/mods/ts/maps/terrace/map.yaml
@@ -509,4 +509,7 @@ Actors:
 		Location: 84,60
 		Owner: Neutral

-Rules: rules.yaml
+Rules:
+	World:
+		GlobalLightingPaletteEffect:
+			Ambient: 0.63
--- a/mods/ts/maps/terrace/rules.yaml
+++ b/mods/ts/maps/terrace/rules.yaml
@@ -1,3 +0,0 @@
-World:
-	GlobalLightingPaletteEffect:
-		Ambient: 0.63
--- a/mods/ts/maps/tread_l/map.yaml
+++ b/mods/ts/maps/tread_l/map.yaml
@@ -1213,4 +1213,7 @@ Actors:
 		Location: 123,20
 		Owner: Neutral

-Rules: rules.yaml
+Rules:
+	World:
+		GlobalLightingPaletteEffect:
+			Ambient: 0.75
--- a/mods/ts/maps/tread_l/rules.yaml
+++ b/mods/ts/maps/tread_l/rules.yaml
@@ -1,3 +0,0 @@
-World:
-	GlobalLightingPaletteEffect:
-		Ambient: 0.75