update S04

see issue #15
cooljeanius · Oct 3, 2023 · ecaa5b2 · ecaa5b2
1 parent a46524f
commit ecaa5b2
Show file tree

Hide file tree

Showing 6 changed files with 253 additions and 220 deletions.
diff --git a/scenarios/04_Up_the_mountain.cfg b/scenarios/04_Up_the_mountain.cfg
@@ -9,7 +9,7 @@
     {VARIABLE_DIFFICULTY_DEPENDANT f_FeeFraction 0.3 0.4 0.5}
     {VARIABLE i_Fee 0}
     {VARIABLE i_Gold 0}
-    {VARIABLE i_UgaUgaPurse 100} # maybe vary this? idk which way, though...
+    {VARIABLE_DIFFICULTY_DEPENDANT i_UgaUgaPurse 100 90 80} # suggestion for direction of variation from Konrad2
     {VARIABLE_DIFFICULTY_DEPENDANT final_turn_limit 42 39 35}
 #enddef
 #define CLEAR_SCENARIO_VARIABLES
@@ -403,10 +403,10 @@
         [sound]
             name={SOUND_LIST:GRYPHON_DIE}
         [/sound]
-        {TEG_MOVE_UNIT_FAKE 12 12 26 25 1 (Gryphon Rider) ()}
         [delay]
-            time=500 # FIXME: while this delay may be necessary for the sounds, it causes the gryphon sprite to disappear... maybe reorder?
+            time=500 # WIP: reordering this delay to here seems to help avoid some flickering, but some further fine-tuning could be useful...
         [/delay]
+        {TEG_MOVE_UNIT_FAKE 12 12 26 25 1 (Gryphon Rider) ()}
         [sound]
             name={SOUND_LIST:GRYPHON_HIT}
         [/sound]
@@ -668,7 +668,12 @@
         [message]
             id=Dulatus
             # po: a bit of a hint that Uga Uga might have something for the player:
-            message= _ "Ach, don't complain so much, Aiglathing! This could be an opportunity before us! In any case, it seems we have a decision to make."
+            message= _ "Ach, don't complain so much, Aiglathing! This could be an opportunity before us! Think of all the previous travelers this beast has shaken down who we now have a chance to avenge!"
+        [/message]
+        [message]
+            id=Aiglathing
+            # po: this was previously part of Dulatus's previous line, but I split it off because it was getting too long:
+            message= _ "In any case, it seems we have a decision to make."
         [/message]
         [message]
             id=Hamel
@@ -794,10 +799,8 @@ This is the domain of the dwarves, and we will travel wherever we want!" + _ "
 #else
             recruit=Ogre
 #endif
-            # TODO: might want to make this progression linear; either {200 330 460} or {160 330 500} or {200 350 500}:
-            {GOLD 200 330 500}
-            # TODO: might want to make this progression linear; either {6 8 10} or {4 8 12} or {6 9 12}:
-            {INCOME 6 8 12}
+            {GOLD 200 350 500}
+            {INCOME 6 9 12}
         [/modify_side]
         [modify_unit]
             [filter]

diff --git a/translations/TEG.pot b/translations/TEG.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.wesnoth.org/\n"
-"POT-Creation-Date: 2023-10-03 05:09 UTC\n"
+"POT-Creation-Date: 2023-10-03 05:32 UTC\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1472,66 +1472,72 @@ msgstr ""
 #. [message]: id=Dulatus
 #. a bit of a hint that Uga Uga might have something for the player:
 #: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:671
-msgid "Ach, don't complain so much, Aiglathing! This could be an opportunity before us! In any case, it seems we have a decision to make."
+msgid "Ach, don't complain so much, Aiglathing! This could be an opportunity before us! Think of all the previous travelers this beast has shaken down who we now have a chance to avenge!"
+msgstr ""
+
+#. [message]: id=Aiglathing
+#. this was previously part of Dulatus's previous line, but I split it off because it was getting too long:
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:676
+msgid "In any case, it seems we have a decision to make."
 msgstr ""
 
 #. [message]: id=Hamel
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:675
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:680
 msgid "I need to think about this..."
 msgstr ""
 
 #. [option]
 #. "pay" option:
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:678
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:683
 msgid "I do not wish to fight you, Uga Uga. I will pay the fee."
 msgstr ""
 
 #. [option]
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:678
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:683
 msgid ""
 "\n"
 "<small>(Defeat the bandits; you will be allowed to freely choose the next scenario.)</small>"
 msgstr ""
 
 #. [option]
 #. "fight" option:
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:688
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:693
 msgid "Who are you to say these mountains belong to you, monster?"
 msgstr ""
 
 #. [option]
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:688
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:693
 msgid ""
 "\n"
 "This is the domain of the dwarves, and we will travel wherever we want!"
 msgstr ""
 
 #. [option]
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:689
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:694
 msgid ""
 "\n"
 "<small>(Defeat the monsters or defeat the bandits, the next scenario is decided by whom you defeat.)</small>"
 msgstr ""
 
 #. [message]: id=Uga_Uga
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:694
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:699
 msgid "Hah! If you attack Uga Uga, you'll be smashed to bits!"
 msgstr ""
 
 #. [message]: id=Uga_Uga
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:740
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:745
 msgid "Heh, good choice! Uga Uga loves bright gold more than smashing tiny dwarves."
 msgstr ""
 
 #. [message]: id=Dulatus
 #. by "enemies" Dulatus means the bandits:
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:751
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:756
 msgid "The path up the mountain is free now, but we shouldn't leave enemies alive who could flank us from behind."
 msgstr ""
 
 #. [objectives]
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:758
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:814
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:763
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:817
 #: The_Earths_Gut/scenarios/09i_Trolls_leave.cfg:95
 #: The_Earths_Gut/scenarios/08_Lost.cfg:1358
 #: The_Earths_Gut/scenarios/20t_A_cry_for_help.cfg:87
