Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

run wmlindent #2

Merged
merged 1 commit into from Jul 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions _main.cfg
Expand Up @@ -13,10 +13,10 @@
abbrev= _ "AFB"
define="CAMPAIGN_FIRE_BIRTH"
first_scenario="00_Prologue_The_Dragon"
{ENABLE_ARMAGEDDON_DRAKE}
{ENABLE_ARMAGEDDON_DRAKE}

{CAMPAIGN_DIFFICULTY EASY "units/drakes/burner.png~RC(magenta>red)" ( _ "Drake Burner") ( _ "Easy")}
{CAMPAIGN_DIFFICULTY NORMAL "units/drakes/fire.png~RC(magenta>red)" ( _ "Fire Drake") ( _ "Normal")} {DEFAULT_DIFFICULTY}
{CAMPAIGN_DIFFICULTY EASY "units/drakes/burner.png~RC(magenta>red)" ( _ "Drake Burner") ( _ "Easy")}
{CAMPAIGN_DIFFICULTY NORMAL "units/drakes/fire.png~RC(magenta>red)" ( _ "Fire Drake") ( _ "Normal")} {DEFAULT_DIFFICULTY}
{CAMPAIGN_DIFFICULTY HARD "units/drakes/inferno.png~RC(magenta>red)" ( _ "Drake Inferno") ( _ "Nightmare")}
description= _ "Explore the secret origins of the drakes.

Expand Down
36 changes: 14 additions & 22 deletions scenarios/00_Prologue_The_Dragon.cfg
Expand Up @@ -41,7 +41,6 @@ This old woman, by the name of Zlela, told me the Drakes' story of their origin.
[/part]
[/story]


[side]
side=1
controller=human
Expand All @@ -58,11 +57,10 @@ This old woman, by the name of Zlela, told me the Drakes' story of their origin.
type=Fire Dragon
id=Fire1
canrecruit=yes
[status]
poisoned=yes
[/status]
[status]
poisoned=yes
[/status]
facing=nw

[/side]

[side]
Expand All @@ -83,10 +81,10 @@ This old woman, by the name of Zlela, told me the Drakes' story of their origin.
{FLAG_VARIANT6 ragged}

type=Elvish Lord
id=Acarion
name= _ "Acarion"
canrecruit=yes
unrenamable=yes
id=Acarion
name= _ "Acarion"
canrecruit=yes
unrenamable=yes

facing=se
[ai]
Expand All @@ -95,7 +93,6 @@ This old woman, by the name of Zlela, told me the Drakes' story of their origin.
[/ai]
[/side]


[event]
name=prestart

Expand All @@ -109,27 +106,26 @@ This old woman, by the name of Zlela, told me the Drakes' story of their origin.
description= _ "Death of the Fire Dragon"
condition=lose
[/objective]
note="The units in this scenario will not be recalled later on."
note="The units in this scenario will not be recalled later on."
{TURNS_RUN_OUT}

[/objectives]
[/event]
[/event]

[event]
name=start

[message]
speaker=narrator
image="wesnoth-icon.png"
message= _ "A fiery beast of pure fire lived in crack in the earth, a volcano in the mountains far to the south. All races and creatures for a hundred miles around feared her.
message= _ "A fiery beast of pure fire lived in crack in the earth, a volcano in the mountains far to the south. All races and creatures for a hundred miles around feared her.

When they discovered that she was with child, her enemies rejoiced, and sought her nest to destroy her and her brood. Goblins, elves, mages, and even the spiders of the deep attacked her."
[/message]

[message]
speaker=narrator
image="wesnoth-icon.png"
message= _ "After a long battle with the poisonous spiders of the deep, the dragon returned to her lair.
message= _ "After a long battle with the poisonous spiders of the deep, the dragon returned to her lair.

Unfortunately, a band of elves and mages had heard of the dragon's eggs, and had entered the her lair to keep her kind from spreading."
[/message]
Expand All @@ -144,15 +140,14 @@ Unfortunately, a band of elves and mages had heard of the dragon's eggs, and had
image="wesnoth-icon.png"
message= _ "The dragon was determined to protect her children, and to destroy everyone who opposed them."
[/message]
[/event]
[/event]

