phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2025-01-28 13:26:48 +00:00
Code Issues Releases Wiki Activity

Accuracy fixes for First Cave through Grasstown

Browse source
This commit is contained in:
periwinkle 2023-07-03 12:33:39 -04:00 committed by Laura K
parent b70f0007b1
commit 4d7dfd0266
4 changed files with 61 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/game/npc/ai/egg_corridor.rs
View file

@ -110,10 +110,6 @@ impl NPC {
let player = self.get_closest_player_ref(&players);
self.face_player(player);
if self.target_x < 100 {
self.target_x += 1;
}
if self.action_counter >= 8
&& self.x - 0xe000 < player.x
&& self.x + 0xe000 > player.x
@ -137,11 +133,10 @@ impl NPC {
}
if self.action_counter >= 8
&& self.target_x >= 100
&& self.x - 0x6000 < player.x
&& self.x + 0x6000 > player.x
&& self.y - 0xa000 < player.y
&& self.y + 0xa000 > player.y
&& self.y + 0x6000 > player.y
{
self.action_num = 2;
self.action_counter = 0;
@ -527,7 +522,7 @@ impl NPC {
self.vel_x = -0x200;
}
self.vel_y += ((self.target_y - self.y).signum() | 1) * 0x08;
self.vel_y -= ((self.y - self.target_y).signum() | 1) * 0x08;
self.vel_x = clamp(self.vel_x, -0x2ff, 0x2ff);
self.vel_y = clamp(self.vel_y, -0x100, 0x100);
@ -587,7 +582,7 @@ impl NPC {
}
}
if self.action_counter > 120 && self.action_counter & 0x02 == 1 && self.anim_num == 1 {
if self.action_counter > 120 && self.action_counter & 0x02 != 0 && self.anim_num == 1 {
self.anim_num = 2;
}
@ -665,7 +660,7 @@ impl NPC {
}
self.action_counter += 1;
if (self.action_counter & 1) != 0 {
if (self.action_counter & 2) != 0 {
self.anim_num = 2;
} else {
self.anim_num = 3;
@ -770,10 +765,6 @@ impl NPC {
self.direction = Direction::Right;
}
if self.target_x < 100 {
self.target_x += 1;
}
if self.action_counter >= 8
&& self.x - 0xe000 < player.x
&& self.x + 0xe000 > player.x
@ -781,8 +772,11 @@ impl NPC {
&& self.y + 0xa000 > player.y
{
self.anim_num = 1;
} else if self.action_counter < 8 {
self.action_counter += 1;
} else {
if self.action_counter < 8 {
self.action_counter += 1;
}
self.anim_num = 0;
}
if self.shock > 0 {
@ -792,11 +786,10 @@ impl NPC {
}
if self.action_counter >= 8
&& self.target_x >= 100
&& self.x - 0x6000 < player.x
&& self.x + 0x6000 > player.x
&& self.y - 0xa000 < player.y
&& self.y + 0xa000 > player.y
&& self.y + 0x6000 > player.y
{
self.action_num = 2;
self.action_counter = 0;
@ -810,7 +803,11 @@ impl NPC {
self.anim_num = 2;
self.vel_y = -0x5ff;
state.sound_manager.play_sfx(30);
let player = self.get_closest_player_mut(players);
if !player.cond.hidden() {
state.sound_manager.play_sfx(30);
}
if self.direction == Direction::Left {
self.vel_x = -0x100;
@ -826,7 +823,10 @@ impl NPC {
self.action_num = 1;
self.anim_num = 0;
state.sound_manager.play_sfx(23);
let player = self.get_closest_player_mut(players);
if !player.cond.hidden() {
state.sound_manager.play_sfx(23);
}
}
}
_ => (),
@ -954,7 +954,7 @@ impl NPC {
self.vel_y += 0x20;
self.action_counter += 1;
if self.action_counter > 8 && self.flags.any_flag() {
if self.action_counter > 8 && self.flags.hit_anything() {
self.action_num = 4;
self.action_counter = 0;
self.damage = 0;
@ -1185,10 +1185,10 @@ impl NPC {
self.vel_x = -0x200;
}
self.vel_y += ((self.target_y - self.y).signum() | 1) * 0x08;
self.vel_y -= ((self.y - self.target_y).signum() | 1) * 0x08;
self.vel_x = clamp(self.vel_x, -0x2ff, 0x2ff);
self.vel_y = clamp(self.vel_y, -0x100, 0x100);
self.vel_y = clamp(self.vel_y, -0x200, 0x200);
if self.shock > 0 {
self.x += self.vel_x / 2;
@ -1245,7 +1245,7 @@ impl NPC {
}
}
if self.action_counter > 120 && self.action_counter & 0x02 == 1 && self.anim_num == 1 {
if self.action_counter > 120 && self.action_counter & 0x02 != 0 && self.anim_num == 1 {
self.anim_num = 2;
}

4
src/game/npc/ai/first_cave.rs
View file

@ -116,7 +116,7 @@ impl NPC {
&& self.x - 0x8000 < player.x
&& self.x + 0x8000 > player.x
&& self.y - 0xa000 < player.y
&& self.y + 0xa000 > player.y
&& self.y + 0x6000 > player.y
{
self.action_num = 2;
self.action_counter = 0;
@ -177,7 +177,7 @@ impl NPC {
}
self.action_counter += 1;
if self.action_counter > 50 {
if self.action_counter >= 50 {
self.action_num = 2;
self.action_counter = 0;
self.vel_y = 0x300;

70
src/game/npc/ai/grasstown.rs
View file

@ -1,7 +1,7 @@
use num_traits::abs;
use num_traits::clamp;
use crate::common::{Direction, Rect};
use crate::common::{Direction, Rect, CDEG_RAD};
use crate::framework::error::GameResult;
use crate::game::caret::CaretType;
use crate::game::npc::{NPC, NPCList};
@ -151,15 +151,15 @@ impl NPC {
match self.action_num {
0 | 1 => {
if self.action_num == 0 {
let angle = self.rng.range(0..0xff);
self.vel_x = ((angle as f64 * 1.40625).cos() * 512.0) as i32;
let angle = self.rng.range(0..0xff) as f64 * CDEG_RAD;
self.vel_x = (angle.cos() * 512.0) as i32;
self.target_x =
self.x + ((angle as f64 * 1.40625 + std::f64::consts::FRAC_2_PI).cos() * 8.0 * 512.0) as i32;
self.x + ((angle + 64.0 * CDEG_RAD).cos() * 8.0 * 512.0) as i32;
let angle = self.rng.range(0..0xff);
self.vel_y = ((angle as f64 * 1.40625).sin() * 512.0) as i32;
let angle = self.rng.range(0..0xff) as f64 * CDEG_RAD;
self.vel_y = (angle.sin() * 512.0) as i32;
self.target_y =
self.y + ((angle as f64 * 1.40625 + std::f64::consts::FRAC_2_PI).sin() * 8.0 * 512.0) as i32;
self.y + ((angle + 64.0 * CDEG_RAD).sin() * 8.0 * 512.0) as i32;
self.action_num = 1;
self.action_counter2 = 120;
@ -228,7 +228,7 @@ impl NPC {
}
if self.action_counter >= 8
&& abs(self.x - player.x) < 0xc000
&& abs(self.x - player.x) < 0x10000
&& self.y - 0x10000 < player.y
&& self.y + 0x6000 > player.y
{
@ -288,7 +288,7 @@ impl NPC {
}
}
4 => {
if self.x > player.x {
if self.x >= player.x {
self.direction = Direction::Left;
} else {
self.direction = Direction::Right;
@ -305,7 +305,7 @@ impl NPC {
self.damage = 3;
} else {
if self.action_counter % 4 == 1 {
state.sound_manager.play_sfx(110);
state.sound_manager.play_sfx(109);
}
if self.flags.hit_bottom_wall() {
@ -392,7 +392,7 @@ impl NPC {
self.clamp_fall_speed();
self.action_counter += 1;
if self.action_counter >= 20 && (self.flags.hit_bottom_wall() || self.y > player.y - 0x2000) {
if self.flags.hit_bottom_wall() || (self.action_counter >= 20 && self.y > player.y - 0x2000) {
self.action_num = 5;
self.anim_num = 2;
self.anim_counter = 0;
@ -609,9 +609,8 @@ impl NPC {
}
if self.action_num == 1 {
if self.action_counter > 0 {
self.action_counter -= 1;
} else {
self.action_counter = self.action_counter.saturating_sub(1);
if self.action_counter == 0 {
self.action_num = 10;
}
}
@ -765,15 +764,15 @@ impl NPC {
self.npc_flags.set_ignore_solidity(true);
} else {
self.npc_flags.set_ignore_solidity(false);
}
self.action_counter += 1;
self.action_counter += 1;
if self.rng.range(0..50) == 1 {
self.action_num = 2;
self.action_counter = 0;
self.anim_num = 0;
self.anim_counter = 0;
if self.rng.range(0..50) == 1 {
self.action_num = 2;
self.action_counter = 0;
self.anim_num = 0;
self.anim_counter = 0;
}
}
}
1 => {
@ -834,7 +833,7 @@ impl NPC {
&& self.action_num != 3
&& self.action_counter > 10
&& ((self.shock > 0)
|| (abs(self.x - player.x) < 0x14000 && abs(self.y - player.y) < 0x8000) && self.rng.range(0..50) == 2)
|| (abs(self.x - player.x) <= 0x14000 && abs(self.y - player.y) <= 0x8000) && self.rng.range(0..50) == 2)
{
self.direction = if self.x >= player.x { Direction::Left } else { Direction::Right };
self.action_num = 10;
@ -1029,9 +1028,8 @@ impl NPC {
match self.action_num {
0 | 1 => {
if self.action_num == 0 {
self.action_counter = self.action_counter.saturating_sub(1);
if self.action_counter > 0 {
self.action_counter -= 1;
} else {
self.action_num = 1;
}
@ -1106,15 +1104,15 @@ impl NPC {
self.npc_flags.set_ignore_solidity(true);
} else {
self.npc_flags.set_ignore_solidity(false);
}
self.action_counter += 1;
self.action_counter += 1;
if self.rng.range(0..50) == 1 {
self.action_num = 2;
self.action_counter = 0;
self.anim_num = 0;
self.anim_counter = 0;
if self.rng.range(0..50) == 1 {
self.action_num = 2;
self.action_counter = 0;
self.anim_num = 0;
self.anim_counter = 0;
}
}
}
1 => {
@ -1176,7 +1174,7 @@ impl NPC {
&& self.action_num != 3
&& self.action_counter > 10
&& ((self.shock > 0)
|| (abs(self.x - player.x) < 0x14000 && abs(self.y - player.y) < 0x8000) && self.rng.range(0..50) == 2)
|| (abs(self.x - player.x) <= 0x14000 && abs(self.y - player.y) <= 0x8000) && self.rng.range(0..50) == 2)
{
self.direction = if self.x >= player.x { Direction::Left } else { Direction::Right };
self.action_num = 10;
@ -1184,9 +1182,7 @@ impl NPC {
self.vel_x = self.direction.vector_x() * 0x100;
self.vel_y = -0x2ff;
if !player.cond.hidden() {
state.sound_manager.play_sfx(30);
}
state.sound_manager.play_sfx(6);
}
self.vel_y = (self.vel_y + 0x80).min(0x5ff);
@ -1230,7 +1226,7 @@ impl NPC {
let player = self.get_closest_player_mut(players);
self.anim_num = 1;
self.direction = if self.x >= player.x { Direction::Left } else { Direction::Right };
self.direction = if self.x > player.x { Direction::Left } else { Direction::Right };
self.action_counter += 1;
if self.action_counter > 20 {
@ -1249,7 +1245,7 @@ impl NPC {
if self.anim_num > 2 {
let player = self.get_closest_player_mut(players);
self.direction = if self.x >= player.x { Direction::Left } else { Direction::Right };
self.direction = if self.x > player.x { Direction::Left } else { Direction::Right };
self.vel_x = self.direction.vector_x() * 0x200;
self.action_counter2 += 1;

4
src/game/npc/ai/mimiga_village.rs
View file

@ -141,7 +141,7 @@ impl NPC {
if (self.x - 0x6000 < player.x)
&& (self.x + 0x6000 > player.x)
&& (self.y - 0x6000 < player.y)
&& (self.y + 0x6000 > player.y)
&& (self.y + 0x2000 > player.y)
{
self.anim_num = 1;
} else {
@ -443,6 +443,7 @@ impl NPC {
0 | 1 => {
if self.action_num == 0 {
self.action_num = 1;
self.anim_num = 0;
self.y += 0x800;
}
@ -807,6 +808,7 @@ impl NPC {
}
self.face_player(player);
self.anim_num = 0;
self.action_counter += 1;
if self.action_counter > 4 {
self.action_num = 120;