Merge remote-tracking branch 'origin/master' into guifixes

This commit is contained in:
Andreas Löf 2016-02-24 22:03:28 +13:00
commit c0f7fb6be2
170 changed files with 1305 additions and 1235 deletions

View file

@ -20,7 +20,7 @@
{CAMPAIGN_DIFFICULTY EASY "units/elves-wood/fighter.png~RC(magenta>red)" ( _ "Fighter") ( _ "Beginner")}
{CAMPAIGN_DIFFICULTY NORMAL "units/elves-wood/lord.png~RC(magenta>red)" ( _ "Lord") ( _ "Normal")} {DEFAULT_DIFFICULTY}
{CAMPAIGN_DIFFICULTY HARD "units/elves-wood/high-lord.png~RC(magenta>red)" ( _ "High Lord") ( _ "Challenging")}
# Geographical and historical assumptions (ESR):
#
# As originally written by Josh Parsons, this campaign was not set in

View file

@ -68,6 +68,7 @@
id=Lomarfel
name= _ "Lomarfel"
profile=portraits/lomarfel.png
unrenamable=yes
x,y=15,18
[modifications]
{TRAIT_LOYAL}

View file

@ -85,7 +85,7 @@
[side]
side=3
controller=ai
hidden=yes
hidden=yes
team_name=Mages
user_team_name= _ "Mages"
# Use stock flags

View file

@ -119,6 +119,7 @@
id=Lomarfel
name= _ "Lomarfel"
profile=portraits/lomarfel.png
unrenamable=yes
x,y=16,18
[modifications]
{TRAIT_LOYAL}
@ -139,6 +140,7 @@
id=Celodith
name= _ "Celodith"
gender=female
unrenamable=yes
x,y=17,18
side=1
[modifications]
@ -159,6 +161,7 @@
id=Earanduil
name= _ "Earanduil"
gender=male
unrenamable=yes
x,y=17,19
side=1
[modifications]
@ -179,6 +182,7 @@
id=Elvyniel
name= _ "Elvyniel"
gender=female
unrenamable=yes
x,y=18,18
side=1
[modifications]
@ -199,6 +203,7 @@
id=Delorfilith
name= _ "Delorfilith"
gender=male
unrenamable=yes
x,y=18,19
side=1
[modifications]

View file

@ -241,41 +241,41 @@
[/filter_location]
[command]
{VARIABLE random_ambusher_type_i ("$(($random_ambusher_type_i + 1) % $random_ambusher_type_table.length)")}
[unit]
x,y=$ambush_location.x,$ambush_location.y
type=$random_ambusher_type_table[$random_ambusher_type_i].type
side={SIDE}
role=ambusher
random_traits=yes
upkeep=loyal
[/unit]
[unit]
x,y=$ambush_location.x,$ambush_location.y
type=$random_ambusher_type_table[$random_ambusher_type_i].type
side={SIDE}
role=ambusher
random_traits=yes
upkeep=loyal
[/unit]
[object]
silent=yes
[object]
silent=yes
[filter]
x,y=$ambush_location.x,$ambush_location.y
[/filter]
[filter]
x,y=$ambush_location.x,$ambush_location.y
[/filter]
[effect]
apply_to=new_ability
[effect]
apply_to=new_ability
[abilities]
[hides]
id=undead_ambush
affect_self=yes
[abilities]
[hides]
id=undead_ambush
affect_self=yes
[filter_self]
role=ambusher
[filter_self]
role=ambusher
[filter_location]
terrain=Ss
[/filter_location]
[/filter_self]
[/hides]
[/abilities]
[/effect]
[/object]
[filter_location]
terrain=Ss
[/filter_location]
[/filter_self]
[/hides]
[/abilities]
[/effect]
[/object]
[/command]
[/random_placement]
#enddef

View file

@ -284,86 +284,86 @@
#define ORC_AMBUSH_AREA SIDE X_SPAN Y_SPAN NUMBER
# Any hill that's completely surrounded by other hills, mountains or
# forest is eligible as an ambush location.
[random_placement]
[random_placement]
variable=ambush_location
num_items={NUMBER}
[filter_location]
x={X_SPAN}
y={Y_SPAN}
terrain=Hh
num_items={NUMBER}
[filter_location]
x={X_SPAN}
y={Y_SPAN}
terrain=Hh
[not]
[filter_adjacent_location]
[not]
terrain=Hh*,Mm*,*^F*
[/not]
[/filter_adjacent_location]
[/not]
[/filter_location]
[command]
[if]
[variable]
name=random_ambusher_type_i
less_than=4
[/variable]
[not]
[filter_adjacent_location]
[not]
terrain=Hh*,Mm*,*^F*
[/not]
[/filter_adjacent_location]
[/not]
[/filter_location]
[command]
[if]
[variable]
name=random_ambusher_type_i
less_than=4
[/variable]
[then]
{VARIABLE_OP random_ambusher_type_i add 1}
[/then]
[then]
{VARIABLE_OP random_ambusher_type_i add 1}
[/then]
[else]
{VARIABLE random_ambusher_type_i 0}
[/else]
[/if]
[else]
{VARIABLE random_ambusher_type_i 0}
[/else]
[/if]
# And here we place an ambusher of a type specified by the
# random_ambusher_type_table and random_ambusher_type_i
# variables, thus always having the same ratio of different
# types.
# And here we place an ambusher of a type specified by the
# random_ambusher_type_table and random_ambusher_type_i
# variables, thus always having the same ratio of different
# types.
[unit]
x,y=$ambush_location.x,$ambush_location.y
type=$random_ambusher_type_table[$random_ambusher_type_i].type
side={SIDE}
facing=sw
role=ambusher
random_traits=yes
[unit]
x,y=$ambush_location.x,$ambush_location.y
type=$random_ambusher_type_table[$random_ambusher_type_i].type
side={SIDE}
facing=sw
role=ambusher
random_traits=yes
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[object]
silent=yes
[object]
silent=yes
[filter]
x,y=$ambush_location.x,$ambush_location.y
[/filter]
[filter]
x,y=$ambush_location.x,$ambush_location.y
[/filter]
[effect]
apply_to=new_ability
[effect]
apply_to=new_ability
[abilities]
[hides]
id=orc_ambush
affect_self=yes
[abilities]
[hides]
id=orc_ambush
affect_self=yes
[filter_self]
role=ambusher
[filter_self]
role=ambusher
[filter_location]
terrain=Hh,Mm
[/filter_location]
[/filter_self]
[/hides]
[/abilities]
[/effect]
[/object]
[/command]
[/random_placement]
[filter_location]
terrain=Hh,Mm
[/filter_location]
[/filter_self]
[/hides]
[/abilities]
[/effect]
[/object]
[/command]
[/random_placement]
#enddef
# Only the number of ambushers differs by difficulty here.

