[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/data scenarios/Eastern_Invasion/Norther...
|
From: |
James Spencer |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/data scenarios/Eastern_Invasion/Norther... |
|
Date: |
Sun, 20 Mar 2005 04:36:17 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: James Spencer <address@hidden> 05/03/20 09:36:16
Modified files:
data/scenarios/Eastern_Invasion: Northern_Outpost.cfg
data/scenarios/The_Rise_of_Wesnoth: A_Final_Spring.cfg
A_Harrowing_Escape.cfg
A_New_Land.cfg
A_Spy_in_the_Woods.cfg
Clearwater_Port.cfg
Cursed_Isle.cfg
Elf_Lords.cfg Epilogue.cfg
Fallen_Lich_Point.cfg
Peoples_in_Decline.cfg
Return_of_the_Fleet.cfg
Return_to_Oldwood.cfg
Rise_of_Wesnoth.cfg
Rough_Landing.cfg Sewer.cfg
Southbay_in_Winter.cfg
Temple_of_the_Deep.cfg
The_Dragon.cfg
The_Midlands.cfg
The_Oldwood.cfg The_Plan.cfg
The_River_Road.cfg
The_Vanguard.cfg
Troll_Hole.cfg
trow-macros.cfg
data : utils.cfg
Log message:
Add UNIT & PLACE_IMAGE macros to utils.cfg as per the ML, and update
TRoW to use this (HttT comes Next)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/utils.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
Patches:
Index: wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.29
wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.30
--- wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.29 Mon Feb
21 08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg Sun Mar
20 09:36:16 2005
@@ -91,9 +91,9 @@
[/ai]
[/side]
-#define TRAPMAN UNIT
+#define TRAPMAN UNIT_TYPE
[unit]
-type={UNIT}
+type={UNIT_TYPE}
side=4
x=$x1
y=$y1
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.39
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.40
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.39 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg Sun Mar
20 09:36:16 2005
@@ -176,7 +176,7 @@
{STARTING_VILLAGES 1 12}
{STARTING_VILLAGES 2 10}
- #{PUT_IMG (items/lighthouse.png) 3 18}
+ #{PLACE_IMAGE (items/lighthouse.png) 3 18}
[item]
x=3
y=18
@@ -184,16 +184,16 @@
halo=halo/lighthouse-aura.png
[/item]
- {PUT_IMG (pirate-galleon.png) 17 24}
- {PUT_IMG (pirate-galleon.png) 20 22}
- {PUT_IMG (galleon.png) 21 25}
- {PUT_IMG (misc/trapdoor.png) 16 30}
- {PUT_IMG (items/signpost.png) 24 24}
- {PUT_IMG (items/signpost.png) 30 44}
- {PUT_IMG (items/signpost.png) 41 32}
- {PUT_IMG (items/signpost.png) 16 4}
- {PUT_IMG (items/signpost.png) 39 11}
- {PUT_IMG (items/signpost.png) 18 17}
+ {PLACE_IMAGE (pirate-galleon.png) 17 24}
+ {PLACE_IMAGE (pirate-galleon.png) 20 22}
+ {PLACE_IMAGE (galleon.png) 21 25}
+ {PLACE_IMAGE (misc/trapdoor.png) 16 30}
+ {PLACE_IMAGE (items/signpost.png) 24 24}
+ {PLACE_IMAGE (items/signpost.png) 30 44}
+ {PLACE_IMAGE (items/signpost.png) 41 32}
+ {PLACE_IMAGE (items/signpost.png) 16 4}
+ {PLACE_IMAGE (items/signpost.png) 39 11}
+ {PLACE_IMAGE (items/signpost.png) 18 17}
[recall]
description=Lady Jessica
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.28
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.29
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.28
Mon Feb 21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg Sun Mar
20 09:36:16 2005
@@ -101,8 +101,8 @@
[event]
name=prestart
- {PUT_IMG (items/signpost.png) 23 38}
- {PUT_IMG (items/signpost.png) 13 7}
+ {PLACE_IMAGE (items/signpost.png) 23 38}
+ {PLACE_IMAGE (items/signpost.png) 13 7}
#ifdef EASY
{GUARD_UNIT (Orcish Grunt) (Snagakhan) 2 17 37}
{GUARD_UNIT (Orcish Grunt) (Knafakhan) 3 19 36}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.24
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.25
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.24 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg Sun Mar 20
09:36:16 2005
@@ -144,11 +144,11 @@
y=31,31,32,32,33,34,35,36,36,37,38,38
[/move_unit_fake]
- {PUT_IMG (galleon.png) 2 38}
- {PUT_IMG (pirate-galleon.png) 3 26}
- {PUT_IMG (pirate-galleon.png) 4 24}
- {PUT_IMG (pirate-galleon.png) 2 23}
- {PUT_IMG (pirate-galleon.png) 5 27}
+ {PLACE_IMAGE (galleon.png) 2 38}
+ {PLACE_IMAGE (pirate-galleon.png) 3 26}
+ {PLACE_IMAGE (pirate-galleon.png) 4 24}
+ {PLACE_IMAGE (pirate-galleon.png) 2 23}
+ {PLACE_IMAGE (pirate-galleon.png) 5 27}
[unhide_unit]
x=1
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg:1.23
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg:1.24
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg:1.23
Mon Feb 21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg Sun Mar
20 09:36:16 2005
@@ -58,7 +58,7 @@
[event]
name=prestart
- {PUT_IMG (items/pine2.png) 13 12}
+ {PLACE_IMAGE (items/pine2.png) 13 12}
{HERO (Outlaw Queen) (Jessica in Hiding) 4 19 16}
[teleport]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.39
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.40
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.39 Sun Feb
27 17:57:54 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg Sun Mar
20 09:36:16 2005
@@ -207,11 +207,11 @@
{STARTING_VILLAGES 2 9}
{STARTING_VILLAGES 1 5}
- {PUT_IMG (items/signpost.png) 33 8}
- {PUT_IMG (items/signpost.png) 8 17}
- {PUT_IMG (items/signpost.png) 1 10}
- {PUT_IMG (items/signpost.png) 36 18}
- #{PUT_IMG (items/lighthouse.png) 34 8}
+ {PLACE_IMAGE (items/signpost.png) 33 8}
+ {PLACE_IMAGE (items/signpost.png) 8 17}
+ {PLACE_IMAGE (items/signpost.png) 1 10}
+ {PLACE_IMAGE (items/signpost.png) 36 18}
+ #{PLACE_IMAGE (items/lighthouse.png) 34 8}
[item]
x=34
y=8
@@ -619,8 +619,8 @@
y=14,14,13,12,11,11,10,11,11,12,12,13,13,14,15
[/move_unit_fake]
- {PUT_IMG (pirate-galleon.png) 30 15}
- {PUT_IMG (items/gohere.png) 31 16}
+ {PLACE_IMAGE (pirate-galleon.png) 30 15}
+ {PLACE_IMAGE (items/gohere.png) 31 16}
[message]
speaker=Lieutenant Aethyr
@@ -635,7 +635,7 @@
[event]
name=turn 18
-# {PUT_IMG (terrain/pier.png) 31 16}
+# {PLACE_IMAGE (terrain/pier.png) 31 16}
[removeitem]
x=31
y=16
@@ -647,7 +647,7 @@
message= _ "My lord, the first ship is departing. But
the second ship should arrive shortly."
[/message]
-# {PUT_IMG (terrain/coast.png) 30 15}
+# {PLACE_IMAGE (terrain/coast.png) 30 15}
[removeitem]
x=30
y=15
@@ -670,8 +670,8 @@
y=14,14,13,12,11,11,10,11,11,12,12,13,14
[/move_unit_fake]
- {PUT_IMG (pirate-galleon.png) 31 14}
- {PUT_IMG (items/gohere.png) 32 14}
+ {PLACE_IMAGE (pirate-galleon.png) 31 14}
+ {PLACE_IMAGE (items/gohere.png) 32 14}
[message]
speaker=Lieutenant Aethyr
@@ -687,7 +687,7 @@
[event]
name=turn 24
-# {PUT_IMG (terrain/pier.png) 32 14}
+# {PLACE_IMAGE (terrain/pier.png) 32 14}
[removeitem]
x=32
y=14
@@ -699,7 +699,7 @@
message= _ "My lord, the second ship is departing. But
the last ship will be here before long. With your help we can hold on just a
while longer"
[/message]
-# {PUT_IMG (terrain/coast.png) 31 14}
+# {PLACE_IMAGE (terrain/coast.png) 31 14}
[removeitem]
x=31
y=14
@@ -722,8 +722,8 @@
y=14,14,13,12,11,11,10,11,11,12,12,13,13,14,15,15
[/move_unit_fake]
- {PUT_IMG (pirate-galleon.png) 28 15}
- {PUT_IMG (items/gohere.png) 29 16}
+ {PLACE_IMAGE (pirate-galleon.png) 28 15}
+ {PLACE_IMAGE (items/gohere.png) 29 16}
[message]
speaker=Lieutenant Aethyr
@@ -739,7 +739,7 @@
[event]
name=turn 30
-# {PUT_IMG (terrain/pier.png) 29 16}
+# {PLACE_IMAGE (terrain/pier.png) 29 16}
[removeitem]
x=29
y=16
@@ -751,7 +751,7 @@
message= _ "My lord, the last ship is departing. We're
Trapped!"
[/message]
-# {PUT_IMG (terrain/ocean.png) 28 15}
+# {PLACE_IMAGE (terrain/ocean.png) 28 15}
[removeitem]
x=28
y=15
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.26
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.27
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.26 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg Sun Mar 20
09:36:16 2005
@@ -239,9 +239,9 @@
{STARTING_VILLAGES 2 12}
{STARTING_VILLAGES 3 12}
- {PUT_IMG (terrain/temple.png) 11 13}
- {PUT_IMG (terrain/temple.png) 10 17}
- {PUT_IMG (terrain/temple.png) 9 15}
+ {PLACE_IMAGE (terrain/temple.png) 11 13}
+ {PLACE_IMAGE (terrain/temple.png) 10 17}
+ {PLACE_IMAGE (terrain/temple.png) 9 15}
{OBJ_POTION_HOLY 29 24 (holy_water1)}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.24
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.25
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.24 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg Sun Mar 20
09:36:16 2005
@@ -79,7 +79,7 @@
[event]
name=prestart
- {PUT_IMG (items/pine2.png) 13 12}
+ {PLACE_IMAGE (items/pine2.png) 13 12}
[recall]
description=Lady Jessica
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg:1.14
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg:1.15
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg:1.14 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg Sun Mar 20
09:36:16 2005
@@ -41,7 +41,7 @@
[event]
name=prestart
- {PUT_IMG (items/slab.png) 8 4}
+ {PLACE_IMAGE (items/slab.png) 8 4}
[recall]
description=Lady Jessica
@@ -128,7 +128,7 @@
letter=r
[/terrain]
- {PUT_IMG (items/flower2.png) 10 5}
+ {PLACE_IMAGE (items/flower2.png) 10 5}
[/event]
[event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.31
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.32
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.31
Mon Feb 21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg Sun Mar
20 09:36:16 2005
@@ -170,10 +170,10 @@
{STARTING_VILLAGES 2 8}
{STARTING_VILLAGES 3 6}
- {PUT_IMG (items/signpost.png) 25 1}
- {PUT_IMG (items/signpost.png) 14 8}
- {PUT_IMG (items/monolith4.png) 14 30}
- {PUT_IMG (terrain/mine.png) 15 9}
+ {PLACE_IMAGE (items/signpost.png) 25 1}
+ {PLACE_IMAGE (items/signpost.png) 14 8}
+ {PLACE_IMAGE (items/monolith4.png) 14 30}
+ {PLACE_IMAGE (terrain/mine.png) 15 9}
#define STONE_SHOOTER X Y
[unit]
@@ -237,7 +237,7 @@
y=30,29,29,28,27,26
[/move_unit_fake]
- {PUT_IMG (pirate-galleon.png) 34 26}
+ {PLACE_IMAGE (pirate-galleon.png) 34 26}
[unhide_unit]
x=33
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.30
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.31
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.30
Mon Feb 21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg Sun Mar
20 09:36:16 2005
@@ -174,7 +174,7 @@
y=9
[/recall]
- {PUT_IMG (galleon.png) 10 9}
+ {PLACE_IMAGE (galleon.png) 10 9}
[/event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.34
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.35
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.34
Mon Feb 21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg Sun Mar
20 09:36:16 2005
@@ -163,21 +163,21 @@
{STARTING_VILLAGES 3 10}
{STARTING_VILLAGES 4 10}
- {PUT_IMG (pirate-galleon.png) 10 27}
- {PUT_IMG (pirate-galleon.png) 7 30}
- {PUT_IMG (pirate-galleon.png) 6 33}
- {PUT_IMG (pirate-galleon.png) 5 36}
-
- {PUT_IMG (items/fire.png) 8 8}
- {PUT_IMG (items/fire.png) 10 2}
- {PUT_IMG (items/fire.png) 17 8}
- {PUT_IMG (items/fire.png) 39 6}
- {PUT_IMG (items/fire.png) 29 8}
- {PUT_IMG (items/fire.png) 26 11}
+ {PLACE_IMAGE (pirate-galleon.png) 10 27}
+ {PLACE_IMAGE (pirate-galleon.png) 7 30}
+ {PLACE_IMAGE (pirate-galleon.png) 6 33}
+ {PLACE_IMAGE (pirate-galleon.png) 5 36}
+
+ {PLACE_IMAGE (items/fire.png) 8 8}
+ {PLACE_IMAGE (items/fire.png) 10 2}
+ {PLACE_IMAGE (items/fire.png) 17 8}
+ {PLACE_IMAGE (items/fire.png) 39 6}
+ {PLACE_IMAGE (items/fire.png) 29 8}
+ {PLACE_IMAGE (items/fire.png) 26 11}
- {PUT_IMG (items/slab.png) 18 15}
+ {PLACE_IMAGE (items/slab.png) 18 15}
- {PUT_IMG (items/signpost.png) 10 34}
+ {PLACE_IMAGE (items/signpost.png) 10 34}
[recall]
description=Burin the Lost
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.25
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.26
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.25
Mon Feb 21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg Sun Mar
20 09:36:16 2005
@@ -69,25 +69,25 @@
[event]
name=prestart
- {PUT_IMG (terrain/temple.png) 23 22}
- {PUT_IMG (items/castle-ruins.png) 5 5}
- {PUT_IMG (items/castle-ruins.png) 6 5}
- {PUT_IMG (items/castle-ruins.png) 6 6}
- {PUT_IMG (items/castle-ruins.png) 5 7}
- {PUT_IMG (items/castle-ruins.png) 4 6}
- {PUT_IMG (items/castle-ruins.png) 4 5}
- {PUT_IMG (items/castle-ruins.png) 29 2}
- {PUT_IMG (items/castle-ruins.png) 29 3}
- {PUT_IMG (items/castle-ruins.png) 27 3}
- {PUT_IMG (items/castle-ruins.png) 27 2}
- {PUT_IMG (items/castle-ruins.png) 15 29}
- {PUT_IMG (items/castle-ruins.png) 15 30}
- {PUT_IMG (items/castle-ruins.png) 13 30}
- {PUT_IMG (items/castle-ruins.png) 13 29}
- {PUT_IMG (items/castle-ruins.png) 17 16}
- {PUT_IMG (items/castle-ruins.png) 17 17}
- {PUT_IMG (items/castle-ruins.png) 15 17}
- {PUT_IMG (items/castle-ruins.png) 15 16}
+ {PLACE_IMAGE (terrain/temple.png) 23 22}
+ {PLACE_IMAGE (items/castle-ruins.png) 5 5}
+ {PLACE_IMAGE (items/castle-ruins.png) 6 5}
+ {PLACE_IMAGE (items/castle-ruins.png) 6 6}
+ {PLACE_IMAGE (items/castle-ruins.png) 5 7}
+ {PLACE_IMAGE (items/castle-ruins.png) 4 6}
+ {PLACE_IMAGE (items/castle-ruins.png) 4 5}
+ {PLACE_IMAGE (items/castle-ruins.png) 29 2}
+ {PLACE_IMAGE (items/castle-ruins.png) 29 3}
+ {PLACE_IMAGE (items/castle-ruins.png) 27 3}
+ {PLACE_IMAGE (items/castle-ruins.png) 27 2}
+ {PLACE_IMAGE (items/castle-ruins.png) 15 29}
+ {PLACE_IMAGE (items/castle-ruins.png) 15 30}
+ {PLACE_IMAGE (items/castle-ruins.png) 13 30}
+ {PLACE_IMAGE (items/castle-ruins.png) 13 29}
+ {PLACE_IMAGE (items/castle-ruins.png) 17 16}
+ {PLACE_IMAGE (items/castle-ruins.png) 17 17}
+ {PLACE_IMAGE (items/castle-ruins.png) 15 17}
+ {PLACE_IMAGE (items/castle-ruins.png) 15 16}
{GUARD_UNIT (Wose) (Orofarn�) 4 14 13}
{GUARD_UNIT (Wose) (Bolwuldelman) 4 19 14}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.25
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.26
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.25 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg Sun Mar
20 09:36:16 2005
@@ -231,19 +231,19 @@
{STARTING_VILLAGES 3 10}
{STARTING_VILLAGES 2 10}
- {PUT_IMG (pirate-galleon.png) 21 35}
- {PUT_IMG (pirate-galleon.png) 21 37}
- {PUT_IMG (pirate-galleon.png) 22 39}
- {PUT_IMG (pirate-galleon.png) 23 44}
-
- {PUT_IMG (items/fire.png) 7 5}
- {PUT_IMG (items/fire.png) 15 21}
- {PUT_IMG (items/fire.png) 21 17}
- {PUT_IMG (items/fire.png) 24 29}
- {PUT_IMG (items/fire.png) 32 34}
- {PUT_IMG (items/fire.png) 41 24}
- {PUT_IMG (items/fire.png) 46 23}
- {PUT_IMG (items/fire.png) 45 29}
+ {PLACE_IMAGE (pirate-galleon.png) 21 35}
+ {PLACE_IMAGE (pirate-galleon.png) 21 37}
+ {PLACE_IMAGE (pirate-galleon.png) 22 39}
+ {PLACE_IMAGE (pirate-galleon.png) 23 44}
+
+ {PLACE_IMAGE (items/fire.png) 7 5}
+ {PLACE_IMAGE (items/fire.png) 15 21}
+ {PLACE_IMAGE (items/fire.png) 21 17}
+ {PLACE_IMAGE (items/fire.png) 24 29}
+ {PLACE_IMAGE (items/fire.png) 32 34}
+ {PLACE_IMAGE (items/fire.png) 41 24}
+ {PLACE_IMAGE (items/fire.png) 46 23}
+ {PLACE_IMAGE (items/fire.png) 45 29}
[recall]
description=Lady Jessica
@@ -1155,7 +1155,7 @@
[event]
name=victory
- {PUT_IMG (terrain/coast.png) 22 39}
+ {PLACE_IMAGE (terrain/coast.png) 22 39}
[move_unit_fake]
type=Transport Galleon
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.27
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.28
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.27 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg Sun Mar
20 09:36:16 2005
@@ -152,7 +152,7 @@
y=24
[/recall]
- {PUT_IMG (galleon.png) 10 27}
+ {PLACE_IMAGE (galleon.png) 10 27}
[/event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.30
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.31
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.30 Mon Feb 21
08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg Sun Mar 20
09:36:16 2005
@@ -92,13 +92,13 @@
[event]
name=prestart
- {PUT_IMG (items/signpost.png) 1 8}
- {PUT_IMG (items/signpost.png) 12 9}
- {PUT_IMG (misc/foot-left-nw.png) 1 7}
-
- {PUT_IMG (terrain/rocks.png) 17 15}
- {PUT_IMG (terrain/rocks.png) 18 14}
- {PUT_IMG (terrain/rocks.png) 19 14}
+ {PLACE_IMAGE (items/signpost.png) 1 8}
+ {PLACE_IMAGE (items/signpost.png) 12 9}
+ {PLACE_IMAGE (misc/foot-left-nw.png) 1 7}
+
+ {PLACE_IMAGE (terrain/rocks.png) 17 15}
+ {PLACE_IMAGE (terrain/rocks.png) 18 14}
+ {PLACE_IMAGE (terrain/rocks.png) 19 14}
[recall]
description=Lady Jessica
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg:1.23
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg:1.24
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg:1.23
Mon Feb 21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg Sun Mar
20 09:36:16 2005
@@ -54,7 +54,7 @@
[event]
name=prestart
- #{PUT_IMG (items/lighthouse.png) 3 5}
+ #{PLACE_IMAGE (items/lighthouse.png) 3 5}
[item]
x=3
y=5
@@ -62,10 +62,10 @@
halo=halo/lighthouse-aura.png
[/item]
- {PUT_IMG (misc/trapdoor.png) 16 17}
- {PUT_IMG (items/signpost.png) 24 11}
- {PUT_IMG (pirate-galleon.png) 20 9}
- {PUT_IMG (pirate-galleon.png) 17 11}
+ {PLACE_IMAGE (misc/trapdoor.png) 16 17}
+ {PLACE_IMAGE (items/signpost.png) 24 11}
+ {PLACE_IMAGE (pirate-galleon.png) 20 9}
+ {PLACE_IMAGE (pirate-galleon.png) 17 11}
[recall]
description=Lady Jessica
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.34
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.35
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.34
Mon Feb 21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg Sun Mar
20 09:36:16 2005
@@ -91,21 +91,21 @@
{UNIT (Tentacle of the Deep) (Tentacle) 2 10 15}
{UNIT (Tentacle of the Deep) (Tentacle) 2 16 15}
#endif
- {PUT_IMG (terrain/cave-floor1.png) 6 18}
- {PUT_IMG (terrain/cave-floor1.png) 20 18}
- {PUT_IMG (terrain/cave-floor1.png) 10 2}
- {PUT_IMG (terrain/cave-floor1.png) 16 2}
- {PUT_IMG (items/monolith3.png) 6 18}
- {PUT_IMG (items/monolith3.png) 20 18}
- {PUT_IMG (misc/chest.png) 13 2}
- {PUT_IMG (items/dragonstatue.png) 10 2}
- {PUT_IMG (items/dragonstatue.png) 16 2}
+ {PLACE_IMAGE (terrain/cave-floor1.png) 6 18}
+ {PLACE_IMAGE (terrain/cave-floor1.png) 20 18}
+ {PLACE_IMAGE (terrain/cave-floor1.png) 10 2}
+ {PLACE_IMAGE (terrain/cave-floor1.png) 16 2}
+ {PLACE_IMAGE (items/monolith3.png) 6 18}
+ {PLACE_IMAGE (items/monolith3.png) 20 18}
+ {PLACE_IMAGE (misc/chest.png) 13 2}
+ {PLACE_IMAGE (items/dragonstatue.png) 10 2}
+ {PLACE_IMAGE (items/dragonstatue.png) 16 2}
- {PUT_IMG (terrain/rocks.png) 16 24}
- {PUT_IMG (terrain/rocks.png) 4 18}
- {PUT_IMG (terrain/rocks.png) 12 12}
- {PUT_IMG (terrain/rocks.png) 6 6}
- {PUT_IMG (terrain/rocks.png) 17 3}
+ {PLACE_IMAGE (terrain/rocks.png) 16 24}
+ {PLACE_IMAGE (terrain/rocks.png) 4 18}
+ {PLACE_IMAGE (terrain/rocks.png) 12 12}
+ {PLACE_IMAGE (terrain/rocks.png) 6 6}
+ {PLACE_IMAGE (terrain/rocks.png) 17 3}
{OBJ_POTION_HOLY 13 19 (holy_helper)}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.26
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.27
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.26 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg Sun Mar 20
09:36:16 2005
@@ -183,7 +183,7 @@
{STARTING_VILLAGES 4 10}
{STARTING_VILLAGES 5 10}
- {PUT_IMG (terrain/mine.png) 20 27}
+ {PLACE_IMAGE (terrain/mine.png) 20 27}
[recall]
description=Lady Jessica
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.29
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.30
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.29 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg Sun Mar 20
09:36:16 2005
@@ -145,13 +145,13 @@
[event]
name=prestart
- {PUT_IMG (items/signpost.png) 31 22}
- {PUT_IMG (items/signpost.png) 18 15}
+ {PLACE_IMAGE (items/signpost.png) 31 22}
+ {PLACE_IMAGE (items/signpost.png) 18 15}
- {PUT_IMG (items/fire.png) 38 34}
- {PUT_IMG (items/fire.png) 8 28}
- {PUT_IMG (items/fire.png) 12 5}
- {PUT_IMG (items/fire.png) 5 3}
+ {PLACE_IMAGE (items/fire.png) 38 34}
+ {PLACE_IMAGE (items/fire.png) 8 28}
+ {PLACE_IMAGE (items/fire.png) 12 5}
+ {PLACE_IMAGE (items/fire.png) 5 3}
[recall]
description=Lady Outlaw
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.34
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.35
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.34 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg Sun Mar 20
09:36:16 2005
@@ -145,25 +145,25 @@
name=prestart
{CLEAR_VARIABLE last_done}
- {PUT_IMG (terrain/temple.png) 23 22}
- {PUT_IMG (items/castle-ruins.png) 5 5}
- {PUT_IMG (items/castle-ruins.png) 6 5}
- {PUT_IMG (items/castle-ruins.png) 6 6}
- {PUT_IMG (items/castle-ruins.png) 5 7}
- {PUT_IMG (items/castle-ruins.png) 4 6}
- {PUT_IMG (items/castle-ruins.png) 4 5}
- {PUT_IMG (items/castle-ruins.png) 29 2}
- {PUT_IMG (items/castle-ruins.png) 29 3}
- {PUT_IMG (items/castle-ruins.png) 27 3}
- {PUT_IMG (items/castle-ruins.png) 27 2}
- {PUT_IMG (items/castle-ruins.png) 15 29}
- {PUT_IMG (items/castle-ruins.png) 15 30}
- {PUT_IMG (items/castle-ruins.png) 13 30}
- {PUT_IMG (items/castle-ruins.png) 13 29}
- {PUT_IMG (items/castle-ruins.png) 17 16}
- {PUT_IMG (items/castle-ruins.png) 17 17}
- {PUT_IMG (items/castle-ruins.png) 15 17}
- {PUT_IMG (items/castle-ruins.png) 15 16}
+ {PLACE_IMAGE (terrain/temple.png) 23 22}
+ {PLACE_IMAGE (items/castle-ruins.png) 5 5}
+ {PLACE_IMAGE (items/castle-ruins.png) 6 5}
+ {PLACE_IMAGE (items/castle-ruins.png) 6 6}
+ {PLACE_IMAGE (items/castle-ruins.png) 5 7}
+ {PLACE_IMAGE (items/castle-ruins.png) 4 6}
+ {PLACE_IMAGE (items/castle-ruins.png) 4 5}
+ {PLACE_IMAGE (items/castle-ruins.png) 29 2}
+ {PLACE_IMAGE (items/castle-ruins.png) 29 3}
+ {PLACE_IMAGE (items/castle-ruins.png) 27 3}
+ {PLACE_IMAGE (items/castle-ruins.png) 27 2}
+ {PLACE_IMAGE (items/castle-ruins.png) 15 29}
+ {PLACE_IMAGE (items/castle-ruins.png) 15 30}
+ {PLACE_IMAGE (items/castle-ruins.png) 13 30}
+ {PLACE_IMAGE (items/castle-ruins.png) 13 29}
+ {PLACE_IMAGE (items/castle-ruins.png) 17 16}
+ {PLACE_IMAGE (items/castle-ruins.png) 17 17}
+ {PLACE_IMAGE (items/castle-ruins.png) 15 17}
+ {PLACE_IMAGE (items/castle-ruins.png) 15 16}
[recall]
description=Lady Outlaw
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg:1.12
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg:1.13
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg:1.12 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg Sun Mar 20
09:36:16 2005
@@ -34,7 +34,7 @@
[event]
name=prestart
- {PUT_IMG (items/slab.png) 8 4}
+ {PLACE_IMAGE (items/slab.png) 8 4}
[recall]
description=Lady Jessica
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.27
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.28
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.27 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg Sun Mar
20 09:36:16 2005
@@ -131,12 +131,12 @@
[event]
name=prestart
- {PUT_IMG (items/signpost.png) 15 31}
- {PUT_IMG (terrain/temple.png) 19 5}
- {PUT_IMG (terrain/temple.png) 30 10}
- {PUT_IMG (terrain/temple.png) 34 36}
- {PUT_IMG (terrain/temple.png) 1 26}
- {PUT_IMG (terrain/temple.png) 5 12}
+ {PLACE_IMAGE (items/signpost.png) 15 31}
+ {PLACE_IMAGE (terrain/temple.png) 19 5}
+ {PLACE_IMAGE (terrain/temple.png) 30 10}
+ {PLACE_IMAGE (terrain/temple.png) 34 36}
+ {PLACE_IMAGE (terrain/temple.png) 1 26}
+ {PLACE_IMAGE (terrain/temple.png) 5 12}
{GUARD_UNIT (Giant Scorpion) (Scorpion) 2 26 4}
{GUARD_UNIT (Giant Scorpion) (Scorpion) 3 32 27}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.31
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.32
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.31 Fri Feb
25 15:48:41 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg Sun Mar 20
09:36:16 2005
@@ -158,15 +158,15 @@
{STARTING_VILLAGES 3 8}
{STARTING_VILLAGES 4 8}
- {PUT_IMG (items/fire.png) 4 24}
- {PUT_IMG (items/fire.png) 8 25}
- {PUT_IMG (items/fire.png) 26 9}
- {PUT_IMG (items/fire.png) 25 17}
+ {PLACE_IMAGE (items/fire.png) 4 24}
+ {PLACE_IMAGE (items/fire.png) 8 25}
+ {PLACE_IMAGE (items/fire.png) 26 9}
+ {PLACE_IMAGE (items/fire.png) 25 17}
{VARIABLE_OP xx1 random 10..18}
{VARIABLE_OP yy1 random 2..6}
- {PUT_IMG (items/chest-plain-closed.png) $xx1 $yy1}
+ {PLACE_IMAGE (items/chest-plain-closed.png) $xx1 $yy1}
[recall]
description=Lady Jessica
@@ -317,7 +317,7 @@
[removeitem]
[/removeitem]
- {PUT_IMG (items/chest-plain-open.png) $xx1 $yy1}
+ {PLACE_IMAGE (items/chest-plain-open.png) $xx1 $yy1}
#ifdef EASY
{LOOT 125 1}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.23
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.24
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.23 Mon Feb
21 08:08:25 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg Sun Mar 20
09:36:16 2005
@@ -152,10 +152,10 @@
{STARTING_VILLAGES 4 10}
{STARTING_VILLAGES 5 10}
- {PUT_IMG (terrain/rocks.png) 3 14}
- {PUT_IMG (terrain/rocks.png) 25 19}
- {PUT_IMG (terrain/rocks.png) 15 3}
- {PUT_IMG (terrain/rocks.png) 17 27}
+ {PLACE_IMAGE (terrain/rocks.png) 3 14}
+ {PLACE_IMAGE (terrain/rocks.png) 25 19}
+ {PLACE_IMAGE (terrain/rocks.png) 15 3}
+ {PLACE_IMAGE (terrain/rocks.png) 17 27}
{UNIT (Tentacle of the Deep) (Tentacle of the Deep) 2 15 11}
{UNIT (Tentacle of the Deep) (Tentacle of the Deep) 3 15 20}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.10
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.11
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.10 Tue Jan
11 08:38:19 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg Sun Mar 20
09:36:16 2005
@@ -5,8 +5,6 @@
#LOOT
#GUARD_UNIT
#HERO
-#UNIT
-#PUT_IMG
#RISE_UP_RISE_UP
#define LOOT AMOUNT SIDE
@@ -49,24 +47,6 @@
[/unit]
#enddef
-#define UNIT TYPE DESC SIDE X Y
- [unit]
- type={TYPE}
- description={DESC}
- side={SIDE}
- x={X}
- y={Y}
- [/unit]
-#enddef
-
-#define PUT_IMG IMG X Y
- [item]
- x={X}
- y={Y}
- image={IMG}
- [/item]
-#enddef
-
#define RISE_UP_RISE_UP X Y
[filter]
side=1
Index: wesnoth/data/utils.cfg
diff -u wesnoth/data/utils.cfg:1.13 wesnoth/data/utils.cfg:1.14
--- wesnoth/data/utils.cfg:1.13 Sat Dec 11 17:04:54 2004
+++ wesnoth/data/utils.cfg Sun Mar 20 09:36:16 2005
@@ -172,3 +172,21 @@
#define MENU_IMG_TXT2 IMG TXT1 TXT2
"&"+{IMG}+"="+{TXT1}+"="+{TXT2}#enddef
+
+#define UNIT TYPE DESCRIPTION SIDE X Y
+ [unit]
+ type={TYPE}
+ description={DESCRIPTION}
+ side={SIDE}
+ x={X}
+ y={Y}
+ [/unit]
+#enddef
+
+#define PLACE_IMAGE IMAGE_FILE X Y
+ [item]
+ x={X}
+ y={Y}
+ image={IMAGE_FILE}
+ [/item]
+#enddef
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/data scenarios/Eastern_Invasion/Norther...,
James Spencer <=