From 4327821271d5b87d23e4cfa3282bd20c11dd71b7 Mon Sep 17 00:00:00 2001 From: nemaara Date: Fri, 18 Jan 2019 16:15:40 -0500 Subject: [PATCH 1/9] DiD S10: updated dialogue --- .../scenarios/10_Alone_at_Last.cfg | 149 +++++++++++++++--- 1 file changed, 123 insertions(+), 26 deletions(-) diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg index 7423de4afc46..c476ab5be292 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg @@ -16,11 +16,15 @@ [story] [part] - story= _ "As he enters the tunnel underneath Lord Karres’s manor, Darken Volk turns and, with a word and gesture causes the entrance to collapse. The two necromancers turn and begin walking down the pitch-black tunnel, temporarily safe from pursuit." + story= _ "As he enters the tunnel underneath Lord Karres’s manor, Darken Volk gestures and causes the entrance to collapse. The two necromancers turn and begin walking down the pitch-black tunnel, temporarily safe from pursuit." {STORYTXT_BACKGROUND travel.jpg} [/part] [part] - story= _ "They continue walking through the damp, cold air all through the morning and day, finally emerging as the last rays of sun sink below the horizon." + story= _ "Silence permeates the darkness, broken only by the irregular dripping of water from the musty cave walls. Malin looks toward Darken Volk occasionally, expecting something from the elder necromancer, but is met with stone-cold dispassion. There is no acknowledgement... no word of gratitude — only a sense of unease that has as much to do with the book as it does with Darken Volk." + {STORYTXT_BACKGROUND travel.jpg} + [/part] + [part] + story= _ "They continue walking through the damp, cold air all through the morning and day, finally emerging as the last rays of sunlight sink below the horizon." {STORYTXT_BACKGROUND travel.jpg} [/part] [/story] @@ -218,12 +222,12 @@ [message] speaker=Malin Keshar - message= _ "Well, we made it out. We got your precious book. What’s in it, anyway? And what do we do now?" + message= _ "Well, we got your precious book and made it out of Tath in one piece. What do we do now?" [/message] [message] speaker=Darken Volk - message= _ "‘We’? We do nothing. You are no longer my apprentice." + message= _ "‘We’? We do nothing." [/message] {MOVE_UNIT (id=Darken Volk) 7 21} @@ -252,7 +256,7 @@ # DV already has book [message] speaker=Darken Volk - message= _ "Now go your own way, and I will go mine." + message= _ "Now go your own way and I will go mine." [/message] [/else] [/if] @@ -293,7 +297,7 @@ [message] role=advisor - message= _ "He cares not about your noble quest to push back the orcs. He needed your help to fight the mages! The book is rightfully yours!" + message= _ "He cares not about your noble quest to push back the orcs. He needed your help to fight the mages!" [/message] [message] @@ -303,7 +307,37 @@ [message] speaker=Malin Keshar - message= _ "All of the training you gave me, that was just so I would help you get that book! Return it to me now, or I will take it by force." + message= _ "You used me! You knew the people of Parthyn would cast me out — you knew I had nobody else to turn to... you knew I would do whatever you said..." + [/message] + + [message] + speaker=Malin Keshar + message= _ "... have I really just been a pawn all this time?" + [/message] + + [message] + speaker=Malin Keshar + message= _ "Why don’t you say anything?! Don’t you care at all?!" + [/message] + + [message] + speaker=Malin Keshar + message= _ "... you can’t abandon me too, not the way they did... father, Drogan, Dela... I have nothing left..." + [/message] + + [message] + role=advisor + message= _ "He will not help you, but perhaps the book might. You were the one who helped him retrieve it; it is rightfully yours!" + [/message] + + [message] + speaker=Malin Keshar + message= _ "Yes, perhaps... I suppose that is right..." + [/message] + + [message] + speaker=Malin Keshar + message= _ "Darken Volk! That book is as much mine as it is yours! Give it back, or I will have to take it by force!" [/message] {MODIFY_UNIT (id=Darken Volk) facing sw} @@ -380,17 +414,37 @@ [message] speaker=Malin Keshar - message= _ "You let me believe Parthyn would accept me back so when they didn’t I would be willing to attack my own countrymen!" + message= _ "You let me believe Parthyn would accept me back, so when they didn’t, I would be willing to attack my own countrymen!" + [/message] + + [message] + speaker=Darken Volk + message= _ "What you let yourself believe is no fault of mine. I gave you more power than you could have possibly dreamed. Use it to fight the orcs that annoy you so, not me." + [/message] + + [message] + speaker=Malin Keshar + message= _ "You took my home away from me. You took Drogan away. You turned my sister against me! You have ruined my life!" + [/message] + + [message] + speaker=Darken Volk + message= _ "The only thing I have done is given you the power to achieve your own goals. The rest, you have done yourself." + [/message] + + [message] + speaker=Malin Keshar + message= _ "That’s not true! You can’t abandon me like this!" [/message] [message] speaker=Darken Volk - message= _ "What you let yourself believe is no fault of mine. Cease your foolish prattle. I gave you more power than you could have possibly dreamed. Use it to fight the orcs that annoy you so, not me." + message= _ "Enough prattle from you, boy. Fighting the orcs is your want, not mine. You cannot expect me to help you in an endeavor that does not concern me at all." [/message] [message] speaker=Malin Keshar - message= _ "So it is true! You took my home away from me. You took Drogan away. Now that all of that is gone, I will at least keep the fruits of my labors." + message= _ "The very same to you! I helped you retrieve that book! If you will not help me with my ambitions, I will at least keep the fruits of my labor." [/message] [message] @@ -400,7 +454,7 @@ [message] speaker=Malin Keshar - message= _ "Perhaps, but I have nothing left to lose." + message= _ "Perhaps... but I have nothing left to lose..." [/message] [/event] @@ -420,7 +474,7 @@ [message] speaker=Darken Volk - message= _ "Done? I have done nothing but give you an opportunity. You have chosen your own path. Now leave me alone!" + message= _ "Done? I have done nothing but give you an opportunity. What you choose to do with your life is not my business. Now leave me alone!" [/message] [/event] @@ -477,17 +531,12 @@ [message] speaker=Sir Cadaeus - message= _ "Your travels in this region have not gone unnoticed, foul necromancers! We have been tracking you for weeks, with our purpose renewed this morning upon hearing of the disaster you wreaked upon the goodly city of Tath." - [/message] - - [message] - speaker=Sir Cadaeus - message= _ "Do not even think of running away — my horsemen can easily catch you. Yes, on this day you shall have to answer for your innumerable crimes." + message= _ "Your travels in this region have not gone unnoticed, necromancers! The disaster you wreaked upon the good city of Tath and the noble Lord Karres can only be paid back in turn with your blood and souls — whatever little may remain of them. Yes, on this day you shall have to answer for your innumerable crimes." [/message] [message] speaker=Darken Volk - message= _ "We’ll see how well your pompous words protect you from the blades of the undead once I have finished this upstart." + message= _ "Pompous words from an arrogant fool. We shall see how well you fare once I have finished this upstart." [/message] [/event] @@ -588,17 +637,35 @@ [message] speaker=Dela Keshar - message= _ "I told you, Malin, that I would find you again, and I have kept my word. I will not suffer you to bring any further harm to my people, and so you will not live to see another sunset." + message= _ "I finally found you, Malin! On this day, you will pay for what you have done to my people. I will not let you live to see another sunset." [/message] [message] speaker=Malin Keshar - message= _ "You wrong me, sister. I have only tried to help. Have you not seen fewer orcs this past summer?" + message= _ "... I suppose you did vow to kill me..." [/message] [message] speaker=Dela Keshar - message= _ "I will not listen to any more of your lies. Men, attack!" + message= _ "Did you not think I would keep my word? Attack him, men! Do not let the traitor escape!" + [/message] + [/event] + +# in case you do manage to defeat Dela + [event] + name=last breath + [filter] + id=Dela Keshar + [/filter] + + [message] + speaker=Dela Keshar + message= _ "Vile fiend... I regret that I was... not strong enough... to destroy you..." + [/message] + + [message] + speaker=Malin Keshar + message= _ "You brought this on yourself..." [/message] [/event] @@ -608,14 +675,29 @@ id=Darken Volk [/filter] + [message] + speaker=Malin Keshar + message= _ "See? This is what happens when you abandon me!" + [/message] + [message] speaker=Darken Volk - message= _ "With my dying breath I curse you, Malin the Damned!" + message= _ "Ungrateful wretch, this is how you repay me? Curse you, Malin the Damned!" [/message] + [kill] + id=Darken Volk + animate=yes + [/kill] + [message] speaker=Malin Keshar - message= _ "Now I’ve just got to get that book off the battlefield!" + message= _ "I have already been cursed many times over. One more time is nothing..." + [/message] + + [message] + speaker=Malin Keshar + message= _ "Well, I suppose I should get that book off the battlefield." [/message] [objectives] @@ -703,7 +785,7 @@ [message] speaker=unit - message= _ "I am sorry, master, but that is too heavy for me." + message= _ "I am sorry, master, but this book is too heavy for me." [/message] [allow_undo][/allow_undo] @@ -763,7 +845,22 @@ [message] speaker=Malin Keshar - message= _ "The paladins will not be able to pursue me through the mountains, and Dela will not dare take the soldiers too far from Parthyn." + message= _ "The terrain is hazardous in these mountains. Neither the paladins nor Dela will be able to pursue me." + [/message] + + [message] + speaker=Malin Keshar + message= _ "... then again, is there a point? Even should I escape, then what?" + [/message] + + [message] + speaker=Malin Keshar + message= _ "Life, death... and unlife — at this point, I could accept any of them and nothing would change." + [/message] + + [message] + speaker=Malin Keshar + message= _ "... but, I suppose giving up now would be a waste..." [/message] [endlevel] From 54987a15ce0b3c003028649ef2d398b3be33dbb3 Mon Sep 17 00:00:00 2001 From: nemaara Date: Sun, 20 Jan 2019 01:50:17 -0500 Subject: [PATCH 2/9] DiD S10: dialogue adjustments --- .../Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg index c476ab5be292..224630f8dd57 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg @@ -332,7 +332,7 @@ [message] speaker=Malin Keshar - message= _ "Yes, perhaps... I suppose that is right..." + message= _ "Yes, perhaps, I suppose that is right..." [/message] [message] @@ -454,7 +454,7 @@ [message] speaker=Malin Keshar - message= _ "Perhaps... but I have nothing left to lose..." + message= _ "Perhaps, but I have nothing left to lose..." [/message] [/event] From 0d35d3a8201368fba356aa10c42c650d9372d540 Mon Sep 17 00:00:00 2001 From: nemaara Date: Wed, 30 Jan 2019 21:22:50 -0500 Subject: [PATCH 3/9] DiD S10: updated gameplay --- .../scenarios/10_Alone_at_Last.cfg | 352 +++++++++++------- 1 file changed, 222 insertions(+), 130 deletions(-) diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg index 224630f8dd57..4ea0e1a2cc1c 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg @@ -4,15 +4,15 @@ id=10_Alone_at_Last name= _ "Alone at Last" map_data="{campaigns/Descent_Into_Darkness/maps/10_Alone_at_Last.map}" - turns=24 + {TURNS 34 30 26} next_scenario=11_Descent_into_Darkness victory_when_enemies_defeated=no {DEFAULT_SCHEDULE_DUSK} - {SCENARIO_MUSIC breaking_the_chains.ogg} - {EXTRA_SCENARIO_MUSIC vengeful.ogg} - {EXTRA_SCENARIO_MUSIC battle.ogg} + {SCENARIO_MUSIC knolls.ogg} + {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg} + {EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg} [story] [part] @@ -20,7 +20,7 @@ {STORYTXT_BACKGROUND travel.jpg} [/part] [part] - story= _ "Silence permeates the darkness, broken only by the irregular dripping of water from the musty cave walls. Malin looks toward Darken Volk occasionally, expecting something from the elder necromancer, but is met with stone-cold dispassion. There is no acknowledgement... no word of gratitude — only a sense of unease that has as much to do with the book as it does with Darken Volk." + story= _ "Silence permeates the darkness, broken only by the irregular dripping of water from the musty cave walls. Malin looks toward Darken Volk occasionally, expecting something from the elder necromancer, but is met with stone-cold dispassion. There is no acknowledgment... no word of gratitude — only a sense of unease that has as much to do with the book as it does with Darken Volk." {STORYTXT_BACKGROUND travel.jpg} [/part] [part] @@ -36,10 +36,12 @@ side=1 controller=human recruit=Walking Corpse,Vampire Bat,Ghost,Ghoul,Skeleton Archer,Skeleton,Dark Adept DiD - gold=200 + {GOLD 260 220 180} team_name=good user_team_name= _ "Malin Keshar" {FLAG_VARIANT undead} + village_gold=2 + village_support=1 # wmllint: recognize Malin Keshar {CHARACTER_STATS_MALIN_KESHAR} @@ -53,7 +55,8 @@ side=2 controller=ai recruit=Blood Bat,Ghost,Wraith,Necrophage,Skeleton Archer,Bone Shooter,Skeleton,Revenant,Deathblade,Dark Adept DiD,Dark Sorcerer DiD - {GOLD 300 340 380} + {GOLD 200 250 300} + {INCOME 16 20 24} team_name=bad user_team_name= _ "Darken Volk" no_leader=yes @@ -144,20 +147,6 @@ [/ai] [/side] - {LIMIT_CONTEMPORANEOUS_RECRUITS 2 (Blood Bat) 2} - {LIMIT_CONTEMPORANEOUS_RECRUITS 2 (Wraith) 2} - {LIMIT_CONTEMPORANEOUS_RECRUITS 2 (Necrophage) 2} - {LIMIT_CONTEMPORANEOUS_RECRUITS 2 (Bone Shooter) 2} - {LIMIT_CONTEMPORANEOUS_RECRUITS 2 (Revenant) 2} - {LIMIT_CONTEMPORANEOUS_RECRUITS 2 (Deathblade) 2} - {LIMIT_CONTEMPORANEOUS_RECRUITS 2 (Dark Sorcerer DiD) 1} - -#ifdef EASY - {LIMIT_CONTEMPORANEOUS_RECRUITS 3 Paladin 2} -#else - {LIMIT_CONTEMPORANEOUS_RECRUITS 3 Paladin 3} -#endif - [event] name=prestart @@ -217,8 +206,8 @@ [event] name=start - {MOVE_UNIT (id=Malin Keshar) 7 22} - {MOVE_UNIT (id=Darken Volk) 5 24} + {MOVE_UNIT (id=Malin Keshar) 6 14} + {MOVE_UNIT (id=Darken Volk) 9 15} [message] speaker=Malin Keshar @@ -230,10 +219,6 @@ message= _ "‘We’? We do nothing." [/message] - {MOVE_UNIT (id=Darken Volk) 7 21} - - {MODIFY_UNIT (id=Darken Volk) facing se} - [if] [variable] name=hasBook @@ -241,6 +226,9 @@ [/variable] [then] # Malin has the book + + {MOVE_UNIT (id=Darken Volk) 7 14} + [message] speaker=Darken Volk message= _ "Now give the book to me." @@ -251,6 +239,8 @@ image=wesnoth-icon.png message=_ "Darken Volk grabs the mysterious book from Malin’s hands and stalks away." [/message] + + {MODIFY_UNIT (id=Darken Volk) facing se} [/then] [else] # DV already has book @@ -270,7 +260,8 @@ {MODIFY_UNIT (id=Darken Volk) facing ne} - {MOVE_UNIT (id=Darken Volk) 19 19} + {MOVE_UNIT (id=Darken Volk) 9 15} + {MOVE_UNIT (id=Darken Volk) 11 15} [delay] time=500 @@ -281,7 +272,8 @@ message= _ "You can’t just leave me here!" [/message] - {MOVE_UNIT (id=Malin Keshar) 9 20} + {MOVE_UNIT (id=Malin Keshar) 7 15} + {MOVE_UNIT (id=Malin Keshar) 8 14} {CREATE_ADVISOR} @@ -305,11 +297,15 @@ message= _ "Wait!" [/message] + {MOVE_UNIT (id=Darken Volk) 12 15} + [message] speaker=Malin Keshar message= _ "You used me! You knew the people of Parthyn would cast me out — you knew I had nobody else to turn to... you knew I would do whatever you said..." [/message] + {MOVE_UNIT (id=Darken Volk) 13 16} + [message] speaker=Malin Keshar message= _ "... have I really just been a pawn all this time?" @@ -320,11 +316,16 @@ message= _ "Why don’t you say anything?! Don’t you care at all?!" [/message] + {MOVE_UNIT (id=Darken Volk) 16 17} + [message] speaker=Malin Keshar message= _ "... you can’t abandon me too, not the way they did... father, Drogan, Dela... I have nothing left..." [/message] + {MOVE_UNIT (id=Darken Volk) 17 17} + {MOVE_UNIT (id=Darken Volk) 20 18} + [message] role=advisor message= _ "He will not help you, but perhaps the book might. You were the one who helped him retrieve it; it is rightfully yours!" @@ -340,35 +341,55 @@ message= _ "Darken Volk! That book is as much mine as it is yours! Give it back, or I will have to take it by force!" [/message] - {MODIFY_UNIT (id=Darken Volk) facing sw} + [delay] + time=1000 + [/delay] + + {MODIFY_UNIT (id=Darken Volk) facing nw} + + [delay] + time=1000 + [/delay] [message] speaker=Darken Volk message= _ "You are even more of a fool than I thought." [/message] - {MOVE_UNIT (id=Malin Keshar) 5 17} - - {MODIFY_UNIT (id=Malin Keshar) facing ne} - - {MOVE_UNIT (id=Darken Volk) 26 10} + {MOVE_UNIT (id=Darken Volk) 29 14} # Make camp [terrain] - x,y=26,10 + x,y=29,14 radius=1 - terrain=Ce + terrain=Cer [/terrain] [terrain] - x,y=26,10 - terrain=Ke + x,y=29,14 + terrain=Ker [/terrain] + [redraw][/redraw] {MODIFY_UNIT (id=Darken Volk) facing sw} - # Redraw to see the castle already when displaying the objectives. + {MOVE_UNIT (id=Malin Keshar) 5 13} + + [terrain] + x,y=5,13 + radius=1 + terrain=Cer + [/terrain] + + [terrain] + x,y=5,13 + terrain=Ker + [/terrain] [redraw][/redraw] + + {MODIFY_UNIT (id=Malin Keshar) facing ne} + + {VARIABLE dela_arrived 0} [/event] # This helps prevent Darken from getting himself killed easily by preventing @@ -480,7 +501,7 @@ # Paladins! [event] - name=turn 8 + name=turn 6 # Fake move the paladin in, set up a camp, have some # dialog, and give him another paladin and a mage of light @@ -488,15 +509,15 @@ [move_unit_fake] type=Paladin - x=34,33 - y=27,26 + x=40,40,39,38,37 + y=23,22,22,21,21 side=3 [/move_unit_fake] [unit] type=Paladin side=3 - x,y=33,26 + x,y=37,21 id=Sir Cadaeus name= _ "Sir Cadaeus" canrecruit=yes @@ -504,19 +525,18 @@ facing=nw [/unit] - {GENERIC_UNIT 3 (Paladin) 34 25} {FACING nw} - {GENERIC_UNIT 3 (Paladin) 33 27} {FACING nw} - {GENERIC_UNIT 3 (Mage of Light) 32 25} {FACING nw} + {GENERIC_UNIT 3 (Paladin) 38 20} {FACING nw} + {GENERIC_UNIT 3 (Mage of Light) 38 21} {FACING nw} # Make camp [terrain] - x,y=33,26 + x,y=37,21 radius=1 terrain=Ce [/terrain] [terrain] - x,y=33,26 + x,y=37,21 terrain=Ke [/terrain] @@ -524,8 +544,8 @@ [modify_side] side=3 - {QUANTITY gold 100 150 200} - income=20 + {QUANTITY gold 50 75 100} + {QUANTITY income 12 15 18} hidden=no [/modify_side] @@ -542,69 +562,24 @@ # Dela joins the party [event] - name=side 4 turn 11 + name=side 4 turn 13 - # Find a good location with no adjacent enemies for Dela to set up camp at - [store_locations] - x=20-25 - y=2-3 - - [not] - [filter_adjacent_location] - [filter][/filter] - [/filter_adjacent_location] - [/not] - - variable=possible_camp_locs - [/store_locations] - - [if] - [variable] - name=possible_camp_locs.length - greater_than=0 - [/variable] - - # If such locations were found, pick one randomly... - [then] - {VARIABLE_OP camp_loc_i rand "0..$($possible_camp_locs.length - 1)"} - [/then] - - # ...but if not, then just pick any non-occupied location - [else] - [store_locations] - x=20-25 - y=2-3 - - [not] - [filter][/filter] - [/not] - - variable=possible_camp_locs - [/store_locations] - - {VARIABLE_OP camp_loc_i rand "0..$($possible_camp_locs.length - 1)"} - [/else] - [/if] - - # Fake move Dela in, set up camp, have some dialog. - # She doesn't bring anyone with her. - {INCIDENTAL_MUSIC legends_of_the_north.ogg} + {INCIDENTAL_MUSIC northern_mountains.ogg} [move_unit_fake] type=Frontier Baroness - x=23,$possible_camp_locs[$camp_loc_i].x - y=1,$possible_camp_locs[$camp_loc_i].y + x=41,40,39,38,37,36 + y= 6, 6, 6, 6, 7, 7 side=4 [/move_unit_fake] [unit] side=4 - x=$possible_camp_locs[$camp_loc_i].x - y=$possible_camp_locs[$camp_loc_i].y + x,y=36,7 animate=no moves=0 - facing=sw # We don't know where she'll come in, but sw seems a good general facing + facing=sw # wmllint: recognize Dela Keshar {CHARACTER_STATS_DELA_KESHAR} @@ -612,26 +587,22 @@ # Make camp [terrain] - x=$possible_camp_locs[$camp_loc_i].x - y=$possible_camp_locs[$camp_loc_i].y + x,y=36,7 radius=1 terrain=Ce [/terrain] [terrain] - x=$possible_camp_locs[$camp_loc_i].x - y=$possible_camp_locs[$camp_loc_i].y + x,y=36,7 terrain=Ke [/terrain] [redraw][/redraw] - {CLEAR_VARIABLE possible_camp_locs,camp_loc_i,camp_hexes} - [modify_side] side=4 - {QUANTITY gold 150 200 250} - income=20 + {QUANTITY gold 160 200 240} + {QUANTITY income 16 20 24} hidden=no [/modify_side] @@ -649,9 +620,10 @@ speaker=Dela Keshar message= _ "Did you not think I would keep my word? Attack him, men! Do not let the traitor escape!" [/message] + + {VARIABLE dela_arrived 1} [/event] -# in case you do manage to defeat Dela [event] name=last breath [filter] @@ -667,6 +639,58 @@ speaker=Malin Keshar message= _ "You brought this on yourself..." [/message] + + [if] + [not] + [have_unit] + id=Sir Cadaeus,Darken Volk + [/have_unit] + [/not] + [then] + [kill] + id=Dela Keshar + animate=yes + [/kill] + [fire_event] + name=alternate victory + [/fire_event] + [/then] + [/if] + [/event] + + [event] + name=last breath + [filter] + id=Sir Cadaeus + [/filter] + + [message] + speaker=Sir Cadaeus + message= _ "For the Light I fall..." + [/message] + + [if] + [not] + [have_unit] + id=Dela Keshar,Darken Volk + [/have_unit] + [/not] + [and] + [variable] + name=dela_arrived + numerical_equals=1 + [/variable] + [/and] + [then] + [kill] + id=Sir Cadaeus + animate=yes + [/kill] + [fire_event] + name=alternate victory + [/fire_event] + [/then] + [/if] [/event] [event] @@ -690,6 +714,11 @@ animate=yes [/kill] + {PLACE_IMAGE items/book5.png $x1 $y1} + + {VARIABLE bookX $x1} + {VARIABLE bookY $y1} + [message] speaker=Malin Keshar message= _ "I have already been cursed many times over. One more time is nothing..." @@ -704,7 +733,7 @@ side=1 [objective] condition=win - description= _ "Bring the book back to Malin’s castle" + description= _ "Bring the book back to Malin’s camp" [/objective] [objective] condition=lose @@ -763,10 +792,24 @@ image="misc/book-icon.png" [/unit_overlay] - [message] - speaker=unit - message= _ "I have the book!" - [/message] + [if] + [have_unit] + x,y=$x1,$y1 + id=Malin Keshar + [/have_unit] + [then] + [message] + speaker=Malin Keshar + message= _ "I have the book." + [/message] + [/then] + [else] + [message] + speaker=Malin Keshar + message= _ "My minions have captured the book." + [/message] + [/else] + [/if] {VARIABLE bookX -1} {VARIABLE bookY -1} @@ -780,36 +823,60 @@ x=$bookX y=$bookY side=1 - type=Ghost,Wraith,Spectre,Shadow,Nightgaunt,Vampire Bat,Blood Bat,Dread Bat + type=Ghost,Wraith,Spectre,Shadow,Nightgaunt [/filter] [message] - speaker=unit + speaker=Malin Keshar message= _ "I am sorry, master, but this book is too heavy for me." [/message] [allow_undo][/allow_undo] [/event] + [event] + name=moveto + first_time_only=no + [filter] + x=$bookX + y=$bookY + side=1 + type=Vampire Bat,Blood Bat,Dread Bat + [/filter] + + [message] + speaker=unit + # po: this is just a squeaking sound a bat might make + message= _ "Neep! Neep!" + [/message] + + [message] + speaker=Malin Keshar + message= _ "It’s impossible for a bat to carry a book that heavy." + [/message] + + [allow_undo][/allow_undo] + [/event] + [event] name=time over [unit] type=Paladin side=3 - x,y=33,26 + x,y=37,21 id=Telemon name= _ "Telemon the Slayer" canrecruit=yes animate=yes facing=nw [/unit] - {GENERIC_UNIT 3 (Mage of Light) 34 25} {FACING nw} - {GENERIC_UNIT 3 (Paladin) 33 25} {FACING nw} - {GENERIC_UNIT 3 (Paladin) 32 25} {FACING nw} - {GENERIC_UNIT 3 (Paladin) 32 26} {FACING nw} - {GENERIC_UNIT 3 (Mage of Light) 33 27} {FACING nw} - {GENERIC_UNIT 3 (Mage of Light) 34 26} {FACING nw} + {GENERIC_UNIT 3 (Paladin) 36 20} {FACING nw} + {GENERIC_UNIT 3 (Paladin) 37 20} {FACING nw} + {GENERIC_UNIT 3 (Paladin) 36 21} {FACING nw} + {GENERIC_UNIT 3 (Mage of Light) 37 22} {FACING nw} + {GENERIC_UNIT 3 (Mage of Light) 38 20} {FACING nw} + {GENERIC_UNIT 3 (Mage of Light) 38 21} {FACING nw} [message] speaker=Telemon @@ -821,7 +888,7 @@ [/message] [/event] - # Victory Condition + # Victory Conditions [event] name=moveto [filter] @@ -830,8 +897,8 @@ [filter_location] terrain=C*,K* [and] - x,y=5,17 - radius=2 + x,y=5,13 + radius=1 [/and] [/filter_location] [/filter] @@ -841,7 +908,7 @@ image="misc/book-icon.png" [/remove_unit_overlay] - {MOVE_UNIT (id=Malin Keshar) 1 12} + {MOVE_UNIT (id=Malin Keshar) 1 8} [message] speaker=Malin Keshar @@ -870,10 +937,35 @@ [/endlevel] [/event] + [event] + name=alternate victory + + [message] + speaker=Malin Keshar + message= _ "So, they are all dead. The paladin, Darken Volk, Dela..." + [/message] + + [message] + speaker=Malin Keshar + message= _ "All that I have fought for, everyone who I have tried to protect, everything is gone. Everyone is dead. Is this truly all that I am left with?" + [/message] + + [message] + speaker=Malin Keshar + message= _ "... nothing at all..." + [/message] + + [endlevel] + result=victory + bonus=yes + {NEW_GOLD_CARRYOVER 40} + [/endlevel] + [/event] + [event] name=victory - {CLEAR_VARIABLE bookX,bookY} + {CLEAR_VARIABLE bookX,bookY,dela_arrived} [/event] {HERODEATH_MALIN} From be6bcd1cb118581f0631f27969dbe44a326cf82a Mon Sep 17 00:00:00 2001 From: nemaara Date: Wed, 30 Jan 2019 21:23:31 -0500 Subject: [PATCH 4/9] DiD S10: updated map --- .../maps/10_Alone_at_Last.map | 54 +++++++++---------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/data/campaigns/Descent_Into_Darkness/maps/10_Alone_at_Last.map b/data/campaigns/Descent_Into_Darkness/maps/10_Alone_at_Last.map index 842423dbbc62..9f9fa23f4d4a 100644 --- a/data/campaigns/Descent_Into_Darkness/maps/10_Alone_at_Last.map +++ b/data/campaigns/Descent_Into_Darkness/maps/10_Alone_at_Last.map @@ -1,29 +1,25 @@ -Mm, Mm, Mm, Mm, Mm, Mm, Gs^Fp, Gs^Fp, Mm, Mm, Mm, Mm, Gg, Hh, Hh, Gg, Hh, Hh, Hh, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Ww, Ww -Mm, Mm, Mm, Mm, Mm, Mm, Gs^Fp, Gs^Fp, Mm, Mm, Mm, Mm, Gg, Hh, Hh, Gg, Hh, Hh, Hh, Gg, Gg, Gg, Gg^Efm, Gg, Gg^Efm, Gg, Gg, Gg, Gs^Vh, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Ww, Ww -Mm, Mm, Mm, Mm, Mm, Mm, Hh, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Hh^Vhh, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Ww, Ww, Ww -Mm, Mm, Mm, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Gs^Fp, Hh, Hh, Hh, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gg, Gg, Ww, Ww, Ww, Ww, Ww -Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gs^Fp, Gs^Fms, Hh^Vhh, Gs^Fp, Hh, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg^Efm, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Gg, Ww, Ww, Ww, Ww, Gg, Gg^Efm, Gg^Efm -Mm, Mm, Mm, Mm, Hh, Mm, Gg, Mm, Gg^Fet, Hh, Gg, Hh, Gs^Fms, Gs^Fp, Gs^Fms, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww^Bw\, Ww, Ww, Ww, Ww, Ww, Gg, Gg^Efm, Gg, Gg, Gg -Mm, Mm, Mm, Mm, Gg, Gg, Gg, Gs^Fms, Gs^Fds, Gg, Gg, Gs^Fds, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Ww, Ww^Bw\, Gg, Gg, Gg, Gg, Gg, Gg, Gg^Fet, Gs^Fms, Gs^Fms -Mm, Mm, Mm, Mm, Gg^Fet, Gg, Gg, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gg^Fet, Gg, Gg, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gg, Gs^Fds, Gs^Fms, Gs^Fms -Mm, Mm, Mm, Gs^Fp, Mm, Gg, Hh, Gg, Gg, Gg, Gs^Fds, Gg^Fet, Gs^Fds, Gs^Fds, Gg, Gg, Ww, Ww, Ww, Ww, Gg, Ww, Gg, Ww, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Gs^Fds, Gg, Gg, Gg, Gs^Fds, Gg, Gg -Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Gs^Fp, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gg, Gg^Vh, Ww, Ww, Ww, Gg, Gg, Gs^Fds, Gs^Fds, Gg, Gg, Gg, Gg, Re^Gvs, Gg^Vh, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gs^Fms, Gs^Fms, Gs^Fp -Mm, Mm, Mm, Mm, Mm, Mm, Gg, Gg, Gg, Gs^Fms, Gs^Fms, Gg, Gs^Fms, Gg, Gg, Ww, Ww, Gg, Gs^Fds, Gg^Fet, Gs^Fds, Gg^Ve, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg^Fet, Gg, Gs^Fds, Gg, Gs^Fms, Gs^Fds -Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gg, Gs^Fp, Gs^Fms, Gg, Gs^Fms, Gg, Gg, Gg, Ww, Ww^Bw/, Gg, Gg, Gs^Fds, Re, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gs^Fms, Gs^Fms, Gs^Fds -Gg, Gg, Gg, Mm, Mm, Mm, Mm, Hh^Vhh, Hh, Gg, Gg, Gg, Gg^Efm, Gg, Gg, Ww^Bw/, Ww, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gg, Gg, Gg^Efm, Gg, Re^Gvs, Gg^Wm, Gg, Gg, Gg, Gg, Gs^Fds, Gg, Gs^Fds, Gs^Fds -Mm, Mm, Mm, Gg, Mm, Mm, Mm, Gg, Gg, Gg, Gg^Efm, Gg, Re, Gg, Ww, Ww, Gg, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg^Efm, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Gg, Gg, Gg, Gg, Gs^Fds, Gs^Fp -Mm, Mm, Mm, Hh, Gg, Mm, Mm, Mm, Gg, Gg, Gg^Efm, Re, Re^Gvs, Re^Gvs, Ww, Gg, Gg, Gg, Gg, Ww, Gg, Gg, Gg^Efm, Gg, Gg, Gg^Efm, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg^Ve, Gs^Fms, Gs^Fds, Gs^Fms -Mm, Mm, Mm, Mm, Mm, Gg, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Gg, Ww, Gg, Gg^Vh, Gg, Ww, Gg, Gg, Gg, Gg^Efm, Gg, Gg^Efm, Gg, Gg, Re^Gvs, Re^Gvs, Gg, Re^Gvs, Gg, Gs^Fms, Gg, Gs^Fms, Gs^Fms -Mm, Mm, Mm, Hh, Chr, Gg, Chr, Gg, Gg^Fet, Gg^Efm, Gg, Gg, Gg, Re^Gvs, Ww, Ww, Gg, Gs^Fds, Ww, Ww, Gg, Gg, Gg, Gg, Gg^Ve, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fds, Gg, Gg, Hh, Gg, Gg -Mm, Mm, Mm, Gg, Chr, Khr, Gg^Fet, Gg, Gg, Gg, Gg^Efm, Gg, Gg, Gg, Ww, Gg, Gs^Fds, Gg, Ww, Gg, Gg, Gg, Gs^Fds, Hh, Hh, Hh, Hh, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Hh, Gs^Fp, Gs^Fp -Mm, Mm, Mm, Gg, Gs^Fds, Chr, Chr, Gs^Fds, Gg, Re, Gg, Gg, Gg^Vh, Gg, Ww, Gg, Ww, Ww, Gg, Gg^Vh, Gg, Gs^Fds, Hh, Hh, Hh, Gs^Fp, Hh, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp -Mm, Mm, Mm, Mm, Hh, Gs^Fds, Gg, Gg, Gg, Gg, Gg, Gg, Ww^Bw\, Ww, Ww, Ww, Gg, Gg, Gg^Efm, Gg, Gg, Hh, Gs^Fms, Hh, Gg^Ve, Hh, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Hh, Hh, Hh, Hh -Mm, Mm, Mm, Mm, Hh, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Ww, Ww^Bw\, Gg, Gg, Gs^Fds, Gg, Gg^Efm, Gg, Gg, Gg, Gs^Fms, Gs^Fms, Gs^Fp, Gs^Fp, Gg, Gg, Re^Gvs, Hh, Gg, Gg, Gg, Gg^Fet, Gg, Gs^Fp, Gs^Fp -Mm, Mm, Mm, Hh, Hh, Hh^Vhh, Gg, Gg, Gg, Ww, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fms, Gs^Fp, Gg, Gg, Gs^Fp, Gg, Gs^Fp, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gs^Fp, Gg, Gg -Mm, Mm, Mm, Mm, Hh, Hh, Hh, Gg, Ww, Ww, Ww, Gg, Gs^Fds, Gg, Gs^Fms, Gs^Fds, Gs^Fms, Gg, Gs^Fds, Re, Re, Gg, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Gg, Gg -Mm, Mm, Mm, Mm, Gs^Fp, Hh, Hh, Hh, Ww, Ww, Gg, Gg, Gs^Fms, Gg^Fet, Gs^Fds, Gs^Fms, Gs^Fp, Gg, Gs^Fms, Gs^Fms, Gs^Fp, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Re^Gvs, Gg, Gg, Gg, Gg, Gg, Hh, Gg, Hh, Hh -Mm^Xm, Mm, Mm, Mm, Gs^Fp, Gs^Fp, Ww, Ww, Hh, Gg, Gs^Fp, Gs^Fms, Hh, Gs^Fms, Hh, Gg^Ve, Gs^Fp, Gs^Fp, Gs^Fms, Gs^Fms, Gs^Fp, Gs^Fp, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg^Ve, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg -Xu, Mm^Xm, Xu, Mm, Ww, Ww, Hh, Hh, Hh, Gs^Fp, Gg^Fet, Gs^Fp, Gs^Fp, Hh, Hh, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Re, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg -Xu, Xu, Uu, 1 Uu, Ww, Hh, Mm, Hh, Hh, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Hh, Gs^Fp, Gg^Fet, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gg -Xu, Uu, Ww, Ww, Xu, Mm, Mm, Mm, Hh, Hh, Hh, Gs^Fp, Gs^Fp, Gg^Ve, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp -Uu, Uu, Ww, Xu, Xu, Mm^Xm, Mm^Xm, Mm, Mm, Hh, Hh, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp +Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Hh, Mm, Hh, Hh^Fp, Hh, Hh^Fdw, Gg, Gs^Fp, Hh, Hh^Fdw, Gg, Hh^Fmw, Hh^Fdw, Hh^Fdw, Ww, Wwf, Ww, Ww, Gs, Gd^Edp, Gs^Fmw, Gd^Fdw, Ww^Ewl, Ww, Gs^Fmw, Ww^Ewl, Gs^Es, Gs^Fmw, Gs^Fmw, Gs +Mm^Xm, Mm^Xm, Mm, Mm, Mm, Mm, Mm, Mm^Xm, Mm, Mm, Mm, Mm^Xm, Mm, Mm, Mm, Mm, Hh^Fmw, Hh^Fmw, Hh^Fdw, Hh^Em, Gll^Fdw, Gs^Fmw, Gll^Fdw, Gs^Fmw, Gs^Em, Gs^Em, Wwr, Wwf, Ww, Wwr, Ww, Wwr, Wwr, Gd^Fdw, Ww^Ewl, Wwr, Ww^Ewl, Ww, Wwr, Ww^Ewl, Gd^Fdw, Gd^Fdw, Ww^Ewl +Mm^Xm, Mm^Xm, Mm, Mm, Mm, Mm, Hh^Fds, Mm, Mm, Mm, Hh^Fms, Mm, Mm, Mm, Mm, Mm, Mm, Hh^Fp, Ww^Ewl, Ww^Ewl, Ww, Wwf, Ww, Gll^Fdw, Ww, Ww, Wwr, Ww, Gd^Vc, Ww, Re^Es, Ww, Wwr, Ww^Ewl, Gd^Edpp, Ww^Ewl, Gd^Fdw, Ww, Ww, Wwr, Ww, Ww, Ww +Mm, Mm, Mm, Mm, Hh^Fp, Hh^Fp, Gs^Fms, Hh^Fds, Hh^Em, Mm, Hh^Fms, Mm, Mm, Mm, Hh^Fmw, Mm, Ww^Ewl, Hh^Fdw, Wwr, Wwr, Wwr, Wwr, Wwr, Ww, Ww, Wwr, Gs^Fmw, Gs^Fdw, Re, Re, Gs^Vht, Re^Es, Ww, Wwr, Gd^Fdw, Gd^Edp, Gs^Fmw, Gd^Fdw, Gs^Vc, Ww^Ewl, Gs^Fdw, Ww, Gs^Fdw +Mm, Mm, Mm, Hh^Vl, Mm, Hh^Em, Gs^Fms, Gs^Fms, Gs^Fp, Hh^Fp, Mm, Mm, Hh^Fds, Hh^Fp, Wwf, Ww, Ww, Wwr, Ww, Wwr, Ww^Ewl, Wwr, Ww, Ww^Ewl, Wwf, Wwf, Gs^Em, Gd^Fdw, Re, Gd^Edpp, Gs^Fdw, Ww, Ww^Ewl, Ww^Ewl, Gg^Efm, Gs, Gs^Em, Gs^Em, Gs^Es, Gs^Fmw, Gs^Fmw, Gs^Fmw, Gg^Fp +Mm, Mm^Xm, Mm^Xm, Mm, Mm^Xm, Mm, Hh^Fp, Hh, Gs^Fp, Hh^Fms, Hh^Em, Hh^Fds, Hh^Fds, Wwf, Gg^Vh, Ww^Bw/, Ww, Ww, Mm, Ww, Mm, Hh^Fdw, Wwf^Ewl, Ww^Ewl, Gs^Em, Gs^Fmw, Re^Es, Re, Gd^Fdw, Ww^Ewl, Wwr, Ww, Gd^Fdw, Gs^Fmw, Gs^Fmw, Gd, Gg, Gs^Fmw, Gd^Edpp, Gs, Gs^Fdw, Gs^Fp, Re^Es +Mm, Mm^Xm, Mm, Mm^Xm, Mm^Xm, Mm, Hh, Gs^Fms, Gs^Emf, Gs^Fms, Mm, Mm, Gs^Fms, Gg^Em, Gg^Efm, Wwf, Ww, Hh^Fdw, Mm, Mm, Hh^Fp, Hh^Vhh, Hh^Es, Wwf^Ewf, Gg^Efm, Gs^Fp, Re, Gd^Fdw, Wwf^Ewl, Wwr, Ww^Ewf, Ww, Gd, Gs^Fmw, Gs, Gd^Fdw, Gg^Efm, Gs, Re^Es, Re, Re^Es, Re^Es, Gs +Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh^Fp, Gs^Fp, Hh^Fms, Hh^Fp, Gs^Fms, Hh^Fp, Hh, Ww^Ewl, Wwr, Ww^Bw/, Re, Re, Hh^Fp, Re, Hh^Fp, Re^Es, Re, Re, Re^Es, Gs, Gs^Fmw, Gs^Fp, Wwr, Ww, Ww^Ewl, Gs, Gd, Gg^Efm, Gs, Re, Re, Gs^Fmw, Gd^Edpp, Gs, Gs^Fp, Gs^Fp +Hh, Hh^Es, Hh^Es, Mm, Hh^Fms, Mm, Mm, Hh^Fms, Hh, Gs^Fp, Gs^Em, Gg^Em, Gg^Efm, Ww^Ewl, Ww^Bw/, Ww^Bw/, Ww, Ww^Ewl, Ww^Ewl, Re, Hh^Fp, Re, Gs^Em, Gs^Fp, Hh^Fp, Gs^Fp, Gg^Efm, Gs, Re^Wm, Wwf, Wwf, Gs^Fp, Gs^Fmw, Gd^Fdw, Gs, Gg, Gs, Gs^Es, Gd^Fdw, Gs^Fmw, Gs^Fms, Gs^Fp, Hh^Fds +Mm, Hh^Fms, Mm, Hh, Mm, Mm, Mm, Hh^Em, Hh^Vhh, Gs, Re, Gs, Re, Re^Es, Ww, Ww, Mm, Wwr, Wwr, Ww, Hh^Fms, Gs^Fms, Gs^Fp, Mm, Hh^Fp, Gs^Fp, Gg, Gs, Gd^Vht, Re^Gvs, Re^Gvs, Re^Gvs, Gs^Es, Gg^Es, Gs, Gs^Es, Gd^Fdw, Gg^Efm, Gs, Gs^Fp, Gs^Fp, Gs^Fms, Gs^Fp +Mm^Xm, Mm, Mm^Xm, Hh^Es, Hh^Es, Mm, Mm, Mm, Hh^Fp, Re^Es, Gs^Fp, Re^Es, Ww^Ewl, Ww, Wwr, Hh^Es, Mm, Mm, Hh^Fdw, Ww, Ww, Hh^Fms, Gs^Em, Hh^Fms, Hh, Gg^Efm, Gs, Gs, Re, Re^Gvs, Re^Gvs, Re^Gvs, Gs, Gs^Fdw, Gs^Fmw, Gd^Em, Gs, Gg^Efm, Gs^Em, Gs^Em, Gs^Fms, Hh^Fms, Hh^Fds +Mm^Xm, Mm^Xm, Mm, Mm, Mm, Hh, Hh^Fp, Hh^Fms, Gs^Fms, Gg^Em, Gs^Fms, Re^Es, Gs^Em, Ww^Ewl, Ww^Ewf, Ww^Ewf, Hh^Es, Re^Vh, Hh, Ww, Ww, Gg^Efm, Gs^Emf, Gs^Fp, Gs^Fp, Gg^Efm, Gg, Gg^Es, Gs, Re^Eff, Gs^Eff, Gd^Eff, Gs, Gg^Es, Gs, Gd, Gs^Es, Gs, Gs^Fmw, Gs^Vl, Gs^Fmw, Hh^Fms, Gs^Fms +Mm, Mm^Xm, Mm, Hh^Fp, Hh, Gs, Gs^Fmw, Gs^Fp, Gs^Fmw, Gs^Fms, Hh, Re, Gg^Efm, Ww^Ewl, Wwr, Ww^Ewl, Re^Es, Re^Es, Wwr, Ww, Ww^Ewl, Gs^Fp, Gs^Fp, Gs^Fp, Gg^Ve, Gg, Gs^Fp, Gg^Es, Gg, Gg^Es, Gg^Es, Gs^Fmw, Gg^Em, Gg^Efm, Gs, Gs^Es, Gd^Fdw, Gs^Em, Gs^Fmw, Hh^Fp, Hh^Fms, Gg^Emf, Gg^Em +Mm^Xm, Mm^Xm, Mm, Hh^Es, Gs, Gs, Gg, Gs^Em, Gs^Fmw, Hh^Fms, Re^Es, Re, Ww, Ww, Wwr, Gd^Edpp, Hh^Fdw, Hh, Ww, Ww, Gs^Fms, Gs^Fms, Gs^Fds, Hh^Fp, Hh^Fp, Hh, Hh, Gs^Fp, Gg, Gg^Efm, Gg^Es, Gs^Es, Gs, Gs^Es, Gd^Fdw, Gs^Em, Gd^Eff, Gd^Fdw, Re^Es, Gs^Fp, Hh, Gs^Fms, Gs^Fp +Mm^Xm, Mm^Xm, Mm^Xm, Hh^Fp, Hh^Fp, Gg, Gg^Es, Gs, Gs, Re, Re^Es, Ww^Ewl, Ww, Ww, Wwf, Gs^Em, Ww, Ww, Ww^Ewf, Ww^Ewl, Gs^Fms, Gs^Fds, Hh^Fms, Hh^Fms, Hh, Gs^Fp, Hh, Gg^Efm, Re, Re, Gg^Efm, Gs, Gs, Gs^Vc, Gd^Eff, Re^Eff, Re^Gvs, Gd^Eff, Re, Gg^Efm, Gs^Fmw, Gs^Fms, Gs^Fms +Mm^Xm, Mm^Xm, Mm, Mm, Hh^Fds, Hh, Gs^Em, Gg^Es, Re, Re^Es, Gs^Fp, Re, Ww^Bw\, Ww, Wwf, Wwf, Ww^Ewl, Ww, Ww, Ww^Ewl, Gs^Fp, Hh^Fms, Gs^Fms, Hh^Fp, Gs^Vl, Hh^Fp, Gg^Efm, Gs^Fp, Re^Es, Gg, Gg, Gg^Es, Gs^Eff, Re^Eff, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Wm, Hh, Hh, Hh, Hh^Fms +Mm^Xm, Mm, Mm, Mm, Hh^Fms, Hh^Fp, Hh, Hh^Vhh, Hh^Fp, Hh, Ww, Ww, Wwf, Wwf^Bw\, Re, Gs, Gs^Fp, Gs^Em, Gg^Efm, Gs^Em, Hh^Fp, Gs^Fms, Gs^Fms, Gs^Fms, Gs^Fp, Gg^Efm, Re, Re^Es, Gs^Es, Gs^Em, Gs^Fmw, Gs^Es, Gs, Gd^Eff, Gd^Eff, Re^Gvs, Re^Gvs, Re^Gvs, Re^Es, Gs^Em, Gs^Fmw, Gs^Fmw, Gs^Fp +Mm^Xm, Mm^Xm, Mm^Xm, Hh^Fms, Mm, Hh^Fp, Hh, Mm, Hh^Fp, Ww^Ewl, Ww, Ww, Gs^Fms, Gs^Fp, Gs^Em, Re, Re^Es, Re, Re, Gs^Fp, Gs^Fms, Gg^Em, Re^Es, Gs^Fp, Re^Es, Re, Gg^Efm, Gs, Gg, Gs^Fmw, Gs^Fp, Gg, Gg^Efm, Gs^Es, Gd, Re^Eff, Re, Re^Es, Gs, Gs, Gs^Em, Gs^Em, Gs^Fp +Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Hh^Es, Mm, Mm, Wwr, Wwr, Ww^Ewl, Hh, Gs^Fds, Hh^Fp, Hh^Em, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Re^Es, Re, Re^Es, Gs, Re, Gs^Em, Gg, Gs^Fp, Gs, Gg^Em, Gg^Efm, Gg, Gs, Gs^Fmw, Gs, Gs, Gd, Re^Es, Re^Vh, Gs, Gg^Efm, Gs, Hh, Gs^Em +Mm^Xm, Mm^Xm, Mm, Mm, Hh^Es, Hh^Es, Hh^Fp, Ww, Ww, Ww^Ewl, Hh^Fp, Hh^Fp, Gs^Fms, Hh^Fp, Gs^Fds, Gs^Fms, Gg^Efm, Gg^Em, Hh^Fp, Gs^Fms, Gs^Em, Gg, Gg^Efm, Gs^Fp, Gs^Fms, Gs^Fms, Gs^Fms, Gs^Fp, Gg, Gs^Fmw, Gg^Em, Gs, Gs^Fdw, Gg^Efm, Gs, Gs, Gd, Gd^Es, Gs^Fdw, Hh, Gg^Efm, Hh^Fdw, Hh^Fdw +Mm^Xm, Mm^Xm, Mm^Xm, Mm, Hh, Mm, Ww, Ww, Hh^Fp, Gs^Emf, Hh^Fp, Gs^Fms, Hh^Em, Gs^Fms, Hh^Fp, Gg^Ve, Gs^Fms, Gg^Em, Gs^Fms, Gs^Fms, Hh^Fp, Gs^Fp, Gs^Em, Gs^Fp, Gs^Fds, Gs^Fms, Gs^Fp, Gg^Ve, Gg^Em, Gg, Gs^Es, Gg^Em, Gs, Gg, Gs, Gg, Gs, Gg, Gs, Gs^Fdw, Gs, Gd, Re^Gvs +Xu, Mm^Xm, Xu, Mm, Wwf, Wwf, Hh^Fp, Wwr, Hh^Em, Hh^Fp, Hh^Fp, Gs^Fds, Hh^Fds, Hh^Emf, Hh^Fp, Gs^Fp, Hh^Fms, Hh^Fms, Gs^Fds, Hh^Fms, Gs^Fms, Gs^Emf, Gs^Fms, Hh^Fms, Gs^Fms, Gs^Fds, Hh^Fms, Gs^Fms, Gs^Fp, Gs, Gs^Em, Gs^Fmw, Re^Eff, Gs^Es, Gs^Es, Gs, Gs, Gs, Re, Gg, Gg^Es, Re^Gvs, Re^Gvs +Xu, Xu, Rb, 1 Rb^Es, Wwf, Hh^Fp, Mm, Hh^Em, Hh^Fp, Hh^Fms, Mm, Hh^Fds, Hh^Fms, Mm, Mm, Gs^Fds, Hh^Fds, Hh^Fds, Gg^Fds, Gs^Fms, Gs^Fms, Gs^Fp, Gs^Fds, Hh^Fms, Hh^Fds, Gs^Fms, Gs^Fms, Hh^Fp, Gs^Fms, Gs^Fp, Gs, Re^Eff, Re^Gvs, Re^Vh, Gd, Gs, Gs^Fdw, Gg, Gg, Re, Re^Es, Gs, Gd +Xu, Rb^Es, Wwf, Wwf, Xu, Mm^Xm, Mm^Xm, Mm, Hh^Fms, Mm, Mm, Mm, Mm, Hh^Fms, Mm, Hh^Fds, Hh^Fp, Gs^Fp, Hh, Hh^Fds, Gs^Fp, Gs^Fp, Gs^Fds, Hh^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gg^Em, Gs^Em, Gs, Gd^Es, Re^Gvs, Re^Gvs, Re^Gvs, Re^Es, Gs^Es, Gg^Es, Gs, Gg^Efm, Gs, Re^Es, Gs, Gg^Efm +Rb, Rb^Es, Ww, Xu, Xu, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Hh, Mm, Hh, Hh, Hh, Hh^Fms, Gs^Fp, Hh, Gs^Fp, Mm, Gs^Fp, Hh, Gg, Gs^Fms, Hh^Fms, Hh^Fms, Gs^Fp, Gg^Efm, Gs^Fp, Gs^Fp, Gg, Re^Gvs, Re, Re^Gvs, Gd, Gs, Gs, Gg, Gg, Gg^Es, Re^Es, Gg, Gg From b64259e6f3cf3d649735da4c542ae766c5279773 Mon Sep 17 00:00:00 2001 From: nemaara Date: Sat, 9 Feb 2019 12:09:41 -0500 Subject: [PATCH 5/9] DiD S10: updated objectives --- .../Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg index 4ea0e1a2cc1c..0fc6d8ca5998 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg @@ -161,6 +161,8 @@ description= _ "Death of Malin Keshar" [/objective] + {TURNS_RUN_OUT} + [gold_carryover] bonus=no carryover_percentage=40 @@ -740,6 +742,8 @@ description= _ "Death of Malin Keshar" [/objective] + {TURNS_RUN_OUT} + [gold_carryover] bonus=no carryover_percentage=40 From 0e74adb10ade53c8344e4783024a048a4a1730e1 Mon Sep 17 00:00:00 2001 From: nemaara Date: Sun, 17 Feb 2019 13:19:27 -0500 Subject: [PATCH 6/9] DiD S10: dialogue fix --- .../Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg index 0fc6d8ca5998..fcdd4b643f8b 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg @@ -16,7 +16,7 @@ [story] [part] - story= _ "As he enters the tunnel underneath Lord Karres’s manor, Darken Volk gestures and causes the entrance to collapse. The two necromancers turn and begin walking down the pitch-black tunnel, temporarily safe from pursuit." + story= _ "As he enters the tunnel underneath Lord Karres’s manor, Darken Volk gestures, causing the entrance to collapse. The two necromancers turn and begin walking down the pitch-black tunnel, temporarily safe from pursuit." {STORYTXT_BACKGROUND travel.jpg} [/part] [part] From 5699c57f2b2c33443a1aa90171f3058d2c294f65 Mon Sep 17 00:00:00 2001 From: nemaara Date: Sun, 17 Feb 2019 13:56:20 -0500 Subject: [PATCH 7/9] DiD S10: added dialogue --- .../Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg index fcdd4b643f8b..32743a92b534 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg @@ -921,7 +921,7 @@ [message] speaker=Malin Keshar - message= _ "... then again, is there a point? Even should I escape, then what?" + message= _ "... then again, is there a point? Even should I escape, then what? All that I have fought for, everyone who I have tried to protect, everything is gone to me." [/message] [message] From 92691942186ef81b3eb4a8f93fb7c52eecbe11f8 Mon Sep 17 00:00:00 2001 From: nemaara Date: Sat, 2 Mar 2019 13:09:31 -0500 Subject: [PATCH 8/9] DiD S10: dialogue tweaks --- .../scenarios/10_Alone_at_Last.cfg | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg index 32743a92b534..b54ddef42f46 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg @@ -303,7 +303,7 @@ [message] speaker=Malin Keshar - message= _ "You used me! You knew the people of Parthyn would cast me out — you knew I had nobody else to turn to... you knew I would do whatever you said..." + message= _ "You used me! You knew the people of Parthyn would cast me out — you knew I had nobody else to turn to! You knew I would do whatever you said..." [/message] {MOVE_UNIT (id=Darken Volk) 13 16} @@ -322,7 +322,7 @@ [message] speaker=Malin Keshar - message= _ "... you can’t abandon me too, not the way they did... father, Drogan, Dela... I have nothing left..." + message= _ "... you can’t abandon me too, not the way they did... father, Drogan, Dela..." [/message] {MOVE_UNIT (id=Darken Volk) 17 17} @@ -462,12 +462,12 @@ [message] speaker=Darken Volk - message= _ "Enough prattle from you, boy. Fighting the orcs is your want, not mine. You cannot expect me to help you in an endeavor that does not concern me at all." + message= _ "Enough prattle from you, boy. Fighting the orcs is your ambition, not mine. You cannot expect me to help you in an endeavor that does not concern me at all." [/message] [message] speaker=Malin Keshar - message= _ "The very same to you! I helped you retrieve that book! If you will not help me with my ambitions, I will at least keep the fruits of my labor." + message= _ "The very same to you! I helped you retrieve that book! If you will not help me with my mission, I will at least keep the fruits of my labor." [/message] [message] @@ -497,7 +497,7 @@ [message] speaker=Darken Volk - message= _ "Done? I have done nothing but give you an opportunity. What you choose to do with your life is not my business. Now leave me alone!" + message= _ "Done? I have done nothing but give you an opportunity. What you choose to do with your life is not my business. Leave me alone!" [/message] [/event] @@ -553,7 +553,7 @@ [message] speaker=Sir Cadaeus - message= _ "Your travels in this region have not gone unnoticed, necromancers! The disaster you wreaked upon the good city of Tath and the noble Lord Karres can only be paid back in turn with your blood and souls — whatever little may remain of them. Yes, on this day you shall have to answer for your innumerable crimes." + message= _ "Your travels in this region have not gone unnoticed, necromancers! The disaster you wreaked upon the good city of Tath and the noble Lord Karres can only be paid back in turn with your blood and souls — whatever little may remain of them. Yes, on this day, you shall have to answer for your innumerable crimes." [/message] [message] @@ -610,7 +610,7 @@ [message] speaker=Dela Keshar - message= _ "I finally found you, Malin! On this day, you will pay for what you have done to my people. I will not let you live to see another sunset." + message= _ "I finally found you, Malin! At last, you will have to pay for what you have done to my people and my home. I will not let you live to see another sunset." [/message] [message] @@ -926,7 +926,7 @@ [message] speaker=Malin Keshar - message= _ "Life, death... and unlife — at this point, I could accept any of them and nothing would change." + message= _ "Life, death... unlife — at this point, I could accept any of them and nothing would change." [/message] [message] From 73c717051385dde10cba5e2d48ac1b02960a8048 Mon Sep 17 00:00:00 2001 From: nemaara Date: Sat, 2 Mar 2019 13:43:49 -0500 Subject: [PATCH 9/9] DiD S10: adjust ai gold --- .../Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg index b54ddef42f46..b431e428b5aa 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg @@ -55,8 +55,8 @@ side=2 controller=ai recruit=Blood Bat,Ghost,Wraith,Necrophage,Skeleton Archer,Bone Shooter,Skeleton,Revenant,Deathblade,Dark Adept DiD,Dark Sorcerer DiD - {GOLD 200 250 300} - {INCOME 16 20 24} + {GOLD 170 220 270} + {INCOME 20 25 30} team_name=bad user_team_name= _ "Darken Volk" no_leader=yes @@ -248,7 +248,7 @@ # DV already has book [message] speaker=Darken Volk - message= _ "Now go your own way and I will go mine." + message= _ "Now go your own way, and I will go mine." [/message] [/else] [/if] @@ -547,7 +547,7 @@ [modify_side] side=3 {QUANTITY gold 50 75 100} - {QUANTITY income 12 15 18} + {QUANTITY income 12 16 20} hidden=no [/modify_side]