upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-16 21:13:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove a duplicated UtBS image -- UtBS coffin2 -> mainline cffin-closed.

Browse Source 
Add some scenery to the laboratory room.

Move an unused macro to the attic.
This commit is contained in:
Eric S. Raymond 2008-02-14 22:07:43 +00:00
parent bf17761f7d
commit 5f05e0f487
7 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
attic/unused.cfg
View File

@ -41,3 +41,32 @@
[/event]
#enddef
#
# Originally from UtBS -- it now has a random-placement macro that
# is probably better than this.
#
#!***Macro to random place unit within area***
#define RANDOM_PLACEMENT X Y RADIUS_NUMBER UNIT_WML
[store_locations]
x,y={X},{Y}
radius={RADIUS_NUMBER}
variable=random_placement_locations
[/store_locations]
{VARIABLE_OP random_string format "0..$random_placement_locations.length"}
{RANDOM $random_string}
{VARIABLE_OP random_placement_x format "$random_placement_locations[$random].x"}
{VARIABLE_OP random_placement_y format "$random_placement_locations[$random].y"}
{CLEAR_VARIABLE random_placement_locations}
{UNIT_WML}
[+unit]
x,y=$random_placement_x,$random_placement_y
[/unit]
#enddef

BIN
data/campaigns/Under_the_Burning_Suns/images/items/coffin2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.8 KiB

2
data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
View File

@ -309,7 +309,7 @@
[/if]
#secret troll tomb furnishings
{PLACE_IMAGE items/coffin2.png 3 28}
{PLACE_IMAGE items/coffin-closed.png 3 28}
{PLACE_IMAGE items/bones.png 6 24}
#troll burial grounds furnishings

4
data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
View File

@ -392,8 +392,8 @@
#secret tomb furnishings
{PLACE_IMAGE items/rune-violet2.png 61 21}
{PLACE_IMAGE items/coffin2.png 65 24}
{PLACE_IMAGE items/coffin2.png 19 97}
{PLACE_IMAGE items/coffin-closed.png 65 24}
{PLACE_IMAGE items/coffin-closed.png 19 97}
#recall heroes
[recall]

15
data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
View File

@ -383,6 +383,13 @@
# golem trapped in magic circle
{PLACE_IMAGE flesh-golem.png 18 29}
# Miscellaneous potions
{PLACE_IMAGE items/potion-poison.png 18 27}
{PLACE_IMAGE items/potion-red.png 17 28}
{PLACE_IMAGE items/potion-grey.png 19 28}
{PLACE_IMAGE items/potion-yellow.png 16 29}
{PLACE_IMAGE items/potion-green.png 20 29}
# wizard's dragon statues
{PLACE_IMAGE items/dragonstatue.png 16 28}
{PLACE_IMAGE items/dragonstatue.png 20 28}
@ -413,10 +420,10 @@
{PLACE_IMAGE items/bones.png 12 42}
# crypt coffins + rocks
{PLACE_IMAGE items/coffin2.png 10 26}
{PLACE_IMAGE items/coffin2.png 10 28}
{PLACE_IMAGE items/coffin2.png 12 25}
{PLACE_IMAGE items/coffin2.png 12 27}
{PLACE_IMAGE items/coffin-closed.png 10 26}
{PLACE_IMAGE items/coffin-closed.png 10 28}
{PLACE_IMAGE items/coffin-closed.png 12 25}
{PLACE_IMAGE items/coffin-closed.png 12 27}
{PLACE_IMAGE scenery/rubble.png 12 28}
# cloaked figure chamber

24
data/campaigns/Under_the_Burning_Suns/utils/macros.cfg
View File

@ -62,30 +62,6 @@
{CLEAR_VARIABLE random_placement_locations}
#enddef
#!***Macro to random place unit within area***
#define RANDOM_PLACEMENT X Y RADIUS_NUMBER UNIT_WML
[store_locations]
x,y={X},{Y}
radius={RADIUS_NUMBER}
variable=random_placement_locations
[/store_locations]
{VARIABLE_OP random_string format "0..$random_placement_locations.length"}
{RANDOM $random_string}
{VARIABLE_OP random_placement_x format "$random_placement_locations[$random].x"}
{VARIABLE_OP random_placement_y format "$random_placement_locations[$random].y"}
{CLEAR_VARIABLE random_placement_locations}
{UNIT_WML}
[+unit]
x,y=$random_placement_x,$random_placement_y
[/unit]
#enddef
#***Macro that will unclutter scenarios somewhat***
#define ADD VAR AMOUNT
[set_variable]

3
data/core/macros/sound-utils.cfg
View File

@ -302,9 +302,6 @@
#define SOUND_LIST:ZOMBIE_HIT
zombie-hit-1.ogg,zombie-hit-2.ogg,zombie-hit-3.ogg,zombie-hit-4.ogg,zombie-hit-5.ogg,zombie-hit-6.ogg #enddef
#define SOUND_LIST:ZOMBIE_STRONG_HIT
zombie-hit-1.ogg,zombie-hit-2.ogg,zombie-hit-3.ogg #enddef
#define SOUND:SLOW
# A convenient way to use the standard slowing sound in an attack
# animation. Put anywhere inside an attack animation block.