[Wesnoth-cvs-commits] wesnoth/data terrain.cfg terrain-graphics.cfg s...

[Susanna Björverud]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Susanna Björverud <address@hidden>      04/11/18 13:07:35

Modified files:
        data           : terrain.cfg terrain-graphics.cfg 
        data/scenarios/multiplayer: Random_Scenario.cfg 
                                    Random_Scenario_Desert.cfg 
                                    Random_Scenario_Marsh.cfg 
                                    Random_Scenario_Winter.cfg 

Log message:
        Added four new village terrains, with place-holder graphics, for 
villages in mountains, hills, snow-hills and desert.
        Made the Random Scenarios use these new terrains.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain.cfg.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain-graphics.cfg.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/multiplayer/Random_Scenario.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/multiplayer/Random_Scenario_Desert.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/multiplayer/Random_Scenario.cfg
diff -u wesnoth/data/scenarios/multiplayer/Random_Scenario.cfg:1.5 
wesnoth/data/scenarios/multiplayer/Random_Scenario.cfg:1.6
--- wesnoth/data/scenarios/multiplayer/Random_Scenario.cfg:1.5  Sun Oct 17 
09:55:52 2004
+++ wesnoth/data/scenarios/multiplayer/Random_Scenario.cfg      Thu Nov 18 
13:07:35 2004
@@ -188,7 +188,7 @@
        [/village]
        [village]
        terrain=d
-       convert_to=v
+       convert_to=B
        rating=2
        adjacent_liked=gccc|/\RRrrtvhf
        [/village]
@@ -202,13 +202,13 @@
        [/village]
        [village]
        terrain=h
-       convert_to=v
+       convert_to=a
        rating=4
        adjacent_liked=gccc|/\RRrrtvhf
        [/village]
        [village]
        terrain=m
-       convert_to=v
+       convert_to=b
        rating=3
        adjacent_liked=gccc|/\RRrrtvhf
        [/village]
Index: wesnoth/data/scenarios/multiplayer/Random_Scenario_Desert.cfg
diff -u wesnoth/data/scenarios/multiplayer/Random_Scenario_Desert.cfg:1.3 
wesnoth/data/scenarios/multiplayer/Random_Scenario_Desert.cfg:1.4
--- wesnoth/data/scenarios/multiplayer/Random_Scenario_Desert.cfg:1.3   Fri Oct 
29 21:54:56 2004
+++ wesnoth/data/scenarios/multiplayer/Random_Scenario_Desert.cfg       Thu Nov 
18 13:07:35 2004
@@ -154,9 +154,10 @@
                rating=8
                [/village]
                
+               #villages in desert
                [village]
                terrain=d
-               convert_to=v
+               convert_to=B
                rating=5
                adjacent_liked=dgccc|/\RRrrtvhf
                [/village]
@@ -169,16 +170,18 @@
                adjacent_liked=gccc|/\RRrrtvhfff
                [/village]
                
+               #villages in hills
                [village]
                terrain=h
-               convert_to=v
+               convert_to=a
                rating=4
                adjacent_liked=gccc|/\RRrrtvhf
                [/village]
                
+               #villages in mountains 
                [village]
                terrain=m
-               convert_to=v
+               convert_to=b
                rating=3
                adjacent_liked=gccc|/\RRrrtvhf
                [/village]
Index: wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg
diff -u wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:1.3 
wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:1.4
--- wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:1.3    Fri Oct 
29 21:54:56 2004
+++ wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg        Thu Nov 
18 13:07:35 2004
@@ -163,7 +163,7 @@
                
                [village]
                terrain=d
-               convert_to=v
+               convert_to=B
                rating=2
                adjacent_liked=gccc|/\RRrrtvhf
                [/village]
@@ -178,14 +178,14 @@
                
                [village]
                terrain=h
-               convert_to=v
+               convert_to=a
                rating=4
                adjacent_liked=gccc|/\RRrrtvhf
                [/village]
                
                [village]
                terrain=m