@@ -1556,144 +1562,144 @@ msgid "Final Objectives:"
 msgstr ""
 
 #. [objectives]
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:759
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:816
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:764
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:819
 msgid "The turn limit has been set to $final_turn_limit|."
 msgstr ""
 
 #. [objective]: condition=win
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:761
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:766
 msgid "Defeat the bandits"
 msgstr ""
 
 #. [message]: id=Uga_Uga
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:775
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:780
 msgid "You stupid dwarves can't trick Uga Uga! Gimme all the gold I want, or die!"
 msgstr ""
 
 #. [objective]: condition=win
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:818
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:821
 msgid "Defeat the monsters (Next scenario is 'Blowing Snow'.)"
 msgstr ""
 
 #. [objective]: condition=win
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:822
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:825
 msgid "Defeat the bandits (Next scenario is 'Unknown Tunnels'.)"
 msgstr ""
 
 #. [message]: id=Lidda
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:845
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:848
 msgid "Uarghh! I cannot die to these halflings..."
 msgstr ""
 
 #. [message]: id=Uga_Uga
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:863
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:866
 msgid "All Uga Uga ever wanted was bright gold!"
 msgstr ""
 
 #. [message]: speaker=second_unit
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:871
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:874
 msgid "Look, there is something on the ground where the monster fell! It's a large purse full of gold!"
 msgstr ""
 
 #. [message]: speaker=narrator
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:883
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:886
 msgid "The purse contains $i_UgaUgaPurse| gold pieces!"
 msgstr ""
 
 #. [message]: speaker=second_unit
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:887
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:890
 msgid "I wish every monster was so rich!"
 msgstr ""
 
 #. [message]: id=Aiglathing
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:891
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:894
 msgid "I wonder how long that brute has forced travelers to pay..."
 msgstr ""
 
 #. [message]: id=Dulatus
 #. time over: If we paid, Lidda must be the remaining enemy.
 #. If we didn't pay, the remaining enemies would be both Lidda and UgaUga.
 #. Otherwise, the leader death events would have ended the scenario.
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:908
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:911
 msgid "We cannot continue with enemies behind us..."
 msgstr ""
 
 #. [role_message]: type=fighter
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:920
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:923
 msgid "Where do we go from here now?"
 msgstr ""
 
 #. [message]: id=Dulatus
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:924
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:927
 msgid "There must be a cave entrance here, somewhere below the mountains! I faintly remember it being discovered years ago."
 msgstr ""
 
 #. [message]: id=04_Up_the_mountain_cave_discoverer
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:956
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:959
 msgid "Yes, I've seen it, here it is!"
 msgstr ""
 
 #. [message]: id=Dulatus
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:963
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:966
 msgid "Does it look like our kind has been there before?"
 msgstr ""
 
 #. [message]: id=04_Up_the_mountain_cave_discoverer
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:967
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:970
 msgid "Maybe... there are some ruins at the opening."
 msgstr ""
 
 #. [message]: id=Dulatus
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:971
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:974
 msgid "I am not sure, but it could be a path to the mines that were rumored to be in those mountains. Those ruins could indeed be dwarvish."
 msgstr ""
 
 #. [role_message]: type=fighter
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:976
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:979
 msgid "Shall we take this way?"
 msgstr ""
 
 #. [message]: id=Dulatus
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:985
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:988
 msgid "Since the monsters are still blocking the pass, we have no choice, so... yes."
 msgstr ""
 
 #. [message]: id=Clarissa
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:989
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1005
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:992
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1008
 msgid "I do not mean to sound like a coward, but I dread entering that cave. I feel a strong evil lurks inside."
 msgstr ""
 
 #. [message]: id=Dulatus
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1009
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1012
 msgid "Since the monsters are gone, the pass is free, so we'd better choose this way. Likely the bandits won't dare to follow."
 msgstr ""
 
 #. [message]: id=Dulatus
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1031
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1034
 msgid "Since the monsters and the bandits are gone, we are free to decide which path to take."
 msgstr ""
 
 #. [message]: id=Hamel
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1035
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1038
 msgid "Shall we travel over the mountains, or explore the cave?"
 msgstr ""
 
 #. [option]
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1037
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1040
 msgid "There is something disturbing about that cave."
 msgstr ""
 
 #. [option]
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1037
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1040
 msgid ""
 "\n"
 "While I do not fear danger, I feel it would be better for all of us to travel over the mountains instead."
 msgstr ""
 
 #. [option]
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1038
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1041
 msgid ""
 "\n"
 "<small>(Next scenario is 'Blowing snow'.)</small>"
@@ -1702,25 +1708,25 @@ msgstr ""
 #. [message]: id=Dulatus
 #. [message]: speaker=unit
 #. spoken by the executioner:
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1043
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1046
 #: The_Earths_Gut/scenarios/19_Prison.cfg:1102
 msgid "So be it."
 msgstr ""
 
 #. [option]
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1053
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1056
 msgid "We will be able to travel faster through those caves than over those mountains."
 msgstr ""
 
 #. [option]
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1053
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1056
 msgid ""
 "\n"
 "<small>(Next scenario is 'Unknown tunnels'.)</small>"
 msgstr ""
 
 #. [message]: id=Dulatus
-#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1058
+#: The_Earths_Gut/scenarios/04_Up_the_mountain.cfg:1061
 msgid "I hope it is safe."
 msgstr ""