diff options
| author | Jesusaves <cpntb1@ymail.com> | 2021-12-07 11:25:58 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2021-12-07 11:32:52 -0300 |
| commit | 51f93d87ca3cb4ad442befcac3e18e57231ec1cc (patch) | |
| tree | c2a8e651058365d8aae5e66a42449e623980e754 | |
| parent | 08ea4636d79ffe5055f203d9017b29a1fa2832c6 (diff) | |
| download | serverdata-51f93d87ca3cb4ad442befcac3e18e57231ec1cc.tar.gz serverdata-51f93d87ca3cb4ad442befcac3e18e57231ec1cc.tar.bz2 serverdata-51f93d87ca3cb4ad442befcac3e18e57231ec1cc.tar.xz serverdata-51f93d87ca3cb4ad442befcac3e18e57231ec1cc.zip | |
Fix whatever could be immediately fixed; Everything else on ticket
| -rw-r--r-- | db/pre-re/mob_db.conf | 2 | ||||
| -rw-r--r-- | npc/080-3/cutscene.txt | 3 | ||||
| -rw-r--r-- | npc/annuals/xmas/2021.txt | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf index 3879d91c..67e3611d 100644 --- a/db/pre-re/mob_db.conf +++ b/db/pre-re/mob_db.conf @@ -7082,7 +7082,7 @@ mob_db: ( Sp: 0 Exp: 2897 JExp: 689 - AttackRange: 3 + AttackRange: 1 Attack: [60, 80] Def: 5 Mdef: 20 diff --git a/npc/080-3/cutscene.txt b/npc/080-3/cutscene.txt index 3598e169..5cb03656 100644 --- a/npc/080-3/cutscene.txt +++ b/npc/080-3/cutscene.txt @@ -120,6 +120,7 @@ OnInit: function ending; if (!isChristmas21()) end; if (.stable == 6) ending(); + if (.stable >= 7) end; mesn; mesq l("..."); next; @@ -222,7 +223,7 @@ function ending { // FIXME: Prize? .stable += 1; X21ED1_DOCLEAR(); - disablenpc .name$; + disablenpc instance_npcname(.name$); close; } diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt index f32901a6..bc7f0d30 100644 --- a/npc/annuals/xmas/2021.txt +++ b/npc/annuals/xmas/2021.txt @@ -82,7 +82,7 @@ function script X21INIT { "#XMAS21Core"::spawn(Grinchboo, 5, .@mapa$); "#XMAS21Core"::spawn(Grinchboo, 3, .@mapc$); "#XMAS21Core"::spawn(Moonshroom, 10, .@mapa$); - "#XMAS21Core"::spawn(Moonshroom, 7, .@mapc$); + "#XMAS21Core"::spawn(Moonshroom, 14, .@mapc$); "#XMAS21Core"::spawn2(BlueSpark, 47, 191, 65, 212, 2, .@mapa$); "#XMAS21Core"::spawn2(RedSpark, 47, 191, 65, 212, 2, .@mapa$); if (X21TYPE() == IOT_PARTY) @@ -109,8 +109,8 @@ function script X21INIT { "#XMAS21Core"::spawn(Fluffy, 16, .@mapa$); /* Peaceful/Mystic/Forgotten Glade (Past) */ - "#XMAS21Core"::spawn(CrotcherScorpion, 12, .@mapc$); - "#XMAS21Core"::spawn(Snail, 20, .@mapc$); + "#XMAS21Core"::spawn(CrotcherScorpion, 10, .@mapc$); + "#XMAS21Core"::spawn(Snail, 18, .@mapc$); "#XMAS21Core"::spawn(Bee, 9, .@mapc$); "#XMAS21Core"::spawn(Butterfly, 24, .@mapc$); "#XMAS21Core"::spawn(PinkFlower, 42, .@mapc$); @@ -124,7 +124,7 @@ function script X21INIT { "#XMAS21Core"::spawn(Bee, 5, .@mapd$); "#XMAS21Core"::spawn(Butterfly, 15, .@mapd$); "#XMAS21Core"::spawn(PinkFlower, 24, .@mapd$); - "#XMAS21Core"::spawn(Pinkie, 18, .@mapd$); + "#XMAS21Core"::spawn(Pinkie, 15, .@mapd$); "#XMAS21Core"::spawn(Hyvern, 3, .@mapd$); /* The Three Guardians */ |