-               convert_to=v
+               convert_to=b
                rating=3
                adjacent_liked=gccc|/\RRrrtvhf
                [/village]
Index: wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg
diff -u wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg:1.4 
wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg:1.5
--- wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg:1.4   Fri Oct 
29 21:54:56 2004
+++ wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg       Thu Nov 
18 13:07:35 2004
@@ -194,21 +194,21 @@
                        
                [village]
                        terrain=h
-                       convert_to=v
+                       convert_to=a
                        rating=4
                        adjacent_liked=gccc|/\RRrrtvhf
                [/village]
                        
                [village]
                        terrain=H
-                       convert_to=V
+                       convert_to=A
                        rating=4
                        adjacent_liked=gccc|/\RRrrtvHf
                [/village]
                        
                [village]
                        terrain=m
-                       convert_to=v
+                       convert_to=b
                        rating=3
                        adjacent_liked=gccc|/\RRrrtvhf
                [/village]
Index: wesnoth/data/terrain-graphics.cfg
diff -u wesnoth/data/terrain-graphics.cfg:1.47 
wesnoth/data/terrain-graphics.cfg:1.48
--- wesnoth/data/terrain-graphics.cfg:1.47      Sun Oct 31 21:37:27 2004
+++ wesnoth/data/terrain-graphics.cfg   Thu Nov 18 13:07:34 2004
@@ -98,6 +98,10 @@
 {TERRAIN_BASE v grassland-r1}
 {TERRAIN_BASE D cave-floor1}
 {TERRAIN_BASE t grassland-r1}
+{TERRAIN_BASE a hills}
+{TERRAIN_BASE A snow-hills}
+{TERRAIN_BASE b mountains}
+{TERRAIN_BASE B desert}
 
 {BUILDING Y ({VIMG       36,40 village-swampwater })}
 {BUILDING V ({VIMG       36,40 village-snow       })}
@@ -105,6 +109,12 @@
 {BUILDING v ({VIMG       36,40 village-human      })}
 {BUILDING D ({VIMG       36,40 dwarven-village    })}
 {BUILDING t ({VIMG_NIGHT 36,40 village 
village-dusk,village-dusk2,village-dusk3,village-dusk4})} 
+#temporary until graphics emerge
+{BUILDING a ({VIMG       36,40 village-human      })}
+{BUILDING A ({VIMG       36,40 village-snow     })}
+{BUILDING b ({VIMG       36,40 village-human      })}
+{BUILDING B ({VIMG       36,40 village-human      })}
+
 
 #
 # Transition between terrains
Index: wesnoth/data/terrain.cfg
diff -u wesnoth/data/terrain.cfg:1.49 wesnoth/data/terrain.cfg:1.50
--- wesnoth/data/terrain.cfg:1.49       Tue Oct 26 19:03:55 2004
+++ wesnoth/data/terrain.cfg    Thu Nov 18 13:07:34 2004
@@ -152,6 +152,53 @@
 gives_income=true
 [/terrain]
 
+#temporary symbol_image until a hill/mountain village graphic emerges
+[terrain]
+symbol_image=village-human
+id=hill village
+name= _ "Village"
+char=a
+aliasof=th
+heals=true
+gives_income=true
+[/terrain]
+
+#temporary symbol_image until a hill/mountain village graphic emerges
+[terrain]
+symbol_image=village-snow
+id=snow-hill village
+name= _ "Village"
+char=A
+light=true
+aliasof=th
+heals=true
+gives_income=true
+light=true
+[/terrain]
+
+#temporary symbol_image until a hill/mountain village graphic emerges
+[terrain]
+symbol_image=village-human
+id=mountain village
+name= _ "Village"
+char=b
+aliasof=tm
+heals=true
+gives_income=true
+[/terrain]
+
+#temporary symbol_image until a desert village graphic emerges
+[terrain]
+symbol_image=village-human
+id=desert village
+name= _ "Village"
+char=B
+aliasof=td
+heals=true
+gives_income=true
+light=true
+[/terrain]
+
 [terrain]
 symbol_image=snow
 id=tundra