Quest complete!

Reward: 3300 GP, 600k EXP, 25k JEXP.
Quest state 19 requires Fortress Island so it will remain WIP.

1 files changed, 68 insertions, 2 deletions

diff --git a/npc/017-10/mayor.txt b/npc/017-10/mayor.txt
index 55dea4bc2..ad34b5e04 100644
--- a/npc/017-10/mayor.txt
+++ b/npc/017-10/mayor.txt
@@ -55,11 +55,77 @@
         // Barbara Quest in progress
         case 18:
             .@s=getq(LoFQuest_Barbara);
+            .@s3=getq3(LoFQuest_Barbara);
             switch (.@s) {
             case 5:
-                // Endtrail
+                // No apple - you fail
+                if (!.@s3) {
+                    mesn;
+                    mesq l("Good luck arresting the criminal!");
+                    mesc l("You need both the stolen item as the thief to complete the quest."), 1;
+                    close;
+                }
+
+                // Good reporting
+                mesn;
+                if (!BARBARA_STATE)
+                    mesq l("I see you've brought Barbara here, excellent. She seems pretty beat up.");
+                else
+                    mesq l("...Where's Barbara, the thief?");
+                next;
+                mesn;
+                mesq l("Also, do you have the stolen item?");
+                // You fail
+                if (!(askyesno() == ASK_YES && countitem(MagicApple))) {
+                    mes "";
+                    mesn;
+                    mesq l("Bring me the stolen item, pretty please.");
+                    close;
+                }
                 mes "";
-                mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
+                mesn;
+                mesq l("Good, there they are.");
+                next;
+                if (BARBARA_STATE) {
+                    mesn strcharinfo(0);
+                    mesq l("I regret to inform Barbara was killed in battle before I could find her. I burried her in the mines.");
+                    next;
+                    mesn;
+                    mesq l("Oh... What a bummer. But you've brought the item back, so we're OK.");
+                    next;
+                // Barbara is alive
+                } else {
+                    mesc l("Pledge for Barbara's innocence?");
+                    // Pledge menu
+                    if (askyesno() == ASK_YES) {
+                        BARBARA_STATE=3;
+                        mesn;
+                        mesq lg("...That's a surprise, the noble @@ defending a criminal like her.", strcharinfo(0));
+                        next;
+                        mesn;
+                        mesq l("I will let Lalica, Pihro and Pyndragon know that you find her not guilty, but...");
+                        next;
+                        mesn;
+                        mesq l("The final sentence still belongs to LoF Admins.");
+                        next;
+                    } else {
+                        BARBARA_STATE=2;
+                    }
+                    // EOF: Pledge Menu
+                    mesn;
+                    mesq l("I'll have her hospitalized now.");
+                    next;
+                }
+                mesn;
+                mesq l("Anyway, here your reward.");
+                delitem MagicApple, 1;
+                setq General_Narrator, 19;
+                setq LoFQuest_Barbara, 0, 0, 0;
+                getexp 400000, 15000; // Needed: 1,148,484
+                Zeny+=3300; // You get a reward in cash
+                next;
+                mesn;
+                mesq l("Please come back later to know how things are going.");
                 break;
             // Bad reporting
             case 4: