From 45361183a6dfd8e7cd32853a57c5be658dbca1d3 Mon Sep 17 00:00:00 2001 From: Simon Forsyth Date: Sun, 8 Jul 2012 22:44:33 +0000 Subject: [PATCH] Allow undoing moves when moving to a location... ...where an unrescued merfolk was after they were killed --- .../09_Blood_is_Thicker_Than_Water.cfg | 552 +++++++++--------- 1 file changed, 272 insertions(+), 280 deletions(-) diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg index d1453eb06fe..629941f4bda 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg @@ -1179,343 +1179,319 @@ [event] name=moveto + id=rescue_urruga [filter] x,y=25, 36 side=1 [/filter] + + [remove_item] + x,y=25, 36 + [/remove_item] + [unit] + type=Merman Warrior + id=Urruga + name= _ "Urruga" + side=1 + x=25 + y=36 + unrenamable=yes + [modifications] + {TRAIT_LOYAL} + {TRAIT_QUICK} + [/modifications] + {IS_LOYAL} + [/unit] [if] [variable] name=number_merfolk_caged - greater_than=0 + numerical_equals=5 [/variable] [then] - [remove_item] - x,y=25, 36 - [/remove_item] - [unit] - type=Merman Warrior - id=Urruga - name= _ "Urruga" - side=1 - x=25 - y=36 - unrenamable=yes - [modifications] - {TRAIT_LOYAL} - {TRAIT_QUICK} - [/modifications] - {IS_LOYAL} - [/unit] [if] - [variable] - name=number_merfolk_caged - numerical_equals=5 - [/variable] + [have_unit] + id=Esanoo + [/have_unit] [then] - [if] - [have_unit] - id=Esanoo - [/have_unit] - [then] - [message] - speaker=Urruga - message= _ "Free at last! Thanks be to the Sea God. But wait a minute, you’re elves?!" - [/message] - [message] - speaker=Esanoo - message= _ "I have returned with the elves we sought. They have agreed to help me rescue the rest of our group from the foul humans." - [/message] - [message] - speaker=Urruga - message= _ "Indeed you have done well, far better than I could have hoped. We shall talk more later, but for now we have to free the rest of our brethren." - [/message] - [/then] - [else] - [message] - speaker=Kaleh - message= _ "Greetings. Esanoo told us that you were looking for us, and he bravely led us here. Though he has fallen in combat, we have come to rescue the rest of your kind." - [/message] - [message] - speaker=Urruga - message= _ "Yes, I recognize your face, young elf. We will remember Esanoo’s sacrifice. But for now we must rescue the rest of my brethren before they too are slain by the foul humans." - [/message] - [message] - speaker=Nym - message= _ "How could he recognize your face? We’ve never seen him before." - [/message] - [message] - speaker=Kaleh - message= _ "We’ll ask later, for now we’ve got to keep fighting." - [/message] - [/else] - [/if] + [message] + speaker=Urruga + message= _ "Free at last! Thanks be to the Sea God. But wait a minute, you’re elves?!" + [/message] + [message] + speaker=Esanoo + message= _ "I have returned with the elves we sought. They have agreed to help me rescue the rest of our group from the foul humans." + [/message] + [message] + speaker=Urruga + message= _ "Indeed you have done well, far better than I could have hoped. We shall talk more later, but for now we have to free the rest of our brethren." + [/message] [/then] [else] + [message] + speaker=Kaleh + message= _ "Greetings. Esanoo told us that you were looking for us, and he bravely led us here. Though he has fallen in combat, we have come to rescue the rest of your kind." + [/message] [message] speaker=Urruga - message= _ "Thank you for rescuing me. We’ll show those humans the true fury of the merfolk!" + message= _ "Yes, I recognize your face, young elf. We will remember Esanoo’s sacrifice. But for now we must rescue the rest of my brethren before they too are slain by the foul humans." + [/message] + [message] + speaker=Nym + message= _ "How could he recognize your face? We’ve never seen him before." + [/message] + [message] + speaker=Kaleh + message= _ "We’ll ask later, for now we’ve got to keep fighting." [/message] [/else] [/if] - {CHECK_IF_FREED_ALL_MERFOLK} [/then] + [else] + [message] + speaker=Urruga + message= _ "Thank you for rescuing me. We’ll show those humans the true fury of the merfolk!" + [/message] + [/else] [/if] + {CHECK_IF_FREED_ALL_MERFOLK} [/event] # Merman Warrior Nuvassa (1st NE island) [event] name=moveto + id=rescue_nuvassa [filter] x,y=34, 31 side=1 [/filter] + + [remove_item] + x,y=34, 31 + [/remove_item] + [unit] + type=Merman Warrior + id=Nuvassa + name= _ "Nuvassa" + side=1 + x=34 + y=31 + unrenamable=yes + [modifications] + {TRAIT_LOYAL} + {TRAIT_RESILIENT} + [/modifications] + {IS_LOYAL} + [/unit] [if] [variable] name=number_merfolk_caged - greater_than=0 + numerical_equals=5 [/variable] [then] - [remove_item] - x,y=34, 31 - [/remove_item] - [unit] - type=Merman Warrior - id=Nuvassa - name= _ "Nuvassa" - side=1 - x=34 - y=31 - unrenamable=yes - [modifications] - {TRAIT_LOYAL} - {TRAIT_RESILIENT} - [/modifications] - {IS_LOYAL} - [/unit] [if] - [variable] - name=number_merfolk_caged - numerical_equals=5 - [/variable] + [have_unit] + id=Esanoo + [/have_unit] [then] - [if] - [have_unit] - id=Esanoo - [/have_unit] - [then] - [message] - speaker=Esanoo - message= _ "I have returned with the elves we sought. They have agreed to help me rescue the rest of our group from the foul humans." - [/message] - [message] - speaker=Nuvassa - message= _ "Indeed you have done well, far better than I could have hoped. We shall talk more later, but for now we have to free the rest of our brethren." - [/message] - [/then] - [else] - [message] - speaker=Kaleh - message= _ "Greetings. Esanoo told us that you were looking for us, and he bravely led us here. Though he has fallen in combat, we have come to rescue the rest of your kind." - [/message] - [message] - speaker=Nuvassa - message= _ "Yes, I recognize your face, young elf. We will remember Esanoo’s sacrifice. But for now we must rescue the rest of my brethren before they too are slain by the foul humans." - [/message] - [message] - speaker=Nym - message= _ "How could he recognize your face? We’ve never seen him before." - [/message] - [message] - speaker=Kaleh - message= _ "We’ll ask later, for now we’ve got to keep fighting." - [/message] - [/else] - [/if] + [message] + speaker=Esanoo + message= _ "I have returned with the elves we sought. They have agreed to help me rescue the rest of our group from the foul humans." + [/message] + [message] + speaker=Nuvassa + message= _ "Indeed you have done well, far better than I could have hoped. We shall talk more later, but for now we have to free the rest of our brethren." + [/message] [/then] [else] [message] - speaker=Nuvassa - message= _ "Thank you for rescuing me. You elves are very skilled at fighting on the dry land. I envy you." + speaker=Kaleh + message= _ "Greetings. Esanoo told us that you were looking for us, and he bravely led us here. Though he has fallen in combat, we have come to rescue the rest of your kind." [/message] [message] - speaker=$unit.id - race=elf - message= _ "As I envy your kind’s prowess when fighting in the water." + speaker=Nuvassa + message= _ "Yes, I recognize your face, young elf. We will remember Esanoo’s sacrifice. But for now we must rescue the rest of my brethren before they too are slain by the foul humans." + [/message] + [message] + speaker=Nym + message= _ "How could he recognize your face? We’ve never seen him before." + [/message] + [message] + speaker=Kaleh + message= _ "We’ll ask later, for now we’ve got to keep fighting." [/message] [/else] [/if] - {CHECK_IF_FREED_ALL_MERFOLK} [/then] + [else] + [message] + speaker=Nuvassa + message= _ "Thank you for rescuing me. You elves are very skilled at fighting on the dry land. I envy you." + [/message] + [message] + speaker=$unit.id + race=elf + message= _ "As I envy your kind’s prowess when fighting in the water." + [/message] + [/else] [/if] + {CHECK_IF_FREED_ALL_MERFOLK} [/event] # Merman Spearman Yantili (2nd NW sandy island) [event] name=moveto + id=rescue_yantili [filter] x,y=18, 32 side=1 [/filter] + + [remove_item] + x,y=18, 32 + [/remove_item] + [unit] + type=Merman Spearman + id=Yantili + name= _ "Yantili" + side=1 + x=18 + y=32 + unrenamable=yes + [modifications] + {TRAIT_LOYAL} + {TRAIT_RESILIENT} + [/modifications] + {IS_LOYAL} + [/unit] [if] [variable] name=number_merfolk_caged - greater_than=0 + numerical_equals=5 [/variable] [then] - [remove_item] - x,y=18, 32 - [/remove_item] - [unit] - type=Merman Spearman - id=Yantili - name= _ "Yantili" - side=1 - x=18 - y=32 - unrenamable=yes - [modifications] - {TRAIT_LOYAL} - {TRAIT_RESILIENT} - [/modifications] - {IS_LOYAL} - [/unit] [if] - [variable] - name=number_merfolk_caged - numerical_equals=5 - [/variable] + [have_unit] + id=Esanoo + [/have_unit] [then] - [if] - [have_unit] - id=Esanoo - [/have_unit] - [then] - [message] - speaker=Esanoo - message= _ "I have returned with the elves we sought. They have agreed to help me rescue the rest of our group from the foul humans." - [/message] + [message] + speaker=Esanoo + message= _ "I have returned with the elves we sought. They have agreed to help me rescue the rest of our group from the foul humans." + [/message] - [message] - speaker=Yantili - message= _ "Indeed you have done well, far better than I could have hoped. We shall talk more later, but for now we have to free the rest of our brethren." - [/message] - [/then] - [else] - [message] - speaker=Kaleh - message= _ "Greetings. Esanoo told us that you were looking for us, and he bravely led us here. Though he has fallen in combat, we have come to rescue the rest of your kind." - [/message] - [message] - speaker=Yantili - message= _ "Yes, I recognize your face, young elf. We will remember Esanoo’s sacrifice. But for now we must rescue the rest of my brethren before they too are slain by the foul humans." - [/message] - [message] - speaker=Nym - message= _ "How could he recognize your face? We’ve never seen him before." - [/message] - [message] - speaker=Kaleh - message= _ "We’ll ask later, for now we’ve got to keep fighting." - [/message] - [/else] - [/if] + [message] + speaker=Yantili + message= _ "Indeed you have done well, far better than I could have hoped. We shall talk more later, but for now we have to free the rest of our brethren." + [/message] [/then] [else] + [message] + speaker=Kaleh + message= _ "Greetings. Esanoo told us that you were looking for us, and he bravely led us here. Though he has fallen in combat, we have come to rescue the rest of your kind." + [/message] [message] speaker=Yantili - message= _ "Thank you for rescuing me. I never imagined that we would actually be able to find you elves. Our master was right after all. But more of that later..." + message= _ "Yes, I recognize your face, young elf. We will remember Esanoo’s sacrifice. But for now we must rescue the rest of my brethren before they too are slain by the foul humans." + [/message] + [message] + speaker=Nym + message= _ "How could he recognize your face? We’ve never seen him before." + [/message] + [message] + speaker=Kaleh + message= _ "We’ll ask later, for now we’ve got to keep fighting." [/message] [/else] [/if] - {CHECK_IF_FREED_ALL_MERFOLK} [/then] + [else] + [message] + speaker=Yantili + message= _ "Thank you for rescuing me. I never imagined that we would actually be able to find you elves. Our master was right after all. But more of that later..." + [/message] + [/else] [/if] + {CHECK_IF_FREED_ALL_MERFOLK} [/event] # Mermaid Priestess Il-tian (2nd NE grass island) [event] name=moveto + id=rescue_iltian [filter] x,y=31, 25 side=1 [/filter] + + [remove_item] + x,y=31, 25 + [/remove_item] + [unit] + type=Mermaid Priestess + id=Il-tian + name= _ "Il-tian" + side=1 + x=31 + y=25 + unrenamable=yes + [modifications] + {TRAIT_LOYAL} + {TRAIT_QUICK} + [/modifications] + {IS_LOYAL} + [/unit] [if] [variable] name=number_merfolk_caged - greater_than=0 + numerical_equals=5 [/variable] [then] - [remove_item] - x,y=31, 25 - [/remove_item] - [unit] - type=Mermaid Priestess - id=Il-tian - name= _ "Il-tian" - side=1 - x=31 - y=25 - unrenamable=yes - [modifications] - {TRAIT_LOYAL} - {TRAIT_QUICK} - [/modifications] - {IS_LOYAL} - [/unit] [if] - [variable] - name=number_merfolk_caged - numerical_equals=5 - [/variable] + [have_unit] + id=Esanoo + [/have_unit] [then] - [if] - [have_unit] - id=Esanoo - [/have_unit] - [then] - [message] - speaker=Esanoo - message= _ "I have returned with the elves we sought. They have agreed to help me rescue the rest of our group from the foul humans." - [/message] - [message] - speaker=Il-tian - message= _ "Indeed you have done well, far better than I could have hoped. We shall talk more later, but for now we have to free the rest of our brethren." - [/message] - [/then] - [else] - [message] - speaker=Kaleh - message= _ "Greetings. Esanoo told us that you were looking for us, and he bravely led us here. Though he has fallen in combat, we have come to rescue the rest of your kind." - [/message] - [message] - speaker=Il-tian - message= _ "Yes, I recognize your face, young elf. We will remember Esanoo’s sacrifice. But for now we must rescue the rest of my brethren before they too are slain by the foul humans." - [/message] - [message] - speaker=Nym - message= _ "How could she recognize your face? We’ve never seen her before." - [/message] - [message] - speaker=Kaleh - message= _ "We’ll ask later, for now we’ve got to keep fighting." - [/message] - [/else] - [/if] + [message] + speaker=Esanoo + message= _ "I have returned with the elves we sought. They have agreed to help me rescue the rest of our group from the foul humans." + [/message] + [message] + speaker=Il-tian + message= _ "Indeed you have done well, far better than I could have hoped. We shall talk more later, but for now we have to free the rest of our brethren." + [/message] [/then] [else] + [message] + speaker=Kaleh + message= _ "Greetings. Esanoo told us that you were looking for us, and he bravely led us here. Though he has fallen in combat, we have come to rescue the rest of your kind." + [/message] [message] speaker=Il-tian - message= _ "Thank you for rescuing me. May the Sea God’s bounty bless you and protect you. If you have any wounded I can help heal them. The blades of the vile humans are terrible indeed." + message= _ "Yes, I recognize your face, young elf. We will remember Esanoo’s sacrifice. But for now we must rescue the rest of my brethren before they too are slain by the foul humans." + [/message] + [message] + speaker=Nym + message= _ "How could she recognize your face? We’ve never seen her before." + [/message] + [message] + speaker=Kaleh + message= _ "We’ll ask later, for now we’ve got to keep fighting." [/message] [/else] [/if] - {CHECK_IF_FREED_ALL_MERFOLK} [/then] + [else] + [message] + speaker=Il-tian + message= _ "Thank you for rescuing me. May the Sea God’s bounty bless you and protect you. If you have any wounded I can help heal them. The blades of the vile humans are terrible indeed." + [/message] + [/else] [/if] + {CHECK_IF_FREED_ALL_MERFOLK} [/event] # We-jial Mermaid Enchantress, trapped in cave @@ -1550,54 +1526,48 @@ [event] name=moveto + id=rescue_wejial [filter] x,y=27, 19 side=1 [/filter] - [if] - [variable] - name=number_merfolk_caged - greater_than=0 - [/variable] - [then] - [remove_item] - x,y=27, 19 - [/remove_item] - [unit] - type=Mermaid Enchantress - id=We-jial - name= _ "We-jial" - side=1 - x=29 - y=19 - unrenamable=yes - [modifications] - {TRAIT_LOYAL} - {TRAIT_INTELLIGENT} - [/modifications] - {IS_LOYAL} - [/unit] - [message] - speaker=We-jial - message= _ "Thank you for rescuing me. How did you manage to escape?" - [/message] - {CHECK_EXPLORER} - [message] - speaker=$explorer.id - message= _ "Esanoo found the elves that we were searching for. He brought them back and they helped free us. I can’t believe the humans imprisoned you in such a horrible place. To be stuck in the darkness with those undead. We will make them pay for what they have done!" - [/message] - [message] - speaker=We-jial - message= _ "Do not worry yourself, now that I am free all will be set to rights. It is not our mission to defeat all the evil in this world. Protecting the elves is most important. We must bring them to our master; all else is secondary." - [/message] - [message] - speaker=$explorer.id - message= _ "Yes, you are right, of course. Pardon me." - [/message] - {CLEAR_VARIABLE explorer} - {CHECK_IF_FREED_ALL_MERFOLK} - [/then] - [/if] + + [remove_item] + x,y=27, 19 + [/remove_item] + [unit] + type=Mermaid Enchantress + id=We-jial + name= _ "We-jial" + side=1 + x=29 + y=19 + unrenamable=yes + [modifications] + {TRAIT_LOYAL} + {TRAIT_INTELLIGENT} + [/modifications] + {IS_LOYAL} + [/unit] + [message] + speaker=We-jial + message= _ "Thank you for rescuing me. How did you manage to escape?" + [/message] + {CHECK_EXPLORER} + [message] + speaker=$explorer.id + message= _ "Esanoo found the elves that we were searching for. He brought them back and they helped free us. I can’t believe the humans imprisoned you in such a horrible place. To be stuck in the darkness with those undead. We will make them pay for what they have done!" + [/message] + [message] + speaker=We-jial + message= _ "Do not worry yourself, now that I am free all will be set to rights. It is not our mission to defeat all the evil in this world. Protecting the elves is most important. We must bring them to our master; all else is secondary." + [/message] + [message] + speaker=$explorer.id + message= _ "Yes, you are right, of course. Pardon me." + [/message] + {CLEAR_VARIABLE explorer} + {CHECK_IF_FREED_ALL_MERFOLK} [/event] # Event 2.1: Merfolk death counter @@ -1803,6 +1773,28 @@ [/variable] [/filter_condition] + # Remove any remaining rescue events + [event] + id=rescue_urruga + remove=true + [/event] + [event] + id=rescue_nuvassa + remove=true + [/event] + [event] + id=rescue_yantili + remove=true + [/event] + [event] + id=rescue_iltian + remove=true + [/event] + [event] + id=rescue_wejial + remove=true + [/event] + # To do: add dialogue when merfolk die # remove shroud around human leader