# HG changeset patch
# User Henek
# Date 1293738922 -3600
# Node ID 7036abbaf3bbc2ee820b4b8537d34beef441de8d
# Parent  f2d966c68289f6686043cc71bb84ee7112eccb32
finnished refactoring the rest themes, and note comments on Eyes and Deepspace

diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Bamboo/theme.cfg
--- a/share/hedgewars/Data/Themes/Bamboo/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Bamboo/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -2,7 +2,7 @@
 border = 143, 171, 80
 water-top = $54, $5C, $9D
 water-bottom = $34, $3C, $7D
-water-opacity =  $80
+water-opacity = $80
 music = oriental.ogg
 clouds = 9
 object = Flower, 3, 65, 258, 80, 2, 1, 0, 0, 240, 215
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Bath/theme.cfg
--- a/share/hedgewars/Data/Themes/Bath/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Bath/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -2,7 +2,7 @@
 border = 173, 182, 247
 water-top = $54, $5C, $9D
 water-bottom = $34, $3C, $7D
-water-opacity =  $80
+water-opacity = $80
 music = bath.ogg
 clouds = 15
 object = Toothbrush, 3, 120, 245, 8, 15, 1, 90, 6, 65, 220
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Brick/theme.cfg
--- a/share/hedgewars/Data/Themes/Brick/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Brick/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -2,7 +2,7 @@
 border = 155, 155, 155
 water-top = $51, $5B, $60
 water-bottom = $22, $2F, $36
-water-opacity =  $80
+water-opacity = $80
 music = Brick.ogg
 clouds = 9
 object = plant1, 1, 83, 215, 92, 35, 1, 0, 0, 250, 190
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Cake/theme.cfg
--- a/share/hedgewars/Data/Themes/Cake/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Cake/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -2,7 +2,7 @@
 border = 255, 200, 90
 water-top = $FF, $DF, $E1
 water-bottom = $FF, $DF, $E1
