From 903b5e2f34ddbb8a6fc26558c41734f164167607 Mon Sep 17 00:00:00 2001 From: Eric Gallager Date: Sat, 28 May 2022 12:48:14 -0400 Subject: [PATCH] remove __UNUSED__ ifdefs also fix some stuff I missed when adding NIGHTMARE, because it only affected the other difficulties. This should be equivalent to cooljeanius/A_New_Order@f129fde, plus the addition of a new image that it looks like I forgot to copy over previously. --- _main.cfg | 2 +- images/halo/dark-aura.png | Bin 0 -> 4395 bytes macros/ano-01_06macros.cfg | 11 ---- macros/ano_macros.cfg | 77 ++++++---------------------- macros/debug.cfg | 6 --- macros/items.cfg | 3 -- macros/messages.cfg | 31 ----------- scenarios/03_Coronation.cfg | 4 +- scenarios/04_Battle_of_Barnon.cfg | 28 +++------- scenarios/05_The_Swamp_Things.cfg | 3 -- scenarios/05_Unexpected_Guests.cfg | 3 -- scenarios/06_Separation.cfg | 7 ++- scenarios/08_Outlaw_Base.cfg | 35 +------------ scenarios/09_Hired_Swords.cfg | 4 -- scenarios/13_Scouting.cfg | 4 +- scenarios/15_Back_in_Freetown.cfg | 4 +- scenarios/16_Choosing_the_Best.cfg | 12 ++--- scenarios/18_Start_of_the_Quest.cfg | 5 +- scenarios/20_Okladia.cfg | 12 ++--- scenarios/24_Fall_of_Freetown.cfg | 12 ++--- scenarios/28_Lorin.cfg | 4 +- scenarios/29_Epilogue.cfg | 54 +++++-------------- units/akladians/Akladian_Lady.cfg | 33 ------------ units/macros/amla.cfg | 3 +- 24 files changed, 61 insertions(+), 296 deletions(-) create mode 100644 images/halo/dark-aura.png diff --git a/_main.cfg b/_main.cfg index 4ee7e9ee..8be1d5b7 100644 --- a/_main.cfg +++ b/_main.cfg @@ -36,7 +36,7 @@ add-ons/A_New_Order#enddef id=A_New_Order name=_ "A New Order" abbrev=_ "ANO" -#ifdef __UNUSED__ +#ifdef OLD_STYLE_VERSIONING version={~{LDR_PATH}/dist/VERSION} #else # The version number is also set many other places in the code (e.g. in ano_macros.cfg); diff --git a/images/halo/dark-aura.png b/images/halo/dark-aura.png new file mode 100644 index 0000000000000000000000000000000000000000..deb92b885f4aeff782cef93ae576ae90d05421b5 GIT binary patch literal 4395 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 literal 0 HcmV?d00001 diff --git a/macros/ano-01_06macros.cfg b/macros/ano-01_06macros.cfg index c083df41..5bdad0e7 100644 --- a/macros/ano-01_06macros.cfg +++ b/macros/ano-01_06macros.cfg @@ -429,14 +429,3 @@ [/if] [/event] #enddef - -#ifdef __UNUSED__ -# wmlscope: start ignoring -#define CLEAR_RECALL_NEW - [kill] - side=1 # or whatever is the side of the player - x,y=recall,recall - [/kill] -#enddef -# wmlscope: stop ignoring -#endif diff --git a/macros/ano_macros.cfg b/macros/ano_macros.cfg index ee39ca3d..32eadcdd 100644 --- a/macros/ano_macros.cfg +++ b/macros/ano_macros.cfg @@ -15,17 +15,6 @@ [/allow_recruit] #enddef -#ifdef ALLOW_DUP_MACRO_DEFS -# wmlscope: start ignoring -#define CONDITION VARIABLE OP VALUE - [variable] - name={VARIABLE} - {OP}={VALUE} - [/variable] -#enddef -# wmlscope: stop ignoring -#endif - #define DISALLOW_RECRUIT SIDE TYPE [disallow_recruit] side={SIDE} @@ -237,8 +226,10 @@ first_time_only=no #dejavu start {IF ANOreload equals true} -#ifdef __DEBUG__ +#ifdef DEBUG_MODE + {IF_DEBUG_MODE_IS_ACTUALLY_ON} {DEBUGMSG1 "reloaded previous turn (${unpleasant}|:${unpleasant}_times|)"} + {END_IF_WITHOUT_ELSE} #endif [fire_event] name=reload previous turn @@ -248,8 +239,10 @@ [/fire_event] {IF {unpleasant} equals false} {VARIABLE_OP {unpleasant}_times add 1} -#ifdef __DEBUG__ +#ifdef DEBUG_MODE + {IF_DEBUG_MODE_IS_ACTUALLY_ON} {DEBUGMSG1 "generating event"} + {END_IF_WITHOUT_ELSE} #endif [fire_event] name="unpleasant event avoided with reload" @@ -348,8 +341,10 @@ [/store_unit] {SET_GLOBAL_VARIABLE {variable}_lastkilled_id $tmp.id} {SET_GLOBAL_VARIABLE {variable}_lastkilled_type $tmp.type} -#ifdef __DEBUG__ +#ifdef DEBUG_MODE + {IF_DEBUG_MODE_IS_ACTUALLY_ON} {DEBUGMSG1 "last {variable}_lastkilled_type $tmp.type"} + {END_IF_WITHOUT_ELSE} #endif {CLEAR_VARIABLE tmp} {SET_GLOBAL_VARIABLE {variable}_turn $turn_number} @@ -367,8 +362,10 @@ {GET_GLOBAL_VARIABLE {variable}} {GLOBAL_VARIABLE_TO_LOCAL {variable}_turn tmp} {GLOBAL_VARIABLE_TO_LOCAL {variable}_count xyz} -#ifdef __DEBUG__ +#ifdef DEBUG_MODE + {IF_DEBUG_MODE_IS_ACTUALLY_ON} {DEBUGMSG1 "reload to avoid deaths : $xyz until now"} + {END_IF_WITHOUT_ELSE} #endif # problem: right now, this event is generated both when player reloads # during his turn, as well as when he hits end turn and then reloads @@ -419,10 +416,12 @@ y=$y1 [/filter] [/store_unit] -#ifdef __DEBUG__ +#ifdef DEBUG_MODE + {IF_DEBUG_MODE_IS_ACTUALLY_ON} # wmllint: validate-off {MESSAGE Assassin () () _"getunit $x1 : $y1 : $ano_tmp.description"} # wmllint: ignore # wmllint: validate-on + {END_IF_WITHOUT_ELSE} #endif {MESSAGE Assassin () () _"getunit $x1 : $y1 : $ano_tmp.id"} [set_variable] @@ -491,6 +490,7 @@ [/recall] #enddef +# TODO: maybe move death macros to a separate file? #define REME_DEATH_N [event] name=last breath @@ -579,30 +579,6 @@ [/event] #enddef -#ifdef __UNUSED__ -# wmlscope: start ignoring -#define CHANGE_TYPE DESC VALUE - [store_unit] - [filter] - id={DESC} - [/filter] - kill=yes - variable=ano_change_side_tmp - [/store_unit] - [set_variable] - name=ano_change_side_tmp.type - value={VALUE} - [/set_variable] - [unstore_unit] - variable=ano_change_side_tmp - [/unstore_unit] - [clear_variable] - name=ano_change_side_tmp - [/clear_variable] -#enddef -# wmlscope: stop ignoring -#endif - #define CHANGE_SIDE DESC VALUE [store_unit] [filter] @@ -644,11 +620,6 @@ #enddef #define VARUNIT ARRAY INDEX UNIT -#ifdef __UNUSED__ - # wmllint: validate-off - {VARIABLE ({ARRAY}[{INDEX}].description) (${UNIT}.description)} # wmllint: ignore - # wmllint: validate-on -#endif {VARIABLE ({ARRAY}[{INDEX}].id) (${UNIT}.id)} {VARIABLE ({ARRAY}[{INDEX}].experience) (${UNIT}.experience)} {VARIABLE ({ARRAY}[{INDEX}].gender) (${UNIT}.gender)} @@ -991,17 +962,6 @@ [/filter] #enddef -#ifdef __UNUSED__ -# wmlscope: start ignoring -#define DIE DESC - name=die - [filter] - id={DESC} - [/filter] -#enddef -# wmlscope: stop ignoring -#endif - #define KILLEDBY DESC DESC2 name=last breath [filter] @@ -1195,11 +1155,6 @@ {OP}={WHAT} side=1 [/filter] -#ifdef __UNUSED__ - kill=yes - fire_event=no - animate=no -#endif [/store_unit] {MSG_narrator _"The unit $ano_loyal[0].name became LOYAL."} {VARIABLE (ano_loyal[0].traits_description) ("$ano_loyal[0].traits_description" + _"loyal")} diff --git a/macros/debug.cfg b/macros/debug.cfg index 8679d90d..8273952b 100644 --- a/macros/debug.cfg +++ b/macros/debug.cfg @@ -10,12 +10,6 @@ description=_"set scenario" id=set_scenario [show_if] - # FIXME: menu options don't show up if this check is enabled: -#ifdef __UNUSED__ - [lua] - code=<> - [/lua] -#endif [/show_if] [command] [message] diff --git a/macros/items.cfg b/macros/items.cfg index edc6a42a..fa6a0769 100644 --- a/macros/items.cfg +++ b/macros/items.cfg @@ -4,9 +4,6 @@ {PICKUPPABLE_ITEM {ID} {X} {Y} ( race=akladian,dwarf,elf,human,dunefolk,lizard -#ifdef __UNUSED__ - formula="(self.movement_costs.frozen >= 1)" -#endif [filter_wml] [not] [modifications] diff --git a/macros/messages.cfg b/macros/messages.cfg index 0cda0f92..b8dcf6d3 100644 --- a/macros/messages.cfg +++ b/macros/messages.cfg @@ -128,37 +128,6 @@ [/command] [/option] #enddef -#ifdef __UNUSED__ -# wmlscope: start ignoring -#define MSGOPT2 SPEAKER MSG OPTION1 VAL1 OPTION2 VAL2 - [message] - speaker={SPEAKER} - message={MSG} - {MSGOPTION ({OPTION1}) ({VAL1})} - {MSGOPTION ({OPTION2}) ({VAL2})} - [/message] -#enddef -#define MSGOPT3 SPEAKER MSG OPTION1 VAL1 OPTION2 VAL2 OPTION3 VAL3 - [message] - speaker={SPEAKER} - message={MSG} - {MSGOPTION ({OPTION1}) ({VAL1})} - {MSGOPTION ({OPTION2}) ({VAL2})} - {MSGOPTION ({OPTION3}) ({VAL3})} - [/message] -#enddef -#define MSGOPT4 SPEAKER MSG OPTION1 VAL1 OPTION2 VAL2 OPTION3 VAL3 OPTION4 VAL4 - [message] - speaker={SPEAKER} - message={MSG} - {MSGOPTION ({OPTION1}) ({VAL1})} - {MSGOPTION ({OPTION2}) ({VAL2})} - {MSGOPTION ({OPTION3}) ({VAL3})} - {MSGOPTION ({OPTION4}) ({VAL4})} - [/message] -#enddef -# wmlscope: stop ignoring -#endif #define MSGOPT5 SPEAKER MSG OPTION1 VAL1 OPTION2 VAL2 OPTION3 VAL3 OPTION4 VAL4 OPTION5 VAL5 [message] speaker={SPEAKER} diff --git a/scenarios/03_Coronation.cfg b/scenarios/03_Coronation.cfg index fda0028e..de980111 100644 --- a/scenarios/03_Coronation.cfg +++ b/scenarios/03_Coronation.cfg @@ -12,9 +12,7 @@ [story] [part] story=_"Carrenemoes have loyally served our kings for generations. I am Reme, son of Raul. My ancestors, according to our family legends, were amongst those who led our people in the great revolt and then in our epic escape through the desert. They established large kingdoms in the lands of underlings, for which we paid a steep price in blood. Now... why do I wonder what was that price paid for?" -#ifdef __UNUSED__ - background=story_images/reme_alone.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/reme/reme_alone.png [/part] [part] story=_"Perhaps it is because of Gawen. Before I began serving his father, I never wondered about the differences between us and underlings. It was simple: God himself gave us this world to rule; everyone else was to serve us. Yet, Gawen Hagarthen is half underling. In fact, he looks a lot like one of them. And he was always more brave and honorable than many Akladians I know... " diff --git a/scenarios/04_Battle_of_Barnon.cfg b/scenarios/04_Battle_of_Barnon.cfg index 020ad139..be2c1784 100644 --- a/scenarios/04_Battle_of_Barnon.cfg +++ b/scenarios/04_Battle_of_Barnon.cfg @@ -493,19 +493,6 @@ {ANO4_TRAITORS _"Blah blah blah; if you are seeing this, you should already know what the deal is."} [/command] [/option] -#ifdef __UNUSED__ - # FIXME: this one doesn't seem to work: - [option] - # po: debug option; completes sentence starting with "Set scenario status to...": - message=_"Hoyre escaping." - [command] - [fire_event] - name=moveto - id=Hoyre_escapes - [/fire_event] - [/command] - [/option] -#endif [option] # po: debug option; completes sentence starting with "Set scenario status to...": message=_"Uri personally attacking Barnon." @@ -725,7 +712,14 @@ {IF_HAVE_UNIT (Hoyre O Barnone)} # This probably shouldn't ever be reached, but just in case: {MESSAGE (Hoyre O Barnone) (portraits/hoyre.png) (Hoyre O Barnone) _"Wait a second, something odd seems to be happening here..."} - {FOUR_END_IFs} + {ELSE} + # REALLY shouldn't ever be reached: + {MSG_narrator _"At this moment, Gawen remembered what he was trying to do."} + {TWO_END_IFs} + {END_IF} + {ELSE} + [redraw][/redraw] + {END_IF} #endif {ELSE} {IF ano_tr equals 6} # To make it more certain that Gawen cannot win @@ -2003,12 +1997,6 @@ {VARIABLE ano_reload true} [/event] -#ifdef __UNUSED__ - [event] - name=reload to the same turn to avoid losses - [/event] -#endif - [event] name=new turn first_time_only=false diff --git a/scenarios/05_The_Swamp_Things.cfg b/scenarios/05_The_Swamp_Things.cfg index ea4027c0..da404c19 100644 --- a/scenarios/05_The_Swamp_Things.cfg +++ b/scenarios/05_The_Swamp_Things.cfg @@ -200,9 +200,6 @@ ## {FOREACH ano_units i} -#ifdef __UNUSED__ - {VARTOUNIT ano_units $i 1 1 1} -#endif [set_variable] name=ano_units[$i].hitpoints value=$ano_units[$i].max_hitpoints diff --git a/scenarios/05_Unexpected_Guests.cfg b/scenarios/05_Unexpected_Guests.cfg index 8d6dc259..5fddf8d1 100644 --- a/scenarios/05_Unexpected_Guests.cfg +++ b/scenarios/05_Unexpected_Guests.cfg @@ -122,9 +122,6 @@ {END_IF_WITHOUT_ELSE} ## {FOREACH ano_units i} -#ifdef __UNUSED__ - {VARTOUNIT ano_units $i 1 1 1} -#endif [set_variable] name=ano_units[$i].hitpoints value=$ano_units[$i].max_hitpoints diff --git a/scenarios/06_Separation.cfg b/scenarios/06_Separation.cfg index f9aeb272..a1e0d0d0 100644 --- a/scenarios/06_Separation.cfg +++ b/scenarios/06_Separation.cfg @@ -6,8 +6,10 @@ amount=20 # i.e. just enough to refund the price of a recall side=1 [/gold] -#ifdef __UNUSED__ +#ifdef DEBUG_MODE + {IF_DEBUG_MODE_IS_ACTUALLY_ON} {MSG_Reme _"You have already recruited $ano_tmp| units."} + {END_IF_WITHOUT_ELSE} #endif [if] {CONDITION ano_tmp equals 5} @@ -169,12 +171,13 @@ {CLEAR_VARIABLE ano_reme_stored} {CLEAR_VARIABLE ano_lorin_stored} {CLEAR_VARIABLE ano_lorin_units} -#ifdef __UNUSED__ +#ifdef LET_REME_KEEP_UNITS # TODO: see if this can be un-ifdef-ed? {RECALL_AND_STORE_ALL ano_reme_units} #endif {CLEAR_VARIABLE ano_tmp} {ELSE} + # (???) {END_IF} [endlevel] result=victory diff --git a/scenarios/08_Outlaw_Base.cfg b/scenarios/08_Outlaw_Base.cfg index 5ac50dc0..b9566f28 100644 --- a/scenarios/08_Outlaw_Base.cfg +++ b/scenarios/08_Outlaw_Base.cfg @@ -304,14 +304,8 @@ [option] message=_"Yes, I shall accept you and any of your people who want to fight in my army." [command] + # This variable causes him to join you in the victory event: {VARIABLE ano_robroe_hired yes} -#ifdef __UNUSED__ - # Rob Roe lives and joins Gawen (duh) - Typhon - {SETVAL ("Rob Roe") hitpoints 10} - {SETVAL ("Rob Roe") side 1} - {ALLOW_RECRUIT 1 Thug,Footpad,Thief} -#endif - # Rob Roe dies or something (sigh) - Malin [store_unit] [filter] id=Outlaw Leader @@ -446,23 +440,7 @@ {IS_LOYAL} [/unit] {CLEAR_VARIABLE ano_robroe_unit} - # ifdef-ed out this stuff because new recruits are dealt - # with later (see ano-11x.cfg, lines 88 to 91) - Malin - # (no such ano-11x.cfg file exists, though?) - egallager -#ifdef __UNUSED__ - [allow_recruit] - side=1 - type=Thug - [/allow_recruit] - [allow_recruit] - side=1 - type=Footpad - [/allow_recruit] - [allow_recruit] - side=1 - type=Thief - [/allow_recruit] -#endif + # (new recruits are dealt with later) [/then] [/if] {VARIABLE ano_gawen_is_stored yes} @@ -477,15 +455,6 @@ variable=ano_gawen_stored kill=yes [/store_unit] -#ifdef __UNUSED__ - [store_unit] - [filter] - id="Ruvio" - [/filter] - variable=ano_ruvio_stored - kill=yes - [/store_unit] -#endif [store_gold] variable=ano_gawen_gold side=1 diff --git a/scenarios/09_Hired_Swords.cfg b/scenarios/09_Hired_Swords.cfg index 71307990..1db32564 100644 --- a/scenarios/09_Hired_Swords.cfg +++ b/scenarios/09_Hired_Swords.cfg @@ -100,11 +100,7 @@ [part] # wmllint: local spelling asa'ir story=_"I found one of their asa'ir and talked to their leader, a man called Majid Yahyazad. I wanted swords and I had gold; they had swords and wanted gold, so we struck a deal quickly. I felt uneasy amongst them; their speech, dress, and customs screaming 'underling.' But I consoled myself with the thought that they were only hired swords." -#ifdef __UNUSED__ - background=story_images/story_yaranov.png -#else background=story_images/majid_big.png -#endif [/part] [/story] {DAWN} diff --git a/scenarios/13_Scouting.cfg b/scenarios/13_Scouting.cfg index 8a18c8ea..a7b8a8a6 100644 --- a/scenarios/13_Scouting.cfg +++ b/scenarios/13_Scouting.cfg @@ -51,9 +51,7 @@ [part] #po: Spoken by Reme Carrenemoe story=_"I am finally free! I still can hardly believe it. Not only am I free, but also Gawen, my king, is alive. It is a very real relief for me; the thought that I had abandoned him during the Battle of Barnon has haunted me for weeks now." -#ifdef __UNUSED__ - background=story_images/reme_alone.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/reme/reme_alone.png [/part] {IF ano_lorin_joined equals yes} [part] diff --git a/scenarios/15_Back_in_Freetown.cfg b/scenarios/15_Back_in_Freetown.cfg index 09800227..c010a032 100644 --- a/scenarios/15_Back_in_Freetown.cfg +++ b/scenarios/15_Back_in_Freetown.cfg @@ -17,9 +17,7 @@ [/part] [part] story=_"Even Lorin and Karen seemed to finally be getting along. I thought they might have started to like each other. Karen had even promised to show Lorin a few easy exercises to help her to regain the slenderness of her youth." -#ifdef __UNUSED__ - background=story_images/story_lorin_karen.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/story/story_lorin_karen.png [/part] {IF ano_lorin_knows_about_roe equals yes} {IF_HAVE_UNIT_ANY (Rob Roe)} diff --git a/scenarios/16_Choosing_the_Best.cfg b/scenarios/16_Choosing_the_Best.cfg index 94e2896a..68b50166 100644 --- a/scenarios/16_Choosing_the_Best.cfg +++ b/scenarios/16_Choosing_the_Best.cfg @@ -57,15 +57,11 @@ [part] #po: spoken by Gawen story=_"Finally, I was confident that my troops were ready for the task which awaited us. When I told Gwidle, he insisted upon a farewell feast. There was wine, food, and music. The finest dancers from among Freetown's girls and women, doing traditional folk-dances in special costumes with masks and shawls, danced for us." -#ifdef __UNUSED__ - background=story_images/story_dancers.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/story/story_dancers.png [/part] [part] story=_"Soon, we were all a little bit drunk. On my right, Karen kept commenting on the dancers' faults and bragged about how she was much better, and how even her dancer's costume was better. On my left I heard Majid Yahyazad trying to seduce my step-mother, even harder as he became more drunk. Lorin ignored him, babbling about something the Oracle had told her in her youth." -#ifdef __UNUSED__ - background=story_images/story_uczta.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/story/story_uczta.png [/part] [part] story=_"Karen was the first to leave the chamber, and Lorin followed almost immediately after her. Of course, Yahyazad jauntily followed her. I continued to drink with Ruvio, without much conversation, and when I decided I had enough I went to my bedroom." @@ -76,9 +72,7 @@ [/part] [part] story=_"Who was she? She wore a dancer's mask, but somehow I knew she wasn't one of dancers from a few hours earlier. There was something familiar in the way she moved, breathed and gasped. Maybe if I had been sober, I would have recognised her even with the mask. But I wasn't, and I didn't care." -#ifdef __UNUSED__ - background=story_images/story_maska.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/story/story_maska.png [/part] [part] story=_"She left as quietly as she came, as if she were just a dream. But I still could smell her in the air, and my hands still remembered her as well. Whoever she was, I was certain I would recognise her, if I could only touch her again." diff --git a/scenarios/18_Start_of_the_Quest.cfg b/scenarios/18_Start_of_the_Quest.cfg index 3c1fd929..b6e61abb 100644 --- a/scenarios/18_Start_of_the_Quest.cfg +++ b/scenarios/18_Start_of_the_Quest.cfg @@ -29,11 +29,10 @@ [part] #po: spoken by Gawen story=_"I wasn't really happy with the results of our visit to Oracle. None of her 'answers' satisfied me. We still had no idea where to search for Deorien, and the exchange between Lorin and the Oracle just confused me more. Lorin categorically refused to talk about it became much more withdrawn, as though she was keeping a weighty matter to herself." -#ifdef __UNUSED__ - background="story_images/gawen_was_mysli.png" # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/gawen/gawen_was_mysli.png [/part] {ELSE} + # (???) {TWO_END_IFs} [/story] diff --git a/scenarios/20_Okladia.cfg b/scenarios/20_Okladia.cfg index 80778352..cd1f485e 100644 --- a/scenarios/20_Okladia.cfg +++ b/scenarios/20_Okladia.cfg @@ -24,9 +24,7 @@ [/part] [part] story=_"Lorin was acting very strangely. Often, she sat outside our camp, her eyes aimlessly scanning the horizon. I started to fret about this, but she rebuffed any attempt to talk about her behaviour." -#ifdef __UNUSED__ - background=story_images/gawen_was_mysli.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/gawen/gawen_was_mysli.png [/part] {ELSE_IF ano_strateg_pos equals 2} [part] @@ -37,18 +35,14 @@ {IF ano_haunted_visited equals yes} #po: spoken by Gawen story=_"This was my first contact with undead, and I was happy that my troops had passed this difficult test. I hope future battles with Grekulak's forces will also be won." -#ifdef __UNUSED__ - background=story_images/gawen_was_mysli.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/gawen/gawen_was_mysli.png {END_IF_WITHOUT_ELSE} [/part] {ELSE} [part] #po: spoken by Gawen story=_"The farmer's daughter wasn't as beautiful as I expected. She was overjoyed to see her father again. She kissed both me and Lorin - leaving my step-mother in total dismay." -#ifdef __UNUSED__ - background=story_images/gawen_was_mysli.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/gawen/gawen_was_mysli.png [/part] {END_IF} {TWO_END_IFs} diff --git a/scenarios/24_Fall_of_Freetown.cfg b/scenarios/24_Fall_of_Freetown.cfg index 6aa197c3..f226a514 100644 --- a/scenarios/24_Fall_of_Freetown.cfg +++ b/scenarios/24_Fall_of_Freetown.cfg @@ -23,21 +23,15 @@ [/part] [part] story=_"I tried to protect them, I tried so hard. I wanted Karen to be safe in Freetown. If not for my orders, maybe at least she..." -#ifdef __UNUSED__ - background=story_images/ruvio_profil.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/ruvio/ruvio_profil.png [/part] [part] story=_"Gawen, I think Karen loved you. I don't know what your feelings were towards her, but I always hoped that you two might find happiness together, and despite knowing it would be impossible - despite knowing that you would have to make some dynastic marriage one day - I even foolishly dreamt you could found a new dynasty." -#ifdef __UNUSED__ - background=story_images/gawen_ruvio.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/gawen/gawen_ruvio.png [/part] [part] story=_" I don't know how long I tarried there. I didn't care about anything. Akladians have taken everything from me. First they took your mother from me. Then they killed her. And now, they have killed my daughters, my wife, my whole family." -#ifdef __UNUSED__ - background=story_images/ruvio_profil.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/ruvio/ruvio_profil.png [/part] [part] story=_" I... am an empty shell. Nothing is left inside me." diff --git a/scenarios/28_Lorin.cfg b/scenarios/28_Lorin.cfg index 8a744c59..7e24a188 100644 --- a/scenarios/28_Lorin.cfg +++ b/scenarios/28_Lorin.cfg @@ -15,9 +15,7 @@ [/part] [part] story=_"Finally one of them said that Lady Lorin committed some kind of terrible crime, and she was caught by the guards; she tried to fight them off, but she was still too weak after her strange accident on the battlefield and was easily overwhelmed." -#ifdef __UNUSED__ - background=story_images/story_powerless.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/story/story_powerless.png [/part] [/story] {INDOORS} # was AFTERNOON, but that doesn't make sense given the location diff --git a/scenarios/29_Epilogue.cfg b/scenarios/29_Epilogue.cfg index 74627afa..bfef17af 100644 --- a/scenarios/29_Epilogue.cfg +++ b/scenarios/29_Epilogue.cfg @@ -12,75 +12,51 @@ [part] #po: spoken by Lorin story=_"Who's here? Gawen? I hoped you would visit me, before I leave Vattin forever... I wish I could see your face this last time... I want to tell you everything. You have to know..." -#ifdef __UNUSED__ - background=story_images/lorin_opowiada.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/lorin/lorin_opowiada.png [/part] [part] story=_"When I was still young, my family took me to the Oracle. I asked her about my future. Her answer was totally unexpected, and greatly excited my family." -#ifdef __UNUSED__ - background=story_images/lorin_opowiada.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/lorin/lorin_opowiada.png [/part] [part] story=_"The Oracle prophesied that I would marry a Hagarthen, become a queen, and that I would bear a Hagarthen son. We... my clan... helped... somehow... the prediction to be fulfilled... When I was chosen to marry your father, I was sure the Oracle was right." -#ifdef __UNUSED__ - background=story_images/lorin_opowiada.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/lorin/lorin_opowiada.png [/part] [part] story=_"But your father never called me to his bed, he never even touched me. You have no idea how I hated him... and you. You have no idea about the poisonous dreams which filled my head then. And yet, I felt... something strange about you. Always." -#ifdef __UNUSED__ - background=story_images/lorin_opowiada.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/lorin/lorin_opowiada.png [/part] [part] story=_"When your father was dead, I felt deceived, fooled. How can I have Hagarthen's son if he is dead?" -#ifdef __UNUSED__ - background=story_images/lorin_opowiada.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/lorin/lorin_opowiada.png [/part] [part] story=_"But then... I realized.. that the Oracle didn't say it would be the same Hagarthen I was married to. I was petrified of those thoughts, during all those moments when I cared for you when you were unconscious almost two years ago. I tried to push those thoughts away, and... anyway, you died... I mean, I thought you were killed after the Battle of Barnon, and..." -#ifdef __UNUSED__ - background=story_images/lorin_opowiada.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/lorin/lorin_opowiada.png [/part] [part] story=_"But then... we met again and... well, you probably don't remember it, probably, but Ruvio once said - that Oracle's predictions are only be fulfilled if we help them along... so... do you remember the night in Freetown, the feast before we left searching for Deorien?" -#ifdef __UNUSED__ - background=story_images/lorin_opowiada.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/lorin/lorin_opowiada.png [/part] [part] story=_"I was drunk... and... Yahyazad tried to stop me at corridor. Maybe he thought that the wine I had drank would have lowered my inhibitions. He spoke softly to me, trying to entice me to go with him. I refused his advances, and he departed. Then I went to Karen's room. She had passed out, so I took her dancer's outfit..." -#ifdef __UNUSED__ - background=story_images/lorin_opowiada.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/lorin/lorin_opowiada.png [/part] [part] story=_"Yes, Gawen. This child... it will be your first born." -#ifdef __UNUSED__ - background=story_images/gawen_slucha.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/gawen/gawen_slucha.png [/part] [part] story=_"I have done a lot of evil in this world. I know I have no hope for redemption. If I tell anyone that you are the child's father, this would mean another war. Such a gross violation of Akladian customs - with your father's widow - would surely cause Akladians to abandon you. And... I know I have sinned in the eyes of our God. He has shown me no mercy. He knows no forgiveness." -#ifdef __UNUSED__ - background=story_images/lorin_opowiada.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/lorin/lorin_opowiada.png [/part] [part] story=_"But I hope... you will find mercy in your heart. I know... I can never have your love... but... maybe... just maybe... will you just touch me once, like you touched me that night... I will carry that touch with me, I will remember it when I go into exile with your child." -#ifdef __UNUSED__ - background=story_images/gawen_slucha.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/gawen/gawen_slucha.png [/part] [part] story=_"Do not try to stop me. You know it is impossible. For the good of Vakladia, for Wesnoth, for your own good - I, Lorin, order you to forget about me and our child! Isn't that funny - me, Lorin, sacrificing herself for something as abstract as the idea of a new, united nation? Look at me, I am laughing. I... I am laughing.... " -#ifdef __UNUSED__ - background=story_images/lorin_opowiada.png # still exists in ANO_art repo; removed due to quality -#endif + # TODO: come up with a better version of this to use as a background: https://github.com/cooljeanius/ANO_art/blob/main/stare/story_images/lorin/lorin_opowiada.png [/part] [part] story=_"The moments are slowly turning into hours, as I am engulfed by the darkness..." @@ -91,12 +67,6 @@ [part] story=_"It is also said that he never called his wife Mavourneen; he never treated her as a husband should treat his wife. Whatever the truth was to that gossip, the fact remains that he died without leaving an heir." [/part] -#ifdef __UNUSED__ - [part] - story=_"The elves believed that with his death the curse of Haldric, long ago placed upon the royal line of Wesnoth, was finally relieved." - [/part] -#endif - # This was deemed unnecessary by szopen and a perusal of the Wesnoth timeline (http://wiki.wesnoth.org/Timeline_of_Wesnoth) shows that Haldric's line ends in 350 YW when Haldric IV dies without an heir. Garardine Dynasty begins in 417 YW. [part] story=_"Lorin journeyed among the Ostans of the Dunefolk, taking the vows required to join them, all the while searching for Majid Yahyazad. He took care of both her and her child, raising the child as if it were his own son, and showing toward her the love and respect he felt ought to be accorded to the She-Wolf of Haeltin. While rumors cast doubt on their happiness together, there was no doubt of their devotion to each other; they spent the rest of their days together." [/part] diff --git a/units/akladians/Akladian_Lady.cfg b/units/akladians/Akladian_Lady.cfg index 667e5e28..36bf31b3 100644 --- a/units/akladians/Akladian_Lady.cfg +++ b/units/akladians/Akladian_Lady.cfg @@ -5,15 +5,6 @@ gender=female race=akladian image="akladian/akl-lady.png" -#ifdef __UNUSED__ - [leading_anim] - [frame] - begin=-150 - end=150 - image="wayfarer/akl-lady-leading.png" - [/frame] - [/leading_anim] -#endif profile=portraits/lady_lorin.png hitpoints=36 movement_type=akladianfoot @@ -55,18 +46,6 @@ end=-50 image="akladian/akl-lady.png" [/frame] -#ifdef __UNUSED__ - [frame] - begin=-50 - end=50 - image="wayfarer/akl-lady-attack2.png" - [/frame] - [frame] - begin=50 - end=250 - image="wayfarer/akl-lady-attack1.png" - [/frame] -#endif [/if] [else] hits=no @@ -79,18 +58,6 @@ end=-50 image="akladian/akl-lady.png" [/frame] -#ifdef __UNUSED__ - [frame] - begin=-50 - end=50 - image="wayfarer/akl-lady-attack2.png" - [/frame] - [frame] - begin=50 - end=250 - image="wayfarer/akl-lady-attack1.png" - [/frame] -#endif [/else] [/attack_anim] [/unit_type] diff --git a/units/macros/amla.cfg b/units/macros/amla.cfg index e97a376f..55c6d35d 100644 --- a/units/macros/amla.cfg +++ b/units/macros/amla.cfg @@ -13,6 +13,7 @@ increase_total={ON_DIFFICULTY4 12 11 10 9} heal_full=yes [/effect] + # TODO: maybe buff resistances too? As it is, the movement penalty isn't really ever worth the HP gain, IMO... [effect] apply_to=movement increase=-1 @@ -35,7 +36,7 @@ apply_to=movement increase=1 [/effect] -#ifdef __UNUSED__ +#ifdef FAST_MODIFIES_MOVEMENT_COSTS [effect] apply_to=movement_costs [movement_costs]