View file

@ -143,7 +143,7 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
#### /Kalenz side ####
#### Landar's side ####
{MP_SIDE 2 (
{MP_SIDE 2 (
save_id=Landar
{PLAYABLE}
{LANDAR}
@ -163,7 +163,7 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
x=19
y=16
[/unit]
)}
)}
#### Landar's side ####
[side]

View file

@ -84,7 +84,7 @@
{PLAYER_GOLD}
fog=no
extra_recruit=Elvish Fighter, Elvish Archer
)}
)}
### Olurf's Code ###
#define OLURFS_LAND
@ -604,9 +604,9 @@
[endlevel]
result=victory
#ifdef MULTIPLAYER
bonus=0.5
bonus=0.5
#else
bonus=yes
bonus=yes
#endif
[/endlevel]
[/event]
@ -646,9 +646,9 @@
[endlevel]
result=victory
#ifdef MULTIPLAYER
bonus=0.5
bonus=0.5
#else
bonus=yes
bonus=yes
#endif
[/endlevel]
[/event]

View file

@ -22,11 +22,12 @@
#### Map setup ####
{LOW_MAP Kalian.map}
{campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg}
[event]
name=prestart
{campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg}
[replace_map]
x=9-53
y=9-53
@ -34,7 +35,7 @@
[/replace_map]
[shift_labels]
x=-8
y=-2
y=-9
[/shift_labels]
[/event]
@ -96,8 +97,8 @@
save_id=Landar
fog=yes
share_view=yes
{PLAYER_GOLD}
)}
{PLAYER_GOLD}
)}
[side]
side=3
@ -153,8 +154,8 @@
{MP_SIDE 4 (
no_leader=yes
previous_save_id=Landar
{PLAYABLE}
previous_save_id=Landar
{PLAYABLE}
save_id=El_Isomithir
fog=yes
share_view=yes
@ -177,7 +178,7 @@
[/modifications]
{IS_LOYAL}
[/unit]
)}
)}
[side]
side=5
@ -1177,7 +1178,7 @@
{GLOBAL_VARIABLE LoW_Chapter_One gold_store el_isomithir_gold global}
#endif
[/event]
{DEFAULT_VICTORY 0.5}
{DEFAULT_VICTORY 0.5}
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
[/scenario]

View file

@ -90,7 +90,7 @@ Chapter Two"
{PLAYABLE}
{PLAYER_GOLD}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
)}
)}
{MP_SIDE 3 (
no_leader=yes
@ -233,10 +233,10 @@ Chapter Two"
[/recall]
#ifdef MULTIPLAYER
# TODO: this is the only unit that player3 controls until
# Cleodil is freed by the other players. We should make this
# scenario more intesting for player 3 during this time.
# Maybe give him some units that managed to escape and want to help?
# TODO: this is the only unit that player3 controls until
# Cleodil is freed by the other players. We should make this
# scenario more intesting for player 3 during this time.
# Maybe give him some units that managed to escape and want to help?
{UNIT 3 (Elvish Ranger) 23 24 (role=liberator)}
#endif
[allow_extra_recruit]
@ -418,7 +418,7 @@ Chapter Two"
message= _ "When you meet your kin in the dry hells, tell them you perished at the hands of Kalenzs elves!"
[/message]
[/event]
{DEFAULT_VICTORY 0.4}
{DEFAULT_VICTORY 0.4}
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
[/scenario]

View file

@ -102,7 +102,7 @@
x=4
y=11
[/unit]
)}
)}
{MP_SIDE 3 (
no_leader=yes
@ -116,7 +116,7 @@
x=1
y=15
[/unit]
)}
)}
#define SAURIAN_AI
{ai/aliases/stable_singleplayer.cfg}
@ -521,7 +521,7 @@
#endif
[/event]
{DEFAULT_VICTORY 0.4}
{DEFAULT_VICTORY 0.4}
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
[/scenario]

View file

@ -75,7 +75,7 @@
name=prestart
{RECALL_LOYALS}
[/event]
{MP_SIDE 2 (
{PLAYABLE}
save_id=Landar
@ -363,7 +363,7 @@
[/sound]
[/event]
{DEFAULT_VICTORY 0.4}
{DEFAULT_VICTORY 0.4}
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
[/scenario]

View file

@ -106,7 +106,6 @@
{RECALL_LOYALS}
[/event]
{MP_SIDE 2 (
no_leader=yes
{PLAYABLE}
@ -122,7 +121,7 @@
x=45
y=35
[/unit]
)}
)}
{MP_SIDE 3 (
no_leader=yes
@ -139,8 +138,7 @@
x=47
y=28
[/unit]
)}
)}
### Allies ####
[side]
@ -152,7 +150,7 @@
{GOLD 400 300 200}
#else
{GOLD 133 100 65}
previous_save_id=Kalenz
previous_save_id=Kalenz
#endif
[unit]
@ -185,22 +183,22 @@
{MP_SIDE 5 (
{PLAYABLE}
{EL_ISOMITHIR}
save_id=El_Isomithir
previous_save_id=Landar
save_id=El_Isomithir
previous_save_id=Landar
x=29
y=32
{GOLD 133 100 65}
)}
)}
{MP_SIDE 6 (
{PLAYABLE}
{ERADION}
save_id=Eradion
previous_save_id=Cleodil
save_id=Eradion
previous_save_id=Cleodil
x=7
y=36
{GOLD 133 100 65}
)}
)}
[event]
name=prestart
@ -684,7 +682,7 @@
[/message]
[/event]
{DEFAULT_VICTORY 0.4}
{DEFAULT_VICTORY 0.4}
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
###/DEATH EVENTS###
[/scenario]

View file

@ -16,12 +16,12 @@
[side]
no_leader=yes
# The mp connect code doesn't like scenarios without human sides
controller=human
allow_player=yes
previous_save_id=Kalenz
save_id=temp1234
persistent=no
# The mp connect code doesn't like scenarios without human sides
controller=human
allow_player=yes
previous_save_id=Kalenz
save_id=temp1234
persistent=no
[unit]
{KALENZ}
[/unit]

View file

