ref: 37dcdcda34f6c34dbf40d8053b4769e07258e16f
parent: c29543001d23ddaf12e2656575386ca25c585189
author: Clownacy <Clownacy@users.noreply.github.com>
date: Mon Feb 4 15:00:05 EST 2019
More NPCs
--- a/src/NpcAct.h
+++ b/src/NpcAct.h
@@ -51,6 +51,8 @@
void ActNpc048(NPCHAR *npc);
+void ActNpc055(NPCHAR *npc);
+
void ActNpc058(NPCHAR *npc);
void ActNpc059(NPCHAR *npc);
void ActNpc060(NPCHAR *npc);
@@ -101,12 +103,12 @@
void ActNpc105(NPCHAR *npc);
void ActNpc106(NPCHAR *npc);
void ActNpc107(NPCHAR *npc);
-
+void ActNpc108(NPCHAR *npc);
void ActNpc109(NPCHAR *npc);
-
+void ActNpc110(NPCHAR *npc);
void ActNpc111(NPCHAR *npc);
void ActNpc112(NPCHAR *npc);
-
+void ActNpc113(NPCHAR *npc);
void ActNpc114(NPCHAR *npc);
void ActNpc115(NPCHAR *npc);
void ActNpc116(NPCHAR *npc);
--- a/src/NpcAct040.cpp
+++ b/src/NpcAct040.cpp
@@ -498,19 +498,76 @@
npc->rect = rcLeft[npc->ani_no];
}
+//Cairn
+void ActNpc055(NPCHAR *npc)
+{+ RECT rcLeft[6];
+ RECT rcRight[6];
+
+ rcLeft[0] = {192, 192, 208, 216};+ rcLeft[1] = {208, 192, 224, 216};+ rcLeft[2] = {192, 192, 208, 216};+ rcLeft[3] = {224, 192, 240, 216};+ rcLeft[4] = {192, 192, 208, 216};+ rcLeft[5] = {240, 192, 256, 216};+
+ rcRight[0] = {192, 216, 208, 240};+ rcRight[1] = {208, 216, 224, 240};+ rcRight[2] = {192, 216, 208, 240};+ rcRight[3] = {224, 216, 240, 240};+ rcRight[4] = {192, 216, 208, 240};+ rcRight[5] = {240, 216, 256, 240};+
+ switch (npc->act_no)
+ {+ case 0:
+ npc->act_no = 1;
+ npc->ani_no = 0;
+ npc->ani_wait = 0;
+ break;
+
+ case 3:
+ npc->act_no = 4;
+ npc->ani_no = 1;
+ npc->ani_wait = 0;
+ // Fallthrough
+ case 4:
+ if (++npc->ani_wait > 4)
+ {+ npc->ani_wait = 0;
+ ++npc->ani_no;
+ }
+
+ if (npc->ani_no > 4)
+ npc->ani_no = 1;
+
+ if (npc->direct == 0)
+ npc->x -= 0x200;
+ else
+ npc->x += 0x200;
+
+ break;
+
+ case 5:
+ npc->ani_no = 5;
+ break;
+ }
+
+ npc->ym += 0x20;
+ if (npc->ym > 0x5FF)
+ npc->ym = 0x5FF;
+
+ npc->y += npc->ym;
+
+ if (npc->direct == 0)
+ npc->rect = rcLeft[npc->ani_no];
+ else
+ npc->rect = rcRight[npc->ani_no];
+}
+
//Basu (Egg Corridor)
void ActNpc058(NPCHAR *npc)
{- unsigned __int8 v1; // ST2F_1@42
- char v2; // ST2F_1@42
- int a5; // ST24_4@42
- int a4; // ST28_4@42
- RECT *v5; // edx@54
- RECT *v6; // eax@54
- RECT *v7; // edx@55
- RECT *v8; // eax@55
- int routine; // [sp+0h] [bp-70h]@1
-
RECT rcLeft[3];
RECT rcRight[3];
--- a/src/NpcAct100.cpp
+++ b/src/NpcAct100.cpp
@@ -9,6 +9,7 @@
#include "Back.h"
#include "Triangle.h"
#include "Frame.h"
+#include "Caret.h"
//Grate
void ActNpc100(NPCHAR *npc)
@@ -479,6 +480,42 @@
npc->rect = rcPoweron[npc->ani_no];
}
+//Balfrog projectile
+void ActNpc108(NPCHAR *npc)
+{+ if (npc->flag & 0xFF)
+ {+ SetCaret(npc->x, npc->y, 2, 0);
+ npc->cond = 0;
+ }
+
+ npc->y += npc->ym;
+ npc->x += npc->xm;
+
+ RECT rect_left[3];
+
+ rect_left[0] = {96, 48, 112, 64};+ rect_left[1] = {112, 48, 128, 64};+ rect_left[2] = {128, 48, 144, 64};+
+ if (++npc->ani_wait > 1)
+ {+ npc->ani_wait = 0;
+ ++npc->ani_no;
+ }
+
+ if (npc->ani_no > 2)
+ npc->ani_no = 0;
+
+ npc->rect = rect_left[npc->ani_no];
+
+ if (++npc->count1 > 300)
+ {+ SetCaret(npc->x, npc->y, 2, 0);
+ npc->cond = 0;
+ }
+}
+
//Malco (broken)
void ActNpc109(NPCHAR *npc)
{@@ -549,6 +586,163 @@
npc->rect = rcRight[npc->ani_no];
}
+//Puchi
+void ActNpc110(NPCHAR *npc)
+{+ RECT rcLeft[3];
+ RECT rcRight[3];
+
+ rcLeft[0] = {96, 128, 112, 144};+ rcLeft[1] = {112, 128, 128, 144};+ rcLeft[2] = {128, 128, 144, 144};+
+ rcRight[0] = {96, 144, 112, 160};+ rcRight[1] = {112, 144, 128, 160};+ rcRight[2] = {128, 144, 144, 160};+
+ switch (npc->act_no)
+ {+ case 0:
+ npc->act_no = 1;
+ npc->act_wait = 0;
+ npc->xm = 0;
+ npc->ym = 0;
+
+ if (npc->direct == 4)
+ {+ if (Random(0, 1) != 0)
+ npc->direct = 0;
+ else
+ npc->direct = 2;
+
+ npc->bits |= 8;
+ npc->ani_no = 2;
+ npc->act_no = 3;
+
+ break;
+ }
+ else
+ {+ npc->bits &= ~8;
+ }
+ // Fallthrough
+ case 1:
+ ++npc->act_wait;
+
+ if (Random(0, 50) == 1)
+ {+ npc->act_no = 2;
+ npc->act_wait = 0;
+ npc->ani_no = 0;
+ npc->ani_wait = 0;
+ }
+
+ break;
+
+ case 2:
+ ++npc->act_wait;
+
+ if (++npc->ani_wait > 2)
+ {+ npc->ani_wait = 0;
+ ++npc->ani_no;
+ }
+
+ if (npc->ani_no > 1)
+ npc->ani_no = 0;
+
+ if (npc->act_wait > 18)
+ {+ npc->act_no = 1;
+ npc->act_no = 1;
+ }
+
+ break;
+
+ case 3:
+ if (++npc->act_wait > 40)
+ npc->bits &= ~8;
+
+ if (npc->flag & 8)
+ {+ npc->act_no = 0;
+ npc->ani_no = 0;
+ npc->act_wait = 0;
+ }
+
+ break;
+
+ case 10:
+ npc->act_no = 11;
+ // Fallthrough
+ case 11:
+ if (npc->flag & 1 && npc->xm < 0)
+ {+ npc->xm = -npc->xm;
+ npc->direct = 2;
+ }
+
+ if (npc->flag & 4 && npc->xm > 0)
+ {+ npc->xm = -npc->xm;
+ npc->direct = 0;
+ }
+
+ if (npc->flag & 8)
+ {+ npc->act_no = 0;
+ npc->ani_no = 0;
+ npc->act_wait = 0;
+ }
+
+ break;
+ }
+
+ bool bJump = false;
+
+ if (npc->act_no < 10 && npc->act_no != 3 && npc->act_wait > 10)
+ {+ if (npc->shock)
+ bJump = true;
+
+ if (npc->x >= gMC.x - 0x14000 && npc->x <= gMC.x + 0x14000 && npc->y >= gMC.y - 0x8000 && npc->y <= gMC.y + 0x8000)
+ {+ if (Random(0, 50) == 2)
+ bJump = true;
+ }
+ }
+
+ if (bJump)
+ {+ if (gMC.x > npc->x)
+ npc->direct = 2;
+ else
+ npc->direct = 0;
+
+ npc->act_no = 10;
+ npc->ani_no = 2;
+ npc->ym = -0x2FF;
+ PlaySoundObject(6, 1);
+
+ if (npc->direct == 0)
+ npc->xm = -0x100u;
+ else
+ npc->xm = 0x100;
+ }
+
+ npc->ym += 0x80;
+ if (npc->ym > 0x5FF)
+ npc->ym = 0x5FF;
+
+ npc->x += npc->xm;
+ npc->y += npc->ym;
+
+ if (npc->direct == 0)
+ npc->rect = rcLeft[npc->ani_no];
+ else
+ npc->rect = rcRight[npc->ani_no];
+}
+
//Quote (teleport out)
void ActNpc111(NPCHAR *npc)
{@@ -707,6 +901,136 @@
npc->rect.bottom = npc->rect.top + npc->act_wait / 4;
if ( npc->act_wait / 2 % 2 )
+ ++npc->rect.left;
+ }
+}
+
+//Professor Booster
+void ActNpc113(NPCHAR *npc)
+{+ RECT rcLeft[7];
+ RECT rcRight[7];
+
+ rcLeft[0] = {224, 0, 240, 16};+ rcLeft[1] = {240, 0, 256, 16};+ rcLeft[2] = {256, 0, 272, 16};+ rcLeft[3] = {224, 0, 240, 16};+ rcLeft[4] = {272, 0, 288, 16};+ rcLeft[5] = {224, 0, 240, 16};+ rcLeft[6] = {288, 0, 304, 16};+
+ rcRight[0] = {224, 16, 240, 32};+ rcRight[1] = {240, 16, 256, 32};+ rcRight[2] = {256, 16, 272, 32};+ rcRight[3] = {224, 16, 240, 32};+ rcRight[4] = {272, 16, 288, 32};+ rcRight[5] = {224, 16, 240, 32};+ rcRight[6] = {288, 16, 304, 32};+
+ switch (npc->act_no)
+ {+ case 0:
+ npc->act_no = 1;
+ npc->ani_no = 0;
+ npc->ani_wait = 0;
+ // Fallthrough
+ case 1:
+ if (Random(0, 120) == 10)
+ {+ npc->act_no = 2;
+ npc->act_wait = 0;
+ npc->ani_no = 1;
+ }
+
+ break;
+
+ case 2:
+ if (++npc->act_wait > 8)
+ {+ npc->act_no = 1;
+ npc->ani_no = 0;
+ }
+
+ break;
+
+ case 3:
+ npc->act_no = 4;
+ npc->ani_no = 2;
+ npc->ani_wait = 0;
+ // Fallthrough
+ case 4:
+ if (++npc->ani_wait > 4)
+ {+ npc->ani_wait = 0;
+ ++npc->ani_no;
+ }
+
+ if (npc->ani_no > 5)
+ npc->ani_no = 2;
+
+ if (npc->direct == 0)
+ npc->x -= 0x200;
+ else
+ npc->x += 0x200;
+
+ break;
+
+ case 5:
+ npc->ani_no = 6;
+ break;
+
+ case 30:
+ npc->act_no = 31;
+ npc->ani_no = 0;
+ npc->ani_wait = 0;
+ npc->hit.bottom = 0x2000;
+ npc->x -= 0x2000;
+ npc->y += 0x1000;
+ PlaySoundObject(29, 1);
+ // Fallthrough
+ case 31:
+ if (++npc->act_wait == 64)
+ {+ npc->act_no = 32;
+ npc->act_wait = 0;
+ }
+
+ break;
+
+ case 32:
+ if (++npc->act_wait > 20)
+ {+ npc->act_no = 33;
+ npc->ani_no = 1;
+ npc->hit.bottom = 0x1000;
+ }
+
+ break;
+
+ case 33:
+ if (npc->flag & 8)
+ {+ npc->act_no = 34;
+ npc->act_wait = 0;
+ npc->ani_no = 0;
+ }
+
+ break;
+ }
+
+ npc->ym += 0x40;
+ npc->y += npc->ym;
+
+ if (npc->direct == 0)
+ npc->rect = rcLeft[npc->ani_no];
+ else
+ npc->rect = rcRight[npc->ani_no];
+
+ if (npc->act_no == 31)
+ {+ npc->rect.bottom = npc->rect.top + npc->act_wait / 4;
+
+ if (npc->act_wait / 2 % 2)
++npc->rect.left;
}
}
--- a/src/NpcTbl.cpp
+++ b/src/NpcTbl.cpp
@@ -111,9 +111,9 @@
nullptr,
nullptr,
nullptr,
+ ActNpc055,
nullptr,
nullptr,
- nullptr,
ActNpc058,
ActNpc059,
ActNpc060,
@@ -164,12 +164,12 @@
ActNpc105,
ActNpc106,
ActNpc107,
- nullptr,
+ ActNpc108,
ActNpc109,
- nullptr,
+ ActNpc110,
ActNpc111,
ActNpc112,
- nullptr,
+ ActNpc113,
ActNpc114,
ActNpc115,
ActNpc116,