phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2024-11-22 13:42:47 +00:00
Code Issues Releases Wiki Activity

bug fixes and more accurate physics

Browse source
This commit is contained in:
Alula 2020-09-19 15:19:00 +02:00
parent 3f12a54335
commit 74010e789e
No known key found for this signature in database
GPG key ID: 3E00485503A1D8BA
6 changed files with 124 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/bullet.rs
View file

@ -3,10 +3,10 @@ use num_traits::clamp;
use crate::caret::CaretType;
use crate::common::{Condition, Direction, Flag, Rect};
use crate::engine_constants::{BulletData, EngineConstants};
use crate::npc::NPCMap;
use crate::physics::{OFF_X, OFF_Y, PhysicalEntity};
use crate::SharedGameState;
use crate::stage::Stage;
use crate::npc::NPCMap;
pub struct BulletManager {
pub bullets: Vec<Bullet>,
@ -500,7 +500,7 @@ impl PhysicalEntity for Bullet {
false
}
fn judge_hit_block(&mut self, state: &SharedGameState, x: isize, y: isize) {
fn judge_hit_block(&mut self, state: &mut SharedGameState, x: isize, y: isize) {
if (self.x - self.hit_bounds.left as isize) < (x * 16 + 8) * 0x200
&& (self.x + self.hit_bounds.right as isize) > (x * 16 - 8) * 0x200
&& (self.y - self.hit_bounds.top as isize) < (y * 16 + 8) * 0x200
@ -563,28 +563,28 @@ impl PhysicalEntity for Bullet {
}
// Slopes
0x50 | 0x70 => {
self.judge_hit_triangle_a(x + ox, y + oy);
self.judge_hit_triangle_a(state, x + ox, y + oy);
}
0x51 | 0x71 => {
self.judge_hit_triangle_b(x + ox, y + oy);
self.judge_hit_triangle_b(state, x + ox, y + oy);
}
0x52 | 0x72 => {
self.judge_hit_triangle_c(x + ox, y + oy);
self.judge_hit_triangle_c(state, x + ox, y + oy);
}
0x53 | 0x73 => {
self.judge_hit_triangle_d(x + ox, y + oy);
self.judge_hit_triangle_d(state, x + ox, y + oy);
}
0x54 | 0x74 => {
self.judge_hit_triangle_e(x + ox, y + oy);
self.judge_hit_triangle_e(state, x + ox, y + oy);
}
0x55 | 0x75 => {
self.judge_hit_triangle_f(x + ox, y + oy);
self.judge_hit_triangle_f(state, x + ox, y + oy);
}
0x56 | 0x76 => {
self.judge_hit_triangle_g(x + ox, y + oy);
self.judge_hit_triangle_g(state, x + ox, y + oy);
}
0x57 | 0x77 => {
self.judge_hit_triangle_h(x + ox, y + oy);
self.judge_hit_triangle_h(state, x + ox, y + oy);
}
_ => {}
}

3
src/common.rs
View file

@ -27,9 +27,6 @@ bitfield! {
pub hit_left_smaller_half, set_hit_left_smaller_half: 17; // 0x20000
pub hit_right_smaller_half, set_hit_right_smaller_half: 18; // 0x40000
pub hit_right_bigger_half, set_hit_right_bigger_half: 19; // 0x80000
// engine specific flags
pub head_bounced, set_head_bounced: 31;
}
bitfield! {

1
src/live_debugger.rs
View file

@ -123,6 +123,7 @@ impl LiveDebugger {
if ui.button(im_str!("Load"), [0.0, 0.0]) {
match GameScene::new(state, ctx, self.selected_stage as usize) {
Ok(mut scene) => {
scene.inventory = game_scene.inventory.clone();
scene.player = game_scene.player.clone();
scene.player.x = (scene.stage.map.width / 2 * 16 * 0x200) as isize;
scene.player.y = (scene.stage.map.height / 2 * 16 * 0x200) as isize;

148
src/physics.rs
View file

@ -1,5 +1,6 @@
use num_traits::clamp;
use crate::caret::CaretType;
use crate::common::{Condition, Direction, Flag, Rect};
use crate::SharedGameState;
use crate::stage::Stage;
@ -29,10 +30,11 @@ pub trait PhysicalEntity {
fn is_player(&self) -> bool;
fn ignore_tile_44(&self) -> bool { true }
fn judge_hit_block(&mut self, state: &SharedGameState, x: isize, y: isize) {
fn judge_hit_block(&mut self, state: &mut SharedGameState, x: isize, y: isize) {
let bounds_x = if self.is_player() { 4 } else { 5 };
// left wall
if (self.y() - self.hit_bounds().top as isize) < (y * 16 + 4) * 0x200
&& self.y() + self.hit_bounds().bottom as isize > (y * 16 - 4) * 0x200
if (self.y() - self.hit_bounds().top as isize) < (y * 16 + bounds_x) * 0x200
&& self.y() + self.hit_bounds().bottom as isize > (y * 16 - bounds_x) * 0x200
&& (self.x() - self.hit_bounds().right as isize) < (x * 16 + 8) * 0x200
&& (self.x() - self.hit_bounds().right as isize) > x * 16 * 0x200 {
self.set_x(((x * 16 + 8) * 0x200) + self.hit_bounds().right as isize);
@ -51,8 +53,8 @@ pub trait PhysicalEntity {
}
// right wall
if (self.y() - self.hit_bounds().top as isize) < (y * 16 + 4) * 0x200
&& self.y() + self.hit_bounds().bottom as isize > (y * 16 - 4) * 0x200
if (self.y() - self.hit_bounds().top as isize) < (y * 16 + bounds_x) * 0x200
&& self.y() + self.hit_bounds().bottom as isize > (y * 16 - bounds_x) * 0x200
&& (self.x() + self.hit_bounds().right as isize) > (x * 16 - 8) * 0x200
&& (self.x() + self.hit_bounds().right as isize) < x * 16 * 0x200 {
self.set_x(((x * 16 - 8) * 0x200) - self.hit_bounds().right as isize);
@ -71,15 +73,17 @@ pub trait PhysicalEntity {
}
// ceiling
if (self.x() - self.hit_bounds().right as isize) < (x * 16 + 5) * 0x200
&& (self.x() + self.hit_bounds().right as isize) > (x * 16 - 5) * 0x200
if (self.x() - self.hit_bounds().right as isize) < (x * 16 + bounds_x) * 0x200
&& (self.x() + self.hit_bounds().right as isize) > (x * 16 - bounds_x) * 0x200
&& (self.y() - self.hit_bounds().top as isize) < (y * 16 + 8) * 0x200
&& (self.y() - self.hit_bounds().top as isize) > y * 16 * 0x200 {
self.set_y(((y * 16 + 8) * 0x200) + self.hit_bounds().top as isize);
if self.is_player() {
if !self.cond().hidden() && self.vel_y() < -0x200 {
self.flags().set_head_bounced(true);
state.sound_manager.play_sfx(3);
state.create_caret(self.x(), self.y() - self.hit_bounds().top as isize, CaretType::LittleParticles, Direction::Left);
state.create_caret(self.x(), self.y() - self.hit_bounds().top as isize, CaretType::LittleParticles, Direction::Left);
}
if self.vel_y() < 0 {
@ -93,15 +97,15 @@ pub trait PhysicalEntity {
}
// floor
if ((self.x() - self.hit_bounds().right as isize) < (x * 16 + 5) * 0x200)
&& ((self.x() + self.hit_bounds().right as isize) > (x * 16 - 5) * 0x200)
if ((self.x() - self.hit_bounds().right as isize) < (x * 16 + bounds_x) * 0x200)
&& ((self.x() + self.hit_bounds().right as isize) > (x * 16 - bounds_x) * 0x200)
&& ((self.y() + self.hit_bounds().bottom as isize) > (y * 16 - 8) * 0x200)
&& ((self.y() + self.hit_bounds().bottom as isize) < y * 16 * 0x200) {
self.set_y(((y * 16 - 8) * 0x200) - self.hit_bounds().bottom as isize);
if self.is_player() {
if self.vel_y() > 0x400 {
// PlaySoundObject(23, SOUND_MODE_PLAY); todo
state.sound_manager.play_sfx(23);
}
if self.vel_y() > 0 {
@ -116,7 +120,7 @@ pub trait PhysicalEntity {
}
// upper left slope (bigger half)
fn judge_hit_triangle_a(&mut self, x: isize, y: isize) {
fn judge_hit_triangle_a(&mut self, state: &mut SharedGameState, x: isize, y: isize) {
if self.x() < (x * 16 + 8) * 0x200
&& self.x() > (x * 16 - 8) * 0x200
&& (self.y() - self.hit_bounds().top as isize) < (y * 16 * 0x200) - (self.x() - x * 16 * 0x200) / 2 + 0x800
@ -124,7 +128,9 @@ pub trait PhysicalEntity {
self.set_y((y * 16 * 0x200) - ((self.x() - x * 16 * 0x200) / 2) + 0x800 + self.hit_bounds().top as isize);
if self.is_player() && !self.cond().hidden() && self.vel_y() < -0x200 {
self.flags().set_head_bounced(true);
state.sound_manager.play_sfx(3);
state.create_caret(self.x(), self.y() - self.hit_bounds().top as isize, CaretType::LittleParticles, Direction::Left);
state.create_caret(self.x(), self.y() - self.hit_bounds().top as isize, CaretType::LittleParticles, Direction::Left);
}
if self.vel_y() < 0 {
@ -136,7 +142,7 @@ pub trait PhysicalEntity {
}
// upper left slope (smaller half)
fn judge_hit_triangle_b(&mut self, x: isize, y: isize) {
fn judge_hit_triangle_b(&mut self, state: &mut SharedGameState, x: isize, y: isize) {
if self.x() < (x * 16 + 8) * 0x200
&& self.x() > (x * 16 - 8) * 0x200
&& (self.y() - self.hit_bounds().top as isize) < (y * 16 * 0x200) - (self.x() - x * 16 * 0x200) / 2 - 0x800
@ -144,7 +150,9 @@ pub trait PhysicalEntity {
self.set_y((y * 16 * 0x200) - ((self.x() - x * 16 * 0x200) / 2) - 0x800 + self.hit_bounds().top as isize);
if self.is_player() && !self.cond().hidden() && self.vel_y() < -0x200 {
self.flags().set_head_bounced(true);
state.sound_manager.play_sfx(3);
state.create_caret(self.x(), self.y() - self.hit_bounds().top as isize, CaretType::LittleParticles, Direction::Left);
state.create_caret(self.x(), self.y() - self.hit_bounds().top as isize, CaretType::LittleParticles, Direction::Left);
}
if self.vel_y() < 0 {
@ -156,7 +164,7 @@ pub trait PhysicalEntity {
}
// upper right slope (smaller half)
fn judge_hit_triangle_c(&mut self, x: isize, y: isize) {
fn judge_hit_triangle_c(&mut self, state: &mut SharedGameState, x: isize, y: isize) {
if self.x() < (x * 16 + 8) * 0x200
&& self.x() > (x * 16 - 8) * 0x200
&& (self.y() - self.hit_bounds().top as isize) < (y * 16 * 0x200) + (self.x() - x * 16 * 0x200) / 2 - 0x800
@ -164,7 +172,9 @@ pub trait PhysicalEntity {
self.set_y((y * 16 * 0x200) + ((self.x() - x * 16 * 0x200) / 2) - 0x800 + self.hit_bounds().top as isize);
if self.is_player() && !self.cond().hidden() && self.vel_y() < -0x200 {
self.flags().set_head_bounced(true);
state.sound_manager.play_sfx(3);
state.create_caret(self.x(), self.y() - self.hit_bounds().top as isize, CaretType::LittleParticles, Direction::Left);
state.create_caret(self.x(), self.y() - self.hit_bounds().top as isize, CaretType::LittleParticles, Direction::Left);
}
if self.vel_y() < 0 {
@ -176,7 +186,7 @@ pub trait PhysicalEntity {
}
// upper right slope (bigger half)
fn judge_hit_triangle_d(&mut self, x: isize, y: isize) {
fn judge_hit_triangle_d(&mut self, state: &mut SharedGameState, x: isize, y: isize) {
if (self.x() < (x * 16 + 8) * 0x200)
&& (self.x() > (x * 16 - 8) * 0x200)
&& (self.y() - self.hit_bounds().top as isize) < (y * 16 * 0x200) + (self.x() - x * 16 * 0x200) / 2 + 0x800
@ -184,7 +194,9 @@ pub trait PhysicalEntity {
self.set_y((y * 16 * 0x200) + ((self.x() - x * 16 * 0x200) / 2) + 0x800 + self.hit_bounds().top as isize);
if self.is_player() && !self.cond().hidden() && self.vel_y() < -0x200 {
self.flags().set_head_bounced(true);
state.sound_manager.play_sfx(3);
state.create_caret(self.x(), self.y() - self.hit_bounds().top as isize, CaretType::LittleParticles, Direction::Left);
state.create_caret(self.x(), self.y() - self.hit_bounds().top as isize, CaretType::LittleParticles, Direction::Left);
}
if self.vel_y() < 0 {
@ -196,7 +208,7 @@ pub trait PhysicalEntity {
}
// lower left half (bigger)
fn judge_hit_triangle_e(&mut self, x: isize, y: isize) {
fn judge_hit_triangle_e(&mut self, state: &mut SharedGameState, x: isize, y: isize) {
self.flags().set_hit_left_bigger_half(true);
if (self.x() < (x * 16 + 8) * 0x200)
@ -206,7 +218,7 @@ pub trait PhysicalEntity {
self.set_y((y * 16 * 0x200) + ((self.x() - x * 16 * 0x200) / 2) - 0x800 - self.hit_bounds().bottom as isize);
if self.is_player() && self.vel_y() > 0x400 {
// PlaySoundObject(23, SOUND_MODE_PLAY); todo
state.sound_manager.play_sfx(23);
}
if self.vel_y() > 0 {
@ -219,7 +231,7 @@ pub trait PhysicalEntity {
}
// lower left half (smaller)
fn judge_hit_triangle_f(&mut self, x: isize, y: isize) {
fn judge_hit_triangle_f(&mut self, state: &mut SharedGameState, x: isize, y: isize) {
self.flags().set_hit_left_smaller_half(true);
if (self.x() < (x * 16 + 8) * 0x200)
@ -229,7 +241,7 @@ pub trait PhysicalEntity {
self.set_y((y * 16 * 0x200) + ((self.x() - x * 16 * 0x200) / 2) + 0x800 - self.hit_bounds().bottom as isize);
if self.is_player() && self.vel_y() > 0x400 {
// PlaySoundObject(23, SOUND_MODE_PLAY); todo
state.sound_manager.play_sfx(23);
}
if self.vel_y() > 0 {
@ -242,7 +254,7 @@ pub trait PhysicalEntity {
}
// lower right half (smaller)
fn judge_hit_triangle_g(&mut self, x: isize, y: isize) {
fn judge_hit_triangle_g(&mut self, state: &mut SharedGameState, x: isize, y: isize) {
self.flags().set_hit_right_smaller_half(true);
if (self.x() < (x * 16 + 8) * 0x200)
@ -252,7 +264,7 @@ pub trait PhysicalEntity {
self.set_y((y * 16 * 0x200) - ((self.x() - x * 16 * 0x200) / 2) + 0x800 - self.hit_bounds().bottom as isize);
if self.is_player() && self.vel_y() > 0x400 {
// PlaySoundObject(23, SOUND_MODE_PLAY); todo
state.sound_manager.play_sfx(23);
}
if self.vel_y() > 0 {
@ -265,7 +277,7 @@ pub trait PhysicalEntity {
}
// lower right half (bigger)
fn judge_hit_triangle_h(&mut self, x: isize, y: isize) {
fn judge_hit_triangle_h(&mut self, state: &mut SharedGameState, x: isize, y: isize) {
self.flags().set_hit_right_bigger_half(true);
if (self.x() < (x * 16 + 8) * 0x200)
@ -275,7 +287,7 @@ pub trait PhysicalEntity {
self.set_y((y * 16 * 0x200) - ((self.x() - x * 16 * 0x200) / 2) - 0x800 - self.hit_bounds().bottom as isize);
if self.is_player() && self.vel_y() > 0x400 {
// PlaySoundObject(23, SOUND_MODE_PLAY); todo
state.sound_manager.play_sfx(23);
}
if self.vel_y() > 0 {
@ -288,10 +300,13 @@ pub trait PhysicalEntity {
}
fn judge_hit_water(&mut self, x: isize, y: isize) {
if (self.x() - self.hit_bounds().right as isize) < (x * 16 + 5) * 0x200
&& (self.x() + self.hit_bounds().right as isize) > (x * 16 - 5) * 0x200
&& (self.y() - self.hit_bounds().top as isize) < (y * 16 + 5) * 0x200
&& (self.y() + self.hit_bounds().bottom as isize) > y * 16 * 0x200 {
let bounds_x = if self.is_player() { 5 } else { 6 };
let bounds_up = if self.is_player() { 5 } else { 6 };
let bounds_down = if self.is_player() { 0 } else { 6 };
if (self.x() - self.hit_bounds().right as isize) < (x * 16 + bounds_x) * 0x200
&& (self.x() + self.hit_bounds().right as isize) > (x * 16 - bounds_x) * 0x200
&& (self.y() - self.hit_bounds().top as isize) < (y * 16 + bounds_up) * 0x200
&& (self.y() + self.hit_bounds().bottom as isize) > (y * 16 - bounds_down) * 0x200 {
self.flags().set_in_water(true);
}
}
@ -332,7 +347,7 @@ pub trait PhysicalEntity {
let y = clamp((self.y() - if big { 0x1000 } else { 0 }) / 16 / 0x200, 0, stage.map.height as isize);
for (idx, (&ox, &oy)) in OFF_X.iter().zip(OFF_Y.iter()).enumerate() {
if idx == 4 && big {
if idx == 4 && !big {
break;
}
@ -344,9 +359,20 @@ pub trait PhysicalEntity {
}
// Blocks
0x02 | 0x60 | 0x62 => {
0x02 | 0x60 => {
self.judge_hit_water(x + ox, y + oy);
}
0x62 if !self.is_player() => {
self.judge_hit_water(x + ox, y + oy);
}
0x61 => {
self.judge_hit_water(x + ox, y + oy);
self.judge_hit_block(state, x + ox, y + oy);
}
0x04 | 0x64 if !self.is_player() => {
self.judge_hit_water(x + ox, y + oy);
self.judge_hit_block(state, x + ox, y + oy);
}
0x05 | 0x41 | 0x43 | 0x46 if self.is_player() => {
self.judge_hit_block(state, x + ox, y + oy);
}
@ -361,58 +387,66 @@ pub trait PhysicalEntity {
// Slopes
0x50 | 0x70 => {
self.judge_hit_triangle_a(x + ox, y + oy);
self.judge_hit_triangle_a(state, x + ox, y + oy);
if attrib & 0x20 != 0 { self.judge_hit_water(x + ox, y + oy); }
}
0x51 | 0x71 => {
self.judge_hit_triangle_b(x + ox, y + oy);
self.judge_hit_triangle_b(state, x + ox, y + oy);
if attrib & 0x20 != 0 { self.judge_hit_water(x + ox, y + oy); }
}
0x52 | 0x72 => {
self.judge_hit_triangle_c(x + ox, y + oy);
self.judge_hit_triangle_c(state, x + ox, y + oy);
if attrib & 0x20 != 0 { self.judge_hit_water(x + ox, y + oy); }
}
0x53 | 0x73 => {
self.judge_hit_triangle_d(x + ox, y + oy);
self.judge_hit_triangle_d(state, x + ox, y + oy);
if attrib & 0x20 != 0 { self.judge_hit_water(x + ox, y + oy); }
}
0x54 | 0x74 => {
self.judge_hit_triangle_e(x + ox, y + oy);
self.judge_hit_triangle_e(state, x + ox, y + oy);
if attrib & 0x20 != 0 { self.judge_hit_water(x + ox, y + oy); }
}
0x55 | 0x75 => {
self.judge_hit_triangle_f(x + ox, y + oy);
self.judge_hit_triangle_f(state, x + ox, y + oy);
if attrib & 0x20 != 0 { self.judge_hit_water(x + ox, y + oy); }
}
0x56 | 0x76 => {
self.judge_hit_triangle_g(x + ox, y + oy);
self.judge_hit_triangle_g(state, x + ox, y + oy);
if attrib & 0x20 != 0 { self.judge_hit_water(x + ox, y + oy); }
}
0x57 | 0x77 => {
self.judge_hit_triangle_h(x + ox, y + oy);
self.judge_hit_triangle_h(state, x + ox, y + oy);
if attrib & 0x20 != 0 { self.judge_hit_water(x + ox, y + oy); }
}
0x61 => {
self.judge_hit_water(x + ox, y + oy);
self.judge_hit_block(state, x + ox, y + oy);
}
0x04 | 0x64 if !self.is_player() => {
self.judge_hit_water(x + ox, y + oy);
self.judge_hit_block(state, x + ox, y + oy);
}
// Forces
0x80 | 0xa0 => {
self.judge_hit_force(x + ox, y + ox, Direction::Left, attrib & 0x20 != 0 );
0x80 | 0xa0 if self.is_player() => {
self.judge_hit_force(x + ox, y + ox, Direction::Left, attrib & 0x20 != 0);
}
0x81 | 0xa1 => {
self.judge_hit_force(x + ox, y + ox, Direction::Up, attrib & 0x20 != 0 );
0x81 | 0xa1 if self.is_player() => {
self.judge_hit_force(x + ox, y + ox, Direction::Up, attrib & 0x20 != 0);
}
0x82 | 0xa2 => {
self.judge_hit_force(x + ox, y + ox, Direction::Right, attrib & 0x20 != 0 );
0x82 | 0xa2 if self.is_player() => {
self.judge_hit_force(x + ox, y + ox, Direction::Right, attrib & 0x20 != 0);
}
0x83 | 0xa3 => {
self.judge_hit_force(x + ox, y + ox, Direction::Bottom, attrib & 0x20 != 0 );
0x83 | 0xa3 if self.is_player() => {
self.judge_hit_force(x + ox, y + ox, Direction::Bottom, attrib & 0x20 != 0);
}
0x80 | 0xa0 if !self.is_player() => {
self.flags().set_force_left(true);
if attrib & 0x20 != 0 { self.flags().set_in_water(true); }
}
0x81 | 0xa1 if !self.is_player() => {
self.flags().set_force_up(true);
if attrib & 0x20 != 0 { self.flags().set_in_water(true); }
}
0x82 | 0xa2 if !self.is_player() => {
self.flags().set_force_right(true);
if attrib & 0x20 != 0 { self.flags().set_in_water(true); }
}
0x83 | 0xa3 if !self.is_player() => {
self.flags().set_force_down(true);
if attrib & 0x20 != 0 { self.flags().set_in_water(true); }
}
_ => {}
}

6
src/player.rs
View file

@ -109,12 +109,6 @@ impl Player {
let physics = if self.flags.in_water() { state.constants.my_char.water_physics } else { state.constants.my_char.air_physics };
self.question = false;
if self.flags.head_bounced() {
self.flags.set_head_bounced(false);
state.sound_manager.play_sfx(3);
state.create_caret(self.x, self.y - self.hit_bounds.top as isize, CaretType::LittleParticles, Direction::Left);
state.create_caret(self.x, self.y - self.hit_bounds.top as isize, CaretType::LittleParticles, Direction::Left);
}
if !state.control_flags.control_enabled() {
self.booster_switch = 0;

33
src/scene/game_scene.rs
View file

@ -693,6 +693,7 @@ impl Scene for GameScene {
self.frame.immediate_update(state, &self.player, &self.stage);
//self.inventory.add_weapon(WeaponType::PolarStar, 0);
//self.inventory.add_xp(120, state);
//self.player.equip.set_booster_2_0(true);
Ok(())
}
@ -709,19 +710,26 @@ impl Scene for GameScene {
}
};
self.player.tick(state, ())?;
self.player.flags.0 = 0;
state.tick_carets();
self.bullet_manager.tick_bullets(state, &self.player, &mut self.stage);
self.npc_map.process_npc_changes(state);
self.player.tick_map_collisions(state, &mut self.stage);
self.player.tick_npc_collisions(state, &mut self.npc_map, &mut self.inventory);
for npc_id in self.npc_map.npc_ids.iter() {
if let Some(npc_cell) = self.npc_map.npcs.get_mut(npc_id) {
let mut npc = npc_cell.borrow_mut();
npc.tick(state, &mut self.player)?;
if npc.cond.alive() {
npc.tick(state, &mut self.player)?;
}
}
}
self.npc_map.process_npc_changes(state);
self.npc_map.process_npc_changes(state);
self.player.flags.0 = 0;
self.player.tick_map_collisions(state, &mut self.stage);
self.player.tick_npc_collisions(state, &mut self.npc_map, &mut self.inventory);
self.npc_map.process_npc_changes(state);
for npc_id in self.npc_map.npc_ids.iter() {
if let Some(npc_cell) = self.npc_map.npcs.get_mut(npc_id) {
let mut npc = npc_cell.borrow_mut();
if npc.cond.alive() && !npc.npc_flags.ignore_solidity() {
npc.flags.0 = 0;
@ -732,6 +740,9 @@ impl Scene for GameScene {
self.npc_map.process_npc_changes(state);
self.tick_npc_bullet_collissions(state);
state.tick_carets();
self.bullet_manager.tick_bullets(state, &self.player, &mut self.stage);
self.frame.update(state, &self.player, &self.stage);
}
@ -794,8 +805,8 @@ impl Scene for GameScene {
npc_cell.borrow().draw(state, ctx, &self.frame)?;
}
}
self.player.draw(state, ctx, &self.frame)?;
self.draw_bullets(state, ctx)?;
self.player.draw(state, ctx, &self.frame)?;
self.draw_tiles(state, ctx, TileLayer::Foreground)?;
self.draw_tiles(state, ctx, TileLayer::Snack)?;
self.draw_carets(state, ctx)?;