Skip to content

Commit

Permalink
DW: Assorted speaker and dialogue tweaks
Browse files Browse the repository at this point in the history 
Most changes according to reports and fixes posted by Wesbane on the forums, but I've tweaked most of his code and added a few things. Most notable change is that I'm not accounting for the player's possible undead units, because I intend to remove the Undead Bat.
  • Loading branch information
@ln-zookeeper
ln-zookeeper committed Jan 19, 2017
1 parent 954fe05 commit 7b0ebf6
Show file tree
Hide file tree
Showing 8 changed files with 378 additions and 135 deletions.
231 changes: 170 additions & 61 deletions data/campaigns/Dead_Water/scenarios/02_Flight.cfg
View file
Expand Up @@ -457,29 +457,12 @@ _f, _f, _f, _f, _f, _f, _f
[/unit]

[if]
[variable]
name=$second_unit.id
not_equals=Gwabbo
[/variable]
[have_unit]
x,y=$x2,$y2
id=Gwabbo
[/have_unit]

[then]
[message]
speaker=second_unit
message= _ "Look! There is a massive bat back here."
[/message]
[message]
speaker=Gwabbo
message= _ "Be courageous, and attack it anyway!"
[/message]
[message]
speaker=second_unit
message= _ "But it isn’t attacking <i>me</i>. Do you think, with its master gone, it might desire a new one?"
[/message]
[message]
speaker=Kai Krellis
message= _ "If it does not attack, we shall not kill it. Let us see if it follows us."
[/message]
[/then]
[else]
[message]
speaker=Kai Krellis
message= _ "That is a mighty bat!"
Expand All @@ -496,6 +479,53 @@ _f, _f, _f, _f, _f, _f, _f
speaker=Kai Krellis
message= _ "If it does not attack, do not kill it. Let us see if it follows us."
[/message]
[/then]

[else]
[if]
[have_unit]
x,y=$x2,$y2
race=bats
[/have_unit]

[then]
[message]
speaker=Kai Krellis
message= _ "That is a mighty bat!"
[/message]
[message]
speaker=second_unit
message= _ "Neep, neep!"
[/message]
[message]
speaker=Cylanna
message= _ "Hold a moment! Do you think, with its master gone, it might desire a new one?"
[/message]
[message]
speaker=Kai Krellis
message= _ "If it does not attack, do not kill it. Let us see if it follows us."
[/message]
[/then]

[else]
[message]
speaker=second_unit
message= _ "Look! There is a massive bat back here."
[/message]
[message]
speaker=Gwabbo
message= _ "Be courageous, and attack it anyway!"
[/message]
[message]
speaker=second_unit
message= _ "But it isn’t attacking <i>me</i>. Do you think, with its master gone, it might desire a new one?"
[/message]
[message]
speaker=Kai Krellis
message= _ "If it does not attack, we shall not kill it. Let us see if it follows us."
[/message]
[/else]
[/if]
[/else]
[/if]

Expand Down Expand Up @@ -554,38 +584,12 @@ _f, _f, _f, _f, _f, _f, _f
[/unit]

[if]
[variable]
name=$second_unit.id
not_equals=Kai Krellis
[/variable]
[have_unit]
x,y=$x2,$y2
id=Kai Krellis
[/have_unit]

[then]
[message]
speaker=second_unit
message= _ "And look! There is a bat cowering in the corner here."
[/message]
[message]
speaker=Kai Krellis
message= _ "Well, kill it, and let’s keep moving."
[/message]
[message]
speaker=second_unit
message= _ "But look, it’s licking my hand."
[/message]
[message]
speaker=Friendly Bat
#po: This should just be "translated" to whatever noise a bat makes in your language.
message= _ "Neep?"
[/message]
[message]
speaker=second_unit
message= _ "It’s kind of cute."
[/message]
[message]
speaker=Kai Krellis
message= _ "Very well then. I suppose we have our own bat."
[/message]
[/then]
[else]
[message]
speaker=second_unit
message= _ "Look! There is a bat cowering in the corner here."
Expand All @@ -606,6 +610,70 @@ _f, _f, _f, _f, _f, _f, _f
speaker=Cylanna
message= _ "Apparently you have your own bat."
[/message]
[/then]

[else]
[if]
[have_unit]
x,y=$x2,$y2
race=bats
[/have_unit]

[then]
[message]
speaker=second_unit
message= _ "Neep, neep!"
[/message]
[message]
speaker=Kai Krellis
message= _ "Look! There is a bat."
[/message]
[message]
speaker=Cylanna
message= _ "Aren’t you going to kill it? We need to keep moving."
[/message]
[message]
speaker=Kai Krellis
message= _ "It’s kind of cute."
[/message]
[message]
speaker=Friendly Bat
message= _ "Neep?"
[/message]
[message]
speaker=Cylanna
message= _ "Apparently you have your own bat."
[/message]
[/then]

