Fixed the bug with Zhul not unstoning (bug #8983)
Added the missing sides to the map Corrected path to sprite for Divine Avatar
This commit is contained in:
Jan Rietema
parent
4e599bb457
commit
a22f55cd30
4 changed files with 55 additions and 35 deletions
|
|
@ -1,4 +1,4 @@
|
|||
Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo
|
||||
Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , 8 Wo , Wo , 7 Wo
|
||||
Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo
|
||||
Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo
|
||||
Wo , Wo , Wo , Wo , Wo , Wo , Wo , Xu , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo
|
||||
|
|
@ -46,4 +46,3 @@ Wo , Wo , Wo , Wo , Wo , Wo
|
|||
Wo , Wo , Wo , Wo , Wo , Ww , Wo , Wo , Ww , Gs^Ft , Ww , Gs^Ft , Ww , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Ss , Ss , Ss , Ss , Ss , Ss , Ss , Ss , Gs^Ft , Gs^Ft , Ss , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Dd , Dd , Dd , Dd , Dd , Dd , Dd , Dd , Dd , 1 Kh , Hd , Dd , Dd , Dd , Hd , Dd , Dd , Dd , Dd , Dd , Dd , Dd , Dd , Gs^Ft , Gs^Ft , Gs^Ft
|
||||
Wo , Wo , Wo , Wo , Ww , Gs^Ft , Ww , Ww , Ww , Ww , Ww , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Ss , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Ss , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Dd , Gs^Ft , Gs^Ft , Dd , Dd , Hd , Hd , Hd , Dd , Dd^Vdt , Dd , Dd , Hd , Hd , Hd , Dd , Dd , Hd , Hd , Hd , Dd , Dd , Dd , Dd , Dd , Dd , Dd , Dd , Dd
|
||||
Wo , Wo , Wo , Ww , Ww , Ww , Ww , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Gs^Ft , Ss , Gs^Ft , Gs , Gs^Ft , Gs^Ft , Dd , Dd , Dd , Dd , Dd , Dd , Hd , Hd , Hd , Dd , Dd , Dd , Hd , Hd , Hd , Hd , Hd , Dd , Dd , Hd , Hd , Hd , Hd , Dd , Hd , Dd , Dd , Dd , Dd , Dd
|
||||
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
name=loyalists.ogg
|
||||
[/music]
|
||||
|
||||
#don't display snapshot of map in saved games
|
||||
# don't display snapshot of map in saved games
|
||||
snapshot="no"
|
||||
|
||||
#max turns in scenario varies depending on difficulty
|
||||
# max turns in scenario varies depending on difficulty
|
||||
#ifdef EASY
|
||||
turns="58"
|
||||
#endif
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
{LONGDARK3}
|
||||
{LONGDARK4}
|
||||
|
||||
#side 1: elves
|
||||
# side 1: elves
|
||||
[side]
|
||||
side=1
|
||||
description=Kaleh
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
fog=no
|
||||
[/side]
|
||||
|
||||
#Side 2:ÊDarius, leader of Human forces (blue)
|
||||
# Side 2: Darius, leader of Human forces (blue)
|
||||
[side]
|
||||
side=2
|
||||
type=Human Commander
|
||||
|
|
@ -114,7 +114,7 @@
|
|||
[/ai]
|
||||
[/side]
|
||||
|
||||
#Side=3 traitorous elves (green)
|
||||
# Side=3 traitorous elves (green)
|
||||
[side]
|
||||
side=3
|
||||
no_leader=yes
|
||||
|
|
@ -151,7 +151,7 @@
|
|||
[/ai]
|
||||
[/side]
|
||||
|
||||
#Side=4 Iron Council (yellow)
|
||||
# Side=4 Iron Council (yellow)
|
||||
|
||||
[side]
|
||||
side=4
|
||||
|
|
@ -199,7 +199,7 @@
|
|||
[/ai]
|
||||
[/side]
|
||||
|
||||
#Side=5 Zelgant Human Lieutenant
|
||||
# Side=5 Zelgant Human Lieutenant
|
||||
[side]
|
||||
side=5
|
||||
type=Shock Trooper
|
||||
|
|
@ -254,7 +254,7 @@
|
|||
[/ai]
|
||||
[/side]
|
||||
|
||||
#Side=6 Alastra Human Lieutenant
|
||||
# Side=6 Alastra Human Lieutenant
|
||||
[side]
|
||||
side=6
|
||||
type=Javelineer
|
||||
|
|
@ -309,7 +309,7 @@
|
|||
[/ai]
|
||||
[/side]
|
||||
|
||||
#Side=7 Crab Man's side
|
||||
# Side=7 Crab Man's side
|
||||
[side]
|
||||
side=7
|
||||
no_leader=yes
|
||||
|
|
@ -320,7 +320,7 @@
|
|||
fog=no
|
||||
[/side]
|
||||
|
||||
#Side=8 Eloh's side
|
||||
# Side=8 Eloh's side
|
||||
[side]
|
||||
side=8
|
||||
no_leader=yes
|
||||
|
|
@ -794,9 +794,17 @@
|
|||
description=Esanoo
|
||||
message= _ "What? Huh?"
|
||||
[/message]
|
||||
|
||||
[scroll_to]
|
||||
x=46
|
||||
y=39
|
||||
[/scroll_to]
|
||||
|
||||
{UNIT_ (Spearman) (Human Scout) ( _ "Human Scout") 2 45 42}
|
||||
{UNIT_ (Javelineer) (Human Scout) ( _ "Human Scout") 2 47 42}
|
||||
{RANDOM_TRAIT_UNIT 2 "Spearman" 45 42 "Human Scout" ()}
|
||||
{RANDOM_TRAIT_UNIT 2 "Javelineer" 47 42 "Human Scout" ()}
|
||||
|
||||
[redraw]
|
||||
[/redraw]
|
||||
|
||||
[message]
|
||||
x,y=45,42
|
||||
|
|
@ -835,12 +843,12 @@
|
|||
[/message]
|
||||
|
||||
[message]
|
||||
x,y=47,42
|
||||
x,y=45,42
|
||||
message= _ "The Dark Lady protect us, they're elves!"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
x,y=45,42
|
||||
x,y=47,42
|
||||
message= _ "There's tons of them! Flee, we must warn the others!"
|
||||
[/message]
|
||||
|
||||
|
|
@ -1518,7 +1526,8 @@
|
|||
{UNIT_ (Necromancer) (Hekuba) ( _ "Hekuba") 4 15 28}
|
||||
|
||||
[message]
|
||||
description=Hekuba
|
||||
side=4
|
||||
type=Necromancer
|
||||
message= _ "Curse them! The elves have stolen our offering to the Lady. We will have our vengeance. Keep fighting and execute plan C!"
|
||||
[/message]
|
||||
|
||||
|
|
@ -3137,10 +3146,12 @@
|
|||
y=26-30
|
||||
side=1
|
||||
[/filter]
|
||||
|
||||
{RANDOM_PLACEMENT_AREA 50 28 3}
|
||||
|
||||
{PLACE_UNITS_RANDOMLY 3 7 "Crab Man" "Angry Crab" ()}
|
||||
|
||||
{UNIT_T (Crab Man) (Angry Crab) ( _ "Angry Crab") 8 48 26}
|
||||
{UNIT_T (Crab Man) (Angry Crab) ( _ "Angry Crab") 8 51 26}
|
||||
{UNIT_T (Crab Man) (Angry Crab) ( _ "Angry Crab") 8 49 25}
|
||||
{CLEAR_PLACEMENT_AREA}
|
||||
|
||||
[message]
|
||||
description=Angry Crab
|
||||
|
|
@ -3161,10 +3172,12 @@
|
|||
y=21-26
|
||||
side=1
|
||||
[/filter]
|
||||
|
||||
{RANDOM_PLACEMENT_AREA 41 23 3}
|
||||
|
||||
{PLACE_UNITS_RANDOMLY 3 7 "Crab Man" "Angry Crab" ()}
|
||||
|
||||
{UNIT_T (Crab Man) (Angry Crab) ( _ "Angry Crab") 8 37 21}
|
||||
{UNIT_T (Crab Man) (Angry Crab) ( _ "Angry Crab") 8 39 26}
|
||||
{UNIT_T (Crab Man) (Angry Crab) ( _ "Angry Crab") 8 41 22}
|
||||
{CLEAR_PLACEMENT_AREA}
|
||||
|
||||
[message]
|
||||
description=Angry Crab
|
||||
|
|
@ -3815,17 +3828,19 @@
|
|||
[/then]
|
||||
[/if]
|
||||
|
||||
[kill]
|
||||
description=Zhul_statue
|
||||
animate=no
|
||||
fire_event=no
|
||||
[/kill]
|
||||
|
||||
[unstone]
|
||||
[filter]
|
||||
description=Zhul
|
||||
[/filter]
|
||||
[/unstone]
|
||||
[store_unit]
|
||||
variable=zhul_statue
|
||||
kill=yes
|
||||
[filter]
|
||||
description=Zhul_statue
|
||||
[/filter]
|
||||
[/store_unit]
|
||||
{VARIABLE zhul_statue.status.stoned "off"}
|
||||
{VARIABLE zhul_statue.description "Zhul"}
|
||||
{VARIABLE zhul_statue.user_description _"Zhul"}
|
||||
[unstore_unit]
|
||||
variable=zhul_statue
|
||||
[/unstore_unit]
|
||||
|
||||
[message]
|
||||
description=Zhul
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
name= _ "Divine Avatar"
|
||||
gender=female
|
||||
race=elf
|
||||
image="eloh.png"
|
||||
image=units/elves-desert/eloh-serene.png
|
||||
profile=portraits/eloh.png
|
||||
hitpoints=40
|
||||
movement_type=woodland
|
||||
|
|
|
|||
|
|
@ -2,6 +2,12 @@
|
|||
# The file contains useful macros I use within the campaign
|
||||
|
||||
#define RANDOM_TRAIT_UNIT SIDE TYPE X Y NAME OTHER
|
||||
{VARIABLE type {TYPE}}
|
||||
{VARIABLE side {SIDE}}
|
||||
[message]
|
||||
speaker=narrator
|
||||
message="Trying to create a $type for side $side"
|
||||
[/message]
|
||||
[unit]
|
||||
side={SIDE}
|
||||
type={TYPE}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue