Skip to content

Commit

Permalink
Campaigns: double spaces after sentences isn't standard
Browse files Browse the repository at this point in the history
  • Loading branch information
Vultraz committed Mar 8, 2020
1 parent 60324e4 commit fa2b2ee
Show file tree
Hide file tree
Showing 49 changed files with 205 additions and 209 deletions.
2 changes: 1 addition & 1 deletion data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
Expand Up @@ -447,7 +447,7 @@
name=turn 2

# If, at the end of turn 2, (actually, beginning of turn 3)
# the merfolk are still ashore, the orcs attack. The event
# the merfolk are still ashore, the orcs attack. The event
# doesn't need to check for the turn being 3, because that's
# the only way the merfolk could be ashore with the orcs still
# passive.
Expand Down
Expand Up @@ -73,7 +73,7 @@

# I want mostly cuttle fish and water serpents, so I'll limit
# everything else. Also, I'll limit the cuttle fish a little,
# because the AI prefers them, but they're quite expensive. On
# because the AI prefers them, but they're quite expensive. On
# hard levels, he has enough gold to buy a few more sea serpents
# at a time.
{LIMIT_CONTEMPORANEOUS_RECRUITS 2 (Tentacle of the Deep) 4}
Expand Down
Expand Up @@ -952,7 +952,7 @@
# the unit gets it because he is standing there already.
# If the unit does not take it, another moveto event is
# added. This one is *not* first_time_only, but it does the same
# thing without the explanation. If a unit does not take the
# thing without the explanation. If a unit does not take the
# sword, an [allow_undo] is added to the event.
[event]
name=moveto
Expand Down
32 changes: 16 additions & 16 deletions data/campaigns/Delfadors_Memoirs/HISTORY
Expand Up @@ -147,7 +147,7 @@ r4393 | esr | 2009-04-08 08:48:12 -0400 (Wed, 08 Apr 2009) | 5 lines

Cope with the fact that saved recruit lists currently seem to override SideWML
declarations, soo they have to be hacked with [allow_recruit] and
[disallow_recruit] explicitly. YogiHH admits there may be a core bug here
[disallow_recruit] explicitly. YogiHH admits there may be a core bug here
due to recent savegame changes; this revision should bulletproof us.

------------------------------------------------------------------------
Expand Down Expand Up @@ -317,7 +317,7 @@ Added the new castle terrain overlay around the mage's keep.
r4305 | esr | 2009-04-05 01:36:05 -0400 (Sun, 05 Apr 2009) | 4 lines

Put back the hexes around Arpus's keep so this will remain playable
until we can replace them with the right custom terrain. Add TODO
until we can replace them with the right custom terrain. Add TODO
notes about this and a few other issues.

------------------------------------------------------------------------
Expand Down Expand Up @@ -369,7 +369,7 @@ parent directory.
r4293 | esr | 2009-04-03 16:36:31 -0400 (Fri, 03 Apr 2009) | 5 lines

During the event where Niktor puts his men under Delfador's command,
try to unfog the mage keep before we scroll to it. Does not work yet
try to unfog the mage keep before we scroll to it. Does not work yet
at trunk rev 34422; an engine change to enable [modify_side] to work
on share_view is in progress.

Expand Down Expand Up @@ -400,14 +400,14 @@ Make the forest in Return of Trouble more interesting, and fix a zookeeper bug.
------------------------------------------------------------------------
r4280 | esr | 2009-04-02 15:45:20 -0400 (Thu, 02 Apr 2009) | 3 lines

Names of two scenarios change. All IDs are consistent with their filenames
Names of two scenarios change. All IDs are consistent with their filenames
now, and capitalization variation in both has been removed.

------------------------------------------------------------------------
r4279 | esr | 2009-04-02 07:18:50 -0400 (Thu, 02 Apr 2009) | 4 lines

Changes for more continuity in recruit lists -- now, we never throw away a
veteran unless there's a strong storyline reason. (One difference this makes
veteran unless there's a strong storyline reason. (One difference this makes
is that dwarves will fight in the showdown with Iliah-Malal.)

