[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth data/terrain-graphics/canyon.cfg data/t...
|
From: |
James Spencer |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth data/terrain-graphics/canyon.cfg data/t... |
|
Date: |
Fri, 25 Mar 2005 10:11:41 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: James Spencer <address@hidden> 05/03/25 15:11:41
Modified files:
data/terrain-graphics: canyon.cfg
data : terrain.cfg terrain-graphics.cfg
images/terrain : canyon-all.png canyon-ne.png canyon-ne-se.png
canyon-ne-s.png canyon-ne-sw.png
canyon-n-ne.png canyon-n-ne-s.png canyon-n.png
canyon-n-se.png canyon-n-s.png canyon-nw-ne.png
canyon-nw-n-ne.png canyon-nw-n.png
canyon-nw-n-s.png canyon-nw.png canyon.png
canyon-se-nw.png canyon-se.png
canyon-se-s-n.png canyon-se-s.png
canyon-se-s-sw-n.png canyon-se-s-sw.png
canyon-se-sw.png canyon-s-nw.png canyon-s.png
canyon-s-sw-n.png canyon-s-sw.png
canyon-sw-n.png canyon-sw-nw.png canyon-sw.png
ford.png lava.png
Added files:
images/terrain : lava2.png ford2.png
Log message:
Canyon fix (Credit Turin 90% of the work on the png cleanups), Ford
Update (Scott & Shadow- I'm not sure if it's an improvement), Lava as 'l'. I'll
be back after string freeze but before release to improve / fix / revert if
needed.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain-graphics/canyon.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain.cfg.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain-graphics.cfg.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/lava2.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/ford2.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-all.png.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-ne.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-ne-se.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-ne-s.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-ne-sw.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-n-ne.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-n-ne-s.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-n.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-n-se.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-n-s.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-nw-ne.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-nw-n-ne.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-nw-n.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-nw-n-s.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-nw.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon.png.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-se-nw.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-se.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-se-s-n.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-se-s.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-se-s-sw-n.png.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-se-s-sw.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-se-sw.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-s-nw.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-s.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-s-sw-n.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-s-sw.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-sw-n.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-sw-nw.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/canyon-sw.png.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/ford.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/terrain/lava.png.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: wesnoth/data/terrain-graphics.cfg
diff -u wesnoth/data/terrain-graphics.cfg:1.58
wesnoth/data/terrain-graphics.cfg:1.59
--- wesnoth/data/terrain-graphics.cfg:1.58 Tue Mar 22 06:54:30 2005
+++ wesnoth/data/terrain-graphics.cfg Fri Mar 25 15:11:41 2005
@@ -128,9 +128,13 @@
{TERRAIN_BASE GT savanna}
{TERRAIN_BASE E desert-road}
{TERRAIN_BASE P desert-oasis}
+#set them to 33 for some irregulrity
+{TERRAIN_BASE_PROB k ford2 33}
{TERRAIN_BASE k ford}
+{TERRAIN_BASE_PROB l lava2 33}
+{TERRAIN_BASE l lava}
-
+{TERRAIN_BASE X grassland-r1}
{CANYON X canyon}
#added ruins
{BRIDGE \ | / cs CKfFNQq bridge}
@@ -433,30 +437,33 @@
{TERRAIN_ADJACENT -180 HA !HA snow-hills}
{TERRAIN_ADJACENT -181 J !J desert-hills}
{TERRAIN_ADJACENT -182 ha !ha hills}
-{TERRAIN_ADJACENT -183 uD !uD cave-floor}
-{TERRAIN_ADJACENT -184 SVF !SVF snow}
-{TERRAIN_ADJACENT -185 i !i ice}
-{TERRAIN_ADJACENT -186 TG cZp\|/ savanna-to-water}
-{TERRAIN_ADJACENT -187 TG s savanna-to-water}
-{TERRAIN_ADJACENT -188 ftgvX kcZp\|/ grassland-to-water}
-{TERRAIN_ADJACENT -189 ftgvX s grassland-to-water}
-#{TERRAIN_ADJACENT -190 ftgvX cZp\|/s cliff}
-{TERRAIN_ADJACENT -190 GT !GT savanna}
-{TERRAIN_ADJACENT -191 ftgvX !ftgvX grassland}
-{TERRAIN_ADJACENT -192 PIB !PIB desert-oasis}
-{TERRAIN_ADJACENT -193 IBPU !IBPU desert}
-{TERRAIN_ADJACENT -194 d !d sand}
-{TERRAIN_ADJACENT -195 r !r dirt}
-{TERRAIN_ADJACENT -196 E !E desert-road}
-{TERRAIN_ADJACENT -197 R !R road}
+{TERRAIN_ADJACENT -183 l !l lava}
+{TERRAIN_ADJACENT -184 uD !uD cave-floor}
+{TERRAIN_ADJACENT -185 SVF !SVF snow}
+{TERRAIN_ADJACENT -186 i !i ice}
+{TERRAIN_ADJACENT -187 TG ks savanna-to-water}
+{TERRAIN_ADJACENT -188 TG cZp\|/ savanna-to-water}
+{TERRAIN_ADJACENT -189 TG s savanna-to-water}
+{TERRAIN_ADJACENT -190 ftgvX ks grassland-to-water}
+{TERRAIN_ADJACENT -191 ftgvX cZp\|/ grassland-to-water}
+{TERRAIN_ADJACENT -192 ftgvX s grassland-to-water}
+#{TERRAIN_ADJACENT -193 ftgvX cZp\|/s cliff}
+{TERRAIN_ADJACENT -193 GT !GT savanna}
+{TERRAIN_ADJACENT -194 ftgvX !ftgvX grassland}
+{TERRAIN_ADJACENT -195 PIB !PIB desert-oasis}
+{TERRAIN_ADJACENT -196 IBPU !IBPU desert}
+{TERRAIN_ADJACENT -197 d !d sand}
+{TERRAIN_ADJACENT -198 r !r dirt}
+{TERRAIN_ADJACENT -199 E !E desert-road}
+{TERRAIN_ADJACENT -200 R !R road}
#addedruins
-{TERRAIN_ADJACENT -198 Ywq !Ywq swampwater}
-{TERRAIN_ADJACENT -199 cZp\|/ !cZp\|/ coast}
-{TERRAIN_ADJACENT -200 s !s ocean}
-{TERRAIN_ADJACENT -201 k !k ford}
-{TERRAIN_ADJACENT -202 Q N sunken-ruin}
-{TERRAIN_ADJACENT -203 Q !QN coast}
-{TERRAIN_ADJACENT -204 !N N grassland}
+{TERRAIN_ADJACENT -201 Ywq !Ywq swampwater}
+{TERRAIN_ADJACENT -202 cZp\|/ !cZp\|/ coast}
+{TERRAIN_ADJACENT -203 s !s ocean}
+{TERRAIN_ADJACENT -204 k !k ford}
+{TERRAIN_ADJACENT -205 Q N sunken-ruin}
+{TERRAIN_ADJACENT -206 Q !QN coast}
+{TERRAIN_ADJACENT -207 !N N grassland}
{TERRAIN_BASE_DEFAULT void}
Index: wesnoth/data/terrain-graphics/canyon.cfg
diff -u wesnoth/data/terrain-graphics/canyon.cfg:1.2
wesnoth/data/terrain-graphics/canyon.cfg:1.3
--- wesnoth/data/terrain-graphics/canyon.cfg:1.2 Sun Aug 22 12:21:07 2004
+++ wesnoth/data/terrain-graphics/canyon.cfg Fri Mar 25 15:11:40 2005
@@ -89,8 +89,8 @@
layer=-1000
name={IMAGE}-all
[/image]
- no_flag="base"
- set_flag="base"
+ no_flag="overlay"
+ set_flag="overlay"
[/tile]
# rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
@@ -118,8 +118,8 @@
layer=-1000
address@hidden@address@hidden@address@hidden
[/image]
- no_flag=base
- set_flag=base,address@hidden
+ no_flag=overlay
+ set_flag=overlay,address@hidden
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
@@ -146,8 +146,8 @@
layer=-1000
address@hidden@address@hidden@R3
[/image]
- no_flag=base
- set_flag=base,address@hidden,address@hidden
+ no_flag=overlay
+ set_flag=overlay,address@hidden,address@hidden
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
@@ -174,8 +174,8 @@
layer=-1000
address@hidden@address@hidden@R4
[/image]
- no_flag=base
- set_flag=base,address@hidden,address@hidden
+ no_flag=overlay
+ set_flag=overlay,address@hidden,address@hidden
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
@@ -201,8 +201,8 @@
layer=-1000
address@hidden@address@hidden
[/image]
- no_flag=base
- set_flag=base,address@hidden,address@hidden,address@hidden
+ no_flag=overlay
+ set_flag=overlay,address@hidden,address@hidden,address@hidden
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
@@ -228,8 +228,8 @@
layer=-1000
address@hidden@address@hidden
[/image]
- no_flag="base"
- set_flag=base,address@hidden,address@hidden,address@hidden
+ no_flag="overlay"
+ set_flag=overlay,address@hidden,address@hidden,address@hidden
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
@@ -255,8 +255,8 @@
layer=-1000
address@hidden@address@hidden
[/image]
- no_flag=base
- set_flag=base,address@hidden,address@hidden,address@hidden
+ no_flag=overlay
+ set_flag=overlay,address@hidden,address@hidden,address@hidden
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
@@ -281,8 +281,8 @@
layer=-1000
address@hidden@R1
[/image]
- no_flag="base"
-
set_flag=base,address@hidden,address@hidden,address@hidden,address@hidden
+ no_flag="overlay"
+
set_flag=overlay,address@hidden,address@hidden,address@hidden,address@hidden
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
@@ -307,8 +307,8 @@
layer=-1000
address@hidden@R3
[/image]
- no_flag="base"
-
set_flag=base,address@hidden,address@hidden,address@hidden,address@hidden
+ no_flag="overlay"
+
set_flag=overlay,address@hidden,address@hidden,address@hidden,address@hidden
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
@@ -333,8 +333,8 @@
layer=-1000
address@hidden@R2
[/image]
- no_flag="base"
-
set_flag=base,address@hidden,address@hidden,address@hidden,address@hidden
+ no_flag="overlay"
+
set_flag=overlay,address@hidden,address@hidden,address@hidden,address@hidden
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
@@ -358,8 +358,8 @@
layer=-1000
address@hidden
[/image]
- no_flag="base"
-
set_flag=base,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
+ no_flag="overlay"
+
set_flag=overlay,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
@@ -378,8 +378,8 @@
layer=-1000
name={IMAGE}
[/image]
- no_flag="base"
-
set_flag=base,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
+ no_flag="overlay"
+
set_flag=overlay,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
[/tile]
# rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
Index: wesnoth/data/terrain.cfg
diff -u wesnoth/data/terrain.cfg:1.56 wesnoth/data/terrain.cfg:1.57
--- wesnoth/data/terrain.cfg:1.56 Tue Mar 22 03:55:15 2005
+++ wesnoth/data/terrain.cfg Fri Mar 25 15:11:41 2005
@@ -474,4 +474,12 @@
unit_height_adjust=-4
[/terrain]
+[terrain]
+symbol_image=lava
+id=ford
+name= _ "Lava"
+char=l
+aliasof=X
+[/terrain]
+
Index: wesnoth/images/terrain/canyon-all.png
Index: wesnoth/images/terrain/canyon-n-ne-s.png
Index: wesnoth/images/terrain/canyon-n-ne.png
Index: wesnoth/images/terrain/canyon-n-s.png
Index: wesnoth/images/terrain/canyon-n-se.png
Index: wesnoth/images/terrain/canyon-n.png
Index: wesnoth/images/terrain/canyon-ne-s.png
Index: wesnoth/images/terrain/canyon-ne-se.png
Index: wesnoth/images/terrain/canyon-ne-sw.png
Index: wesnoth/images/terrain/canyon-ne.png
Index: wesnoth/images/terrain/canyon-nw-n-ne.png
Index: wesnoth/images/terrain/canyon-nw-n-s.png
Index: wesnoth/images/terrain/canyon-nw-n.png
Index: wesnoth/images/terrain/canyon-nw-ne.png
Index: wesnoth/images/terrain/canyon-nw.png
Index: wesnoth/images/terrain/canyon-s-nw.png
Index: wesnoth/images/terrain/canyon-s-sw-n.png
Index: wesnoth/images/terrain/canyon-s-sw.png
Index: wesnoth/images/terrain/canyon-s.png
Index: wesnoth/images/terrain/canyon-se-nw.png
Index: wesnoth/images/terrain/canyon-se-s-n.png
Index: wesnoth/images/terrain/canyon-se-s-sw-n.png
Index: wesnoth/images/terrain/canyon-se-s-sw.png
Index: wesnoth/images/terrain/canyon-se-s.png
Index: wesnoth/images/terrain/canyon-se-sw.png
Index: wesnoth/images/terrain/canyon-se.png
Index: wesnoth/images/terrain/canyon-sw-n.png
Index: wesnoth/images/terrain/canyon-sw-nw.png
Index: wesnoth/images/terrain/canyon-sw.png
Index: wesnoth/images/terrain/canyon.png
Index: wesnoth/images/terrain/ford.png
Index: wesnoth/images/terrain/lava.png
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth data/terrain-graphics/canyon.cfg data/t...,
James Spencer <=