wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Hogne Hskjold
Subject: [Wesnoth-cvs-commits] wesnoth data/terrain-graphics.cfg images/terrai...
Date: Mon, 11 Apr 2005 17:21:59 -0400

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Hogne Håskjold <address@hidden> 05/04/11 21:21:59

Modified files:
        data           : terrain-graphics.cfg 
        images/terrain : forest.png forest2.png forest3.png forest4.png 
Added files:
        images/terrain : forest-castle-n.png forest-castle-ne.png 
                         forest-castle-nw.png forest-castle-s.png 
                         forest-castle-se.png forest-castle-sw.png 
                         forest-castle.png forest2_small.png 
                         forest_small.png 

Log message:
        Added new multihex forest

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain-graphics.cfg.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest-castle-n.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest-castle-ne.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest-castle-nw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest-castle-s.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest-castle-se.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest-castle-sw.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest-castle.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest2_small.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest_small.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest.png.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest2.png.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest3.png.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/forest4.png.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: wesnoth/data/terrain-graphics.cfg
diff -u wesnoth/data/terrain-graphics.cfg:1.61 
wesnoth/data/terrain-graphics.cfg:1.62
--- wesnoth/data/terrain-graphics.cfg:1.61      Thu Mar 31 05:37:58 2005
+++ wesnoth/data/terrain-graphics.cfg   Mon Apr 11 21:21:58 2005
@@ -12,6 +12,229 @@
 # Use the following layers:
 # -1000                : terrain base graphics
 
+#-----------------------------------------------------------------
+# Forest<->Castle|Encampment special cases
+#-----------------------------------------------------------------
+#define FORESTADJCASTLEA ID PROB TILE
+[terrain_graphics]
+      map="
+  1
+*   1
+  2
+*   *
+  *"
+
+         [tile]
+                 pos=1
+                 type={ID}
+         [/tile]
+
+         [tile]
+                 pos=2
+                 type=f
+                 no_flag="overlay"
+                 set_flag="overlay"
+         [/tile]
+
+         probability={PROB}
+         rotations=n,ne,se,s,sw,nw
+         
+         [image]
+                 name={TILE}
+                 position=vertical
+                 base=90, 108
+         [/image]
+
+
+[/terrain_graphics]
+#enddef
+
+{FORESTADJCASTLEA Cn 100 forest-castle}
+
+#define FORESTADJCASTLES ID PROB TILE
+[terrain_graphics]
+      map="
+  1
+*   *
+  2
+*   1
+  *"
+
+         [tile]
+                 pos=1
+                 type={ID}
+         [/tile]
+
+         [tile]
+                 pos=2
+                 type=f
+                 no_flag="overlay"
+                 set_flag="overlay"
+         [/tile]
+
+         probability={PROB}
+         rotations=n,ne,se,s,sw,nw
+         
+         [image]
+                 name={TILE}
+                 position=vertical
+                 base=90, 108
+         [/image]
+
+
+[/terrain_graphics]
+#enddef
+
+{FORESTADJCASTLES Cn 100 forest-castle}
+
+#define FORESTADJCASTLEO ID PROB TILE
+[terrain_graphics]
+      map="
+  1
+*   *
+  2
+*   *
+  1"
+
+         [tile]
+                 pos=1
+                 type={ID}
+         [/tile]
+
+         [tile]
+                 pos=2
+                 type=f
+                 no_flag="overlay"
+                 set_flag="overlay"
+         [/tile]
+
+         probability={PROB}
+         rotations=n,ne,se,s,sw,nw
+         
+         [image]
+                 name={TILE}
+                 position=vertical
+                 base=90, 108
+         [/image]
+
+
+[/terrain_graphics]
+#enddef
+
+{FORESTADJCASTLEO Cn 100 forest-castle}
+
+#define FORESTADJCASTLE ID PROB TILE
+[terrain_graphics]
+      map="
+  1
+*   *
+  2
+*   *
+  *"
+
+         [tile]
+                 pos=1
+                 type={ID}
+         [/tile]
+
+         [tile]
+                 pos=2
+                 type=f
+                 no_flag="overlay"
+                 set_flag="overlay"
+         [/tile]
+
+         probability={PROB}
+         rotations=n,ne,se,s,sw,nw
+         
+         [image]
+                 address@hidden
+                 position=vertical
+                 base=90, 108
+         [/image]
+
+
+[/terrain_graphics]
+#enddef
+
+{FORESTADJCASTLE Cnv 100 forest-castle}
+
+#-----------------------------------------------------------------
+# Use a Different forest tile  when next to:
+# Shallow and deep Water, mountain, desert hill & mountain, swamp
+#-----------------------------------------------------------------
+#define FORESTADJ ID PROB TILE
+[terrain_graphics]
+      map="
+  1
+*   *
+  2
+*   *
+  *"
+
+         [tile]
+                 pos=1
+                 type={ID}
+         [/tile]
+
+         [tile]
+                 pos=2
+                 type=f
+                 no_flag="overlay"
+                 set_flag="overlay"
+         [/tile]
+
+         probability={PROB}
+         rotations=n,ne,se,s,sw,nw
+         
+         [image]
+                 name={TILE}
+                 position=vertical
+                 base=90, 108
+         [/image]
+
+
+[/terrain_graphics]
+#enddef
+
+{FORESTADJ csmJMw 33 forest_small}
+{FORESTADJ csmJMw 25 forest3}
+{FORESTADJ csmJMw 10 forest4}
+{FORESTADJ csmJMw 100 forest2_small}
+
+#Macro for Single Hex
+#define SHEX TYPE FLAG PROB TILE
+[terrain_graphics]
+      map="
+  *
+*   *
+  1
+*   *
+  *"
+
+         [tile]
+                 pos=1
+                 type={TYPE}
+                 no_flag={FLAG}
+                 set_flag={FLAG}
+         [/tile]
+
+         probability={PROB}
+
+         [image]
+                 name={TILE}
+                 position=vertical
+                 base=36,108
+         [/image]
+[/terrain_graphics]
+#enddef
+
+#Single hex normal forest tiles
+{SHEX f overlay 33 forest}
+{SHEX f overlay 25 forest3}
+{SHEX f overlay 10 forest4}
+{SHEX f overlay 100 forest2}
+
 #Multi-hex: shadow for desert village
 [terrain_graphics]
       map="
