Author: esr
Date: Wed Mar 26 14:55:33 2008
New Revision: 25147
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25147&view=rev
Log:
wmllint-warning and cosmetic fixes in NR.
Modified:
trunk/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
trunk/data/campaigns/Northern_Rebirth/utils/utils.cfg
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg?rev=25147&r1=25146&r2=25147&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg Wed Mar
26 14:55:33 2008
@@ -320,204 +320,56 @@
role=Study Guard
ai_special=guardian
[/unit]
- {NOTRAIT_UNIT 2 Draug 18 11}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 20 11}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 20 14}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 21 13}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 23 16}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 23 22}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 23 24}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 24 14}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 26 21}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 26 23}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 26 25}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 28 20}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 28 22}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 28 24}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Draug 28 26}
- [+unit]
- ai_special=guardian
- [/unit]
+ {NOTRAIT_UNIT 2 Draug 18 11} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 20 11} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 20 14} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 21 13} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 23 16} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 23 22} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 23 24} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 24 14} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 26 21} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 26 23} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 26 25} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 28 20} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 28 22} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 28 24} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Draug 28 26} {MAKE_PREVIOUS_GUARDIAN}
# And larger army of Revenants
- {NOTRAIT_UNIT 2 Revenant 2 35}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 4 37}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 4 19}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 6 21}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 6 25}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 6 26}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 6 30}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 6 32}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 6 36}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 7 15}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 7 38}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 9 36}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 10 17}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 10 19}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 10 21}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 11 15}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 12 17}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 12 23}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 13 9}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 13 20}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 14 18}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 15 9}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 19 21}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 19 24}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 19 27}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 21 21}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 21 24}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 21 27}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 33 30}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 33 33}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 34 30}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 34 32}
- [+unit]
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 21 35}
- [+unit]
- id=Revenant
- ai_special=guardian
- [/unit]
- {NOTRAIT_UNIT 2 Revenant 19 35}
- [+unit]
- ai_special=guardian
- [/unit]
+ {NOTRAIT_UNIT 2 Revenant 2 35} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 4 37} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 4 19} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 6 21} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 6 25} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 6 26} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 6 30} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 6 32} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 6 36} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 7 15} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 7 38} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 9 36} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 10 17} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 10 19} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 10 21} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 11 15} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 12 17} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 12 23} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 13 9} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 13 20} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 14 18} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 15 9} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 19 21} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 19 24} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 19 27} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 21 21} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 21 24} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 21 27} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 33 30} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 33 33} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 34 30} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 34 32} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 21 35} {MAKE_PREVIOUS_GUARDIAN}
+ {NOTRAIT_UNIT 2 Revenant 19 35} {MAKE_PREVIOUS_GUARDIAN}
# Initial dialogue and objectives
[message]
speaker=Tallin
@@ -655,8 +507,10 @@
# Above sums up to Newbie - 100 gold, Easy - 200, Normal - 350 and Hard
500
[/event]
-# Now freeing the prisoners, there is four of them and the nearest one looking
from the entrance is
-# 1a - Father Marcus - free and death event
+ # Now freeing the prisoners, there is four of them and the nearest
+ # one looking from the entrance is 1a - Father Marcus - free and
+ # death event
+ # wmllint: recognize Sister Theta
[event]
name=moveto
[filter]
@@ -693,7 +547,8 @@
speaker=Tallin
message= _ "It's just Tallin, no Lord. And no problem."
[/message]
- # If he was freed after sister Theta there is no need to repeat the
exposition
+ # If he was freed after sister Theta,
+ # there is no need to repeat the exposition
[if]
[have_unit]
id="Sister Theta"
Modified:
trunk/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg?rev=25147&r1=25146&r2=25147&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
Wed Mar 26 14:55:33 2008
@@ -633,7 +633,7 @@
message= _ "Come on,
Ro'Sothian, we really don't have to be doing this. Come, join us!"
[/message]
[message]
- id="Ro'Sothian2"
+ id="Ro'Sothian"
message= _ "Never!"
[/message]
[message]
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg?rev=25147&r1=25146&r2=25147&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg Wed Mar
26 14:55:33 2008
@@ -11,7 +11,9 @@
victory_when_enemies_defeated=yes
next_scenario=eastern_flank
-# Story with few branches depending on wether Anita is alive and hostile
towards the Alliance
+ # Story with few branches depending on wether Anita is alive and hostile
+ # towards the Alliance.
+ # wmllint: recognize Anita
[story]
[part]
story= _ "Puzzled by the presence of trolls so close to the
dwarvish defenses, the party quickly made their way back to Knalga."
@@ -75,7 +77,7 @@
[if]
[variable]
name=anita_hostile
- equals=no
+ equals=no
[/variable]
[then]
[part]
@@ -83,7 +85,7 @@
background=portraits/Tallin.jpg
[/part]
[part]
- story= _ "Och, we tried Tallin, but with the orcs still
pressing our southern defenses and other groups of trolls trying to break
through everywhere, we simply ha' not the manpower."
+ story= _ "Och, we tried, Tallin, but with the orcs still
pressing our southern defenses and other groups of trolls trying to break
through everywhere, we simply ha' not the manpower."
background=portraits/Hamel.jpg
[/part]
[part]
@@ -140,13 +142,13 @@
story= _ "Soon, the trail began to lead east, and then
south. A few hours later the party emerged from the tunnels into dawn's early
light."
[/part]
[/then]
- # Anita dead or hostile
+ # Anita dead or hostile
[else]
[if]
[have_unit]
id=Anita
[/have_unit]
- # Dead
+ # Anita is dead
[else]
[part]
story= _ "This isn't looking good. Not only do we
fail to get the princess but now we lost all of our gold! Seriously Hamel, I
don't know if we're gonna make it."
Modified: trunk/data/campaigns/Northern_Rebirth/utils/utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/utils/utils.cfg?rev=25147&r1=25146&r2=25147&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/utils/utils.cfg (original)
+++ trunk/data/campaigns/Northern_Rebirth/utils/utils.cfg Wed Mar 26 14:55:33
2008
@@ -215,3 +215,9 @@
[/unit]
#enddef
+#define MAKE_PREVIOUS_GUARDIAN
+ # Meant to be used as a suffix to a unit-generating macro call.
+ [+unit]
+ ai_special=guardian
+ [/unit]
+#enddef
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
