duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Converted hitbox measurements to pixels

Browse source 
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Gabriel Ravier 2019-09-15 14:12:35 +02:00
parent 4070f1b972
commit 08131d527a
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/BossFrog.cpp
View file

@ -71,32 +71,32 @@ static void ActBossChar02_01(void)
{ {
case BALFROG_SPRT_NOTHING: case BALFROG_SPRT_NOTHING:
boss->hit_voice = SND_BEHEMOTH_LARGE_HURT; boss->hit_voice = SND_BEHEMOTH_LARGE_HURT;
boss->hit.front = TILES_TO_UNITS(1); boss->hit.front = PIXELS_TO_UNITS(16);
boss->hit.top = TILES_TO_UNITS(1); boss->hit.top = PIXELS_TO_UNITS(16);
boss->hit.back = TILES_TO_UNITS(1); boss->hit.back = PIXELS_TO_UNITS(16);
boss->hit.bottom = TILES_TO_UNITS(1); boss->hit.bottom = PIXELS_TO_UNITS(16);
boss->size = 3; boss->size = 3;
boss->bits = NPC_INVULNERABLE; boss->bits = NPC_INVULNERABLE;
break; break;
case BALFROG_SPRT_STANDING_STILL: case BALFROG_SPRT_STANDING_STILL:
boss->x = gBoss[0].x + TILES_TO_UNITS(-1.5) * minus; boss->x = gBoss[0].x + PIXELS_TO_UNITS(-24) * minus;
boss->y = gBoss[0].y - TILES_TO_UNITS(1.5); boss->y = gBoss[0].y - PIXELS_TO_UNITS(24);
break; break;
case BALFROG_SPRT_MOUTH_BARELY_OPEN_CROUCHING: case BALFROG_SPRT_MOUTH_BARELY_OPEN_CROUCHING:
boss->x = gBoss[0].x + TILES_TO_UNITS(-1.5) * minus; boss->x = gBoss[0].x + PIXELS_TO_UNITS(-24) * minus;
boss->y = gBoss[0].y - TILES_TO_UNITS(1.25); boss->y = gBoss[0].y - PIXELS_TO_UNITS(20);
break; break;
case BALFROG_SPRT_MOUTH_OPEN_CROUCHING: case BALFROG_SPRT_MOUTH_OPEN_CROUCHING:
case BALFROG_SPRT_MOUTH_OPEN_CROUCHING_FLASHING: case BALFROG_SPRT_MOUTH_OPEN_CROUCHING_FLASHING:
boss->x = gBoss[0].x + TILES_TO_UNITS(-1.5) * minus; boss->x = gBoss[0].x + PIXELS_TO_UNITS(-24) * minus;
boss->y = gBoss[0].y - TILES_TO_UNITS(2); boss->y = gBoss[0].y - PIXELS_TO_UNITS(32);
break; break;
case BALFROG_SPRT_JUMPING: case BALFROG_SPRT_JUMPING:
boss->x = gBoss[0].x + TILES_TO_UNITS(-1.5) * minus; boss->x = gBoss[0].x + PIXELS_TO_UNITS(-24) * minus;
boss->y = gBoss[0].y - PIXELS_TO_UNITS(43); // 2.6873 tiles boss->y = gBoss[0].y - PIXELS_TO_UNITS(43); // 2.6873 tiles
break; break;
} }
@ -110,10 +110,10 @@ static void ActBossChar02_02(void)
{ {
case BALFROG_SPRT_NOTHING: case BALFROG_SPRT_NOTHING:
boss->hit_voice = SND_BEHEMOTH_LARGE_HURT; boss->hit_voice = SND_BEHEMOTH_LARGE_HURT;
boss->hit.front = TILES_TO_UNITS(1.5); boss->hit.front = PIXELS_TO_UNITS(24);
boss->hit.top = TILES_TO_UNITS(1); boss->hit.top = PIXELS_TO_UNITS(16);
boss->hit.back = TILES_TO_UNITS(1.5); boss->hit.back = PIXELS_TO_UNITS(24);
boss->hit.bottom = TILES_TO_UNITS(1); boss->hit.bottom = PIXELS_TO_UNITS(16);
boss->size = 3; boss->size = 3;
boss->bits = NPC_INVULNERABLE; boss->bits = NPC_INVULNERABLE;
break; break;
@ -176,10 +176,10 @@ void ActBossChar_Frog(void)
boss->view.back = TILES_TO_UNITS(2); boss->view.back = TILES_TO_UNITS(2);
boss->view.bottom = TILES_TO_UNITS(1); boss->view.bottom = TILES_TO_UNITS(1);
boss->hit_voice = SND_BEHEMOTH_LARGE_HURT; boss->hit_voice = SND_BEHEMOTH_LARGE_HURT;
boss->hit.front = TILES_TO_UNITS(1.5); boss->hit.front = PIXELS_TO_UNITS(24);
boss->hit.top = TILES_TO_UNITS(1); boss->hit.top = PIXELS_TO_UNITS(16);
boss->hit.back = TILES_TO_UNITS(1.5); boss->hit.back = PIXELS_TO_UNITS(24);
boss->hit.bottom = TILES_TO_UNITS(1); boss->hit.bottom = PIXELS_TO_UNITS(16);
boss->size = 3; boss->size = 3;
boss->exp = 1; boss->exp = 1;
boss->code_event = 1000; boss->code_event = 1000;