summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--world/map/db/mob_db.conf8
-rw-r--r--world/map/db/mob_db_over_100.txt2
-rw-r--r--world/map/npc/annuals/2022.txt17
3 files changed, 18 insertions, 9 deletions
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf
index 8b45e7e7..c502afbb 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -7880,19 +7880,19 @@ mob_db: (
Id: 1174
SpriteName: "Emo"
Name: "Emo"
- Lv: 150
+ Lv: 130
Hp: 50000
Sp: 80
Exp: 500000
JExp: 1000
AttackRange: 2
Attack: [453, 555]
- Def: 80
- Mdef: 90
+ Def: 70
+ Mdef: 80
CriticalDef: 80
Stats: {
Str: 100
- Agi: 60
+ Agi: 40
Vit: 80
Int: 90
Dex: 100
diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt
index 34da95f7..8aa503e2 100644
--- a/world/map/db/mob_db_over_100.txt
+++ b/world/map/db/mob_db_over_100.txt
@@ -47,4 +47,4 @@
1167, SnowmanBoss, SnowmanBoss, 100, 35000, 0, 28970, 1689, 3, 60, 80, 20, 20, 0, 15, 15, 10, 15, 95, 50, 14, 16, 1, 3, 10, 165, 700, 1672, 672, 480, 567, 800, 568, 800, 4002, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1169, CrystalSpider, CrystalSpider, 140, 1000, 0, 800, 200, 1, 80, 95, 8, 12, 0, 20, 15, 20, 11, 45, 30, 1, 1, 1, 0, 22, 139, 1000, 1500, 672, 480, 537, 500, 535, 100, 638, 20, 526, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
1173, MontBlanc, MontBlanc, 100, 65535, 0, 1, 1, 12, 30, 40, 20, 0, 255, 15, 10, 30, 5, 20, 10, 12, 12, 1, 3, 12, 164, 800, 800, 672, 480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-1174, Emo, Emo, 150, 50000, 80, 500000, 1000, 2, 453, 555, 80, 90, 80, 100, 60, 80, 90, 100, 100, 40, 10, 1, 1, 21, 183, 200, 250, 672, 50, 528, 5000, 532, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1174, Emo, Emo, 130, 50000, 80, 500000, 1000, 2, 453, 555, 70, 80, 80, 100, 40, 80, 90, 100, 100, 40, 10, 1, 1, 21, 183, 200, 250, 672, 50, 528, 5000, 532, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
diff --git a/world/map/npc/annuals/2022.txt b/world/map/npc/annuals/2022.txt
index 8a23ea41..3b6df57a 100644
--- a/world/map/npc/annuals/2022.txt
+++ b/world/map/npc/annuals/2022.txt
@@ -9,7 +9,7 @@
end;
OnFirst:
- if (strcharinfo(0) != "Blanc" && GM < G_SYSOP) end;
+ if (strcharinfo(0) != "Blanc" && GM < G_ADMIN) end;
wgm "==> Flagship spawned by "+strcharinfo(0);
monster "002-1", 29, 61, "", MontBlanc, 1, "#CRC2022::OnExplode";
areatimer 0, "002-1", 20, 20, 100, 120, 10, "#CRC2023::OnMusic";
@@ -17,7 +17,7 @@ OnFirst:
end;
OnThird:
- if (strcharinfo(0) != "Blanc" && GM < G_SYSOP) end;
+ if (strcharinfo(0) != "Blanc" && GM < G_ADMIN) end;
gmlog strcharinfo(0)+" : @spawn CRCMonsters 25";
//set $@CRC22Mc, mobcount("002-1", "#CRC2022::OnDie")+1;
set $@CRC22Mc, 0;
@@ -34,10 +34,14 @@ OnMusic:
music "Dramatic.ogg";
end;
+OnDeMusic:
+ music "faith.ogg";
+ end;
+
// Main ship cannon (range = infinity)
OnBoom:
misceffect 30, strcharinfo(0);
- heal -(rand(BaseLevel*2)), 0;
+ heal -(rand(BaseLevel*3/2)), 0;
end;
// Extra wave control system [0]
@@ -58,10 +62,15 @@ OnTimer5000:
OnDie:
end;
+OnExplodeT:
+ if (strcharinfo(0) != "Blanc" && GM < G_ADMIN) end;
+ goto OnExplode;
+
OnExplode:
wgm "==> Flagship sank by "+strcharinfo(0);
stopnpctimer;
mapannounce "002-1", "Mont Blanc : Captain! Fall back!! They have damaged the outer hull!", 0;
+ areatimer 0, "002-1", 20, 20, 100, 120, 10, "#CRC2023::OnDeMusic";
end;
OnInit:
@@ -69,7 +78,7 @@ OnInit:
// Register commands
registercmd "#crcflagship", strnpcinfo(0)+"::OnFirst";
registercmd "#crcmobs", strnpcinfo(0)+"::OnThird";
- registercmd "#crcdie", strnpcinfo(0)+"::OnExplode";
+ registercmd "#crcdie", strnpcinfo(0)+"::OnExplodeT";
end;
}