From 925d3e2ce98db5b0228d0df2b3261392365ffdfd Mon Sep 17 00:00:00 2001 From: sigurdfdragon Date: Sun, 8 Sep 2019 13:13:45 -0400 Subject: [PATCH] WoV: Update to match the 1.0.3 version on the 1.14 add-on server Changes: S01: Make easier on easy and improve flow of human enemies S08: Improve dialog feel Use ellipses Remove deprecated macro --- data/campaigns/Wings_of_Victory/_main.cfg | 2 +- data/campaigns/Wings_of_Victory/dist/version | 2 +- .../scenarios/01_The_Hunt.cfg | 27 +++++++++++++------ .../scenarios/03_The_Contention.cfg | 6 ++--- .../scenarios/04_The_Spiral_Path.cfg | 8 +++--- .../Wings_of_Victory/scenarios/05_Islands.cfg | 6 ++--- .../scenarios/06_The_Three_Sisters.cfg | 2 +- .../Wings_of_Victory/scenarios/08_Wesmere.cfg | 6 ++--- .../scenarios/09_Foothills.cfg | 4 +-- .../scenarios/11_Fire_Meets_Steel.cfg | 2 +- .../Wings_of_Victory/utils/deaths.cfg | 2 +- 11 files changed, 39 insertions(+), 28 deletions(-) diff --git a/data/campaigns/Wings_of_Victory/_main.cfg b/data/campaigns/Wings_of_Victory/_main.cfg index b1618e09bbf1..089c99cb4b5b 100644 --- a/data/campaigns/Wings_of_Victory/_main.cfg +++ b/data/campaigns/Wings_of_Victory/_main.cfg @@ -15,7 +15,7 @@ define=CAMPAIGN_WINGS_OF_VICTORY first_scenario="01_The_Hunt" image="data/core/images/portraits/drakes/inferno.png~SCALE(350,350)" - description= _ "Seize, conquer, dominate, expand. That was ever the Way of the Drakes. But the Brothers of the Spiral Path have seen a vision: Irdya is made like an egg, and the day will come when there is no more world to conquer — and what of the Way then? There was a drake named Galun on whom fell the burden of finding an answer... + description= _ "Seize, conquer, dominate, expand. That was ever the Way of the Drakes. But the Brothers of the Spiral Path have seen a vision: Irdya is made like an egg, and the day will come when there is no more world to conquer — and what of the Way then? There was a drake named Galun on whom fell the burden of finding an answer… " + _ "(Intermediate level, 11 scenarios.)" + " " + _ "Version:" + " " + "{./dist/version}" + " " + "https://r.wesnoth.org/t49140" diff --git a/data/campaigns/Wings_of_Victory/dist/version b/data/campaigns/Wings_of_Victory/dist/version index e6d5cb833c63..e4c0d46e55ff 100644 --- a/data/campaigns/Wings_of_Victory/dist/version +++ b/data/campaigns/Wings_of_Victory/dist/version @@ -1 +1 @@ -1.0.2 \ No newline at end of file +1.0.3 \ No newline at end of file diff --git a/data/campaigns/Wings_of_Victory/scenarios/01_The_Hunt.cfg b/data/campaigns/Wings_of_Victory/scenarios/01_The_Hunt.cfg index 87092df31d86..024be003397d 100644 --- a/data/campaigns/Wings_of_Victory/scenarios/01_The_Hunt.cfg +++ b/data/campaigns/Wings_of_Victory/scenarios/01_The_Hunt.cfg @@ -79,16 +79,17 @@ # TRoW type Wesfolk that got lost at sea and shipwrecked in Morogor side=2 controller=ai + hidden=yes recruit=Footpad, Thug, Thief - {GOLD 75 100 125} - {INCOME 2 3 5} + # Gold & Income handled when keep is spotted + gold=0 + {NO_INCOME} team_name=humans user_team_name= _ "Humans" no_leader=yes [ai] recruitment_pattern=fighter,scout,scout {QUANTITY aggression 0.1 0.2 0.3} - {ATTACK_DEPTH 3 4 5} [/ai] [/side] @@ -130,6 +131,9 @@ terrain=*^F* {SCATTER_NOT_NEXT} ) (side=3)} +#ifdef EASY + {GENERIC_UNIT 3 (Lynx) 23 45} # Easy kill +#endif [micro_ai] side=3 ai_type=big_animals @@ -232,7 +236,7 @@ [/message] [message] speaker=Galun - message= _ "... What? ... Sorry, I wasn't listening...." + message= _ "… What? … Sorry, I wasn't listening…" [/message] [message] speaker=Vank @@ -260,7 +264,7 @@ [/message] [message] speaker=Vank - message= _ "That may be, but if you truly aim to lead a flight across the Great Ocean, you’ll have to become a Dominant first, otherwise no drake will follow you. (Laughs) And you an Aspirant? Not so long as you dream when the hunt is called..." + message= _ "That may be, but if you truly aim to lead a flight across the Great Ocean, you’ll have to become a Dominant first, otherwise no drake will follow you. (Laughs) And you an Aspirant? Not so long as you dream when the hunt is called…" [/message] [message] speaker=Galun @@ -268,7 +272,7 @@ [/message] [message] speaker=Vank - message= _ "... Right ... Hunters! Take wing!" + message= _ "… Right … Hunters! Take wing!" [/message] [/event] @@ -302,6 +306,13 @@ x,y=50,8 [/unit] + [modify_side] + side=2 + hidden=no + {GOLD 50 85 120} + {INCOME 7 11 15} + [/modify_side] + {STARTING_VILLAGES 2 10} [message] @@ -355,7 +366,7 @@ [/filter] [message] speaker=unit - message= _ "My dream perishes with me..." + message= _ "My dream perishes with me…" [/message] [endlevel] result=defeat @@ -369,7 +380,7 @@ [/filter] [message] speaker=Galun - message= _ "Vank! No! You would have been my Chief Intendant..." + message= _ "Vank! No! You would have been my Chief Intendant…" [/message] [endlevel] result=defeat diff --git a/data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg b/data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg index 64fafd47efc5..6e462c95661b 100644 --- a/data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg +++ b/data/campaigns/Wings_of_Victory/scenarios/03_The_Contention.cfg @@ -22,7 +22,7 @@ story= _ "For ages, we of the Spiral Path have not demurred when our kin of the Straight Path spoke vaguely of the ’end of the world’ lying beyond the oceans, receding ever farther as Dominants claim new ranges. However, we knew better: for we have found it written in the tides and the motion of the stars that our world is round, made like a drake’s egg." [/part] [part] - story= _ "Every hatchling’s hope is to become the Dominant of a new flight. But the sinking of our islands may only prefigure a vastly greater tragedy; for if the world is bounded, our Way must end in a final war of drake against drake...or a great starvation." + story= _ "Every hatchling’s hope is to become the Dominant of a new flight. But the sinking of our islands may only prefigure a vastly greater tragedy; for if the world is bounded, our Way must end in a final war of drake against drake…or a great starvation." [/part] [part] story= _ "Every turn of the heavens brings us closer to that doom. We of the Spiral Path seek a way for Drake-kind to step off that wheel, before it is too late." @@ -245,7 +245,7 @@ [/filter] [message] speaker=unit - message= _ "The chance at my dream, lost..." + message= _ "The chance at my dream, lost…" [/message] [/event] [event] @@ -292,7 +292,7 @@ value=2 [message] speaker=Galun - message= _ "The chance at my dream, lost..." + message= _ "The chance at my dream, lost…" [/message] [endlevel] result=defeat diff --git a/data/campaigns/Wings_of_Victory/scenarios/04_The_Spiral_Path.cfg b/data/campaigns/Wings_of_Victory/scenarios/04_The_Spiral_Path.cfg index e3a7f783992a..c0abee7336a8 100644 --- a/data/campaigns/Wings_of_Victory/scenarios/04_The_Spiral_Path.cfg +++ b/data/campaigns/Wings_of_Victory/scenarios/04_The_Spiral_Path.cfg @@ -25,7 +25,7 @@ [part] background={RESHANLO_PORTRAIT} scale_background=no - story={CAPTION ( _ "Reshan'lo")} + _ "That...may not always be possible." + story={CAPTION ( _ "Reshan'lo")} + _ "That…may not always be possible." [/part] [part] background={GALUN_PORTRAIT} @@ -55,7 +55,7 @@ [part] background={RESHANLO_PORTRAIT} scale_background=no - story={CAPTION ( _ "Reshan'lo")} + _ "As for the abyss at the end of the great ocean...you have heard, perhaps, that some drakes believe the world is round like an egg; that there is no abyss to fall into." + story={CAPTION ( _ "Reshan'lo")} + _ "As for the abyss at the end of the great ocean…you have heard, perhaps, that some drakes believe the world is round like an egg; that there is no abyss to fall into." [/part] [part] background={GALUN_PORTRAIT} @@ -80,7 +80,7 @@ [part] background={RESHANLO_PORTRAIT} scale_background=no - story={CAPTION ( _ "Reshan'lo")} + _ "One of the things they have forgotten is that there is indeed other land in the world. Long ago, cycles beyond counting, we lived on a great landmass far to the west of here. We..most of us...chose to forget our origins, because we were driven from it in a great war. We came to Morogor fleeing enemies." + story={CAPTION ( _ "Reshan'lo")} + _ "One of the things they have forgotten is that there is indeed other land in the world. Long ago, cycles beyond counting, we lived on a great landmass far to the west of here. We…most of us…chose to forget our origins, because we were driven from it in a great war. We came to Morogor fleeing enemies." [/part] [part] background={GALUN_PORTRAIT} @@ -110,7 +110,7 @@ [part] background={RESHANLO_PORTRAIT} scale_background=no - story={CAPTION ( _ "Reshan'lo")} + _ "Think now of the great green world as an island; if you travel around its shore long enough, you will end where you began. Galun...what will happen when the world fills up with drakes?" + story={CAPTION ( _ "Reshan'lo")} + _ "Think now of the great green world as an island; if you travel around its shore long enough, you will end where you began. Galun…what will happen when the world fills up with drakes?" [/part] [part] background={GALUN_PORTRAIT} diff --git a/data/campaigns/Wings_of_Victory/scenarios/05_Islands.cfg b/data/campaigns/Wings_of_Victory/scenarios/05_Islands.cfg index f63794407f48..0cfbc082ee33 100644 --- a/data/campaigns/Wings_of_Victory/scenarios/05_Islands.cfg +++ b/data/campaigns/Wings_of_Victory/scenarios/05_Islands.cfg @@ -16,7 +16,7 @@ [story] [part] - story= _ "They had little time to prepare the new flight. The new hatchlings could not go long without food...but worse, if the breeders grew heavy with eggs they would lose their ability to fly." + story= _ "They had little time to prepare the new flight. The new hatchlings could not go long without food…but worse, if the breeders grew heavy with eggs they would lose their ability to fly." [/part] [part] story= _ "Galun prepared for true long-distance travel by abandoning the massive armor of the Clashers. The flight took only the lighter tools with it, counting on re-creating the heavier ones in the new land. Instead, they loaded up with sling bags of dried meat. That, and the prey they could take from the Great Ocean on their journey, might see them through." @@ -26,7 +26,7 @@ [/part] [part] # TODO: where did they sleep? - story= _ "For many days they flew over unknown waters, growing weary and hungry and wing-sore. Then Galun, scouting ahead with a few followers, sighted land..." + story= _ "For many days they flew over unknown waters, growing weary and hungry and wing-sore. Then Galun, scouting ahead with a few followers, sighted land…" [/part] [/story] @@ -236,7 +236,7 @@ name=new turn delayed_variable_substitution=no - # We need to use this lengthy SLF twice, so macroify it here... + # We need to use this lengthy SLF twice, so macroify it here… #define POSSIBLE_SERPENT_SPAWN_LOCS_SLF include_borders=no terrain=Wo* diff --git a/data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg b/data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg index da646f83e607..22e9c2be8015 100644 --- a/data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg +++ b/data/campaigns/Wings_of_Victory/scenarios/06_The_Three_Sisters.cfg @@ -246,7 +246,7 @@ speaker=Midnight Queen image_pos=right mirror=yes - message= _ "You will be made to serve... Come admire me. Feel my love." + message= _ "You will be made to serve… Come admire me. Feel my love." [/message] [message] speaker=Galun diff --git a/data/campaigns/Wings_of_Victory/scenarios/08_Wesmere.cfg b/data/campaigns/Wings_of_Victory/scenarios/08_Wesmere.cfg index efb03ba1de6c..8a833e84e987 100644 --- a/data/campaigns/Wings_of_Victory/scenarios/08_Wesmere.cfg +++ b/data/campaigns/Wings_of_Victory/scenarios/08_Wesmere.cfg @@ -129,7 +129,7 @@ [/message] [message] speaker=Vank - message= _ "Some of the game has two legs rather than four. They don’t quite look like our runners, though. They move better. And...Galun, I could swear some of the trees down there are walking!" + message= _ "Some of the game has two legs rather than four. They don’t quite look like our runners, though. They move better. And…Galun, I could swear some of the trees down there are walking!" [/message] [message] speaker=Galun @@ -224,7 +224,7 @@ [/message] [message] speaker=Xirtrezyx - message= {ASIDE ( _ "Sssilence! I can sssee that now that we are up close, but the dragon has beaten the humans and the elvesss, so do not disrespect the dragon.")} # no spellcheck + message= {ASIDE ( _ "Sssilence! I can sssee that now that we are up close, but the dragon has beaten the humansss and the elvesss, so do not disrespect the dragon.")} # no spellcheck [/message] [message] speaker=Xirtrezyx @@ -236,7 +236,7 @@ # Otherwise, a less supplicating introduction [message] speaker=Xirtrezyx - message= _ "O great ... flying reptiles, we have ssseen you strike at the hated humansss, and wish to ally with you." # no spellcheck + message= _ "O great … flying reptiles, we have ssseen you strike at the hated humansss, and wish to ally with you." # no spellcheck [/message] [message] speaker=Krenix diff --git a/data/campaigns/Wings_of_Victory/scenarios/09_Foothills.cfg b/data/campaigns/Wings_of_Victory/scenarios/09_Foothills.cfg index 58a0d5288bd8..f88e21e56032 100644 --- a/data/campaigns/Wings_of_Victory/scenarios/09_Foothills.cfg +++ b/data/campaigns/Wings_of_Victory/scenarios/09_Foothills.cfg @@ -171,7 +171,7 @@ [/message] [message] speaker=Galun - message= {WHISPER ( _ "Yes, it does. How fitting...")} + message= {WHISPER ( _ "Yes, it does. How fitting…")} [/message] [message] speaker=Galun @@ -201,7 +201,7 @@ [/message] [message] speaker=Vank - message= {WHISPER ( _ "Careful, Galun. We are no longer in Morogor...")} + message= {WHISPER ( _ "Careful, Galun. We are no longer in Morogor…")} [/message] [message] speaker=Naemir diff --git a/data/campaigns/Wings_of_Victory/scenarios/11_Fire_Meets_Steel.cfg b/data/campaigns/Wings_of_Victory/scenarios/11_Fire_Meets_Steel.cfg index de123fd6a09d..e38a5da46951 100644 --- a/data/campaigns/Wings_of_Victory/scenarios/11_Fire_Meets_Steel.cfg +++ b/data/campaigns/Wings_of_Victory/scenarios/11_Fire_Meets_Steel.cfg @@ -200,7 +200,7 @@ [/message] [message] speaker=Vank - message= {WHISPER ( _ "Perhaps that could have been put better...")} + message= {WHISPER ( _ "Perhaps that could have been put better…")} [/message] [message] speaker=Thurdakor diff --git a/data/campaigns/Wings_of_Victory/utils/deaths.cfg b/data/campaigns/Wings_of_Victory/utils/deaths.cfg index 2097e8f07a21..70878e99c6ef 100644 --- a/data/campaigns/Wings_of_Victory/utils/deaths.cfg +++ b/data/campaigns/Wings_of_Victory/utils/deaths.cfg @@ -8,7 +8,7 @@ [/filter] [message] speaker=unit - message= _ "My dream perishes with me..." + message= _ "My dream perishes with me…" [/message] [endlevel] result=defeat