[event]
name=victory

message= _ "This is the victory message."
[/event]


[event]
name=last breath
[filter]
Expand All @@ -163,13 +158,12 @@ Unfortunately, a band of elves and mages had heard of the dragon's eggs, and had
speaker=Acarion
message= _ "You may have defeated us, beast, but your days are numbered! Your wounds will destroy you before nightfall!"
[/message]

[endlevel]
result=victory
[/endlevel]
[/event]


[event]
name=last breath
[filter]
Expand All @@ -180,7 +174,7 @@ Unfortunately, a band of elves and mages had heard of the dragon's eggs, and had
speaker=Acarion
message= _ "We have defeated the beast! Destroy those eggs!"
[/message]

[endlevel]
result=defeat
[/endlevel]
Expand All @@ -193,7 +187,5 @@ Unfortunately, a band of elves and mages had heard of the dragon's eggs, and had
speaker=Acarion
message= _ "Our reinforcements are coming! Nothing can stop us now!"
[/message]

[/event]

[/scenario]
61 changes: 28 additions & 33 deletions scenarios/01_Scaly_Friends.cfg
Expand Up @@ -26,10 +26,9 @@ Unaware of the difficulties the dragon faced within, the band of saurians faced
[/part]
[/story]


[side]
side=1
save_id=Menir
save_id=Menir
controller=human
recruit=Saurian Skirmisher, Saurian Augur
gold=150
Expand All @@ -41,16 +40,15 @@ Unaware of the difficulties the dragon faced within, the band of saurians faced
id=Szel
name= _ "Szel"
canrecruit=yes
[filter_recall]
type=Saurian Skirmisher, Saurian Skirmisher, Saurian Flanker, Saurian Oracle, Saurian Soothsayer, Saurian Augur, Drake Clasher, Drake Arbiter, Drake Warden, Drake Thrasher, Drake Enforcer
[/filter_recall]
random_traits=yes
[modifications]
{TRAIT_LOYAL}
[/modifications]
unrenamable=yes
[filter_recall]
type=Saurian Skirmisher, Saurian Skirmisher, Saurian Flanker, Saurian Oracle, Saurian Soothsayer, Saurian Augur, Drake Clasher, Drake Arbiter, Drake Warden, Drake Thrasher, Drake Enforcer
[/filter_recall]
random_traits=yes
[modifications]
{TRAIT_LOYAL}
[/modifications]
unrenamable=yes
facing=nw

[/side]

[side]
Expand All @@ -73,10 +71,10 @@ Unaware of the difficulties the dragon faced within, the band of saurians faced

# wmllint: recognize Szel
type=Goblin Rouser
id=Flit
name= _ "Flit"
canrecruit=yes
unrenamable=yes
id=Flit
name= _ "Flit"
canrecruit=yes
unrenamable=yes

facing=se
[ai]
Expand All @@ -93,24 +91,24 @@ Unaware of the difficulties the dragon faced within, the band of saurians faced
recruit=Goblin Spearman
{FLAG_VARIANT undead}

gold=0
gold=0
type=Fire Dragon
id=Fire1
canrecruit=yes
hitpoints=1
hitpoints=1
facing=nw

[status]
poisoned=yes
[/status]
[status]
poisoned=yes
[/status]

[ai]
grouping=no
passive_leader=yes
[/ai]
[/side]

#ifdef EASY
#ifdef EASY
{STARTING_VILLAGES 1 6}
#endif

Expand All @@ -135,7 +133,7 @@ Unaware of the difficulties the dragon faced within, the band of saurians faced
carryover_percentage=40
[/gold_carryover]
[/objectives]
[/event]
[/event]

[event]
name=start
Expand All @@ -154,11 +152,11 @@ Unaware of the difficulties the dragon faced within, the band of saurians faced
id=Fire1
animate=yes
[/kill]
[delay]
time = 500
[/delay]

[delay]
time = 500
[/delay]

[message]
speaker=Szel
message= _ "Sewer pits and swamp garbage, this is a foul sight."
Expand All @@ -173,9 +171,8 @@ Unaware of the difficulties the dragon faced within, the band of saurians faced
speaker=Szel
message= _ "Saurians, to our arms! Our protector, our dragon is gone, and it falls to us to defeat these intruders alone!"
[/message]