@@ -76,18 +299,18 @@
 {TERRAIN_BASE_PROB            u cave-floor2         10}
 {TERRAIN_BASE                 u cave-floor1}
 {TERRAIN_BASE                 W cavewall}
-{TERRAIN_BASE_PROB_OV         f forest2             10}
-{TERRAIN_BASE_PROB_OV         f forest3             10}
-{TERRAIN_BASE_PROB_OV         f forest4             10}
-{TERRAIN_BASE_PROB_OV         f forest5             10}
-{TERRAIN_BASE_PROB_OV         f forest6             10}
-{TERRAIN_BASE_PROB_OV         f forest7             10}
-{TERRAIN_BASE_PROB_OV         f forest8             10}
-{TERRAIN_BASE_PROB_OV         f forest-stones1      1}
-{TERRAIN_BASE_PROB_OV         f forest-stones2      2}
-{TERRAIN_BASE_PROB_OV         f forest-stones3      1}
-{TERRAIN_BASE_PROB_OV         f forest-stones4      1}
-{TERRAIN_BASE_OV              f forest}
+#{TERRAIN_BASE_PROB_OV         f forest2             10}
+#{TERRAIN_BASE_PROB_OV         f forest3             10}
+#{TERRAIN_BASE_PROB_OV         f forest4             10}
+#{TERRAIN_BASE_PROB_OV         f forest5             10}
+#{TERRAIN_BASE_PROB_OV         f forest6             10}
+#{TERRAIN_BASE_PROB_OV         f forest7             10}
+#{TERRAIN_BASE_PROB_OV         f forest8             10}
+#{TERRAIN_BASE_PROB_OV         f forest-stones1      1}
+#{TERRAIN_BASE_PROB_OV         f forest-stones2      2}
+#{TERRAIN_BASE_PROB_OV         f forest-stones3      1}
+#{TERRAIN_BASE_PROB_OV         f forest-stones4      1}
+#{TERRAIN_BASE_OV              f forest}
 {TERRAIN_BASE_PROB            m mountains-peak1     33}
 {TERRAIN_BASE_PROB            m mountains-peak2     33}
 {TERRAIN_BASE                 m mountains}
@@ -453,7 +676,7 @@
 #added ruins
 {TERRAIN_ADJACENT_VERTICAL             T      !TNQq      tropical-forest}
 {TERRAIN_ADJACENT_VERTICAL             F      !FNQq      snow-forest}
-{TERRAIN_ADJACENT_VERTICAL             f      !fNQq      forest}
+#{TERRAIN_ADJACENT_VERTICAL             f      !fNQq      forest}
 {TERRAIN_ADJACENT          -177        mHhfF  N       grassland}
 {TERRAIN_ADJACENT          -178        M     !M       desert-mountains}
 {TERRAIN_ADJACENT          -179        mb     !mb     mountains}
Index: wesnoth/images/terrain/forest.png
Index: wesnoth/images/terrain/forest2.png
Index: wesnoth/images/terrain/forest3.png
Index: wesnoth/images/terrain/forest4.png




reply via email to

[Prev in Thread] Current Thread [Next in Thread]