From 5994142c5d324deb1b3969052761db3bcc94a152 Mon Sep 17 00:00:00 2001 From: Eric Gallager Date: Sun, 22 May 2022 15:00:12 -0400 Subject: [PATCH 1/7] Update 01_Elensefar.cfg copy over my version of the scenario from https://github.com/cooljeanius/wesnoth_mods/blob/master/campaigns/Defense_of_Elensefar/01_Elensefar.cfg (basically just tweaks some values to create more variance between difficulties) --- scenarios/01_Elensefar.cfg | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/scenarios/01_Elensefar.cfg b/scenarios/01_Elensefar.cfg index 8948487..47a82b3 100644 --- a/scenarios/01_Elensefar.cfg +++ b/scenarios/01_Elensefar.cfg @@ -16,12 +16,13 @@ [story] {DOE_PROLOGUE_STORY_OF_SOTA} [/story] + # you: [side] controller="human" fog=yes - {GOLD4 300 300 250 150} + {GOLD4 350 300 250 150} hidden=no - income=4 + {INCOME4 7 6 5 4} no_leader=no share_vision="none" shroud=no @@ -46,13 +47,14 @@ support_villages=yes [/ai] [/side] + # enemies: [side] controller="ai" fog=no facing=nw - {GOLD4 150 200 200 250} + {GOLD4 100 150 200 250} hidden=no - {INCOME4 40 50 50 60} + {INCOME4 30 40 50 60} no_leader=no share_vision="none" shroud=no @@ -64,7 +66,7 @@ type="Ancient Lich" recruit="Walking Corpse, Dark Adept, DoE_Ghost, Ghoul" # This side also has a recall list, see the RAS_HAS_RECALLS lines later - # Killing a lighthouse was intended to be possible, but it splits the enmy forces too much. It might be an interesting way to add a turn-limit, by having a couple of dedicated attackers start with the lighthouses. + # Killing a lighthouse was intended to be possible, but it splits the enemy forces too much. It might be an interesting way to add a turn-limit, by having a couple of dedicated attackers start with the lighthouses. [ai] [avoid] [and] @@ -114,7 +116,7 @@ # Hard difficulty allows this side to recruit blood bats, so the gold and income are much higher to match the more expensive units and upkeep. [event] - {QUANTITY4 name (unused_event) (unused_event) (turn 13) (turn 13)} + {QUANTITY4 name (unused_event) (unused_event) (turn 12) (turn 13)} [message] type="DoE Lighthouse" message=_ "I just saw a flock of bats arriving on the north side of the river." @@ -126,12 +128,12 @@ [/modify_side] [gold] side=3 - {QUANTITY4 amount 0 0 63 84} + {QUANTITY4 amount 0 1 63 84} [/gold] [/event] [event] - {QUANTITY4 name (turn 13) (turn 19) (turn 25) (turn 25)} + {QUANTITY4 name (turn 13) (turn 19) (turn 24) (turn 25)} [modify_side] side=2 income=25 @@ -270,12 +272,12 @@ [/for] #enddef {RAS_HAS_RECALLS 5 "Dark Sorcerer"} - {RAS_HAS_RECALLS {ON_DIFFICULTY4 1 2 4 4} Spectre} + {RAS_HAS_RECALLS {ON_DIFFICULTY4 1 2 3 4} Spectre} {RAS_HAS_RECALLS 5 DoE_Shadow} - {RAS_HAS_RECALLS {ON_DIFFICULTY4 1 1 3 4} DoE_Nightgaunt} + {RAS_HAS_RECALLS {ON_DIFFICULTY4 1 2 3 4} DoE_Nightgaunt} {RAS_HAS_RECALLS 5 Necrophage} - {RAS_HAS_RECALLS {ON_DIFFICULTY4 1 1 3 4} Ghast} - {RAS_HAS_RECALLS {ON_DIFFICULTY4 2 2 4 5} Lich} + {RAS_HAS_RECALLS {ON_DIFFICULTY4 1 1 2 3} Ghast} + {RAS_HAS_RECALLS {ON_DIFFICULTY4 1 2 4 5} Lich} {RAS_HAS_RECALLS {ON_DIFFICULTY4 0 0 1 1} "Ancient Lich"} #undefine RAS_HAS_RECALLS From 3c1164971cb5eba6431ccef3cc7488e70b10711b Mon Sep 17 00:00:00 2001 From: Eric Gallager Date: Sat, 7 Sep 2024 14:49:17 -0400 Subject: [PATCH 2/7] Update 01_Elensefar.cfg address feedback received from @stevecotton in reviews --- scenarios/01_Elensefar.cfg | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scenarios/01_Elensefar.cfg b/scenarios/01_Elensefar.cfg index 47a82b3..979ce0a 100644 --- a/scenarios/01_Elensefar.cfg +++ b/scenarios/01_Elensefar.cfg @@ -20,7 +20,7 @@ [side] controller="human" fog=yes - {GOLD4 350 300 250 150} + {GOLD4 300 250 200 150} hidden=no {INCOME4 7 6 5 4} no_leader=no @@ -116,7 +116,8 @@ # Hard difficulty allows this side to recruit blood bats, so the gold and income are much higher to match the more expensive units and upkeep. [event] - {QUANTITY4 name (unused_event) (unused_event) (turn 12) (turn 13)} + # An enemy reinforcements event, so having it happen earlier makes it harder: + {QUANTITY4 name (unused_event) (unused_event) (turn 19) (turn 13)} [message] type="DoE Lighthouse" message=_ "I just saw a flock of bats arriving on the north side of the river." @@ -133,7 +134,8 @@ [/event] [event] - {QUANTITY4 name (turn 13) (turn 19) (turn 24) (turn 25)} + # This turn should be dawn: + {QUANTITY4 name (turn 13) (turn 19) (turn 25) (turn 31)} [modify_side] side=2 income=25 From 3f22a997640eeac07b120d09e03beaa1e81908e0 Mon Sep 17 00:00:00 2001 From: Eric Gallager Date: Sun, 27 Oct 2024 01:30:34 -0400 Subject: [PATCH 3/7] run 1.18's `wmlindent` --- _main.cfg | 1 - scenarios/01_Elensefar.cfg | 24 ++++++++++++------------ units/DoE_Nightgaunt.cfg | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/_main.cfg b/_main.cfg index 211eca4..23db562 100644 --- a/_main.cfg +++ b/_main.cfg @@ -32,7 +32,6 @@ Three months after the attack on Carcyn, an army of undead came out of the North Now the few who remained in Elensefar must hope to defend. A single-scenario campaign. Note: The author has no idea if the nightmare difficulty is possible, but better players keep asking for hard to be harder." - [/campaign] #ifdef CAMPAIGN_DEFENSE_OF_ELENSEFAR diff --git a/scenarios/01_Elensefar.cfg b/scenarios/01_Elensefar.cfg index 979ce0a..3df2d59 100644 --- a/scenarios/01_Elensefar.cfg +++ b/scenarios/01_Elensefar.cfg @@ -260,18 +260,18 @@ # Add units to Ras-Tabahn's recall list #define RAS_HAS_RECALLS COUNT TYPE - [for] - start=1 - end={COUNT} - [do] - [unit] - type={TYPE} - side=2 - placement=recall - random_gender=yes - [/unit] - [/do] - [/for] + [for] + start=1 + end={COUNT} + [do] + [unit] + type={TYPE} + side=2 + placement=recall + random_gender=yes + [/unit] + [/do] + [/for] #enddef {RAS_HAS_RECALLS 5 "Dark Sorcerer"} {RAS_HAS_RECALLS {ON_DIFFICULTY4 1 2 3 4} Spectre} diff --git a/units/DoE_Nightgaunt.cfg b/units/DoE_Nightgaunt.cfg index 0bdf9c1..a7e2ea1 100644 --- a/units/DoE_Nightgaunt.cfg +++ b/units/DoE_Nightgaunt.cfg @@ -1,6 +1,6 @@ [unit_type] id=DoE_Nightgaunt - [base_unit] + [base_unit] id=Nightgaunt [/base_unit] cost=45 From 7499f352ec049fca39dc3b7e8100f9ccbdcff245 Mon Sep 17 00:00:00 2001 From: Eric Gallager Date: Sun, 27 Oct 2024 01:31:36 -0400 Subject: [PATCH 4/7] run 1.18's `wmllint` --- .gitignore | 1 + utils/journey.cfg | 6 +++--- utils/story.cfg | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1e82030..85bad2d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ Desktop.ini *~ .deps .dirstamp +*.cfg-bak diff --git a/utils/journey.cfg b/utils/journey.cfg index aac5280..3112b10 100644 --- a/utils/journey.cfg +++ b/utils/journey.cfg @@ -1,6 +1,6 @@ # wmllint: no translatables -# trackplacer: map=data/core/images/maps/titlescreen.png +# trackplacer: map=data/core/images/maps/titlescreen.webp #define ENEMY_NEW_JOURNEY X Y # Make a new journey mark on a tracking map @@ -62,13 +62,13 @@ #define JOURNEY_PART STAGE [part] [background_layer] - image=maps/background.jpg + image=maps/background.webp scale_vertically=yes scale_horizontally=no keep_aspect_ratio=yes [/background_layer] [background_layer] - image=maps/titlescreen.png + image=maps/titlescreen.webp scale_vertically=yes scale_horizontally=no keep_aspect_ratio=yes diff --git a/utils/story.cfg b/utils/story.cfg index 6c54050..3030f2e 100644 --- a/utils/story.cfg +++ b/utils/story.cfg @@ -33,7 +33,7 @@ Still, it was a formidable army that approached Elensefar." #define DOE_EPILOGUE [part] [background_layer] - image=story/landscape-battlefield.jpg + image=story/landscape-battlefield.webp scale_vertically=yes scale_horizontally=no keep_aspect_ratio=yes From 69201342e69208e1e423bf234076a07ba9dea040 Mon Sep 17 00:00:00 2001 From: Eric Gallager Date: Sun, 27 Oct 2024 01:37:07 -0400 Subject: [PATCH 5/7] more wmllint fixes --- _main.cfg | 2 +- scenarios/01_Elensefar.cfg | 3 ++- scenarios/02_Epilogue.cfg | 3 ++- units/DoE_Caravan.cfg | 3 ++- units/DoE_Ghost.cfg | 2 ++ units/DoE_Lighthouse.cfg | 3 ++- units/DoE_Nightgaunt.cfg | 2 ++ units/DoE_Shadow.cfg | 2 ++ utils/abilities.cfg | 2 +- utils/lighthouse_schedule.cfg | 1 + utils/story.cfg | 2 +- 11 files changed, 18 insertions(+), 7 deletions(-) diff --git a/_main.cfg b/_main.cfg index 23db562..1b6a98d 100644 --- a/_main.cfg +++ b/_main.cfg @@ -10,7 +10,7 @@ name= _ "Defense of Elensefar" abbrev= _ "DoE" define=CAMPAIGN_DEFENSE_OF_ELENSEFAR - extra_defines=ENABLE_ANCIENT_LICH + {ENABLE_ANCIENT_LICH} icon="items/holy-water.png" # image="" {CAMPAIGN_DIFFICULTY EASY "units/human-peasants/peasant.png~RC(magenta>red)" ( _ "Civilian") ( _ "Beginner")} diff --git a/scenarios/01_Elensefar.cfg b/scenarios/01_Elensefar.cfg index 3df2d59..1ff9559 100644 --- a/scenarios/01_Elensefar.cfg +++ b/scenarios/01_Elensefar.cfg @@ -1,4 +1,5 @@ -#text_domain wesnoth-Defense_of_Elensefar +#textdomain wesnoth-Defense_of_Elensefar + [scenario] current_time=0 description="" diff --git a/scenarios/02_Epilogue.cfg b/scenarios/02_Epilogue.cfg index a42c328..3a707e4 100644 --- a/scenarios/02_Epilogue.cfg +++ b/scenarios/02_Epilogue.cfg @@ -1,4 +1,5 @@ -#text_domain wesnoth-Defense_of_Elensefar +#textdomain wesnoth-Defense_of_Elensefar + [scenario] id="02_Epilogue" name= _ "Epilogue" diff --git a/units/DoE_Caravan.cfg b/units/DoE_Caravan.cfg index 102d95c..c5b1d4b 100644 --- a/units/DoE_Caravan.cfg +++ b/units/DoE_Caravan.cfg @@ -1,4 +1,5 @@ -#text_domain wesnoth-Defense_of_Elensefar +#textdomain wesnoth-Defense_of_Elensefar + [unit_type] id="DoE Mortuary Caravan" name= _ "Mortuary Caravan" diff --git a/units/DoE_Ghost.cfg b/units/DoE_Ghost.cfg index 0cf5b56..21fdcd0 100644 --- a/units/DoE_Ghost.cfg +++ b/units/DoE_Ghost.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + [unit_type] id=DoE_Ghost [base_unit] diff --git a/units/DoE_Lighthouse.cfg b/units/DoE_Lighthouse.cfg index 76b7f40..31ab2fc 100644 --- a/units/DoE_Lighthouse.cfg +++ b/units/DoE_Lighthouse.cfg @@ -1,4 +1,5 @@ -#text_domain wesnoth-Defense_of_Elensefar +#textdomain wesnoth-Defense_of_Elensefar + [unit_type] id="DoE Lighthouse" name= _ "Lighthouse" diff --git a/units/DoE_Nightgaunt.cfg b/units/DoE_Nightgaunt.cfg index a7e2ea1..0772df5 100644 --- a/units/DoE_Nightgaunt.cfg +++ b/units/DoE_Nightgaunt.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + [unit_type] id=DoE_Nightgaunt [base_unit] diff --git a/units/DoE_Shadow.cfg b/units/DoE_Shadow.cfg index 70d3afa..e4032af 100644 --- a/units/DoE_Shadow.cfg +++ b/units/DoE_Shadow.cfg @@ -1,3 +1,5 @@ +# wmllint: no translatables + [unit_type] id=DoE_Shadow [base_unit] diff --git a/utils/abilities.cfg b/utils/abilities.cfg index 34e6327..f99bdaf 100644 --- a/utils/abilities.cfg +++ b/utils/abilities.cfg @@ -1,4 +1,4 @@ -#text_domain wesnoth-Defense_of_Elensefar +#textdomain wesnoth-Defense_of_Elensefar #define DOE_ABILITY_NIGHTSTALK [hides] diff --git a/utils/lighthouse_schedule.cfg b/utils/lighthouse_schedule.cfg index 6acaedb..15d4cc9 100644 --- a/utils/lighthouse_schedule.cfg +++ b/utils/lighthouse_schedule.cfg @@ -1,3 +1,4 @@ +# wmllint: no translatables # Time Area for the lighthouse and the mortuary houses, simulating illumination (from TRoW's Clearwater Port) #define DOE_LIT_SCHEDULE # Schedule using the red, green, blue values from other ToDs, diff --git a/utils/story.cfg b/utils/story.cfg index 3030f2e..635e20f 100644 --- a/utils/story.cfg +++ b/utils/story.cfg @@ -1,4 +1,4 @@ -#text_domain wesnoth-Defense_of_Elensefar +#textdomain wesnoth-Defense_of_Elensefar #define DOE_PROLOGUE_STORY_OF_SOTA {JOURNEY_PART CARCYN} From 0554daa668c2a6c1402ef709156914f55b739684 Mon Sep 17 00:00:00 2001 From: Eric Gallager Date: Sun, 27 Oct 2024 01:42:24 -0400 Subject: [PATCH 6/7] spellchecking with wmllint using the aspell spellchecker --- _main.cfg | 3 +++ scenarios/01_Elensefar.cfg | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/_main.cfg b/_main.cfg index 1b6a98d..c5ae948 100644 --- a/_main.cfg +++ b/_main.cfg @@ -4,6 +4,9 @@ name="wesnoth-Defense_of_Elensefar" [/textdomain] +# wmllint: general spellings Elensefar undead Blackwater Carcyn lich liches nightstalk Alduin dwarves dwarvish dwarven Knalgan there'll +# wmllint: general spellings nagas merfolk saurians Tath Grey + # wmlscope: set export=no [campaign] id="Defense_of_Elensefar" diff --git a/scenarios/01_Elensefar.cfg b/scenarios/01_Elensefar.cfg index 1ff9559..3158920 100644 --- a/scenarios/01_Elensefar.cfg +++ b/scenarios/01_Elensefar.cfg @@ -500,6 +500,7 @@ [message] # use $unit to make the auto-store happen before the transform id=$unit.id + # wmllint: local spelling Neep message= _ "Neep! Neep!" [/message] [message] @@ -573,7 +574,7 @@ name=bat_transformed_to_undead [message] x,y=$x1,$y1 - message= _ "Neeeeeeeep!" + message= _ "Neeeeeeeep!" # wmllint: no spellcheck scroll=no [/message] [message] @@ -856,6 +857,7 @@ [else] [message] speaker=unit + # wmllint: local spelling male_necro message= _ "male_necro^Vaults full of bodies! They shall all join my minions, and all of the living defenders soon will too!" female_message= _ "female_necro^Vaults full of bodies! They shall all join my minions, and all of the living defenders soon will too!" [/message] From 48ae43977a866a86ad8686623565015b30602091 Mon Sep 17 00:00:00 2001 From: Eric Gallager Date: Sun, 27 Oct 2024 01:55:34 -0400 Subject: [PATCH 7/7] a few validator fixes --- scenarios/01_Elensefar.cfg | 4 ++-- scenarios/02_Epilogue.cfg | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scenarios/01_Elensefar.cfg b/scenarios/01_Elensefar.cfg index 3158920..0c3bce7 100644 --- a/scenarios/01_Elensefar.cfg +++ b/scenarios/01_Elensefar.cfg @@ -63,7 +63,7 @@ team_name=Undead user_team_name= _ "Undead" id=Ras-Tabahn - name="King Ras–Tabahn" + name=_"King Ras–Tabahn" type="Ancient Lich" recruit="Walking Corpse, Dark Adept, DoE_Ghost, Ghoul" # This side also has a recall list, see the RAS_HAS_RECALLS lines later @@ -164,7 +164,7 @@ {IS_LOYAL} [/unit] [redraw] - clear_fog=yes + clear_shroud=yes [/redraw] [message] race=merman diff --git a/scenarios/02_Epilogue.cfg b/scenarios/02_Epilogue.cfg index 3a707e4..4b78ed3 100644 --- a/scenarios/02_Epilogue.cfg +++ b/scenarios/02_Epilogue.cfg @@ -23,6 +23,7 @@ [/event] [side] + side=1 controller="human" team_name=Heroes user_team_name= _ "Elensefar"