@ -87,7 +87,7 @@ Chapter Three"
[/side]
#Landar's side
{MP_SIDE 2 (
{MP_SIDE 2 (
{PLAYABLE}
save_id=Landar
fog=no
@ -95,10 +95,10 @@ Chapter Three"
{MULTIPLAYER_GOLD}
no_leader=yes
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
)}
)}
#Olurf's side
{MP_SIDE 3 (
{MP_SIDE 3 (
{PLAYABLE}
save_id=Olurf
fog=no
@ -108,10 +108,10 @@ Chapter Three"
no_leader=yes
{DWARF_SETUP}
extra_recruit=Dwarvish Fighter, Dwarvish Scout, Dwarvish Guardsman, Dwarvish Thunderer
)}
)}
#Cleodil's side
{MP_SIDE 4 (
{MP_SIDE 4 (
{PLAYABLE}
save_id=Cleodil
fog=no
@ -119,7 +119,7 @@ Chapter Three"
{MULTIPLAYER_GOLD}
no_leader=yes
recruit=Elvish Shaman, Wose, Elvish Scout
)}
)}
[side]
side=5
@ -545,9 +545,9 @@ Chapter Three"
[endlevel]
result=victory
#ifdef MULTIPLAYER
bonus=0.3
bonus=0.3
#else
bonus=yes
bonus=yes
#endif
[/endlevel]
[/event]
@ -665,7 +665,7 @@ Chapter Three"
#endif
[/event]
{DEFAULT_VICTORY 0.3}
{DEFAULT_VICTORY 0.3}
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
[/scenario]

View file

@ -74,8 +74,8 @@
#endif
[/side]
{MP_SIDE 2 (
no_leader=yes
{MP_SIDE 2 (
no_leader=yes
{MULTIPLAYER_GOLD}
{PLAYABLE}
save_id=Landar
@ -83,9 +83,9 @@
{LANDAR}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
[/unit]
)}
)}
{MP_SIDE 3 (
{MP_SIDE 3 (
no_leader=yes
{MULTIPLAYER_GOLD}
{PLAYABLE}
@ -94,9 +94,9 @@
{OLURF}
extra_recruit=Dwarvish Fighter, Dwarvish Scout, Dwarvish Guardsman, Dwarvish Thunderer
[/unit]
)}
)}
{MP_SIDE 4 (
{MP_SIDE 4 (
no_leader=yes
{MULTIPLAYER_GOLD}
{PLAYABLE}
@ -280,9 +280,9 @@
[endlevel]
result=victory
#ifdef MULTIPLAYER
bonus=0.3
bonus=0.3
#else
bonus=yes
bonus=yes
#endif
[/endlevel]
[/event]
@ -394,7 +394,7 @@
{UNCLEAR_FOG}
[/event]
{DEFAULT_VICTORY 0.3}
{DEFAULT_VICTORY 0.3}
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
[/scenario]

View file

@ -77,7 +77,7 @@
#endif
[/side]
{MP_SIDE 2 (
{MP_SIDE 2 (
{PLAYABLE}
save_id=Landar
fog=yes
@ -87,9 +87,9 @@
{LANDAR}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
[/unit]
)}
)}
{MP_SIDE 3 (
{MP_SIDE 3 (
{PLAYABLE}
save_id=Olurf
fog=yes
@ -99,19 +99,19 @@
{OLURF}
extra_recruit=Dwarvish Scout, Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Guardsman
[/unit]
)}
)}
{MP_SIDE 4 (
{MP_SIDE 4 (
{PLAYABLE}
save_id=Cleodil
fog=yes
share_view=yes
no_leader=yes
[unit]
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Wose, Elvish Scout
[/unit]
)}
)}
[side]
side=5
@ -288,9 +288,9 @@
result=victory
save=no
#ifdef MULTIPLAYER
bonus=0.3
bonus=0.3
#else
bonus=yes
bonus=yes
#endif
[/endlevel]
[/event]
@ -309,7 +309,7 @@
[/endlevel]
[/event]
{DEFAULT_VICTORY 0.3}
{DEFAULT_VICTORY 0.3}
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
[/scenario]

View file

@ -40,7 +40,7 @@
share_view=yes
no_leader=yes
{PLAYER_TEAM}
save_id=Kalenz
save_id=Kalenz
[unit]
{KALENZ}
x=12
@ -66,8 +66,8 @@
[side]
side=2
no_leader=yes
save_id=Landar
{PLAYABLE}
save_id=Landar
{PLAYABLE}
[unit]
{LANDAR}
x=11
@ -79,8 +79,8 @@
[side]
side=3
no_leader=yes
save_id=Olurf
{PLAYABLE}
save_id=Olurf
{PLAYABLE}
[unit]
{OLURF}
x=11
@ -92,8 +92,8 @@
[side]
side=4
no_leader=yes
save_id=Cleodil
{PLAYABLE}
save_id=Cleodil
{PLAYABLE}
[unit]
{CLEODIL}
x=11

View file

@ -115,7 +115,7 @@ Chapter Four"
fog=no
side=2
no_leader=yes
{PLAYABLE}
{PLAYABLE}
[unit]
id=Aldar
type=General
@ -223,7 +223,7 @@ Chapter Four"
{PLAYABLE}
fog=no
save_id=Galtrid
previous_save_id=Kalenz
previous_save_id=Kalenz
#ifdef MULTIPLAYER
{MULTIPLAYER_GOLD}
#else
@ -395,7 +395,7 @@ Chapter Four"
shroud=no
no_leader=yes
{PLAYABLE}
save_id=Landar
save_id=Landar
[unit]
{LANDAR}
@ -411,7 +411,7 @@ Chapter Four"
fog=no
shroud=no
no_leader=yes
save_id=Olurf
save_id=Olurf
[unit]
{OLURF}
@ -429,7 +429,7 @@ Chapter Four"
fog=no
shroud=no
{PLAYABLE}
save_id=Cleodil
save_id=Cleodil
no_leader=yes
[unit]
{CLEODIL}
@ -447,8 +447,8 @@ Chapter Four"
shroud=no
{PLAYABLE}
no_leader=yes
previous_save_id=Landar
save_id=El_Isomithir
previous_save_id=Landar
save_id=El_Isomithir
[unit]
{EL_ISOMITHIR}
x=13
@ -464,8 +464,8 @@ Chapter Four"
fog=no
shroud=no
{PLAYABLE}
save_id=Eradion
previous_save_id=Cleodil
save_id=Eradion
previous_save_id=Cleodil
no_leader=yes
[unit]
{ERADION}
@ -681,7 +681,7 @@ Chapter Four"
[/message]
[/event]
{DEFAULT_VICTORY 0.3}
{DEFAULT_VICTORY 0.3}
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
[/scenario]

View file

@ -213,7 +213,7 @@
side=6
save_id=Landar
fog=yes
{PLAYABLE}
{PLAYABLE}
no_leader=yes
[unit]
{LANDAR}
@ -226,7 +226,7 @@
[side]
side=7
save_id=Olurf
{PLAYABLE}
{PLAYABLE}
no_leader=yes
[unit]
@ -241,7 +241,7 @@
[side]
side=8
save_id=Cleodil
{PLAYABLE}
{PLAYABLE}
{MULTIPLAYER_GOLD}
fog=yes

View file

@ -184,7 +184,7 @@ Chapter Five"
{PLAYABLE}
{MULTIPLAYER_GOLD}
save_id=Landar
save_id=Landar
no_leader=yes
[unit]
{LANDAR}

View file

@ -11,7 +11,7 @@
{PLAYER_TEAM}
village_gold=1
persistent=yes
allow_player=yes
allow_player=yes
#ifdef MULTIPLAYER
team_lock=yes
gold_lock=yes

View file

@ -2,34 +2,34 @@
#ifdef MULTIPLAYER
#define MP_SIDE NUM WML
[side]
side={NUM}
{WML}
[/side]
[side]
side={NUM}
{WML}
[/side]
#enddef
#else
#define MP_SIDE NUM WML
[side]
side={NUM}
hidden=yes
controller=null
allow_player=no
no_leader=yes
[/side]
[side]
side={NUM}
hidden=yes
controller=null
allow_player=no
no_leader=yes
[/side]
#enddef
#endif
#define DEFAULT_VICTORY MP_BONUS
[event]
name=enemies defeated
[endlevel]
[event]
name=enemies defeated
[endlevel]
#ifdef MULTIPLAYER
bonus={MP_BONUS}
bonus={MP_BONUS}
#else
bonus=yes
bonus=yes
#endif
[/endlevel]
[/event]
[/endlevel]
[/event]
#enddef
#define FILTER_LOYALS

View file

@ -31,6 +31,8 @@ Their tale I now relate...
" + _"(Expert level, 9 scenarios.)"
description_alignment = "center"
[about]
title = _ "Campaign Design"
[entry]

View file

@ -1091,7 +1091,7 @@
{VARIABLE shooters {ON_DIFFICULTY 1 1 2} }
{VARIABLE revenants {ON_DIFFICULTY 0 1 1} }
{PLACE_UNITS_RANDOMLY 1 4 "Revenant" "Go'hag" ( _ "Gohag") ()}
{PLACE_UNITS_RANDOMLY 1 4 "Revenant" "ElyssaUndead" ( _ "Gohag") ( id="Go_hag" )}
{PLACE_UNITS_RANDOMLY $skeletons 4 "Skeleton" "ElyssaUndead" ( _ "Undead Raider") ()}
{PLACE_UNITS_RANDOMLY $archers 4 "Skeleton Archer" "ElyssaUndead" ( _ "Undead Raider") ()}
{PLACE_UNITS_RANDOMLY $revenants 4 "Revenant" "ElyssaUndead" ( _ "Undead Raider") ()}
@ -1113,14 +1113,14 @@
#ifdef HARD
[message]
role="Go'hag"
id="Go_hag"
message= _ "You have defied our master for the last time. Now you shall die! And I shall personally make it slow and painful, to thank you for that scorching you gave me."
[/message]
#else
[message]
role="Go'hag"
id="Go_hag"
message= _ "You have defied our master for the last time. Now you shall die!"
[/message]

View file

@ -621,7 +621,7 @@
[not]
[filter]
[/filter]
[/not]
[/not]
) (
side=2
upkeep=free

View file

@ -1339,6 +1339,9 @@
name = "Robert Spencer"
comment = "2012 Google Code-in Students' Micro AI development"
[/entry]
[entry]
name = "Robert Wallace (Robertdebrus)"
[/entry]
[entry]
name = "Rocco J Carello (rogue)"
[/entry]

Binary file not shown.

After

Width:  |  Height:  |  Size: 288 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 312 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 312 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 398 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 293 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 309 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 313 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 313 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 888 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 944 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 928 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 859 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 799 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 841 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1,002 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 972 B

View file

@ -771,14 +771,7 @@
rotations=tr,r,br,bl,l,tl
[image]
name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R5.png):200
random_start=no
layer={LAYER}
center=90,144
base=90,144
[/image]
[image]
name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R1.png):200
name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/masks/7hex-@R0.png):200
random_start=no
layer={LAYER}
center=90,144
@ -809,7 +802,7 @@
rotations=tr,r,br,bl,l,tl
[image]
name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R5.png):200
name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/masks/7hex-@R0-@R5.png):200
random_start=no
layer={LAYER}
center=90,144
@ -841,14 +834,7 @@
rotations=tr,r,br,bl,l,tl
[image]
name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R5.png):200
random_start=no
layer={LAYER}
center=90,144
base=90,144
[/image]
[image]
name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R1.png):200
name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/masks/7hex-@R0.png):200
random_start=no
layer={LAYER}
center=90,144
@ -879,7 +865,7 @@
rotations=tr,r,br,bl,l,tl
[image]
name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R5.png):200
name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/masks/7hex-@R0-@R5.png):200
random_start=no
layer={LAYER}
center=90,144

