Skip to content

Commit

Permalink
DiD: all-inclusive format fixup, code cleanup, and general refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vultraz
Vultraz committed Feb 1, 2015
1 parent aebe2ab commit e0b0240
Show file tree
Hide file tree
Showing 13 changed files with 789 additions and 767 deletions.
2 changes: 1 addition & 1 deletion data/campaigns/Descent_Into_Darkness/_main.cfg
View file
Expand Up @@ -70,4 +70,4 @@

#endif

# wmllint: directory spelling Malin Dela Keshar Drogan Darken Volk
# wmllint: directory spelling Malin Dela Keshar Drogan Darken Volk Karres
135 changes: 68 additions & 67 deletions data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
View file

Large diffs are not rendered by default.

81 changes: 42 additions & 39 deletions data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
View file
Expand Up @@ -2,45 +2,51 @@

[scenario]
id=02_Peaceful_Valley
name=_ "Peaceful Valley"
name= _ "Peaceful Valley"
map_data="{campaigns/Descent_Into_Darkness/maps/02_Peaceful_Valley.map}"
victory_when_enemies_defeated=no
{TURNS 29 26 23}
next_scenario=03_A_Haunting_in_Winter

{DEFAULT_SCHEDULE_MORNING}

{INTRO_AND_SCENARIO_MUSIC wanderer.ogg elvish-theme.ogg}
{SCENARIO_MUSIC elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC knolls.ogg}
{EXTRA_SCENARIO_MUSIC revelation.ogg}

[story]
[part]
story=_ "Fighting tears and rage, Malin follows the back-trail of the orcish band. He curses the elder mages for sending him from the Isle of Alduin half-prepared, only to be thrust into conflict. He curses Drogan for lacking the courage to see what must be done. Most fiercely, he curses the orcs for ravaging his family and home through their ceaseless attacks."
music=wanderer.ogg
story= _ "Fighting tears and rage, Malin follows the back-trail of the orcish band. He curses the elder mages for sending him from the Isle of Alduin half-prepared, only to be thrust into conflict. He curses Drogan for lacking the courage to see what must be done. Most fiercely, he curses the orcs for ravaging his family and home through their ceaseless attacks."
{STORYTXT_BACKGROUND_BIGMAP_DID}
[/part]
[part]
story=_ "Three days’ travel outside Parthyn, Malin meets Darken Volk, the same necromancer who had saved Parthyn and taught Malin to raise the dead not long ago. The necromancer takes pity on Malin in his friendless state, and asks Malin to travel with him. As the weeks pass, he teaches Malin more dark magic."
story= _ "Three days’ travel outside Parthyn, Malin meets Darken Volk, the same necromancer who had saved Parthyn and taught Malin to raise the dead not long ago. The necromancer takes pity on Malin in his friendless state, and asks Malin to travel with him. As the weeks pass, he teaches Malin more dark magic."
{STORYTXT_BACKGROUND travel.jpg}
[/part]
[/story]

{DID_TRACK {JOURNEY_02_NEW} }
{DID_TRACK {JOURNEY_02_NEW}}

[side]
side=1
controller=human
recruit=Walking Corpse,Vampire Bat
{GOLD 120 100 80}
team_name=good
user_team_name= _ "Malin Keshar"
{FLAG_VARIANT undead}

type=Apprentice Mage
id=Malin Keshar
name=_ "Malin Keshar"
profile=portraits/malin_young.png
unrenamable=yes
canrecruit=yes
recruit=Walking Corpse,Vampire Bat
{GOLD 120 100 80}
unrenamable=yes

fog=yes
shroud=yes
{FLAG_VARIANT undead}

facing=nw

[unit]
Expand Down Expand Up @@ -81,14 +87,18 @@
[side]
side=2
controller=ai
recruit=Goblin Rouser,Goblin Impaler,Wolf Rider
{GOLD 70 90 110}
team_name=goblins
user_team_name= _ "Goblins"
{FLAG_VARIANT6 ragged}

type=Goblin Knight
id="T'shar Lggi"
name=_ "T’shar Lggi"
canrecruit=yes
recruit=Goblin Rouser,Goblin Impaler,Wolf Rider
{GOLD 70 90 110}

fog=yes
{FLAG_VARIANT6 ragged}
facing=se

[ai]
Expand All @@ -107,15 +117,15 @@
side=1
[objective]
condition=win
description=_ "Occupy all of the goblin villages"
description= _ "Occupy all of the goblin villages"
[/objective]
[objective]
condition=lose
description=_ "Death of Malin Keshar"
description= _ "Death of Malin Keshar"
[/objective]
[objective]
condition=lose
description=_ "Death of Darken Volk"
description= _ "Death of Darken Volk"
[/objective]

{TURNS_RUN_OUT}
Expand All @@ -132,32 +142,32 @@

