phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2024-11-16 02:43:02 +00:00
Code Issues Releases Wiki Activity

fix balfrog

Browse source
This commit is contained in:
Alula 2021-04-28 22:58:07 +02:00
parent 4d08158427
commit d6316aa718
No known key found for this signature in database
GPG key ID: 3E00485503A1D8BA
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/npc/boss/balfrog.rs
View file

@ -222,7 +222,8 @@ impl BossNPC {
} }
113 => { 113 => {
if self.parts[0].shock != 0 { if self.parts[0].shock != 0 {
if self.parts[0].action_counter2 / 2 % 2 != 0 { self.parts[0].action_counter2 += 1;
if (self.parts[0].action_counter2 / 2) & 1 != 0 {
self.parts[0].anim_num = 4; self.parts[0].anim_num = 4;
} else { } else {
self.parts[0].anim_num = 3; self.parts[0].anim_num = 3;
@ -309,9 +310,9 @@ impl BossNPC {
if self.parts[0].anim_counter > 4 { if self.parts[0].anim_counter > 4 {
self.parts[0].action_num = 124; self.parts[0].action_num = 124;
self.parts[0].anim_num = 5; self.parts[0].anim_num = 5;
self.parts[0].vel_x = -5 * 0x200; self.parts[0].vel_y = -0xa00;
self.parts[0].display_bounds.top = 64 * 0x200; self.parts[0].display_bounds.top = 0x8000;
self.parts[0].display_bounds.bottom = 24 * 0x200; self.parts[0].display_bounds.bottom = 0x3000;
state.sound_manager.play_sfx(25); state.sound_manager.play_sfx(25);
} }
@ -320,8 +321,8 @@ impl BossNPC {
if self.parts[0].flags.hit_bottom_wall() { if self.parts[0].flags.hit_bottom_wall() {
self.parts[0].action_num = 100; self.parts[0].action_num = 100;
self.parts[0].anim_num = 1; self.parts[0].anim_num = 1;
self.parts[0].display_bounds.top = 48 * 0x200; self.parts[0].display_bounds.top = 0x6000;
self.parts[0].display_bounds.bottom = 16 * 0x200; self.parts[0].display_bounds.bottom = 0x2000;
let mut npc = NPC::create(104, &state.npc_table); let mut npc = NPC::create(104, &state.npc_table);
for _ in 0..2 { for _ in 0..2 {
@ -363,7 +364,7 @@ impl BossNPC {
if self.parts[0].direction == Direction::Right && self.parts[0].x > player.x { if self.parts[0].direction == Direction::Right && self.parts[0].x > player.x {
self.parts[0].action_num = 110; self.parts[0].action_num = 110;
self.parts[0].direction = Direction::Right; self.parts[0].direction = Direction::Left;
} }
state.sound_manager.play_sfx(26); state.sound_manager.play_sfx(26);
@ -419,7 +420,7 @@ impl BossNPC {
} }
132 => { 132 => {
self.parts[0].action_counter += 1; self.parts[0].action_counter += 1;
if (self.parts[0].action_counter / 2 % 2) != 0 { if (self.parts[0].action_counter / 2) & 1 != 0 {
self.parts[0].anim_num = 6; self.parts[0].anim_num = 6;
self.parts[0].display_bounds = Rect { self.parts[0].display_bounds = Rect {
left: 20 * 0x200, left: 20 * 0x200,