View file

@ -14,7 +14,7 @@
# 4 pixels wide
x = 0
y = 0
name = "buttons/scrollgroove-left.png{IPF}"
name = "buttons/scrollbars/scrollgroove-left.png{IPF}"
[/image]
[image]
@ -24,14 +24,14 @@
, 0, width - {GROOVE_LEFT} - {GROOVE_RIGHT}))"
h = 0
resize_mode = "stretch"
name = "buttons/scrollgroove-horizontal.png{IPF}"
name = "buttons/scrollbars/scrollgroove-horizontal.png{IPF}"
[/image]
[image]
# 5 pixels wide
x = "(width - {GROOVE_RIGHT})"
y = 0
name = "buttons/scrollgroove-right.png{IPF}"
name = "buttons/scrollbars/scrollgroove-right.png{IPF}"
[/image]
#
@ -42,7 +42,7 @@
# 5 pixels wide
x = "(positioner_offset)"
y = 0
name = "buttons/scrollleft{IMAGE_SUFFIX}{IPF}"
name = "buttons/scrollbars/scrollleft{IMAGE_SUFFIX}{IPF}"
[/image]
[image]
@ -52,14 +52,14 @@
if(positioner_length - {POSITIONER_LEFT} - {POSITIONER_RIGHT} < 0
, 0, positioner_length - {POSITIONER_LEFT} - {POSITIONER_RIGHT}))"
resize_mode = "stretch"
name = "buttons/scrollhorizontal{IMAGE_SUFFIX}{IPF}"
name = "buttons/scrollbars/scrollhorizontal{IMAGE_SUFFIX}{IPF}"
[/image]
[image]
# 5 pixels wide
x = "(positioner_offset + positioner_length - {POSITIONER_RIGHT})"
y = 0
name = "buttons/scrollright{IMAGE_SUFFIX}{IPF}"
name = "buttons/scrollbars/scrollright{IMAGE_SUFFIX}{IPF}"
[/image]
[/draw]

