0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Liberty fixes and a new core macro

Browse source 
(GENERIC_UNIT, which spawns a generic random-trait, random-named unit).
This commit is contained in:
Lari Nieminen 2007-07-21 23:00:49 +00:00
parent b9403f6fd7
commit 981493e5fd
3 changed files with 48 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/campaigns/Liberty/scenarios/01_The_Raid.cfg
View file

@ -83,9 +83,6 @@
description=Baldras
user_description= _ "Baldras"
profile=portraits/p_baldras.png
[modifications]
{TRAIT_RESILIENT}
[/modifications]
side=1
canrecruit=1
recruit=
@ -231,9 +228,8 @@
side=1
[modifications]
{TRAIT_LOYAL}
{TRAIT_STRONG}
[/modifications]
overlays=hero-icon.png
{IS_HERO}
unrenamable=yes
[/unit]

185
data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
View file

@ -31,10 +31,11 @@
[side]
type=Bandit_Peasant
description=Baldras
user_description= _ "Baldras"
profile=portraits/p_baldras.png
side=1
canrecruit=1
controller=human
hitpoints=50
gold=100
team_name=good_guys
recruit=Footpad_Peasant,Poacher_Peasant,Thug_Peasant
@ -43,9 +44,11 @@
[side]
type=Cavalier
description=Tarwen
user_description= _ "Tarwen"
side=2
canrecruit=1
controller=ai
team_name=bad_guys
[ai]
passive_leader=yes
@ -89,11 +92,11 @@
[/objective]
[/objectives]
{MK_LOYAL_UNIT 21 4 3 Peasant ( )}
{MK_LOYAL_UNIT 26 3 3 Peasant ( )}
{MK_LOYAL_UNIT 29 6 3 Peasant ( )}
{MK_LOYAL_UNIT 30 8 3 Peasant ( )}
{MK_LOYAL_UNIT 27 13 3 Peasant ( )}
{GENERIC_UNIT 3 Peasant 21 4}
{GENERIC_UNIT 3 Peasant 26 3}
{GENERIC_UNIT 3 Peasant 29 6}
{GENERIC_UNIT 3 Peasant 30 8}
{GENERIC_UNIT 3 Peasant 27 13}
{SET_VILLAGE 25 6 1}
{SET_VILLAGE 23 11 1}
@ -118,32 +121,15 @@
[event]
name=start
[store_unit]
variable=cavalier_store
kill=yes
[filter]
description=Tarwen
[/filter]
[/store_unit]
[move_unit_fake]
type=$cavalier_store.type
x=12
y=9
[/move_unit_fake]
[recall]
description=Harper
image=portraits/p_harper.png
[/recall]
[message]
description=Harper
image=portraits/p_harper.png
message= _ "Look, riders approach."
[/message]
[message]
description=Baldras
image=portraits/p_baldras.png
message= _ "Stand fast, nephew."
[/message]
@ -174,7 +160,6 @@
[/message]
[message]
description=Harper
image=portraits/p_harper.png
message= _ "Garard is the King of Wesnoth. We are ruled by no queen."
[/message]
[message]
@ -182,155 +167,56 @@
message= _ "Insolent peasants, you will kneel before your betters! Asheviere is the queen of Wesnoth. The King fell three weeks ago at Abez. I am done arguing with you. Your magistrate will be coming with us, and we do not care if it is dead or alive."
[/message]
[move_unit_fake]
type=Cavalryman
x=19,20,21,22,23,24
y= 7, 6, 7, 6, 7, 6
[/move_unit_fake]
{GENERIC_UNIT 2 Cavalryman 19 7 }
{MOVE_UNIT x,y=19,7 24 6}
{CREATE_UNIT 2 (Cavalryman) 24 6 () ()}
{GENERIC_UNIT 2 Cavalryman 19 7 }
{MOVE_UNIT x,y=19,7 24 8}
[redraw]
[/redraw]
{GENERIC_UNIT 2 Cavalryman 19 7 }
{MOVE_UNIT x,y=19,7 23 9}
[move_unit_fake]
type=Cavalryman
x=19,20,21,22,23,24
y= 7, 7, 8, 7, 8, 8
[/move_unit_fake]
{CREATE_UNIT 2 (Cavalryman) 24 8 () ()}
[redraw]
[/redraw]
[move_unit_fake]
type=Cavalryman
x=19,20,21,22,23
y= 7, 7, 8, 8, 9
[/move_unit_fake]
{CREATE_UNIT 2 (Cavalryman) 23 9 () ()}
[redraw]
[/redraw]
[move_unit_fake]
type=Cavalryman
x=19,20,21,22,23
y= 7, 6, 6, 5, 5
[/move_unit_fake]
{CREATE_UNIT 2 (Cavalryman) 23 5 () ()}
[redraw]
[/redraw]
{GENERIC_UNIT 2 Cavalryman 19 7 }
{MOVE_UNIT x,y=19,7 23 5}
#ifdef NORMAL
[move_unit_fake]
type=Horseman
x=19,20,21,22,23,24,25,26
y= 7, 7, 7, 7, 7, 7, 7, 6
[/move_unit_fake]
{GENERIC_UNIT 2 Horseman 19 7 }
{MOVE_UNIT x,y=19,7 26 6}
{CREATE_UNIT 2 (Horseman) 26 6 () ()}
[redraw]
[/redraw]
[move_unit_fake]
type=Horseman
x=19,20,21,22,23,24,25,26
y= 7, 7, 7, 7, 7, 7, 8, 8
[/move_unit_fake]
{CREATE_UNIT 2 (Horseman) 26 8 () ()}
[redraw]
[/redraw]
{GENERIC_UNIT 2 Horseman 19 7 }
{MOVE_UNIT x,y=19,7 26 8}
#endif
#ifdef HARD
[move_unit_fake]
type=Horseman
x=19,20,21,22,23,24,25,26
y= 7, 7, 7, 7, 7, 7, 7, 6
[/move_unit_fake]
{GENERIC_UNIT 2 Horseman 19 7 }
{MOVE_UNIT x,y=19,7 26 6}
{CREATE_UNIT 2 (Horseman) 26 6 () ()}
{GENERIC_UNIT 2 Horseman 19 7 }
{MOVE_UNIT x,y=19,7 26 8}
[redraw]
[/redraw]
{GENERIC_UNIT 2 Horseman 19 7 }
{MOVE_UNIT x,y=19,7 25 5}
[move_unit_fake]
type=Horseman
x=19,20,21,22,23,24,25,26
y= 7, 7, 7, 7, 7, 7, 8, 8
[/move_unit_fake]
{CREATE_UNIT 2 (Horseman) 26 8 () ()}
[redraw]
[/redraw]
[move_unit_fake]
type=Horseman
x=19,20,21,22,23,24,25
y= 7, 6, 7, 6, 6, 5, 5
[/move_unit_fake]
{CREATE_UNIT 2 (Horseman) 25 5 () ()}
[redraw]
[/redraw]
[move_unit_fake]
type=Horseman
x=19,20,21,22,23,24,25
y= 7, 7, 8, 8, 9, 9, 10
[/move_unit_fake]
# This macro must stay left-justified
{CREATE_UNIT 2 (Horseman) 25 10 () ()}
[redraw]
[/redraw]
{GENERIC_UNIT 2 Horseman 19 7 }
{MOVE_UNIT x,y=19,7 25 10}
#endif
[message]
description=Tarwen
message= _ "Guard the gate."
[/message]
[move_unit_fake]
type=Spearman
x=18, 19,20
y= 6, 7, 6
[/move_unit_fake]
{GENERIC_UNIT 2 Spearman 18 6}
{MOVE_UNIT x,y=18,6 20 6}
{CREATE_UNIT 2 (Spearman) 20 6 () ()}
[redraw]
[/redraw]
[move_unit_fake]
type=Spearman
x=18, 19,20
y= 7, 7, 7
[/move_unit_fake]
{CREATE_UNIT 2 (Spearman) 20 7 () ()}
[redraw]
[/redraw]
{GENERIC_UNIT 2 Spearman 18 7}
{MOVE_UNIT x,y=18,7 20 7}
[message]
description=Baldras
image=portraits/p_baldras.png
message= _ "Harper, get out of here. This is no battle for you."
[/message]
[message]
description=Baldras
image=portraits/p_baldras.png
message= _ "I am the magistrate of Dallben, and it is YOU who will be leaving Dallben, be it dead or alive."
[/message]
[/event]
@ -407,13 +293,11 @@
[message]
description=Baldras
image=portraits/p_baldras.png
message= _ "Our lives were hard enough when we were beneath the attention of the Crown. But now I fear things will be worse."
[/message]
[message]
description=Harper
image=portraits/p_harper.png
message= _ "We must tell the people of Delwyn about this."
[/message]
@ -432,13 +316,11 @@
[message]
description=Baldras
image=portraits/p_baldras.png
message= _ "Very well. We will go to Delwyn and share consel with them. I never thought Wesnoth would fall into darkness. Now, not only do the orcs threaten our lands, but some sinister thing is happening with the ascent of the Queen to the throne."
[/message]
[message]
description=Baldras
image=portraits/p_baldras.png
message= _ "Today we may no longer be citizens of Wesnoth. I pray it could be otherwise, but we are now outlaws."
[/message]
@ -483,7 +365,6 @@
name=time over
[message]
description=Baldras
image=portraits/p_baldras.png
message= _ "Oh, no! We have run out of time, they have arrived with reinforcements..."
[/message]
[endlevel]

14
data/core/macros/utils.cfg
View file

@ -240,6 +240,20 @@
{CLEAR_VARIABLE IF_TERRAIN_temp}
#enddef
#define GENERIC_UNIT SIDE TYPE X Y
# Creates a generic unit of TYPE belonging to SIDE at X,Y, which has a
# random name and traits (just like a recruited unit).
[unit]
side={SIDE}
type={TYPE}
x={X}
y={Y}
generate_description=yes
random_traits=yes
upkeep=full
[/unit]
#enddef
#define CREATE_UNIT SIDE TYPE X Y UNIT_ID OTHER
# Creates a unit of TYPE belonging to SIDE at X,Y. UNIT_ID can be used
# when filtering on it. For example, let's create a wose for player 1