Experimental placeholders

3 files changed, 64 insertions, 2 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 2e4b39961..b0db167c9 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4159,12 +4159,14 @@ constants_db: {
 	NPC_PET_TAMER:          456
 	NPC_YETI:               457
 	NPC_KENTON:             458
+	NPC_GUARD_DEAD:         459
 
 	NPC_MONSTERKING:        500
 	NPC_AIRSHIP:            501
 	NPC_POLITICS:           502
 	NPC_GAMEMASTER:         503
 	NPC_GAMEMISTRESS:       504
+	NPC_WOUNDEDSOLDIER:     505
 
 	NPC_SOUL_NORMAL:        700
 	NPC_SOUL_DESERT:        701
diff --git a/npc/018-6-1/main.txt b/npc/018-6-1/main.txt
index e38d102f4..3f8f1ba2a 100644
--- a/npc/018-6-1/main.txt
+++ b/npc/018-6-1/main.txt
@@ -87,6 +87,10 @@ OnTouch:
     .@q=getq(LoFQuest_Barbara);
     .@q2=getq2(LoFQuest_Barbara);
     .@q3=getq3(LoFQuest_Barbara);
+    // Skipped cutscenes, show you the EXIT
+    if (.@q == 1 && .@q3 != 2)
+        cwarp "017-1", 32, 45;
+
     if (.@q >= 1) {
         warp BarbaraInstCheck(0), 90, 91;
         // Complete the first arc if possible
@@ -124,6 +128,45 @@ OnInit:
 }
 
 ///////////////////////////// Minievents
+018-6-1,128,131,0	script	Wounded Soldier#01861	NPC_GUARD_DEAD,{
+    //npctalk3 l("Please find her and don't worry with me! And be careful!");
+    npctalk3 l("*scream in pain*");
+    close;
+
+OnMain:
+    mesn l("Wounded Soldier");
+    mesq l("Hey, you! Are you here on Kenton's orders?!");
+    next;
+    mesn l("Benjamin, Wounded Soldier");
+    mesq l("My name is Benjamin, and I was in charge of an incursion here to capture Barbara.");
+    next;
+    mesn l("Benjamin, Wounded Soldier");
+    mesq l("My unit, however, was attacked!");
+    mesc l("You help Benjamin in getting up.");
+    mesq l("I now entrust this quest in your hands!");
+    mesc l("With a wave, Benjamin returns to report Kenton about the outcome.");
+    setq3 LoFQuest_Barbara, 1;
+    disablenpc instance_npcname(.name$); // NPC will now go to rest
+    close;
 
+OnInit:
+    disablenpc .name$;
+    end;
+OnInstanceInit:
+    disablenpc instance_npcname(.name$);
+    end;
+}
 
+// Event trigger
+018-6-1,121,132,0	script	Wounded Soldier#01861	NPC_WOUNDEDSOLDIER, 0, 10,{
+OnTouch:
+    .@q=getq(LoFQuest_Barbara);
+    .@q2=getq2(LoFQuest_Barbara);
+    .@q3=getq3(LoFQuest_Barbara);
+    if (.@q == 1 && .@q3 == 0) {
+        enablenpc instance_npcname("Wounded Soldier#01861", .@q2);
+        addtimer 500, instance_npcname("Wounded Soldier#01861", .@q2)+"::OnMain";
+    }
+    end;
+}
 
diff --git a/npc/018-6-3/main.txt b/npc/018-6-3/main.txt
index 54ee982a5..19c5feafc 100644
--- a/npc/018-6-3/main.txt
+++ b/npc/018-6-3/main.txt
@@ -194,6 +194,24 @@ L_Room128:
     }
     end;
 
+OnFinalRoom:
+// Room: 74,83 ~ 106,97
+    .@x1=74;
+    .@y1=83;
+    .@x2=106;
+    .@y2=97;
+    .@id=256;
+    mapannounce getmap(), l("BOSS FIGHT!"), bc_map|bc_pc;
+    // TODO the boss: A night dragon or a Black Cat?
+    // Both summon Energy Balls against players
+    // Night dragon summoning EB/Black Cat depending on player style?
+    .@mi=FafiDragon; // TODO
+    .@boss=monster(.@m$, 90, 89, strmobinfo(1, .@mi), .@mi, 1, instance_npcname(.name$)+"::OnKillBoss");
+
+    // Spawn reinforcements based on difficulty
+    AreaMonsterB(getmap(), .@x1, .@y1, .@x2, .@y2, MagicGoblin, (@difficulty_modulus ? 4 : 2));
+    end;
+
 // Kill boss will use setq3 and also erase any remaining monster
 // Then it'll cast again the room event to enable the warps.
 OnKill1:
@@ -885,7 +903,6 @@ OnInstanceInit:
         l("Break it!"),
         l("Leave it alone!");
     mes "";
-    @difficulty_modulus=10;
     switch (@menu) {
         case 1:
             mesc l("Curiously, you try to touch the Mana Stone.");
@@ -901,7 +918,7 @@ OnInstanceInit:
             if (askyesno() == ASK_NO)
                 close;
             mes "";
-            @difficulty_modulus+=10;
+            @difficulty_modulus=true;
             break;
         default:
             close;