View file

@ -1,87 +0,0 @@
#textdomain wesnoth-lib
###
### Definition of a label.
###
### Defines the following revision label for the title screen.
#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_COLOR_ENABLED FONT_COLOR_DISABLED Y_POSITION
[resolution]
{RESOLUTION}
min_width = 0
min_height = 0
default_width = 0
default_height = 0
max_width = 0
max_height = 0
text_font_size = {FONT_SIZE}
[state_enabled]
[draw]
[text]
x = 0
y = 0
w = "(width)"
h = "(height)"
maximum_width = "(width)"
font_size = {FONT_SIZE}
text_alignment = "(text_alignment)"
color = {FONT_COLOR_ENABLED}
text = "(text)"
text_markup = "(text_markup)"
[/text]
[/draw]
[/state_enabled]
[state_disabled]
[draw]
[text]
x = 0
y = 0
w = "(width)"
h = "(height)"
maximum_width = "(width)"
font_size = {FONT_SIZE}
text_alignment = "(text_alignment)"
color = {FONT_COLOR_DISABLED}
text = "(text)"
text_markup = "(text_markup)"
[/text]
[/draw]
[/state_disabled]
[/resolution]
#enddef
#define _GUI_DEFINITION ID DESCRIPTION FONT_SIZE FONT_COLOR Y_POSITION
[label_definition]
id = {ID}
description = {DESCRIPTION}
{_GUI_RESOLUTION
({GUI_NORMAL__RESOLUTION})
({GUI_NORMAL__FONT_SIZE__{FONT_SIZE}})
({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}})
({GUI__FONT_COLOR_DISABLED__{FONT_COLOR}})
({Y_POSITION})
}
[/label_definition]
#enddef
{_GUI_DEFINITION "title_screen_revision" "label used for the revision number in the title screen" SMALL DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
#undef _GUI_DEFINITION
#undef _GUI_RESOLUTION

View file

@ -15,19 +15,12 @@
[/rectangle]
#enddef
#
# Text antialiasing doesn't work as expected when rendering over a rectangle
# filled with an alpha < 255 color, so instead of using
# GUI__BACKGROUND_COLOR_ENABLED and GUI__BACKGROUND_COLOR_DISABLED for the
# textbox background, use fully opaque colors that correspond to the averages
# one would get with those two macros.
#
#define _GUI_TEXTBOX_BACKGROUND_ENABLED
{_GUI_DRAW_BACKGROUND ("10, 13, 22, 255")}
{_GUI_DRAW_BACKGROUND ({GUI__BACKGROUND_COLOR_ENABLED})}
#enddef
#define _GUI_TEXTBOX_BACKGROUND_DISABLED
{_GUI_DRAW_BACKGROUND ("28, 31, 41, 255")}
{_GUI_DRAW_BACKGROUND ({GUI__BACKGROUND_COLOR_DISABLED})}
#enddef
#define _GUI_DRAW_BORDER COLOR
@ -37,17 +30,6 @@
w = "(width)"
h = "(height)"
border_thickness = 3
border_color = "55, 55, 55, 192"
[/rectangle]
[rectangle]
x = 1
y = 1
w = "(if(width < 2, 0, width - 2))"
h = "(if(height < 2, 0, height - 2))"
border_thickness = 1
border_color = {COLOR}
@ -55,17 +37,6 @@
#enddef
#define _GUI_DRAW_TEXT SIZE COLOR
[rectangle]
x = "(text_x_offset + selection_offset)"
y = "(text_y_offset)"
w = "(selection_width)"
h = "(text_font_height)"
border_thickness = 0
fill_color = "21, 53, 80, 255"
[/rectangle]
[text]
x = "(text_x_offset)"
y = "(text_y_offset)"

View file

@ -6,7 +6,7 @@
#define _GUI_TEXT FONT_SIZE FONT_COLOR
[text]
x = 0
x = 5
y = {GUI__TEXT_VERTICALLY_CENTRED}
w = "(width)"
h = "(text_height)"
@ -16,7 +16,7 @@
[/text]
#enddef
#define _GUI_RESOLUTION RESOLUTION WIDTH HEIGHT IMAGE_Y FONT_SIZE
#define _GUI_RESOLUTION RESOLUTION WIDTH HEIGHT FONT_SIZE
[resolution]
{RESOLUTION}
@ -93,8 +93,8 @@
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) }
[image]
x = "(width - 10)"
y = {IMAGE_Y}
x = "(width - 15)"
y = "(height / 3)"
name = "buttons/sliders/slider_arrow_blue.png~ROTATE(180)"
[/image]
[/draw]
@ -107,8 +107,8 @@
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__TITLE}) }
[image]
x = "(width - 10)"
y = {IMAGE_Y}
x = "(width - 15)"
y = "(height / 3)"
name = "buttons/sliders/slider_arrow_blue.png~ROTATE(180)~GS()"
[/image]
@ -131,8 +131,8 @@
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) }
[image]
x = "(width - 10)"
y = {IMAGE_Y}
x = "(width - 15)"
y = "(height / 3)"
name = "buttons/sliders/slider_arrow_blue.png~ROTATE(180)"
[/image]
@ -160,8 +160,8 @@
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) }
[image]
x = "(width - 10)"
y = {IMAGE_Y}
x = "(width - 15)"
y = "(height / 3)"
name = "buttons/sliders/slider_arrow_blue.png"
[/image]
[/draw]
@ -174,8 +174,8 @@
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__TITLE}) }
[image]
x = "(width - 10)"
y = {IMAGE_Y}
x = "(width - 15)"
y = "(height / 3)"
name = "buttons/sliders/slider_arrow_blue.png~GS()"
[/image]
@ -198,8 +198,8 @@
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) }
[image]
x = "(width - 10)"
y = {IMAGE_Y}
x = "(width - 15)"
y = "(height / 3)"
name = "buttons/sliders/slider_arrow_blue.png"
[/image]
@ -216,7 +216,7 @@
id = "listbox_header"
description = "Checkbox."
{_GUI_RESOLUTION () 30 18 5 ({GUI_NORMAL__FONT_SIZE__SMALL}) }
{_GUI_RESOLUTION () 30 20 ({GUI_NORMAL__FONT_SIZE__SMALL}) }
[/toggle_button_definition]

View file

