Siege temporary final version

2 files changed, 33 insertions, 25 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index fdc75757b..c1fab2a32 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -3775,8 +3775,8 @@ mob_db: (
     Lv: 30
     Hp: 800
     Sp: 0
-    Exp: 85
-    JExp: 36
+    Exp: 25
+    JExp: 16
     AttackRange: 1
     Attack: [80, 120]
     Def: 20
@@ -3956,8 +3956,8 @@ mob_db: (
     Lv: 35
     Hp: 800
     Sp: 0
-    Exp: 120
-    JExp: 36
+    Exp: 20
+    JExp: 14
     AttackRange: 3
     Attack: [50, 500]
     Def: 20
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 2dd13393e..aaaa3f561 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -98,7 +98,7 @@ OnBlackScorpionDeath:
 
 OnBlackScorpion2Death:
     areamonster("003-1", 0, 0, 120, 155, l("Black Scorpion"), 1074, 1, "Lieutenant Dausen::OnBlackScorpionDeath");
-    if (rand(10000) <= 500)
+    if (rand(10000) <= 1000)
         getitem StrangeCoin, 1;
     end;
 
@@ -110,13 +110,13 @@ OnGreenSlimeDeath:
 
 OnCandiedSlimeDeath:
     areamonster("003-1", 0, 0, 120, 155, l("Candied Slime"), 1089, 1, "Lieutenant Dausen::OnCandiedSlimeDeath");
-    if (rand(10000) <= 200)
+    if (rand(10000) <= 250)
         getitem StrangeCoin, 1;
     end;
 
 OnManaGhostDeath:
     areamonster("003-1", 0, 0, 120, 155, l("Mana Ghost"), 1068, 1, "Lieutenant Dausen::OnManaGhostDeath");
-    if (rand(10000) <= 1500)
+    if (rand(10000) <= 1000)
         getitem StrangeCoin, 1;
     end;
 
@@ -125,8 +125,8 @@ OnManaGhostDeath:
 
 
 OnTimer5000:
-    areamonster("004-1", 0, 0, 79, 81, l("Black Scorpion"), 1074, 5, "Lieutenant Dausen::OnBlackScorpionDeath");
-    areamonster("003-1", 0, 0, 120, 155, l("Black Scorpion"), 1074, 5, "Lieutenant Dausen::OnBlackScorpion2Death");
+    areamonster("004-1", 0, 0, 79, 81, "Black Scorpion", 1074, 5, "Lieutenant Dausen::OnBlackScorpionDeath");
+    areamonster("003-1", 0, 0, 120, 155, "Black Scorpion", 1074, 5, "Lieutenant Dausen::OnBlackScorpion2Death");
     mapannounce("003-1", "##2Message to all Tulimshar NPCs: Take shelter!", bc_map);
     disablenpc "Ched";
     disablenpc "Aahna";
@@ -150,49 +150,53 @@ OnTimer5000:
     disablenpc "Tamiloc";
     disablenpc "Tinris";
     disablenpc "#water_animation0";
+    disablenpc "Luca";
     end;
 
 OnTimer15000:
-    areamonster("004-1", 0, 0, 79, 81, l("Black Scorpion"), 1074, 5, "Lieutenant Dausen::OnBlackScorpionDeath");
-    areamonster("003-1", 0, 0, 120, 155, l("Black Scorpion"), 1074, 10, "Lieutenant Dausen::OnBlackScorpion2Death");
+    areamonster("004-1", 0, 0, 79, 81, ("Black Scorpion"), 1074, 5, "Lieutenant Dausen::OnBlackScorpionDeath");
+    areamonster("003-1", 0, 0, 120, 155, ("Black Scorpion"), 1074, 10, "Lieutenant Dausen::OnBlackScorpion2Death");
     disablenpc "Aidan";
     disablenpc "Inar";
     disablenpc "Malivox";
+    disablenpc "Estard";
+    disablenpc "Malindou";
+    disablenpc "Jhedia";
     end;
 
 OnTimer60000:
-    areamonster("003-1", 0, 0, 120, 155, l("Black Scorpion"), 1074, 3, "Lieutenant Dausen::OnBlackScorpion2Death");
-    areamonster("003-1", 0, 0, 120, 155, l("Green Slime"), 1085, 10, "Lieutenant Dausen::OnGreenSlimeDeath");
-    areamonster("003-1", 0, 0, 120, 155, l("Candied Slime"), 1089, 1, "Lieutenant Dausen::OnCandiedSlimeDeath");
+    areamonster("003-1", 0, 0, 120, 155, ("Black Scorpion"), 1074, 3, "Lieutenant Dausen::OnBlackScorpion2Death");
+    areamonster("003-1", 0, 0, 120, 155, ("Green Slime"), 1085, 10, "Lieutenant Dausen::OnGreenSlimeDeath");
+    areamonster("003-1", 0, 0, 120, 155, ("Candied Slime"), 1089, 1, "Lieutenant Dausen::OnCandiedSlimeDeath");
     end;
 
 OnTimer120000:
-    areamonster("003-1", 0, 0, 120, 155, l("Slime Blast"), 1090, 15);
-    areamonster("003-1", 0, 0, 120, 155, l("Black Scorpion"), 1074, 3, "Lieutenant Dausen::OnBlackScorpion2Death");
-    areamonster("003-1", 0, 0, 120, 155, l("Green Slime"), 1085, 10, "Lieutenant Dausen::OnGreenSlimeDeath");
-    areamonster("003-1", 0, 0, 120, 155, l("Mana Ghost"), 1068, 2, "Lieutenant Dausen::OnManaGhostDeath");
+    areamonster("003-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 15);
+    areamonster("003-1", 0, 0, 120, 155, ("Black Scorpion"), 1074, 3, "Lieutenant Dausen::OnBlackScorpion2Death");
+    areamonster("003-1", 0, 0, 120, 155, ("Green Slime"), 1085, 10, "Lieutenant Dausen::OnGreenSlimeDeath");
+    areamonster("003-1", 0, 0, 120, 155, ("Mana Ghost"), 1068, 2, "Lieutenant Dausen::OnManaGhostDeath");
     end;
 
 OnTimer180000:
-    areamonster("003-1", 0, 0, 120, 155, l("Slime Blast"), 1090, 25);
-    areamonster("003-1", 0, 0, 120, 155, l("Candied Slime"), 1089, 10, "Lieutenant Dausen::OnCandiedSlimeDeath");
-    areamonster("003-1", 0, 0, 120, 155, l("Mana Ghost"), 1068, 2, "Lieutenant Dausen::OnManaGhostDeath");
+    areamonster("003-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 25);
+    areamonster("003-1", 0, 0, 120, 155, ("Candied Slime"), 1089, 10, "Lieutenant Dausen::OnCandiedSlimeDeath");
+    areamonster("003-1", 0, 0, 120, 155, ("Mana Ghost"), 1068, 2, "Lieutenant Dausen::OnManaGhostDeath");
     end;
 
 OnTimer240000:
     mapannounce("003-1", "##1The Monster King is getting tired of resistance!", bc_map);
-    areamonster("003-1", 0, 0, 120, 155, l("Slime Blast"), 1090, 25);
-    areamonster("003-1", 0, 0, 120, 155, l("Mana Ghost"), 1068, 2, "Lieutenant Dausen::OnManaGhostDeath");
+    areamonster("003-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 25);
+    areamonster("003-1", 0, 0, 120, 155, ("Mana Ghost"), 1068, 2, "Lieutenant Dausen::OnManaGhostDeath");
     end;
 
 OnTimer300000:
     mapannounce("003-1", "##1The Monster King is withdrawing!", bc_map);
     end;
 
-OnTimer350000:
+OnTimer2000:
     killmonsterall("003-1", 0);
     killmonsterall("004-1", 0);
-    announce(l("Tulimshar siege is over!"), bc_all);
+    announce(("Tulimshar siege is over!"), bc_all);
     enablenpc "Ched";
     enablenpc "Aahna";
     enablenpc "Constable Perry";
@@ -218,6 +222,10 @@ OnTimer350000:
     enablenpc "Aidan";
     enablenpc "Inar";
     enablenpc "Malivox";
+    enablenpc "Luca";
+    enablenpc "Estard";
+    enablenpc "Malindou";
+    enablenpc "Jhedia";
     stopnpctimer;
     end;