[message]
speaker=Darken Volk
message=_ "In truth, I share your hatred for the orcs. The northlands have been my... home... for many years, and the orcs have been a growing infestation in them. They despoil the beauty of the land wherever they go. If you are interested, I would be happy to take you on as my apprentice so that you can... aid me in the fight against them."
message= _ "In truth, I share your hatred for the orcs. The northlands have been my... home... for many years, and the orcs have been a growing infestation in them. They despoil the beauty of the land wherever they go. If you are interested, I would be happy to take you on as my apprentice so that you can... aid me in the fight against them."
[/message]

[message]
speaker=Malin Keshar
message=_ "Yes! I thirst for revenge on those creatures!"
message= _ "Yes! I thirst for revenge on those creatures!"
[/message]

[message]
speaker=Darken Volk
message=_ "Who knows? Perhaps removing the threat of orc raids will persuade the people of Parthyn to... welcome you home."
message= _ "Who knows? Perhaps removing the threat of orc raids will persuade the people of Parthyn to... welcome you home."
[/message]

[message]
speaker=Malin Keshar
message=_ "Perhaps. Even Drogan would have to be thankful for a summer without orc raids."
message= _ "Perhaps. Even Drogan would have to be thankful for a summer without orc raids."
[/message]

[message]
speaker=Darken Volk
message=_ "A goblin village lies in this valley, just ahead. They are a bastard race born of the orcs, and help them in their wars against humans and dwarves. These do not know of our coming. Subduing them will give us souls upon which to call in our fight against the orcs."
message= _ "A goblin village lies in this valley, just ahead. They are a bastard race born of the orcs, and help them in their wars against humans and dwarves. These do not know of our coming. Subduing them will give us souls upon which to call in our fight against the orcs."
[/message]

[message]
speaker=Darken Volk
message=_ "It will be a worthwhile test of your new skills."
message= _ "It will be a worthwhile test of your new skills."
[/message]
[/event]

Expand All @@ -171,7 +181,7 @@

[message]
speaker=Darken Volk
message=_ "Beware the goblin guards in the villages."
message= _ "Beware the goblin guards in the villages."
[/message]
[/event]

Expand Down Expand Up @@ -299,7 +309,7 @@

[message]
speaker=Darken Volk
message=_ "Ahhh... I did not realize there was a swamp near this village. Malin, I believe it would be beneficial for your training if you and I were to investigate the swamp."
message= _ "Ahhh... I did not realize there was a swamp near this village. Malin, I believe it would be beneficial for your training if you and I were to investigate the swamp."
[/message]

[allow_undo][/allow_undo]
Expand All @@ -308,14 +318,7 @@
[event]
name=moveto
[filter]
[not]
[not]
id=Darken Volk
[/not]
[not]
id=Malin Keshar
[/not]
[/not]
id=Darken Volk,Malin Keshar
x=14-15,16-20,19-20
y=9-10,6-10,11
[/filter]
Expand Down Expand Up @@ -350,27 +353,27 @@

[message]
speaker=Malin Keshar
message=_ "What are those things?"
message= _ "What are those things?"
[/message]

[message]
speaker=Darken Volk
message=_ "They are ghouls. Once, they were... evil men... murderers and outlaws. Through magic they have been transformed so their outsides match the spirits within. Those that outlive their masters gravitate towards the swamps and bogs, drawn by the natural decay there."
message= _ "They are ghouls. Once, they were... evil men... murderers and outlaws. Through magic they have been transformed so their outsides match the spirits within. Those that outlive their masters gravitate towards the swamps and bogs, drawn by the natural decay there."
[/message]

[message]
speaker=Malin Keshar
message=_ "It seems cruel to turn men into such a hideous form."
message= _ "It seems cruel to turn men into such a hideous form."
[/message]

[message]
speaker=Darken Volk
message=_ "In their present form they can best serve the greater good. Even now they will aid you in defeating this goblin rabble. Besides, as I said, these were men of great evil. No punishment is too great for their kind."
message= _ "In their present form they can best serve the greater good. Even now they will aid you in defeating this goblin rabble. Besides, as I said, these were men of great evil. No punishment is too great for their kind."
[/message]

[message]
speaker=Malin Keshar
message=_ "I suppose so..."
message= _ "I suppose so..."
[/message]
[/event]

Expand Down Expand Up @@ -411,17 +414,17 @@

[message]
speaker=Malin Keshar
message=_ "Sacking goblin villages is all well and good, but walking corpses and bats won’t stand up to full orcish warriors."
message= _ "Sacking goblin villages is all well and good, but walking corpses and bats won’t stand up to full orcish warriors."
[/message]

[message]
speaker=Darken Volk
message=_ "Your training is just beginning, Malin. With the souls from these goblins now available for our use, you will see your forces grow quickly."
message= _ "Your training is just beginning, Malin. With the souls from these goblins now available for our use, you will see your forces grow quickly."
[/message]

[message]
speaker=Malin Keshar
message=_ "Excellent. I’m eager to move on to the real foes."
message= _ "Excellent. I’m eager to move on to the real foes."
[/message]

[store_villages]
Expand Down

0 comments on commit e0b0240

Please sign in to comment.