------------------------------------------------------------------------
Expand Down Expand Up @@ -1071,7 +1071,7 @@ ke sure death events are defined where they should be.
r2734 | esr | 2008-12-01 17:06:43 -0300 (Mon, 01 Dec 2008) | 5 lines

Trim the Parthyn Ford map further, assign all villages omn the souuth shore,
add a few villages to compensate for those lost by trimming. This change should
add a few villages to compensate for those lost by trimming. This change should
save the player from getting involved in a boring village-chasing exercise on
the south shore of the river.

Expand Down Expand Up @@ -1104,7 +1104,7 @@ Start Chantal with her feet dry,
r2726 | esr | 2008-12-01 11:48:42 -0300 (Mon, 01 Dec 2008) | 3 lines

Arrange for Delfador's portrait to change along with his unit image
when he advances to Elder Mage. More material for the walkthrough.
when he advances to Elder Mage. More material for the walkthrough.

------------------------------------------------------------------------
r2725 | esr | 2008-12-01 02:40:35 -0300 (Mon, 01 Dec 2008) | 2 lines
Expand Down Expand Up @@ -1547,7 +1547,7 @@ Also, remove Kalenz from last mention in the Epilog; this is Delfador's story.
------------------------------------------------------------------------
r2259 | esr | 2008-10-30 05:50:40 -0300 (Thu, 30 Oct 2008) | 2 lines

Dialog and kournet-track fixups. Have Kalenz and Delf and Chantal figure out that Asheviere ids their real problem
Dialog and kournet-track fixups. Have Kalenz and Delf and Chantal figure out that Asheviere ids their real problem

------------------------------------------------------------------------
r2258 | esr | 2008-10-30 04:06:37 -0300 (Thu, 30 Oct 2008) | 2 lines
Expand Down Expand Up @@ -1595,7 +1595,7 @@ Update the DM to-do liat.
------------------------------------------------------------------------
r2250 | esr | 2008-10-29 04:19:03 -0300 (Wed, 29 Oct 2008) | 3 lines

Rename Southern Pass to Terror at Parthyn Ford. It is manifestly not a pass,
Rename Southern Pass to Terror at Parthyn Ford. It is manifestly not a pass,
that's flat country!

------------------------------------------------------------------------
Expand Down Expand Up @@ -1713,7 +1713,7 @@ Trackplacer conversion, prose polishing, and partial wmllint cleanup.
------------------------------------------------------------------------
r2227 | esr | 2008-10-27 17:19:31 -0300 (Mon, 27 Oct 2008) | 3 lines

Deal with issues in ESR-NOTES. Consolidate to-do items in the TODO file.
Deal with issues in ESR-NOTES. Consolidate to-do items in the TODO file.
Prose polish and historical continuity fixes.

------------------------------------------------------------------------
Expand Down Expand Up @@ -1823,7 +1823,7 @@ Transplant some macro definitions from LoW.
r2004 | esr | 2008-10-06 18:36:44 -0400 (Mon, 06 Oct 2008) | 5 lines

Finish LoW at after scenario 24. Move LoW scenarios 25-32 to the directory
for DM, where they will eventually be merged. Perform apprppriate moves of
for DM, where they will eventually be merged. Perform apprppriate moves of
unit and graphics resources, and delete things no longer used when they
have duplicates in mainline.

Expand Down Expand Up @@ -1879,7 +1879,7 @@ Add story outline for DM.
------------------------------------------------------------------------
r102 | esr | 2008-04-04 00:50:41 -0400 (Fri, 04 Apr 2008) | 3 lines

Delfador's Memoirs moved to UMC sandbox. Older hisory
Delfador's Memoirs moved to UMC sandbox. Older hisory
of the campaign is in HISTORY.

------------------------------------------------------------------------
Expand Down Expand Up @@ -2014,7 +2014,7 @@ Fix a glitch detectected by wmllint.
------------------------------------------------------------------------
r1979 | esr | 2008-01-30 23:35:15 -0500 (Wed, 30 Jan 2008) | 3 lines

Reinstate the Cockatrice unit and images. Fix some recuitment-pattern
Reinstate the Cockatrice unit and images. Fix some recuitment-pattern
glitches revealed by wmllint.

