mail[Wesnoth-commits] r44089 - in /trunk/data/core: images/terrain/bridge/ terrain-graphics/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by jeremy . rosen on July 10, 2010 - 18:59:
Author: boucman
Date: Sat Jul 10 18:59:31 2010
New Revision: 44089

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44089&view=rev
Log:
make single tile bridgs work, namining convention is base-ns.png 
base-nesw.png and base-senw.png depending on the underlying terrain type

Added:
    trunk/data/core/images/terrain/bridge/stone-test-senw.png
      - copied unchanged from r44086, 
trunk/data/core/images/terrain/bridge/stone-test.png
Removed:
    trunk/data/core/images/terrain/bridge/stone-test.png
Modified:
    trunk/data/core/terrain-graphics/internal-complex-tracks.cfg
    trunk/data/core/terrain-graphics/internal-tracks.cfg
    trunk/data/core/terrain-graphics/tracks.cfg

Removed: trunk/data/core/images/terrain/bridge/stone-test.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/bridge/stone-test.png?rev=44088&view=auto
==============================================================================
Binary file - no diff available.

Modified: trunk/data/core/terrain-graphics/internal-complex-tracks.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/internal-complex-tracks.cfg?rev=44089&r1=44088&r2=44089&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/internal-complex-tracks.cfg (original)
+++ trunk/data/core/terrain-graphics/internal-complex-tracks.cfg Sat Jul 10 
18:59:31 2010
@@ -87,18 +87,18 @@
 {TRACK_ANGLE_CCW_PLF {TERRAINLIST} {ADJACENT1} {ADJACENT2} 100 {LAYER} 
{FLAG} {IMAGESTEM}}
 #enddef
 
