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

Merge pull request #21 from GabrielRavier/improveBoss

Browse source 
Improve Boss
This commit is contained in:
Clownacy 2019-05-07 17:15:22 +00:00 • committed by GitHub
commit cf6097d873
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Boss.cpp
View file

@ -97,7 +97,7 @@ void HitBossBullet()
if (gBul[bul].damage == -1) if (gBul[bul].damage == -1)
continue; continue;
//Check if bullet touches boss // Check if bullet touches boss
bHit = FALSE; bHit = FALSE;
if (gBoss[bos].bits & npc_shootable if (gBoss[bos].bits & npc_shootable
&& gBoss[bos].x - gBoss[bos].hit.back < gBul[bul].x + gBul[bul].enemyXL && gBoss[bos].x - gBoss[bos].hit.back < gBul[bul].x + gBul[bul].enemyXL
@ -114,7 +114,7 @@ void HitBossBullet()
if (bHit) if (bHit)
{ {
//Damage boss // Damage boss
if (gBoss[bos].bits & npc_shootable) if (gBoss[bos].bits & npc_shootable)
{ {
if (gBoss[bos].cond & 0x10) if (gBoss[bos].cond & 0x10)

2
src/BossAlmo1.cpp
View file

@ -459,7 +459,7 @@ void ActBossChar_Core(void)
PlaySoundObject(101, 1); PlaySoundObject(101, 1);
} }
if ( npc->act_wait > 400 ) if (npc->act_wait > 400)
{ {
npc->act_no = 200; npc->act_no = 200;
gBoss[4].ani_no = 2; gBoss[4].ani_no = 2;

2
src/BossBallos.cpp
View file

@ -230,7 +230,7 @@ void ActBossChar_Ballos(void)
SetQuake2(30); SetQuake2(30);
PlaySoundObject(44, 1); PlaySoundObject(44, 1);
if ( gMC.y > npc->y + 0x6000 && gMC.x < npc->x + 0x3000 && gMC.x > npc->x - 0x3000 ) if (gMC.y > npc->y + 0x6000 && gMC.x < npc->x + 0x3000 && gMC.x > npc->x - 0x3000)
DamageMyChar(16); DamageMyChar(16);
for (i = 0; i < 0x10; ++i) for (i = 0; i < 0x10; ++i)

12
src/BossOhm.cpp
View file

@ -183,7 +183,7 @@ void ActBossChar_Omega()
gBoss[5].cond = 0x80; gBoss[5].cond = 0x80;
break; break;
case 20: //Rising out of the ground case 20: // Rising out of the ground
gBoss[0].act_no = 30; gBoss[0].act_no = 30;
gBoss[0].act_wait = 0; gBoss[0].act_wait = 0;
gBoss[0].ani_no = 0; gBoss[0].ani_no = 0;
@ -227,7 +227,7 @@ void ActBossChar_Omega()
} }
break; break;
case 50: //Open mouth case 50: // Open mouth
if (++gBoss[0].count1 > 2) if (++gBoss[0].count1 > 2)
{ {
gBoss[0].count1 = 0; gBoss[0].count1 = 0;
@ -244,7 +244,7 @@ void ActBossChar_Omega()
} }
break; break;
case 60: //Shoot out of mouth case 60: // Shoot out of mouth
if (++gBoss[0].act_wait > 20 && gBoss[0].act_wait < 80 && !(gBoss[0].act_wait % 3)) if (++gBoss[0].act_wait > 20 && gBoss[0].act_wait < 80 && !(gBoss[0].act_wait % 3))
{ {
if (Random(0, 9) < 8) if (Random(0, 9) < 8)
@ -263,7 +263,7 @@ void ActBossChar_Omega()
} }
break; break;
case 70: //Close mouth case 70: // Close mouth
if (++gBoss[0].count1 > 2) if (++gBoss[0].count1 > 2)
{ {
gBoss[0].count1 = 0; gBoss[0].count1 = 0;
@ -299,7 +299,7 @@ void ActBossChar_Omega()
} }
break; break;
case 90: //Go back into the ground case 90: // Go back into the ground
SetQuake(2); SetQuake(2);
gBoss[0].y += 0x200; gBoss[0].y += 0x200;
@ -313,7 +313,7 @@ void ActBossChar_Omega()
} }
break; break;
case 100: //Move to proper position for coming out of the ground case 100: // Move to proper position for coming out of the ground
if (++gBoss[0].act_wait == 120) if (++gBoss[0].act_wait == 120)
{ {
gBoss[0].act_wait = 0; gBoss[0].act_wait = 0;

2
src/BossTwinD.cpp
View file

@ -490,7 +490,7 @@ void ActBossChar_Twin(void)
} }
} }
if ( npc->count1 > 0x3FF ) if (npc->count1 > 0x3FF)
npc->count1 -= 0x400; npc->count1 -= 0x400;
break; break;

4
src/BossX.cpp
View file

@ -55,7 +55,7 @@ static void ActBossChar03_01(NPCHAR *npc)
++npc->ani_no; ++npc->ani_no;
} }
if ( npc->ani_no > 3 ) if (npc->ani_no > 3)
npc->ani_no = 2; npc->ani_no = 2;
npc->xm -= 0x20; npc->xm -= 0x20;
@ -100,7 +100,7 @@ static void ActBossChar03_01(NPCHAR *npc)
++npc->ani_no; ++npc->ani_no;
} }
if ( npc->ani_no > 5 ) if (npc->ani_no > 5)
npc->ani_no = 4; npc->ani_no = 4;
npc->xm += 0x20; npc->xm += 0x20;