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

Merge branch '1.14' of github.com:wesnoth/wesnoth into 1.14

Browse source
This commit is contained in:
Charles Dang 2018-05-02 18:46:43 +11:00
commit d4818923b2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
View file

@ -276,7 +276,7 @@ of Healing"
image=items/gravestone1.png
[/item]
{PLACE_GUARD 10 11 (Spearman) RESILIENT QUICK "Gwillyn" (_"Gwillyn")}
{PLACE_GUARD 10 11 (Spearman) RESILIENT QUICK "Gwyllin" (_"Gwyllin")}
{PLACE_GUARD 10 10 (Spearman) QUICK RESILIENT "Veomyr" (_"Veomyr")}
{PLACE_GUARD 8 10 (Spearman) STRONG RESILIENT "Syrillin" (_"Syrillin")}
{PLACE_GUARD 7 10 (Bowman) STRONG INTELLIGENT "Glant" (_"Glant")}
@ -293,7 +293,7 @@ of Healing"
#endif
# We don't want the guard on the village to move from there:
{FREEZE_UNIT Gwillyn}
{FREEZE_UNIT Gwyllin}
[store_locations]
terrain=*^Gryv

2
data/campaigns/Secrets_of_the_Ancients/scenarios/08_Carcyn.cfg
View file

@ -89,7 +89,7 @@ After several days of travel, he approached the frontier town of Carcyn."
[unit]
type=Shadow
side=1
name= _ "Vash Gorn"
name= _ "Vash-Gorn"
[/unit]
[unit]
type=Ghost