-#define TRACK_ALONE_RANDOM_LF TERRAINLIST LAYER FLAG IMAGESTEM R0 R1 R2 R3 
R4 R5 S0 S1 S2 S3 S4 S5
-{TRACK_ALONE_PLF ({TERRAINLIST})  9  {LAYER} {FLAG} {IMAGESTEM}11 {R0} {R1} 
{R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 10  {LAYER} {FLAG} {IMAGESTEM}10 {R0} {R1} 
{R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 11  {LAYER} {FLAG} {IMAGESTEM}9  {R0} {R1} 
{R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 12  {LAYER} {FLAG} {IMAGESTEM}8  {R0} {R1} 
{R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 14  {LAYER} {FLAG} {IMAGESTEM}7  {R0} {R1} 
{R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 16  {LAYER} {FLAG} {IMAGESTEM}6  {R0} {R1} 
{R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 20  {LAYER} {FLAG} {IMAGESTEM}5  {R0} {R1} 
{R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 25  {LAYER} {FLAG} {IMAGESTEM}4  {R0} {R1} 
{R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 33  {LAYER} {FLAG} {IMAGESTEM}3  {R0} {R1} 
{R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 50  {LAYER} {FLAG} {IMAGESTEM}2  {R0} {R1} 
{R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 100 {LAYER} {FLAG} {IMAGESTEM}   {R0} {R1} 
{R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
+#define TRACK_ALONE_RANDOM_LF TERRAINLIST LAYER FLAG IMAGESTEM SUFFIX R0 R1 
R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
+{TRACK_ALONE_PLF ({TERRAINLIST})  9  {LAYER} {FLAG} {IMAGESTEM}11 {SUFFIX} 
{R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
+{TRACK_ALONE_PLF ({TERRAINLIST}) 10  {LAYER} {FLAG} {IMAGESTEM}10 {SUFFIX} 
{R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
+{TRACK_ALONE_PLF ({TERRAINLIST}) 11  {LAYER} {FLAG} {IMAGESTEM}9  {SUFFIX} 
{R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
+{TRACK_ALONE_PLF ({TERRAINLIST}) 12  {LAYER} {FLAG} {IMAGESTEM}8  {SUFFIX} 
{R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
+{TRACK_ALONE_PLF ({TERRAINLIST}) 14  {LAYER} {FLAG} {IMAGESTEM}7  {SUFFIX} 
{R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
+{TRACK_ALONE_PLF ({TERRAINLIST}) 16  {LAYER} {FLAG} {IMAGESTEM}6  {SUFFIX} 
{R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
+{TRACK_ALONE_PLF ({TERRAINLIST}) 20  {LAYER} {FLAG} {IMAGESTEM}5  {SUFFIX} 
{R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
+{TRACK_ALONE_PLF ({TERRAINLIST}) 25  {LAYER} {FLAG} {IMAGESTEM}4  {SUFFIX} 
{R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
+{TRACK_ALONE_PLF ({TERRAINLIST}) 33  {LAYER} {FLAG} {IMAGESTEM}3  {SUFFIX} 
{R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
+{TRACK_ALONE_PLF ({TERRAINLIST}) 50  {LAYER} {FLAG} {IMAGESTEM}2  {SUFFIX} 
{R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
+{TRACK_ALONE_PLF ({TERRAINLIST}) 100 {LAYER} {FLAG} {IMAGESTEM}   {SUFFIX} 
{R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
 #enddef
 
 

Modified: trunk/data/core/terrain-graphics/internal-tracks.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/internal-tracks.cfg?rev=44089&r1=44088&r2=44089&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/internal-tracks.cfg (original)
+++ trunk/data/core/terrain-graphics/internal-tracks.cfg Sat Jul 10 18:59:31 
2010
@@ -128,7 +128,7 @@
 #enddef
 
 #mark the bridges that are alone
-#define TRACK_ALONE_PLF TERRAINLIST PROB LAYER FLAG IMAGESTEM R0 R1 R2 R3 R4 
R5 S0 S1 S2 S3 S4 S5
+#define TRACK_ALONE_PLF TERRAINLIST PROB LAYER FLAG IMAGESTEM SUFFIX R0 R1 
R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
     [terrain_graphics]
         map="
 ,  *
@@ -141,10 +141,10 @@
            pos=1
             type={TERRAINLIST}
            no_flag={FLAG},{FLAG}-connect-{R0},{FLAG}-connect-{R3}
-            set_flag={FLAG}
-        [/tile]
-        probability={PROB}
-        {IMAGEC_LN {LAYER}  {IMAGESTEM} ()}
+            set_flag={FLAG},{FLAG}-connect-{R0},{FLAG}-connect-{R3}
+        [/tile]
+        probability={PROB}
+        {IMAGEC_LN {LAYER}  {IMAGESTEM} {SUFFIX}}
     [/terrain_graphics]
 #enddef
 

Modified: trunk/data/core/terrain-graphics/tracks.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/tracks.cfg?rev=44089&r1=44088&r2=44089&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/tracks.cfg (original)
+++ trunk/data/core/terrain-graphics/tracks.cfg Sat Jul 10 18:59:31 2010
@@ -36,12 +36,12 @@
     {TRACK_CORNER_RANDOM_LF {SE_NW_VALUE} {N_S_VALUE}   {LAYER} {FLAG} 
{IMAGESTEM} -n-se  se n  s  nw ne sw 3 2 * * * *}
 
     # Mark lonely tiles
-    {TRACK_ALONE_RANDOM_LF {N_S_VALUE}   -80 {FLAG} {IMAGESTEM} n ne se s sw 
nw * 2 * * * *}
-    {TRACK_ALONE_RANDOM_LF {NE_SW_VALUE} -80 {FLAG} {IMAGESTEM} ne se s sw 
nw n * * 2 * * *}
-    {TRACK_ALONE_RANDOM_LF {SE_NW_VALUE} -80 {FLAG} {IMAGESTEM} se s sw nw n 
ne * * * 2 * *}
-    {TRACK_ALONE_RANDOM_LF {N_S_VALUE}   -80 {FLAG} {IMAGESTEM} s sw nw n ne 
se * * * * 2 *}
-    {TRACK_ALONE_RANDOM_LF {NE_SW_VALUE} -80 {FLAG} {IMAGESTEM} sw nw n ne 
se s * * * * * 2}
-    {TRACK_ALONE_RANDOM_LF {SE_NW_VALUE} -80 {FLAG} {IMAGESTEM} nw n ne se s 
sw 2 * * * * *}
+    {TRACK_ALONE_RANDOM_LF {N_S_VALUE}   -80 {FLAG} {IMAGESTEM} -ns n ne se 
s sw nw * 2 * * * *}
+    {TRACK_ALONE_RANDOM_LF {NE_SW_VALUE} -80 {FLAG} {IMAGESTEM} -nesw ne se 
s sw nw n * * 2 * * *}
+    {TRACK_ALONE_RANDOM_LF {SE_NW_VALUE} -80 {FLAG} {IMAGESTEM} -senw se s 
sw nw n ne * * * 2 * *}
+    {TRACK_ALONE_RANDOM_LF {N_S_VALUE}   -80 {FLAG} {IMAGESTEM} -ns s sw nw 
n ne se * * * * 2 *}
+    {TRACK_ALONE_RANDOM_LF {NE_SW_VALUE} -80 {FLAG} {IMAGESTEM} -nesw sw nw 
n ne se s * * * * * 2}
+    {TRACK_ALONE_RANDOM_LF {SE_NW_VALUE} -80 {FLAG} {IMAGESTEM} -senw nw n 
ne se s sw 2 * * * * *}
 
     # At this point, we mark "dead end bridges"
     {TRACK_DEADEND_RANDOM_LF {N_S_VALUE}   -80 {FLAG} {IMAGESTEM} n ne se s 
sw nw * 2 * * * *}




Related Messages


Powered by MHonArc, Updated Sat Jul 10 19:40:08 2010