diff options
| author | Jesusaves <cpntb1@ymail.com> | 2021-12-07 11:01:18 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2021-12-07 11:32:52 -0300 |
| commit | 08ea4636d79ffe5055f203d9017b29a1fa2832c6 (patch) | |
| tree | 5f2218872fa4e4e8d31ef0851c98f45b191847e8 | |
| parent | 7c5fbe2f3a627bceb6132dbd50d06e4c92257b8a (diff) | |
| download | serverdata-08ea4636d79ffe5055f203d9017b29a1fa2832c6.tar.gz serverdata-08ea4636d79ffe5055f203d9017b29a1fa2832c6.tar.bz2 serverdata-08ea4636d79ffe5055f203d9017b29a1fa2832c6.tar.xz serverdata-08ea4636d79ffe5055f203d9017b29a1fa2832c6.zip | |
Some minor fixes, but some stuff is still broken
| -rw-r--r-- | db/pre-re/mob_db.conf | 2 | ||||
| -rw-r--r-- | npc/081-2/logic.txt | 2 | ||||
| -rw-r--r-- | npc/annuals/xmas/2021.txt | 27 |
3 files changed, 16 insertions, 15 deletions
diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf index 17879965..3879d91c 100644 --- a/db/pre-re/mob_db.conf +++ b/db/pre-re/mob_db.conf @@ -7029,7 +7029,7 @@ mob_db: ( Race: 0 Element: (0, 1) Mode: { - CanMove: true + CanMove: false CanAttack: true ChangeTargetMelee: true ChangeTargetChase: true diff --git a/npc/081-2/logic.txt b/npc/081-2/logic.txt index efc0edf0..ba9b6abd 100644 --- a/npc/081-2/logic.txt +++ b/npc/081-2/logic.txt @@ -139,7 +139,7 @@ OnInit: else .@n$=('OBSCURECOLOR ? "Regular" : "No"); - dispbottom l("The central candle should not use %s Fire.", .@n$); + dispbottom l("The central candle should NOT use %s Fire.", .@n$); OnInit: .distance=1; end; diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt index 70b2b7da..f32901a6 100644 --- a/npc/annuals/xmas/2021.txt +++ b/npc/annuals/xmas/2021.txt @@ -254,7 +254,7 @@ function script X21_SEEDS { if (.@y < 159 || .@y > 177) return; // Should never happen, so nuke everything - if (instance_id() < 0) end; + //if (instance_id() < 0) end; // Already planted this spot if ('XMAS21TREE_X[.@x] && 'XMAS21TREE_Y[.@y]) return; // Record the success planting it @@ -328,16 +328,16 @@ public function spawn2 { .@y2=min(getarg(2)+getarg(3), getmapinfo(MAPINFO_SIZE_Y, .@m$)-20); */ if (mobcount(.@m$, .@n$) < 200) { - .@m=areamonster(.@m$, .@x1, .@y1, .@x2, .@y2, strmobinfo(1, getarg(0)), getarg(0), getarg(5, 1), .@n$); - if (.@noob) { - .@hp = getunitdata(.@m, UDT_MAXHP) * 3 / 5; // Reduce to 60% HP - .@ak = getunitdata(.@m, UDT_ATKMIN) * 4 / 5; // Reduce to 80% ATK - .@ax = getunitdata(.@m, UDT_ATKMAX) * 4 / 5; // Reduce to 80% ATK - - setunitdata(.@m, UDT_MAXHP, .@hp); - setunitdata(.@m, UDT_HP, .@hp); - setunitdata(.@m, UDT_ATKMIN, .@ak); - setunitdata(.@m, UDT_ATKMAX, .@ax); + .@mg=areamonster(.@m$, .@x1, .@y1, .@x2, .@y2, strmobinfo(1, getarg(0)), getarg(0), getarg(5, 1), .@n$); + if (.@noob && .@mg) { + .@hp = getunitdata(.@mg, UDT_MAXHP) * 3 / 5; // Reduce to 60% HP + .@ak = getunitdata(.@mg, UDT_ATKMIN) * 4 / 5; // Reduce to 80% ATK + .@ax = getunitdata(.@mg, UDT_ATKMAX) * 4 / 5; // Reduce to 80% ATK + + setunitdata(.@mg, UDT_MAXHP, .@hp); + setunitdata(.@mg, UDT_HP, .@hp); + setunitdata(.@mg, UDT_ATKMIN, .@ak); + setunitdata(.@mg, UDT_ATKMAX, .@ax); } } return; @@ -556,8 +556,9 @@ OnInit: "#XMAS21Core"::spawn(Wisp, 7, "081-1"); "#XMAS21Core"::spawn(Spectre, 7, "081-1"); "#XMAS21Core"::spawn(WhiteSlime, 12, "081-1"); - "#XMAS21Core"::spawn(SantaSlime, 3, "081-1"); - "#XMAS21Core"::spawn(Moggun, 18, "081-1"); + "#XMAS21Core"::spawn(SantaSlime, 4, "081-1"); + "#XMAS21Core"::spawn(Moggun, 10, "081-1"); + "#XMAS21Core"::spawn(Moonshroom, 7, "081-1"); end; } |