[/event]
[event]
[/event]
[event]
name=last breath
[filter]
id=Flit
Expand All @@ -195,7 +192,7 @@ Unaware of the difficulties the dragon faced within, the band of saurians faced
speaker=Szel
message= _ "Perhaps we were stronger than we thought. But we can't stay here with our dragon gone. Perhaps...perhaps there is something else we can try. Let's take a look at those eggs."
[/message]

[endlevel]
result=victory
bonus=yes
Expand Down Expand Up @@ -231,7 +228,5 @@ Unaware of the difficulties the dragon faced within, the band of saurians faced
speaker=Szel
message= _ "More goblins are coming! We will die!"
[/message]

[/event]

[/scenario]
44 changes: 20 additions & 24 deletions scenarios/02_Something_New.cfg
Expand Up @@ -45,15 +45,14 @@ The strongest hatchling, Menir, proved himself both ambitious and charismatic. T
team_name=good
user_team_name= _ "Scaly Folk"
{FLAG_VARIANT undead}
save_id=Menir

save_id=Menir
type=Drake Burner
id=Menir
name= _ "Menir"
canrecruit=yes

facing=nw

[/side]

[side]
Expand All @@ -79,10 +78,10 @@ The strongest hatchling, Menir, proved himself both ambitious and charismatic. T
#else
type=Spectre
#endif
id=Varanus
name= _ "Varanus"
canrecruit=yes
unrenamable=yes
id=Varanus
name= _ "Varanus"
canrecruit=yes
unrenamable=yes

facing=se
[ai]
Expand All @@ -91,7 +90,7 @@ The strongest hatchling, Menir, proved himself both ambitious and charismatic. T
[/ai]
[/side]

#ifdef EASY
#ifdef EASY
{STARTING_VILLAGES 1 6}
#endif

Expand Down Expand Up @@ -120,18 +119,18 @@ The strongest hatchling, Menir, proved himself both ambitious and charismatic. T
carryover_percentage=40
[/gold_carryover]
[/objectives]
[/event]
[/event]

[event]
name=start
[unit]
id=Szel

[unit]
id=Szel
x,y=25,30
side=1
[/unit]
{MODIFY_UNIT (id=Szel) canrecruit no}
{MAKE_HERO Szel}
{MODIFY_UNIT (id=Szel) canrecruit no}
{MAKE_HERO Szel}
[message]
speaker=Varanus
message= _ "Depart from here, scaled ones. These waters were ours long before your dragon came. With her gone, these waters will be ours again."
Expand All @@ -142,13 +141,12 @@ The strongest hatchling, Menir, proved himself both ambitious and charismatic. T
message= _ "Menir, you have proven yourself to be wise and strong, even in your youth. Your mother once guarded our community. We have done the best we can in her absence, but our spears and our cold cannot destroy these dead. Help us, Menir."
[/message]


[message]
speaker=Menir
message= _ "I will do the best I can, Szel. I will honor the memory of my mother."
[/message]
[/event]
[event]
[/event]
[event]
name=last breath
[filter]
id=Varanus
Expand All @@ -168,7 +166,7 @@ The strongest hatchling, Menir, proved himself both ambitious and charismatic. T
speaker=Menir
message= _ "Szel, will he really return?"
[/message]

[message]
speaker=Szel
message= _ "Yes. It may take years for his essence to gather itself again, but he will return. He always has."
Expand All @@ -194,10 +192,10 @@ The strongest hatchling, Menir, proved himself both ambitious and charismatic. T
[event]
name=turn 4

[message]
speaker=Szel
message= _ "Careful on the mountains! You're too big to hide there, but you have the advantage of speed."
[/message]
[message]
speaker=Szel
message= _ "Careful on the mountains! You're too big to hide there, but you have the advantage of speed."
[/message]
[/event]

[event]
Expand Down Expand Up @@ -244,7 +242,5 @@ The strongest hatchling, Menir, proved himself both ambitious and charismatic. T
speaker=Szel
message= _ "These undead will never stop coming."
[/message]

[/event]

[/scenario]