-water-opacity =  $80
+water-opacity = $80
 music = snow.ogg
 clouds = 9
 object = plant1, 3, 83, 215, 92, 35, 1, 0, 0, 250, 190
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Castle/theme.cfg
--- a/share/hedgewars/Data/Themes/Castle/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Castle/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -1,18 +1,12 @@
-45 53 57
-145 145 145
-81 91 96
-81 91 96 $80
-Castle.ogg
-5
-4
-Spear
-3 65 258 175 2 1 0 0 240 215
-Shield
-3 0 165 163 2 1 0 0 163 140
-Sword
-3 240 22 17 43 1 8 21 227 80
-Axe
-3 25 195 90 65 1 40 5 195 175
-0
-25
-3 99999999 0 750
+sky = 45, 53, 57
+border = 145, 145, 145
+water-top = 81, 91, 96
+water-bottom = 81, 91, 96
+water-opacity = $80
+music = Castle.ogg
+clouds = 5
+object = Spear, 3, 65, 258, 175, 2, 1, 0, 0, 240, 215
+object = Shield, 3, 0, 165, 163, 2, 1, 0, 0, 163, 140
+object = Sword, 3, 240, 22, 17, 43, 1, 8, 21, 227, 80
+object = Axe, 3, 25, 195, 90, 65, 1, 40, 5, 195, 175
+flakes = 25, 3, 99999999, 0, 750
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Cheese/theme.cfg
--- a/share/hedgewars/Data/Themes/Cheese/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Cheese/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -1,19 +1,12 @@
-16 5 27
-240 175 32
-$54 $5C $9D
-$34 $3C $7D $80
-EarthRise.ogg
-9
-5
-cheese
-3 60 80 55 30 1 0 0 140 70
-mouseright
-3 85 162 60 20 1 6 6 200 140
-mouseleft
-3 60 162 63 20 1 6 6 200 140
-knife
-3 90 130 50 20 1 140 0 160 110
-fork
-3 240 130 10 30 1 0 0 170 120
-0
-0
+sky = 16, 5, 27
+border = 240, 175, 32
+water-top = $54, $5C, $9D
+water-bottom = $34, $3C, $7D
+water-opacity = $80
+music = EarthRise.ogg
+clouds = 9
+object = cheese, 3, 60, 80, 55, 30, 1, 0, 0, 140, 70
+object = mouseright, 3, 85, 162, 60, 20, 1, 6, 6, 200, 140
+object = mouseleft, 3, 60, 162, 63, 20, 1, 6, 6, 200, 140
+object = knife, 3, 90, 130, 50, 20, 1, 140, 0, 160, 110
+object = fork, 3, 240, 130, 10, 30, 1, 0, 0, 170, 120
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Christmas/theme.cfg
--- a/share/hedgewars/Data/Themes/Christmas/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Christmas/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -1,26 +1,16 @@
-9 14 45
-141 151 213
-$54 $5C $9D
-$34 $3C $7D $80
-snow.ogg
-9
-6
-reindeer
-1 90 232 94 12 2 55 60 90 73 80 134 105 64
-tree
-1 238 706 36 9 2 122 355 208 293 164 168 82 154
-plant2
-3 0 85 25 25 2 0 0 170 70 50 70 120 40
-plant3
-3 26 0 48 1 1 25 15 50 60
-plant4
-3 45 4 1 45 1 20 45 20 60
-Snowman
-1 38 283 119 14 1 38 21 124 216
-2
-holly
-4
-holly2
-4
-100
-3 99999999 100 300
+sky = 9, 14, 45
+border = 141, 151, 213
+water-top = $54, $5C, $9D
+water-bottom = $34, $3C, $7D
+water-opacity = $80
+music = snow.ogg
+clouds = 9
+object = reindeer, 1, 90, 232, 94, 12, 2, 55, 60, 90, 73, 80, 134, 105, 64
+object = tree, 1, 238, 706, 36, 9, 2, 122, 355, 208, 293, 164, 168, 82, 154
+object = plant2, 3, 0, 85, 25, 25, 2, 0, 0, 170, 70, 50, 70, 120, 40
+object = plant3, 3, 26, 0, 48, 1, 1, 25, 15, 50, 60
+object = plant4, 3, 45, 4, 1, 45, 1, 20, 45, 20, 60
+object = Snowman, 1, 38, 283, 119, 14, 1, 38, 21, 124, 216
+spray = holly, 4
+spray = holly2, 4
+flakes = 100, 3, 99999999, 100, 300
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/City/theme.cfg
--- a/share/hedgewars/Data/Themes/City/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/City/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -1,19 +1,12 @@
-21 20 38
-128 0 0
-$54 $5C $9D
-$34 $3C $7D
-$80
-City.ogg
-45
-4
-plant1
-3 200 344 54 2 1 0 0 160 215
-plant2
-3 32 165 65 2 1 0 0 163 140
-plant3
-3 45 0 14 1 1 23 9 54 57
-plant4
-3 99 8 1 38 1 42 7 42 103
-0
-1500
-0 0 0 2000
+sky = 21, 20, 38
+border = 128, 0, 0
+water-top = $54, $5C, $9D
+water-bottom = $34, $3C, $7D
+water-opacity = $80
+music = City.ogg
+clouds = 45
+object = plant1, 3, 200, 344, 54, 2, 1, 0, 0, 160, 215
+object = plant2, 3, 32, 165, 65, 2, 1, 0, 0, 163, 140
+object = plant3, 3, 45, 0, 14, 1, 1, 23, 9, 54, 57
+object = plant4, 3, 99, 8, 1, 38, 1, 42, 7, 42, 103
+flakes = 1500, 0, 0, 0, 2000
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Compost/theme.cfg
--- a/share/hedgewars/Data/Themes/Compost/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Compost/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -1,34 +1,20 @@
-92 151 253
-52 38 23
-$41 $23 $12
-$33 $21 $9 $FF
-Compost.ogg
-16
-8
-Eggshell1
-3 48 92 78 37 1 0 0 125 47
-Eggshell2
-3 40 65 80 50 1 0 0 120 50
-Onion1
-3 0 65 90 30 1 0 0 75 50
-Onion2
-3 35 80 75 40 2 0 0 30 50 0 36 30 50
-Cucumber1
-3 0 100 75 40 1 80 0 89 95
-Cucumber2
-3 0 70 125 45 1 0 0 70 55
-Carrot1
-3 65 0 40 30 1 0 100 100 100
-Carrot2
-3 0 30 40 35 1 80 65 100 100
-4
-Cucumber3
-1
-Cucumber4
-1
-Carrot3
-1
-Carrot4
-1
-100
-1 130 0 5
+sky = 92, 151, 253
+border = 52, 38, 23
+water-top = $41, $23, $12
+water-bottom = $33, $21, $9
+water-opacity = $FF
+music = Compost.ogg
+clouds = 16
+object = Eggshell1, 3, 48, 92, 78, 37, 1, 0, 0, 125, 47
+object = Eggshell2, 3, 40, 65, 80, 50, 1, 0, 0, 120, 50
+object = Onion1, 3, 0, 65, 90, 30, 1, 0, 0, 75, 50
+object = Onion2, 3, 35, 80, 75, 40, 2, 0, 0, 30, 50, 0, 36, 30, 50
+object = Cucumber1, 3, 0, 100, 75, 40, 1, 80, 0, 89, 95
+object = Cucumber2, 3, 0, 70, 125, 45, 1, 0, 0, 70, 55
+object = Carrot1, 3, 65, 0, 40, 30, 1, 0, 100, 100, 100
+object = Carrot2, 3, 0, 30, 40, 35, 1, 80, 65, 100, 100
+spray = Cucumber3, 1
+spray = Cucumber4, 1
+spray = Carrot3, 1
+spray = Carrot4, 1
+flakes = 100, 1, 130, 0, 5
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/CrazyMission/theme.cfg
--- a/share/hedgewars/Data/Themes/CrazyMission/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/CrazyMission/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -1,9 +1,7 @@
-20 23 24
-20 23 24
-21 57 76
-21 57 76 $80
-snow.ogg
-4
-0
-0
-0
\ No newline at end of file
+sky = 20, 23, 24
+border = 20, 23, 24
+water-top = 21, 57, 76
+water-bottom = 21, 57, 76
+water-opacity = $80
+music = snow.ogg
+clouds = 4
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Deepspace/theme.cfg
--- a/share/hedgewars/Data/Themes/Deepspace/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Deepspace/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -1,9 +1,9 @@
-0 0 0
-175 177 75
-$2B $2B $2B
-$2A $2A $2A $CC
-hell.ogg
-9
-0
-0
-50
+sky = 0, 0, 0
+border = 175, 177, 75
+water-top = $2B, $2B, $2B
+water-bottom = $2A, $2A, $2A
+water-opacity = $CC
+music = hell.ogg
+clouds = 9
+flakes = 50, 1, 1000, 50, 50
+;1, 1000, 50, 50 are copied from bamboo theme, as these numbers are required
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Desert/theme.cfg
--- a/share/hedgewars/Data/Themes/Desert/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Desert/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -1,26 +1,15 @@
-116 239 255
-242 230 124
-$3E $7B $94
-$35 $69 $85 $80
-Desert.ogg
-9
-7
-sand
-4 9 3 4 4 2 1 1 7 27 9 31 5 6
-sandR
-4 4 3 4 4 2 9 1 7 27 3 31 5 6
-buzzard
-1 17 318 4 21 1 51 91 289 241
-cobra
-1 65 230 57 4 1 28 0 206 202
-cactus
-3 27 440 73 10 1 0 0 258 384
-rock1
-2 75 108 73 12 1 0 0 173 99
-rock2
-5 7 18 10 1 1 0 0 24 12
-1
-cowskull
-2
-0
-1 9999 50 10
+sky = 116, 239, 255
+border = 242, 230, 124
+water-top = $3E, $7B, $94
+water-bottom = $35, $69, $85
+water-opacity = $80
+music = Desert.ogg
+clouds = 9
+object = sand, 4, 9, 3, 4, 4, 2, 1, 1, 7, 27, 9, 31, 5, 6
+object = sandR, 4, 4, 3, 4, 4, 2, 9, 1, 7, 27, 3, 31, 5, 6
+object = buzzard, 1, 17, 318, 4, 21, 1, 51, 91, 289, 241
+object = cobra, 1, 65, 230, 57, 4, 1, 28, 0, 206, 202
+object = cactus, 3, 27, 440, 73, 10, 1, 0, 0, 258, 384
+object = rock1, 2, 75, 108, 73, 12, 1, 0, 0, 173, 99
+object = rock2, 5, 7, 18, 10, 1, 1, 0, 0, 24, 12
+spray = cowskull, 2
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/EarthRise/theme.cfg
--- a/share/hedgewars/Data/Themes/EarthRise/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/EarthRise/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -1,14 +1,10 @@
-0 0 0
-106 106 106
-$54 $5C $9D
-$34 $3C $7D $80
-EarthRise.ogg
-0
-2
-Rock
-3 65 258 175 2 1 0 0 240 215
-RockShort
-3 0 165 163 2 1 0 0 163 140
-0
-20
-1 0 20 0
+sky = 0, 0, 0
+border = 106, 106, 106
+water-top = $54, $5C, $9D
+water-bottom = $34, $3C, $7D
+water-opacity = $80
+music = EarthRise.ogg
+clouds = 0
+object = Rock, 3, 65, 258, 175, 2, 1, 0, 0, 240, 215
+object = RockShort, 3, 0, 165, 163, 2, 1, 0, 0, 163, 140
+flakes = 20, 1, 0, 20, 0
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Eyes/theme.cfg
--- a/share/hedgewars/Data/Themes/Eyes/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Eyes/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -1,9 +1,9 @@
-0 0 0
-175 177 75
-$2B $2B $2B
-$2A $2A $2A $CC
-hell.ogg
-9
-0
-0
-50
+sky = 0, 0, 0
+border = 175, 177, 75
+water-top = $2B, $2B, $2B
+water-bottom = $2A, $2A, $2A
+water-opacity = $CC
+music = hell.ogg
+clouds = 9
+flakes = 50, 1, 1000, 50, 50
+;1, 1000, 50, 50 are copied from bamboo theme, as these numbers are required
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Freeway/theme.cfg
--- a/share/hedgewars/Data/Themes/Freeway/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Freeway/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -1,22 +1,14 @@
-99 51 43
-70 58 55
-$54 $5C $9D
-$34 $3C $7D $80
-Freeway.ogg
-9
-2
-Tire
-3 83 215 92 35 1 0 0 250 190
-AppleSmall
-3 40 0 25 1 1 0 35 100 65
-4
-TireDirt
-2
-AppleDirt
-5
-FishDirt
-4
-BottleDirt
-4
-200
-1 0 0 0
+sky = 99, 51, 43
+border = 70, 58, 55
+water-top = $54, $5C, $9D
+water-bottom = $34, $3C, $7D
+water-opacity = $80
+music = Freeway.ogg
+clouds = 9
+object = Tire, 3, 83, 215, 92, 35, 1, 0, 0, 250, 190
+object = AppleSmall, 3, 40, 0, 25, 1, 1, 0, 35, 100, 65
+spray = TireDirt, 2
+spray = AppleDirt, 5
+spray = FishDirt, 4
+spray = BottleDirt, 4
+flakes = 200, 1, 0, 0, 0
diff -r f2d966c68289 -r 7036abbaf3bb share/hedgewars/Data/Themes/Halloween/theme.cfg
--- a/share/hedgewars/Data/Themes/Halloween/theme.cfg	Thu Dec 30 20:10:26 2010 +0100
+++ b/share/hedgewars/Data/Themes/Halloween/theme.cfg	Thu Dec 30 20:55:22 2010 +0100
@@ -1,14 +1,10 @@
-16 3 8
-116 0 100
-37 91 31
-44 84 40 $80
-Halloween.ogg
-9
-2
-Rock
-3 65 258 175 2 1 0 0 240 215
-RockShort
-3 0 165 163 2 1 0 0 163 140
-0
-20
-7 130 0 5
+sky = 16, 3, 8
+border = 116, 0, 100
+water-top = 37, 91, 31
+water-bottom = 44, 84, 40
+water-opacity = $80
+music = Halloween.ogg
+clouds = 9
+object = Rock, 3, 65, 258, 175, 2, 1, 0, 0, 240, 215
+object = RockShort, 3, 0, 165, 163, 2, 1, 0, 0, 163, 140
+flakes = 20, 7, 130, 0, 5