@ -14,7 +14,7 @@
# 4 pixels high
x = 0
y = 0
name = "buttons/scrollgroove-top.png{IPF}"
name = "buttons/scrollbars/scrollgroove-top.png{IPF}"
[/image]
[image]
@ -23,14 +23,14 @@
h = "(if(height - {GROOVE_TOP} - {GROOVE_BOTTOM} < 0
, 0, height - {GROOVE_TOP} - {GROOVE_BOTTOM}))"
resize_mode = "stretch"
name = "buttons/scrollgroove-mid.png{IPF}"
name = "buttons/scrollbars/scrollgroove-mid.png{IPF}"
[/image]
[image]
# 5 pixels high
x = 0
y = "(height - {GROOVE_BOTTOM})"
name = "buttons/scrollgroove-bottom.png{IPF}"
name = "buttons/scrollbars/scrollgroove-bottom.png{IPF}"
[/image]
#
@ -41,7 +41,7 @@
# 5 pixels high
x = 0
y = "(positioner_offset)"
name = "buttons/scrolltop{IMAGE_SUFFIX}{IPF}"
name = "buttons/scrollbars/scrolltop{IMAGE_SUFFIX}{IPF}"
[/image]
[image]
@ -51,14 +51,14 @@
if(positioner_length - {POSITIONER_TOP} - {POSITIONER_BOTTOM} < 0
, 0, positioner_length - {POSITIONER_TOP} - {POSITIONER_BOTTOM}))"
resize_mode = "stretch"
name = "buttons/scrollmid{IMAGE_SUFFIX}{IPF}"
name = "buttons/scrollbars/scrollmid{IMAGE_SUFFIX}{IPF}"
[/image]
[image]
# 5 pixels high
x = 0
y = "(positioner_offset + positioner_length - {POSITIONER_BOTTOM})"
name = "buttons/scrollbottom{IMAGE_SUFFIX}{IPF}"
name = "buttons/scrollbars/scrollbottom{IMAGE_SUFFIX}{IPF}"
[/image]
[/draw]

View file

@ -14,6 +14,7 @@
vertical_placement = "center"
horizontal_placement = "center"
maximum_height = 600
maximum_width = 1000
[linked_group]
id = "icon_area"
@ -426,14 +427,14 @@
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
horizontal_grow = "true"
vertical_alignment = "top"
[label]
id = "description"
definition = "default"
characters_per_line = 66
wrap = "true"
[/label]
[/column]

View file

@ -239,8 +239,8 @@
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
# No border by design
[toggle_button]
id = "sort_0"
definition = "listbox_header"
@ -253,8 +253,8 @@
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
# No border by design
[toggle_button]
id = "sort_1"
definition = "listbox_header"
@ -339,9 +339,9 @@
[grid]
[row]
grow_factor = 1
[column]
grow_factor = 1
horizontal_alignment = "left"
border = "bottom"
border_size = 10
@ -357,6 +357,7 @@
[/column]
[column]
grow_factor = 0
horizontal_alignment = "right"
border = "bottom"

View file

@ -11,6 +11,7 @@
[grid]
[row]
[column]
grow_factor = 0
border = "all"
border_size = 5
horizontal_alignment = "left"
@ -21,6 +22,7 @@
[/column]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = true
@ -235,35 +237,28 @@
#enddef
[layer]
[row]
[column]
horizontal_grow = true
vertical_grow = true
horizontal_grow = "true"
vertical_alignment = "top"
[grid]
[row]
[column]
horizontal_grow = "true"
vertical_alignment = "top"
[grid]
{_GUI_PREFERENCES_GENERAL_GRID_1}
[/grid]
[/column]
[/row]
[row]
[column]
horizontal_alignment = "left"
vertical_alignment = "bottom"
[grid]
{_GUI_PREFERENCES_GENERAL_GRID_2}
[/grid]
[/column]
[/row]
{_GUI_PREFERENCES_GENERAL_GRID_1}
[/grid]
[/column]
[/row]
[row]
[column]
horizontal_alignment = "left"
vertical_alignment = "bottom"
[grid]
{_GUI_PREFERENCES_GENERAL_GRID_2}
[/grid]
[/column]
[/row]
[/layer]
#undef _GUI_PREFERENCES_GENERAL_GRID_1

View file

@ -279,36 +279,29 @@
#enddef
[layer]
[row]
[column]
horizontal_grow = true
vertical_grow = true
horizontal_grow = "true"
vertical_alignment = "top"
[grid]
[row]
[column]
horizontal_grow = "true"
vertical_alignment = "top"
[grid]
{_GUI_PREFERENCES_DISPLAY_GRID_1}
[/grid]
[/column]
[/row]
[row]
[column]
horizontal_alignment = "left"
vertical_alignment = "bottom"
[grid]
{_GUI_PREFERENCES_DISPLAY_GRID_2}
[/grid]
[/column]
[/row]
{_GUI_PREFERENCES_DISPLAY_GRID_1}
[/grid]
[/column]
[/row]
[row]
[column]
horizontal_alignment = "left"
vertical_alignment = "bottom"
[grid]
{_GUI_PREFERENCES_DISPLAY_GRID_2}
[/grid]
[/column]
[/row]
[/layer]
#undef _GUI_PREFERENCES_DISPLAY_GRID_1

View file

@ -106,25 +106,18 @@
#enddef
[layer]
[row]
[column]
horizontal_grow = true
vertical_grow = true
horizontal_grow = "true"
vertical_alignment = "top"
[grid]
[row]
[column]
horizontal_grow = "true"
vertical_alignment = "top"
[grid]
{_GUI_PREFERENCES_SOUND_GRID}
[/grid]
[/column]
[/row]
{_GUI_PREFERENCES_SOUND_GRID}
[/grid]
[/column]
[/row]
[/layer]
#undef _GUI_PREFERENCES_SOUND_GRID

View file

@ -134,25 +134,18 @@
#enddef
[layer]
[row]
[column]
horizontal_grow = true
vertical_grow = true
horizontal_grow = "true"
vertical_alignment = "top"
[grid]
[row]
[column]
horizontal_grow = "true"
vertical_alignment = "top"
[grid]
{_GUI_ADVANCED_GRID}
[/grid]
[/column]
[/row]
{_GUI_ADVANCED_GRID}
[/grid]
[/column]
[/row]
[/layer]
#undef _GUI_ADVANCED_GRID

View file

@ -483,7 +483,7 @@
border_size = 5
[label]
id = "revision_number"
definition = "title_screen_revision"
definition = "default_small"
[/label]
[/column]

View file

@ -254,9 +254,8 @@
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
# No border by design
[toggle_button]
id = "sort_0"
definition = "listbox_header"
@ -268,9 +267,8 @@
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
# No border by design
[toggle_button]
id = "sort_1"
definition = "listbox_header"

View file