------------------------------------------------------------------------
Expand Down Expand Up @@ -2074,7 +2074,7 @@ Fix some dialogue markup.
------------------------------------------------------------------------
r1961 | esr | 2008-01-28 16:18:47 -0500 (Mon, 28 Jan 2008) | 3 lines

Create new 4th-level Mage Magister for Delfador. Mage Commander advances
Create new 4th-level Mage Magister for Delfador. Mage Commander advances
to it, it advances to Elder Mage.

------------------------------------------------------------------------
Expand Down Expand Up @@ -2125,7 +2125,7 @@ Create user_desciption attributes where needed.
------------------------------------------------------------------------
r1946 | esr | 2008-01-27 17:41:53 -0500 (Sun, 27 Jan 2008) | 2 lines

Add music. Use {DEFAULT_SCHEDULE} where appropriate.
Add music. Use {DEFAULT_SCHEDULE} where appropriate.

------------------------------------------------------------------------
r1939 | esr | 2008-01-27 12:29:37 -0500 (Sun, 27 Jan 2008) | 2 lines
Expand All @@ -2151,7 +2151,7 @@ Recall Methor rather than recreating him.
------------------------------------------------------------------------
r1931 | esr | 2008-01-24 15:43:22 -0500 (Thu, 24 Jan 2008) | 3 lines

Hand out nearby starting villagesto sides. In Valley of Statues this
Hand out nearby starting villagesto sides. In Valley of Statues this
required a downward side income adustment for balance.

------------------------------------------------------------------------
Expand Down
Expand Up @@ -581,7 +581,7 @@
[message]
speaker=narrator
#po: "matter" is used here with an archaic meaning, roughly
#po: that of "ground" or "essence". This sense survives in
#po: that of "ground" or "essence". This sense survives in
#po: modern English in constructions like "It matters a lot."
message=_"Peoples vanish and lands wither under the pitiless gaze of eternity; the true matter of the world is deeper. Delfador, I ask you a third time, and on your answer hangs your life: ARE YOU A SERVANT OF THE LIGHT?"
image="portraits/tomb-guardian.png"
Expand Down
Expand Up @@ -63,8 +63,8 @@
[/gold_carryover]
[/objectives]
# A bit of hackery to get the map border to look right, after
# Iliah-Malal has opened the portal. The map initially includes
# a bit of grassland to the northwest. We remove that here, but
# Iliah-Malal has opened the portal. The map initially includes
# a bit of grassland to the northwest. We remove that here, but
# when the portal opens, the grassland will appear to continue
# off the edge of the map.
[terrain]
Expand Down
Expand Up @@ -240,9 +240,9 @@
speaker=Chantal
# Historical background: Parthyn appears as the home town
# of Malin Keshar from Descent Into Darkness; he is exiled
# sometime in 389-390 YW. Garard I ends the civil war in
# sometime in 389-390 YW. Garard I ends the civil war in
# 417 YW; Parthyn is strongly garrisoned within the next
# few years. It is now 470 YW and Garard I died a few months
# few years. It is now 470 YW and Garard I died a few months
# previously. Garard II, the new King, is 30 years old.
message= _ "This is the nearest human garrison, Delfador. Here is the only place to cross the river. Soon after the last King of Wesnoth began his reign, he put a strong garrison not far south of here in the town of Parthyn, and orcs have not been able to cross into Wesnoth over this part of the river since."
[/message]
Expand Down
10 changes: 3 additions & 7 deletions data/campaigns/Delfadors_Memoirs/timeline.txt
Expand Up @@ -24,8 +24,8 @@ or black-letter chronology.
necromancer Iliah-Malal raid Wesnoth's borders. All but the first
and last scenarios of Delfador's Memoirs take place in this year.
* Control of the Estmarks is effectively lost during this war, not to
be regained for decades. Outposts are built on the near
side of the Weldyn to repel orc raids. The long watch of
be regained for decades. Outposts are built on the near
side of the Weldyn to repel orc raids. The long watch of
the River Guard begins.

473 YW: * Garard I dies.
Expand All @@ -50,8 +50,4 @@ or black-letter chronology.
** Wesnoth and the orcs of the north go to war.

