Author: alarantalara
Date: Mon Oct 24 05:11:25 2011
New Revision: 51609
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51609&view=rev
Log:
New macro: MOUNTAIN_SINGLE_RANDOM. Allows removal of 6 terrain_graphics rules
Modified:
trunk/changelog
trunk/data/core/terrain-graphics.cfg
trunk/data/core/terrain-graphics/mountains.cfg
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=51609&r1=51608&r2=51609&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Mon Oct 24 05:11:25 2011
@@ -33,6 +33,7 @@
* add function wesnoth.debug
* Terrain:
* Oasis may be placed on any terrain, aliased to base
+ * New terrain macro: MOUNTAIN_SINGLE_RANDOM
* Unit changes and Balancing
* All mounted units now have forest defines capped at 30%. This reduces
their
defense on forested hills from 40% to 30%
Modified: trunk/data/core/terrain-graphics.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics.cfg?rev=51609&r1=51608&r2=51609&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics.cfg (original)
+++ trunk/data/core/terrain-graphics.cfg Mon Oct 24 05:11:25 2011
@@ -148,9 +148,7 @@
{MOUNTAINS_2x2 Mm 40
overlay mountains/basic5}
{MOUNTAINS_2x2 Mm 30
overlay mountains/basic6}
-{MOUNTAIN_SINGLE Mm 33
overlay mountains/basic3}
-{MOUNTAIN_SINGLE Mm 50
overlay mountains/basic2}
-{MOUNTAIN_SINGLE Mm 100
overlay mountains/basic}
+{MOUNTAIN_SINGLE_RANDOM Mm
overlay mountains/basic}
# Dry Mountains
{OVERLAY_RESTRICTED3 Md (!,Xv,!,C*,K*,X*,Ql,Qx*,W*)
mountains/dry-castle-n}
@@ -167,9 +165,7 @@
{MOUNTAINS_2x2 Md 40
overlay mountains/dry5}
{MOUNTAINS_2x2 Md 30
overlay mountains/dry6}
-{MOUNTAIN_SINGLE Md 33
overlay mountains/dry3}
-{MOUNTAIN_SINGLE Md 50
overlay mountains/dry2}
-{MOUNTAIN_SINGLE Md 100
overlay mountains/dry}
+{MOUNTAIN_SINGLE_RANDOM Md
overlay mountains/dry}
# Single-hex volcano
{OVERLAY_COMPLETE Mv (!,Xv,Mv,!,C*,K*,X*,Q*)
mountains/volcano}
@@ -192,9 +188,7 @@
{MOUNTAINS_2x2 Ms 15
overlay mountains/snow5}
{MOUNTAINS_2x2 Ms 25
overlay mountains/snow6}
-{MOUNTAIN_SINGLE Ms 33
overlay mountains/snow3}
-{MOUNTAIN_SINGLE Ms 50
overlay mountains/snow2}
-{MOUNTAIN_SINGLE Ms 100
overlay mountains/snow}
+{MOUNTAIN_SINGLE_RANDOM Ms
overlay mountains/snow}
#This one is to fill any "gaps" there might be when next to castles or walls
{TERRAIN_BASE_RANDOM Mm
hills/regular}
Modified: trunk/data/core/terrain-graphics/mountains.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/mountains.cfg?rev=51609&r1=51608&r2=51609&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/mountains.cfg (original)
+++ trunk/data/core/terrain-graphics/mountains.cfg Mon Oct 24 05:11:25 2011
@@ -220,10 +220,15 @@
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} ()}
base=90,107
center=90,144
- [/image]
-
- probability={PROB}
- [/terrain_graphics]
+ variations=";2;3;4;5;6"
+ [/image]
+
+ probability={PROB}
+ [/terrain_graphics]
+#enddef
+
+#define MOUNTAIN_SINGLE_RANDOM TERRAIN FLAG IMAGESTEM
+ {MOUNTAIN_SINGLE ({TERRAIN}) 100 {FLAG} {IMAGESTEM}@V}
#enddef
#
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