@ -22,7 +22,7 @@ Note: You need to use the default map settings for the scenario to work right."
no_leader=yes
controller="ai"
village_gold=1
defeat_condition=never
defeat_condition=never
[/side]
[side]
@ -78,7 +78,7 @@ Note: You need to use the default map settings for the scenario to work right."
share_view="yes"
[/side]
[lua]
code = <<
code = <<
wesnoth.dofile("multiplayer/scenarios/2p_Dark_Forecast.lua")
>>
[/lua]
@ -234,15 +234,15 @@ The weather will also change randomly, affecting the layout of the map.
message= _ "The enemy cheers as a dark mist rises from the land, engulfing you. As ghostly wisps drain away your will, you realize that your time in this land is over."
[/message]
[/event]
[options]
[options]
[slider]
id = "enemey_gold_factor"
default = 0
min = -30
max = 30
step = 10
name = "Difficulty"
description = "Changes the gold worth of the enemy spawns by a certain perentage"
default = 0
min = -30
max = 30
step = 10
name = "Difficulty"
description = "Changes the gold worth of the enemy spawns by a certain perentage"
[/slider]
[/options]
[/options]
[/multiplayer]

View file

@ -71,7 +71,8 @@
#define SHARE_FARMING_KNOWLEDGE_OPTION TARGET_SIDE
[option]
message= {MENU_IMG_TXT "items/flower4.png" $diplo_msg[{TARGET_SIDE}].farming}
image = "items/flower4.png"
message = $diplo_msg[{TARGET_SIDE}].farming
[show_if]
[variable]
name=player_$side_number|.farming.target
@ -109,7 +110,8 @@
#define SHARE_MINING_KNOWLEDGE_OPTION TARGET_SIDE
[option]
message= {MENU_IMG_TXT "items/gold-coins-small.png" $diplo_msg[{TARGET_SIDE}].mining}
image = "items/gold-coins-small.png"
message = $diplo_msg[{TARGET_SIDE}].mining
[show_if]
[variable]
name=player_$side_number|.mining.target
@ -147,7 +149,8 @@
#define SHARE_WARFARE_KNOWLEDGE_OPTION TARGET_SIDE
[option]
message= {MENU_IMG_TXT "wesnoth-icon.png" $diplo_msg[{TARGET_SIDE}].warfare}
image = "wesnoth-icon.png"
message = $diplo_msg[{TARGET_SIDE}].warfare
[show_if]
[variable]
name=player_$side_number|.warfare.target
@ -307,8 +310,9 @@ Share knowledge of warfare"
# Giving Money
[option]
message= {MENU_IMG_TXT "items/gold-coins-small.png" ( _ "<span color='green'>Donate Funds</span>
Give 20 gold to another player")}
image = "items/gold-coins-small.png"
message = _ "<span color='green'>Donate Funds</span>
Give 20 gold to another player"
[command]
[set_variable]
name=finished_suboptions
@ -351,8 +355,9 @@ Give 20 gold to another player")}
# Sharing Knowledge
[option]
message= {MENU_IMG_TXT "items/book4.png" ( _ "<span color='green'>Share Knowledge</span>
Help an ally with their research")}
image = "items/book4.png"
message = _ "<span color='green'>Share Knowledge</span>
Help an ally with their research"
[command]
[set_variable]
name=finished_suboptions
@ -369,7 +374,7 @@ Help an ally with their research")}
[message]
caption= _ "Diplomatic Options"
speaker=unit
image=items/book4.png
image= "items/book4.png"
message= _ "Who will you share knowledge with?"
[option]
@ -408,9 +413,10 @@ Help an ally with their research")}
# Dwarves
[option]
message= {MENU_IMG_TXT "units/dwarves/lord.png~TC(1,magenta)" ( _ "<span color='green'>Negotiate with the Dwarves</span>
image = "units/dwarves/lord.png~TC(1,magenta)"
message = _ "<span color='green'>Negotiate with the Dwarves</span>
Lets you recruit a Dwarvish unit
Negotiation Progress: $player_$side_number|.leader_option_1.progress|/$player_$side_number|.leader_option_1.target")}
Negotiation Progress: $player_$side_number|.leader_option_1.progress|/$player_$side_number|.leader_option_1.target"
[show_if]
[variable]
name=player_$side_number|.ally_1
@ -463,9 +469,10 @@ Negotiation Progress: $player_$side_number|.leader_option_1.progress|/$player_$s
# Elves
[option]
message= {MENU_IMG_TXT "units/elves-wood/marshal.png~TC(1,magenta)" ( _ "<span color='green'>Negotiate with the Elves</span>
image = "units/elves-wood/marshal.png~TC(1,magenta)"
message = _ "<span color='green'>Negotiate with the Elves</span>
Lets you recruit an Elvish unit
Negotiation Progress: $player_$side_number|.leader_option_2.progress|/$player_$side_number|.leader_option_2.target")}
Negotiation Progress: $player_$side_number|.leader_option_2.progress|/$player_$side_number|.leader_option_2.target"
[show_if]
[variable]
name=player_$side_number|.ally_5

View file

@ -51,31 +51,28 @@
[filter_location]
terrain="Gg^Ve,Gg^Vea"
[/filter_location]
# wmlindent: start ignoring
[command]
[message]
speaker=unit
caption=_ "Study Complete"
# wmllint: display on
message= _ "Which type of unit would you like to be able to recruit?"
# wmllint: display off
#textdomain wesnoth-units
{PICK_RECRUIT_OPTION ("units/human-loyalists/spearman.png~TC($side_number|,magenta)") "Spearman" _"Spearman" troop_1}
{PICK_RECRUIT_OPTION ("units/human-loyalists/bowman.png~TC($side_number|,magenta)") "Bowman" _"Bowman" troop_2}
{PICK_RECRUIT_OPTION ("units/human-loyalists/fencer.png~TC($side_number|,magenta)") "Fencer" _"Fencer" troop_3}
{PICK_RECRUIT_OPTION ("units/human-loyalists/heavyinfantry.png~TC($side_number|,magenta)") "Heavy Infantryman" _"Heavy Infantryman" troop_4}
{PICK_RECRUIT_OPTION ("units/human-loyalists/sergeant.png~TC($side_number|,magenta)") "Sergeant" _"Sergeant" troop_5}
{PICK_RECRUIT_OPTION ("units/human-loyalists/cavalryman/cavalryman.png~TC($side_number|,magenta)") "Cavalryman" _"Cavalryman" troop_6}
{PICK_RECRUIT_OPTION ("units/human-loyalists/horseman/horseman.png~TC($side_number|,magenta)") "Horseman" _"Horseman" troop_7}
#textdomain wesnoth-anl
[/message]
[set_variable]
name=player_$side_number|.warfare.troop_available
sub=1
[/set_variable]
[/command]
# wmlindent: stop ignoring
[command]
[message]
speaker=unit
caption=_ "Study Complete"
message= _ "Which type of unit would you like to be able to recruit?"
#textdomain wesnoth-units
{PICK_RECRUIT_OPTION ("units/human-loyalists/spearman.png~TC($side_number|,magenta)") "Spearman" _"Spearman" troop_1}
{PICK_RECRUIT_OPTION ("units/human-loyalists/bowman.png~TC($side_number|,magenta)") "Bowman" _"Bowman" troop_2}
{PICK_RECRUIT_OPTION ("units/human-loyalists/fencer.png~TC($side_number|,magenta)") "Fencer" _"Fencer" troop_3}
{PICK_RECRUIT_OPTION ("units/human-loyalists/heavyinfantry.png~TC($side_number|,magenta)") "Heavy Infantryman" _"Heavy Infantryman" troop_4}
{PICK_RECRUIT_OPTION ("units/human-loyalists/sergeant.png~TC($side_number|,magenta)") "Sergeant" _"Sergeant" troop_5}
{PICK_RECRUIT_OPTION ("units/human-loyalists/cavalryman/cavalryman.png~TC($side_number|,magenta)") "Cavalryman" _"Cavalryman" troop_6}
{PICK_RECRUIT_OPTION ("units/human-loyalists/horseman/horseman.png~TC($side_number|,magenta)") "Horseman" _"Horseman" troop_7}
#textdomain wesnoth-anl
[/message]
[set_variable]
name=player_$side_number|.warfare.troop_available
sub=1
[/set_variable]
[/command]
[/set_menu_item]
# Changing Research Target
@ -124,7 +121,6 @@
[/variable]
[do]
# wmlindent: start ignoring
[message]
speaker=unit
caption=_ "Research"
@ -150,13 +146,14 @@ Our mines produce $player_$side_number|.mining.gold|g
[/set_variable]
[/command]
[/option]
# wmlindent: stop ignoring
# Farming
[option]
message= {MENU_IMG_TXT "items/flower4.png" ( _ "<span color='green'>Agriculture</span>
image = "items/flower4.png"
message = _ "<span color='green'>Agriculture</span>
Farmers produce +1 gold
Study Progress: $player_$side_number|.farming.progress|/$player_$side_number|.farming.target")}
Study Progress: $player_$side_number|.farming.progress|/$player_$side_number|.farming.target"
[command]
{TARGET_RESEARCH_COMMAND agriculture ( _ "agriculture")}
[/command]
@ -165,9 +162,10 @@ Study Progress: $player_$side_number|.farming.progress|/$player_$side_number|.fa
# Mining
[option]
message= {MENU_IMG_TXT "items/gold-coins-small.png" ( _ "<span color='green'>Mining</span>
image = "items/gold-coins-small.png"
message = _ "<span color='green'>Mining</span>
Miners produce +1 gold
Study Progress: $player_$side_number|.mining.progress|/$player_$side_number|.mining.target")}
Study Progress: $player_$side_number|.mining.progress|/$player_$side_number|.mining.target"
[command]
{TARGET_RESEARCH_COMMAND mining ( _ "mining")}
[/command]
@ -176,9 +174,10 @@ Study Progress: $player_$side_number|.mining.progress|/$player_$side_number|.min
#Warfare
[option]
message= {MENU_IMG_TXT "wesnoth-icon.png" ( _ "<span color='green'>Warfare</span>
image = "wesnoth-icon.png"
message = _ "<span color='green'>Warfare</span>
Allows you to recruit a new type of unit
Study Progress: $player_$side_number|.warfare.progress|/$player_$side_number|.warfare.target")}
Study Progress: $player_$side_number|.warfare.progress|/$player_$side_number|.warfare.target"
[show_if]
[variable]
name=player_$side_number|.troops

View file

@ -127,7 +127,8 @@
#define PICK_RECRUIT_OPTION UNIT_IMAGE UNIT_TYPE_STRING UNIT_TYPE_NAME_STRING VAR
[option]
message={MENU_IMG_TXT {UNIT_IMAGE} {UNIT_TYPE_NAME_STRING}}
image = {UNIT_IMAGE}
message = {UNIT_TYPE_NAME_STRING}
[show_if]
[variable]
name=player_$side_number|.{VAR}

File diff suppressed because it is too large Load diff

View file

@ -11,4 +11,4 @@
[/generator]
{DEFAULT_SCHEDULE}
[/multiplayer]
#endif
#endif

View file

Before

Width:  |  Height:  |  Size: 101 B

After

Width:  |  Height:  |  Size: 101 B

View file

Before

Width:  |  Height:  |  Size: 167 B

After

Width:  |  Height:  |  Size: 167 B

View file

Before

Width:  |  Height:  |  Size: 167 B

After

Width:  |  Height:  |  Size: 167 B

View file

Before

Width:  |  Height:  |  Size: 172 B

After

Width:  |  Height:  |  Size: 172 B

View file

Before

Width:  |  Height:  |  Size: 102 B

After

Width:  |  Height:  |  Size: 102 B

View file

Before

Width:  |  Height:  |  Size: 103 B

After

Width:  |  Height:  |  Size: 103 B

View file

Before

Width:  |  Height:  |  Size: 202 B

After

Width:  |  Height:  |  Size: 202 B

View file

Before

Width:  |  Height:  |  Size: 126 B

After

Width:  |  Height:  |  Size: 126 B

View file

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 216 B

View file

Before

Width:  |  Height:  |  Size: 119 B

After

Width:  |  Height:  |  Size: 119 B

View file

Before

Width:  |  Height:  |  Size: 155 B

After

Width:  |  Height:  |  Size: 155 B

View file

Before

Width:  |  Height:  |  Size: 212 B

After

Width:  |  Height:  |  Size: 212 B

View file

Before

Width:  |  Height:  |  Size: 132 B

After

Width:  |  Height:  |  Size: 132 B

View file

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 192 B

View file

Before

Width:  |  Height:  |  Size: 123 B

After

Width:  |  Height:  |  Size: 123 B

View file

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 233 B

View file

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 249 B

View file

Before

Width:  |  Height:  |  Size: 222 B

After

Width:  |  Height:  |  Size: 222 B

View file

Before

Width:  |  Height:  |  Size: 97 B

After

Width:  |  Height:  |  Size: 97 B

View file

Before

Width:  |  Height:  |  Size: 97 B

After

Width:  |  Height:  |  Size: 97 B

View file

Before

Width:  |  Height:  |  Size: 101 B

After

Width:  |  Height:  |  Size: 101 B

View file

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 207 B

View file

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 242 B

Some files were not shown because too many files have changed in this diff Show more