[else]
[message]
speaker=second_unit
message= _ "And look! There is a bat cowering in the corner here."
[/message]
[message]
speaker=Kai Krellis
message= _ "Well, kill it, and let’s keep moving."
[/message]
[message]
speaker=second_unit
message= _ "But look, it’s licking my hand."
[/message]
[message]
speaker=Friendly Bat
#po: This should just be "translated" to whatever noise a bat makes in your language.
message= _ "Neep?"
[/message]
[message]
speaker=second_unit
message= _ "It’s kind of cute."
[/message]
[message]
speaker=Kai Krellis
message= _ "Very well then. I suppose we have our own bat."
[/message]
[/else]
[/if]
[/else]
[/if]

Expand Down Expand Up @@ -658,10 +726,31 @@ _f, _f, _f, _f, _f, _f, _f
{IS_LOYAL}
[/unit]

[message]
speaker=second_unit
message= _ "Look! There is a bat in the corner here. It is moving, but it looks half dead."
[/message]
[if]
[have_unit]
x,y=$x2,$y2
race=bats
[/have_unit]

[then]
[message]
speaker=second_unit
message= _ "Neep, neep!"
[/message]
[message]
speaker=Kai Krellis
message= _ "Look! There is a bat. It is moving, but it looks half dead."
[/message]
[/then]

[else]
[message]
speaker=second_unit
message= _ "Look! There is a bat in the corner here. It is moving, but it looks half dead."
[/message]
[/else]
[/if]

[if]
[have_unit]
id=Gwabbo
Expand Down Expand Up @@ -694,10 +783,30 @@ _f, _f, _f, _f, _f, _f, _f
x,y=$x1,$y1
image=misc/blank-hex.png~BLIT(items/chest-open.png~CROP(0,0,68,54),4,18)
[/item]
[message]
speaker=second_unit
message= _ "He had a chest in his tent, too. It is filled with gold!"
[/message]

[if]
[have_unit]
x,y=$x2,$y2
race=bats
[/have_unit]
[then]
[message]
speaker=second_unit
message= _ "Neep, neep!"
[/message]
[message]
speaker=Kai Krellis
message= _ "He had a chest in his tent, too. It is filled with gold!"
[/message]
[/then]
[else]
[message]
speaker=second_unit
message= _ "He had a chest in his tent, too. It is filled with gold!"
[/message]
[/else]
[/if]

[sound]
name=gold.ogg
[/sound]
Expand Down
10 changes: 5 additions & 5 deletions data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg
View file
Expand Up @@ -239,12 +239,12 @@
[if]
[variable]
name=get_trident
not_equal=done
not_equals=done
[/variable]

[then]
[message]
speaker=$unit.id
speaker=unit
message= _ "Neep, neep!"
[/message]

Expand Down Expand Up @@ -283,7 +283,7 @@
[/filter]

[message]
speaker=$unit.id
speaker=unit
message= _ "There is something sticking out of the mud here. Ah! I got it."
[/message]

Expand All @@ -301,7 +301,7 @@
[/message]

[message]
speaker=$unit.id
speaker=unit
[option]
label= _ "That sounds great! I’ll take it."
[command]
Expand Down Expand Up @@ -348,7 +348,7 @@
[/variable]
[then]
[message]
speaker=$unit.id
speaker=unit
[option]
label= _ "Let me have that trident. I want to control lightning!"
[command]
Expand Down
4 changes: 2 additions & 2 deletions data/campaigns/Dead_Water/scenarios/04_Slavers.cfg
View file
Expand Up @@ -580,7 +580,7 @@
[/variable]
[then]
[message]
speaker=$unit.id
speaker=unit
message= _ "Neep!"
[/message]
[message]
Expand Down Expand Up @@ -703,7 +703,7 @@
[/variable]
[then]
[message]
speaker=$unit.id
speaker=unit
message= _ "Neep?"
[/message]
[message]
Expand Down
30 changes: 26 additions & 4 deletions data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
View file
Expand Up @@ -702,10 +702,32 @@
y=$y1
image=items/chest.png
[/item]
[message]
speaker=second_unit
message= _ "It seems that orc was rich! He has a chest here with over 100 pieces of gold!"
[/message]

[if]
[have_unit]
x,y=$x2,$y2
race=bats
[/have_unit]

[then]
[message]
speaker=second_unit
message= _ "Neep, neep!"
[/message]

[message]
speaker=Kai Krellis
message= _ "It seems that orc was rich! He has a chest here with over 100 pieces of gold!"
[/message]
[/then]
[else]
[message]
speaker=second_unit
message= _ "It seems that orc was rich! He has a chest here with over 100 pieces of gold!"
[/message]
[/else]
[/if]

[sound]
name=gold.ogg
[/sound]
Expand Down
10 changes: 5 additions & 5 deletions data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg
View file
Expand Up @@ -391,10 +391,10 @@
[/unit]

[if]
[variable]
name=unit.id
equals=Keshan
[/variable]
[have_unit]
x,y=$x1,$y1
id=Keshan,Inky
[/have_unit]
[then]
[message]
speaker=Keshan
Expand All @@ -417,7 +417,7 @@
[/variable]
[then]
[message]
speaker=$unit.id
speaker=unit
message= _ "Neep, neep, neep!"
[/message]
[/then]
Expand Down

0 comments on commit 7b0ebf6

Please sign in to comment.