diff options
-rw-r--r-- | npc/006-0/core.txt | 2 | ||||
-rw-r--r-- | npc/006-2-1/glim.txt | 8 | ||||
-rw-r--r-- | npc/006-2-5/dusk.txt | 87 | ||||
-rw-r--r-- | npc/006-2-5/reed.txt | 76 |
4 files changed, 82 insertions, 91 deletions
diff --git a/npc/006-0/core.txt b/npc/006-0/core.txt index 191044837..93b01e4c9 100644 --- a/npc/006-0/core.txt +++ b/npc/006-0/core.txt @@ -8,7 +8,7 @@ OnTouch: if (CRAZYPOINTS < 3) goto L_Reject; // FIXME /* TODO: Piou Isles Arc */ - if (!getq2(Lilitquest_Glim)) goto L_Reject; // FIXME lame hack + if (!getq2(LilitQuest_Glim)) goto L_Reject; // FIXME lame hack if (getq(General_Narrator) < 3) goto L_Reject; // Tulimshar Arc must be finished specialeffect(5000, SELF, getcharid(3)); diff --git a/npc/006-2-1/glim.txt b/npc/006-2-1/glim.txt index 414232888..a9d620d5c 100644 --- a/npc/006-2-1/glim.txt +++ b/npc/006-2-1/glim.txt @@ -21,12 +21,12 @@ L_Loop: mesq l("Argh, I've run out o' arrows! Say, ye don't have any I could use, do ye? I only got %s...", fnum($GLIM_ST)); next; if (.@q2 < $@GLIM_QTIMER) { - setq1 Lilitquest_Glim, 0; - setq2 Lilitquest_Glim, $@GLIM_QTIMER; + setq1 LilitQuest_Glim, 0; + setq2 LilitQuest_Glim, $@GLIM_QTIMER; } // Daily limit reached - .@q1=getq1(Lilitquest_Glim); + .@q1=getq1(LilitQuest_Glim); if (.@q1 >= (BaseLevel-17)/3) goto L_Timer; select rif(countitem(TolchiAmmoBox), l("Give Glim a %s"), getitemname(TolchiAmmoBox)), @@ -44,7 +44,7 @@ L_Loop: break; } $GLIM_ST+=1; - setq1 Lilitquest_Glim, .@q1+1; + setq1 LilitQuest_Glim, .@q1+1; goto L_Loop; L_Timer: diff --git a/npc/006-2-5/dusk.txt b/npc/006-2-5/dusk.txt index 5982ced8f..fa4ba8733 100644 --- a/npc/006-2-5/dusk.txt +++ b/npc/006-2-5/dusk.txt @@ -1,8 +1,8 @@ // TMW-2 scripts. // Original Authors: Hal9000 & Qwerty Dragon // TMW-2 Authors: -// +seeds -// dangerduck +// +seeds +// dangerduck // Description: // Piou captain who gives information about the war, and the piou queen. @@ -13,26 +13,25 @@ .@q=getq(LilitQuest_Pouf); if (.@q <= 2) - { - .@r = rand2(3); - if (.@r == 0) + { + switch (rand2(3)) { + case 0: npctalk3 l("Don't think you'll sneak anything by me. I'm watching you..."); - } - else if (.@r == 1) - { + break; + case 1: npctalk3 l("I don't tolerate a piou, or %s, who is afraid of hard work.", get_race()); - } - else - { + break; + default: npctalk3 l("Best steer clear of the Princess, %s. It won't go well if you upset her.", strcharinfo(0)); + break; } } - else if (.@q == 3) - { - duskHello(); - } - close; + else if (.@q == 3) + { + duskHello(); + } + close; function duskHello { mesn; @@ -54,41 +53,41 @@ function duskHello { close; break; } - return; + return; } function duskAboutQueen { - mesn; - mesq l("Queen +seeds of Piou Isles is busy coordinating war efforts at the front."); - next; - mesn; - mesq l("She's a fierce piou, leading our troops into the heart of each battle. I admire her bravery."); - next; - mesn; - mesq l("Princess Pouf has been given leadership until our Queen returns. Should Queen +seeds perish, Princess Pouf will take the crown."); - next; - mesn; - mesq l("Fight bravely and well, %s, and perhaps our Queen will survive to return to her beloved Isles.", strcharinfo(0)); - return; + mesn; + mesq l("Queen +seeds of Piou Isles is busy coordinating war efforts at the front."); + next; + mesn; + mesq l("She's a fierce piou, leading our troops into the heart of each battle. I admire her bravery."); + next; + mesn; + mesq l("Princess Pouf has been given leadership until our Queen returns. Should Queen +seeds perish, Princess Pouf will take the crown."); + next; + mesn; + mesq l("Fight bravely and well, %s, and perhaps our Queen will survive to return to her beloved isles.", strcharinfo(0)); + return; } function duskAboutWar { - mesn; - mesq l("So far neither the Duck Side or the Piou Knights have gained the upper hand in the war."); - next; - mesn; - mesq l("However, our mages have recently sensed something dark stirring."); - next; - mesn; - mesq l("I fear something terrible is rising, and I do not know if we can weather the coming storm."); - next; - mesc l("The captain falls quiet, and appears to be lost in thought."); - next; - return; + mesn; + mesq l("So far neither the Duck Side or the Piou Knights have gained the upper hand in the war."); + next; + mesn; + mesq l("However, our mages have recently sensed something dark stirring."); + next; + mesn; + mesq l("I fear something terrible is rising, and I do not know if we can weather the coming storm."); + next; + mesc l("The captain falls quiet, and appears to be lost in thought."); + next; + return; } OnInit: - .sex = G_OTHER; - .distance = 4; - end; + .sex = G_OTHER; + .distance = 4; + end; } diff --git a/npc/006-2-5/reed.txt b/npc/006-2-5/reed.txt index 6eb2fa26a..c880c0924 100644 --- a/npc/006-2-5/reed.txt +++ b/npc/006-2-5/reed.txt @@ -1,58 +1,50 @@ // TMW-2 scripts. // Original Authors: Hal9000 & Qwerty Dragon // TMW-2 Authors: -// +seeds -// dangerduck +// +seeds +// dangerduck // Description: // Piou captain who gives information about shrewboo mounts and the Piou Knights. 006-2-5,40,25,0 script Captain Reed NPC_PIOU_KNIGHT_L,{ - function reedHello; - function reedAboutKnights; - function reedAboutShrewboos; - .@q=getq(LilitQuest_Pouf); + function reedHello; + function reedAboutKnights; + function reedAboutShrewboos; + .@q=getq(LilitQuest_Pouf); - if (.@q <= 2) - { - .@r = rand2(3); - if (.@r == 0) - { - npctalk3 l("This is no place for a weakling like you. I suggest you leave."); - } - else if (.@r == 1) - { - npctalk3 l("Allowing you to remain on our Isles is dangerous. Tread carefully, %s.", get_race()); - } - else - { - npctalk3 l("I'll be keeping an eye on you, %s. Don't make trouble.", strcharinfo(0)); - } - } - else if (.@q == 3) - { + if (.@q <= 2) { + switch (rand2(3)) { + case 0: + npctalk3 l("This is no place for a weakling like you. I suggest you leave."); + break; + case 1: + npctalk3 l("Allowing you to remain on our Isles is dangerous. Tread carefully, %s.", get_race()); + break; + default: + npctalk3 l("I'll be keeping an eye on you, %s. Don't make trouble.", strcharinfo(0)); + } + } else if (.@q == 3) { reedHello(); } close; function reedHello { - mesn; - mesq l("Do you need assistance, Knight %s?", strcharinfo(0)); - next; - select - l("What can you tell me about the Piou Knights?"), - l("Why do Piou Knights need mounts if they can fly?"), - l("I just wanted to say hi."); - mes ""; - switch (@menu) { - case 1: - reedAboutKnights(); - break; - case 2: - reedAboutShrewboos(); - case 3: - // fallthrough - break; - } + mesn; + mesq l("Do you need assistance, Knight %s?", strcharinfo(0)); + next; + select + l("What can you tell me about the Piou Knights?"), + l("Why do Piou Knights need mounts if they can fly?"), + l("I just wanted to say hi."); + mes ""; + switch (@menu) { + case 1: + reedAboutKnights(); + break; + case 2: + reedAboutShrewboos(); + break; + } return; } |