501 YW ** Prince Eldred kills Garard II at Abez and is in turn killed
by Delfador. Usurpation of Asheviere begins.




by Delfador. Usurpation of Asheviere begins.
24 changes: 12 additions & 12 deletions data/campaigns/Delfadors_Memoirs/utils/sides.cfg
@@ -1,7 +1,7 @@
#textdomain wesnoth-dm

# During the plot of this campaign Delfador changes recall lists more
# often than most Wesnoth characters change their underwear. This file
# often than most Wesnoth characters change their underwear. This file
# exists to encapsulate all that machinery and the comments explaining
# what it does.

Expand Down Expand Up @@ -141,7 +141,7 @@
#enddef

# In Terror at the Ford of Parthyn (12), Delfador gets control of some
# loyalist troops and later some mages. We'll use SUBSUME_SIDE_AND_VILLAGES
# loyalist troops and later some mages. We'll use SUBSUME_SIDE_AND_VILLAGES
# for these.

# At the end of Terror at the Ford of Parthyn (12), Chantal leaves to
Expand Down Expand Up @@ -174,7 +174,7 @@

# Survivors from Terror at the Ford of Parthyn will be conditionally
# available depending on which group Delfador is running with in
# the future. No need to filter out Chantal as she is already gone.
# the future. No need to filter out Chantal as she is already gone.
{MEMOIRS_STORE_MATCHING_UNITS race=human delfador_human_veterans}
{MEMOIRS_STORE_MATCHING_UNITS (race=elf
[not]
Expand Down Expand Up @@ -278,7 +278,7 @@
# At the end of Shadows (14), control of side 1 needs to be handed
# back to Delfador. He gets his elvish veterans back, but he's not
# Kalenz (e.g current or former High Lord of the Elves) so he can't
# recruit L2s. This macro will be used in Prince of Wesnoth (20) as
# recruit L2s. This macro will be used in Prince of Wesnoth (20) as
# well.

#define DELFADOR_TAKES_CONTROL
Expand All @@ -294,7 +294,7 @@
#enddef

# At the end of Save the Prince (15), Delfador loses Kalenz, Chantal, his
# Elvish veterans, and the ability to recruit elves. This is as it
# Elvish veterans, and the ability to recruit elves. This is as it
# should be; he's returning to human lands. He also loses his rescue
# force of Wesnothians.

Expand Down Expand Up @@ -350,7 +350,7 @@
[/disallow_recruit]
#enddef

# Delfador returns to Weldyn in The King's Council (16). This is when he
# Delfador returns to Weldyn in The King's Council (16). This is when he
# plugs back into the Wesnothian power structure, though the recruiting
# consequences are delayed because 16 is talk-only.
#
Expand Down Expand Up @@ -389,7 +389,7 @@
#enddef

# At the beginning of Portal of Doom (18), Delf acquires the ability to
# recruit dwarves via Ulrek. (Should be called from the prestart event.)
# recruit dwarves via Ulrek. (Should be called from the prestart event.)

#define DELFADOR_GETS_DWARVES
[allow_recruit]
Expand All @@ -399,7 +399,7 @@
#enddef

# At the beginning of Showdown in the Northern Swamp (19), Kalenz
# rejoins Delfador. Chantal is not here for this one.
# rejoins Delfador. Chantal is not here for this one.

#define KALENZ_REJOINS_DELFADOR X Y
[unstore_unit]
Expand Down Expand Up @@ -444,7 +444,7 @@

# At the end of Showdown in the Northern Swamp (19), Delfador departs
# the scene: Kalenz will lead side 1 in the next scenario, 26 years
# later. This is preparation.
# later. This is preparation.
#define DELFADOR_DEPARTS_AGAIN
# He's not going to be where he can recruit dwarves again.
[disallow_recruit]
Expand All @@ -462,10 +462,10 @@
# Delfador dismissed his undead veterans
{CLEAR_VARIABLE dead_recall}
# It would be nice to let Delfador keep his other veterans, but that
# would stretch the storyline a bit far. Human veterans will get
# would stretch the storyline a bit far. Human veterans will get
# old; dwarves have longer lifespans, but letting Delfador have
# them back would imply that dwarves had been following him around
# *in Wesnoth* for 26 years. Revisit this if we let Delfador
# *in Wesnoth* for 26 years. Revisit this if we let Delfador
# have his elvish veterans for this battle.
# If the player has recruited any elves, store them
[store_unit]
Expand Down Expand Up @@ -497,7 +497,7 @@
#enddef

# At the beginning of Prince of Wesnoth (20) Kalenz is running
# things again. Delfador will make another entrance, but without the ability
# things again. Delfador will make another entrance, but without the ability
# to recruit loyalists and mages (he's going against Prince Eldred)
# and gets back the Elvish recall list. Chantal reappears as well.

Expand Down
Expand Up @@ -213,7 +213,7 @@ end

[message]
speaker=Malin Keshar
message= _ "The Whitefang orcs... so that’s their name. When I was younger, I remember fearing the sight of their banners rais’d across the river. Now, though, it’s something totally different. Loathing? Disgust? A desire for vengeance? Certainly... this is no longer a fight merely to protect Parthyn."
message= _ "The Whitefang orcs... so that’s their name. When I was younger, I remember fearing the sight of their banners rais’d across the river. Now, though, it’s something totally different. Loathing? Disgust? A desire for vengeance? Certainly... this is no longer a fight merely to protect Parthyn."
[/message]

[message]
Expand Down
Expand Up @@ -628,7 +628,7 @@
[/event]

# Dela Keshar can't actually die here, she needs to reappear in
# Alone At Last. It's not easy to get to this contingency, which
# Alone At Last. It's not easy to get to this contingency, which
# is why we settle for a relatively crude fallback here.
# This is also an alternative victory condition.
[event]
Expand Down
Expand Up @@ -34,7 +34,7 @@
{EI_BIGMAP}
[/part]
[part]
# The River Guard posts had been built in 470 YW. They were
# The River Guard posts had been built in 470 YW. They were
# abandoned in 544 YW; the wave of colonization had begun around
# 530 YW.
story= _ "In the days of the king Garard I, two strong-points had been built along the near bank of the Weldyn, south of Soradoc, to stop bandits and orcish raiders out of the Estmarks from entering Wesnoth. But in later years the River Guard posts had been abandoned, as colonists spread into the Estmarks and the orcs were driven in retreat north of the Great River."
Expand Down
Expand Up @@ -625,7 +625,7 @@
message= _ "I have been meeting with the Ka’lian, the Great Council of the Elves. This is Kalenz, a great lord of the Northern Elves who came to the Council to offer us the support of his people."
# See Legend of Wesmere; Kalenz is the former High Lord of
# the elves. At this time in 517 YW, he is probably a leader or
# legate of the elves of the Forest of Lintanir. None of
# legate of the elves of the Forest of Lintanir. None of
# this backstory existed when HttT was first written.
[/message]

Expand Down
Expand Up @@ -435,9 +435,9 @@
# Sleeping Gryphons will counter if attacked, then wake up and
# morph to new Gryphons (a different unit type). The new unit will
# then usually fly away because the AI thinks your attacking unit
# is too tough for it to take. This could be fixed with some
# WML contortions, but why do it? The nonstandard behavior adds
# variety and a bit of mystery. Gryphon Mountain is a magical place.
# is too tough for it to take. This could be fixed with some
# WML contortions, but why do it? The nonstandard behavior adds
# variety and a bit of mystery. Gryphon Mountain is a magical place.

#
# If the sleeping gryphon is attacked, it wakes up
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Legend_of_Wesmere/HISTORY
Expand Up @@ -9,7 +9,7 @@ This finishes the first pass of the LoW scenario poishing.
------------------------------------------------------------------------
r2000 | esr | 2008-10-06 12:06:49 -0400 (Mon, 06 Oct 2008) | 2 lines

LoW text polish up to scenario 21. Includes the Kalenz/Cleodil love scene.
LoW text polish up to scenario 21. Includes the Kalenz/Cleodil love scene.

------------------------------------------------------------------------
r1999 | esr | 2008-10-06 10:28:38 -0400 (Mon, 06 Oct 2008) | 2 lines
Expand Down

0 comments on commit fa2b2ee

Please sign in to comment.