phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2025-03-23 10:29:18 +00:00
Code Issues Releases Wiki Activity

Inventory inaccuracies (fixes #119)

Browse source
This commit is contained in:
dawnDus 2022-04-21 13:24:44 -04:00
parent daea35381b
commit c97ed04fea
No known key found for this signature in database
GPG key ID: 972AABDE81848F21
4 changed files with 43 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/components/inventory.rs
View file

@ -1,5 +1,6 @@
use crate::common::Rect; use crate::common::Rect;
use crate::components::draw_common::{draw_number, Alignment}; use crate::components::draw_common::{draw_number, Alignment};
use crate::components::hud::HUD;
use crate::entity::GameEntity; use crate::entity::GameEntity;
use crate::frame::Frame; use crate::frame::Frame;
use crate::framework::context::Context; use crate::framework::context::Context;
@ -62,20 +63,25 @@ impl InventoryUI {
inventory.get_item_idx(self.selected_item as usize).map(|i| i.0 + 6000).unwrap_or(6000) inventory.get_item_idx(self.selected_item as usize).map(|i| i.0 + 6000).unwrap_or(6000)
} }
fn exit(&mut self, state: &mut SharedGameState, _player: &mut Player, inventory: &mut Inventory) { fn get_weapon_event_number(&self, inventory: &Inventory) -> u16 {
inventory.get_current_weapon().map(|w| w.wtype as u16 + 1000).unwrap_or(1000)
}
fn exit(&mut self, state: &mut SharedGameState, _player: &mut Player, inventory: &mut Inventory, hud: &mut HUD) {
self.focus = InventoryFocus::None; self.focus = InventoryFocus::None;
inventory.current_item = 0; inventory.current_item = 0;
self.text_y_pos = 16; self.text_y_pos = 16;
hud.weapon_x_pos = 32;
state.textscript_vm.reset(); state.textscript_vm.reset();
state.textscript_vm.set_mode(ScriptMode::Map); state.textscript_vm.set_mode(ScriptMode::Map);
} }
} }
impl GameEntity<(&mut Context, &mut Player, &mut Inventory)> for InventoryUI { impl GameEntity<(&mut Context, &mut Player, &mut Inventory, &mut HUD)> for InventoryUI {
fn tick( fn tick(
&mut self, &mut self,
state: &mut SharedGameState, state: &mut SharedGameState,
(ctx, player, inventory): (&mut Context, &mut Player, &mut Inventory), (ctx, player, inventory, hud): (&mut Context, &mut Player, &mut Inventory, &mut HUD),
) -> GameResult<()> { ) -> GameResult<()> {
let (off_left, off_top, off_right, _) = crate::framework::graphics::screen_insets_scaled(ctx, state.scale); let (off_left, off_top, off_right, _) = crate::framework::graphics::screen_insets_scaled(ctx, state.scale);
let mut slot_rect = let mut slot_rect =
@ -86,10 +92,11 @@ impl GameEntity<(&mut Context, &mut Player, &mut Inventory)> for InventoryUI {
if state.control_flags.control_enabled() if state.control_flags.control_enabled()
&& (player.controller.trigger_inventory() && (player.controller.trigger_inventory()
|| player.controller.trigger_menu_back() || player.controller.trigger_menu_back()
|| (player.controller.trigger_menu_ok() && self.focus == InventoryFocus::Weapons)
|| (state.settings.touch_controls && state.touch_controls.consume_click_in(slot_rect))) || (state.settings.touch_controls && state.touch_controls.consume_click_in(slot_rect)))
{ {
state.control_flags.set_ok_button_disabled(false); state.control_flags.set_ok_button_disabled(false);
self.exit(state, player, inventory); self.exit(state, player, inventory, hud);
return Ok(()); return Ok(());
} }
@ -124,10 +131,6 @@ impl GameEntity<(&mut Context, &mut Player, &mut Inventory)> for InventoryUI {
} }
} }
fn get_weapon_event_number(inventory: &Inventory) -> u16 {
inventory.get_current_weapon().map(|w| w.wtype as u16 + 1000).unwrap_or(1000)
}
self.selected_item = inventory.current_item; self.selected_item = inventory.current_item;
self.selected_weapon = inventory.current_weapon; self.selected_weapon = inventory.current_weapon;
@ -137,21 +140,21 @@ impl GameEntity<(&mut Context, &mut Player, &mut Inventory)> for InventoryUI {
InventoryFocus::None => { InventoryFocus::None => {
self.focus = InventoryFocus::Weapons; self.focus = InventoryFocus::Weapons;
state.control_flags.set_ok_button_disabled(false); state.control_flags.set_ok_button_disabled(false);
state.textscript_vm.start_script(get_weapon_event_number(inventory)); state.textscript_vm.start_script(self.get_weapon_event_number(inventory));
} }
InventoryFocus::Weapons if state.control_flags.control_enabled() => { InventoryFocus::Weapons if state.control_flags.control_enabled() => {
if player.controller.trigger_left() { if player.controller.trigger_left() {
state.sound_manager.play_sfx(4); state.sound_manager.play_sfx(4);
inventory.prev_weapon(); inventory.prev_weapon();
state.control_flags.set_ok_button_disabled(false); state.control_flags.set_ok_button_disabled(false);
state.textscript_vm.start_script(get_weapon_event_number(inventory)); state.textscript_vm.start_script(self.get_weapon_event_number(inventory));
} }
if player.controller.trigger_right() { if player.controller.trigger_right() {
state.sound_manager.play_sfx(4); state.sound_manager.play_sfx(4);
inventory.next_weapon(); inventory.next_weapon();
state.control_flags.set_ok_button_disabled(false); state.control_flags.set_ok_button_disabled(false);
state.textscript_vm.start_script(get_weapon_event_number(inventory)); state.textscript_vm.start_script(self.get_weapon_event_number(inventory));
} }
if player.controller.trigger_up() || player.controller.trigger_down() { if player.controller.trigger_up() || player.controller.trigger_down() {
@ -161,6 +164,8 @@ impl GameEntity<(&mut Context, &mut Player, &mut Inventory)> for InventoryUI {
} }
} }
InventoryFocus::Items if self.item_count != 0 && state.control_flags.control_enabled() => { InventoryFocus::Items if self.item_count != 0 && state.control_flags.control_enabled() => {
let mut moved_cursor = false;
if player.controller.trigger_left() { if player.controller.trigger_left() {
state.sound_manager.play_sfx(1); state.sound_manager.play_sfx(1);
@ -171,23 +176,23 @@ impl GameEntity<(&mut Context, &mut Player, &mut Inventory)> for InventoryUI {
} }
state.control_flags.set_ok_button_disabled(false); state.control_flags.set_ok_button_disabled(false);
state.textscript_vm.start_script(self.get_item_event_number(inventory)); moved_cursor = true;
} }
if player.controller.trigger_right() { if player.controller.trigger_right() {
match () { match () {
_ if self.selected_item == self.item_count + 1 => { _ if self.selected_item + 1 == self.item_count => {
self.selected_item = count_x * (self.selected_item / count_x); self.selected_item = count_x * (self.selected_item / count_x);
} }
_ if (self.selected_item % count_x) + 1 == count_x => { _ if (self.selected_item % count_x) + 1 == count_x => {
self.selected_item = self.selected_item.saturating_sub(count_x) + 1; self.selected_item = self.selected_item.saturating_sub(count_x - 1);
} }
_ => self.selected_item += 1, _ => self.selected_item += 1,
} }
state.sound_manager.play_sfx(1); state.sound_manager.play_sfx(1);
state.control_flags.set_ok_button_disabled(false); state.control_flags.set_ok_button_disabled(false);
state.textscript_vm.start_script(self.get_item_event_number(inventory)); moved_cursor = true;
} }
if player.controller.trigger_up() { if player.controller.trigger_up() {
@ -196,13 +201,13 @@ impl GameEntity<(&mut Context, &mut Player, &mut Inventory)> for InventoryUI {
state.sound_manager.play_sfx(4); state.sound_manager.play_sfx(4);
state.control_flags.set_ok_button_disabled(false); state.control_flags.set_ok_button_disabled(false);
state.textscript_vm.start_script(get_weapon_event_number(inventory)); state.textscript_vm.start_script(self.get_weapon_event_number(inventory));
} else { } else {
self.selected_item -= count_x; self.selected_item -= count_x;
state.sound_manager.play_sfx(1); state.sound_manager.play_sfx(1);
state.control_flags.set_ok_button_disabled(false); state.control_flags.set_ok_button_disabled(false);
state.textscript_vm.start_script(self.get_item_event_number(inventory)); moved_cursor = true;
} }
} }
@ -212,21 +217,26 @@ impl GameEntity<(&mut Context, &mut Player, &mut Inventory)> for InventoryUI {
state.sound_manager.play_sfx(4); state.sound_manager.play_sfx(4);
state.control_flags.set_ok_button_disabled(false); state.control_flags.set_ok_button_disabled(false);
state.textscript_vm.start_script(get_weapon_event_number(inventory)); moved_cursor = true;
} else { } else {
self.selected_item += count_x; self.selected_item += count_x;
state.sound_manager.play_sfx(1); state.sound_manager.play_sfx(1);
state.control_flags.set_ok_button_disabled(false); state.control_flags.set_ok_button_disabled(false);
state.textscript_vm.start_script(self.get_item_event_number(inventory)); moved_cursor = true;
} }
} }
self.selected_item = self.selected_item.min(self.item_count - 1);
if moved_cursor {
state.textscript_vm.start_script(self.get_item_event_number(inventory));
}
if !state.control_flags.ok_button_disabled() && player.controller.trigger_menu_ok() { if !state.control_flags.ok_button_disabled() && player.controller.trigger_menu_ok() {
state.textscript_vm.start_script(self.get_item_event_number_action(inventory)); state.textscript_vm.start_script(self.get_item_event_number_action(inventory));
} }
self.selected_item = self.selected_item.min(self.item_count - 1);
inventory.current_item = self.selected_item; inventory.current_item = self.selected_item;
} }
_ => {} _ => {}
@ -244,8 +254,8 @@ impl GameEntity<(&mut Context, &mut Player, &mut Inventory)> for InventoryUI {
state.sound_manager.play_sfx(4); state.sound_manager.play_sfx(4);
self.selected_weapon = i; self.selected_weapon = i;
inventory.current_weapon = i; inventory.current_weapon = i;
state.textscript_vm.start_script(get_weapon_event_number(inventory)); state.textscript_vm.start_script(self.get_weapon_event_number(inventory));
self.exit(state, player, inventory); self.exit(state, player, inventory, hud);
} }
} }

4
src/npc/ai/last_cave.rs
View file

@ -226,8 +226,8 @@ impl NPC {
} }
self.anim_num = 0; self.anim_num = 0;
if self.anim_counter > 0 { if self.action_counter > 0 {
self.anim_counter -= 1; self.action_counter -= 1;
return Ok(()); return Ok(());
} }

9
src/scene/game_scene.rs
View file

@ -1478,6 +1478,7 @@ impl GameScene {
if state.textscript_vm.state == TextScriptExecutionState::Ended { if state.textscript_vm.state == TextScriptExecutionState::Ended {
if self.player1.controller.trigger_inventory() { if self.player1.controller.trigger_inventory() {
self.inventory_player1.current_item = 0;
state.textscript_vm.set_mode(ScriptMode::Inventory); state.textscript_vm.set_mode(ScriptMode::Inventory);
self.player1.cond.set_interacted(false); self.player1.cond.set_interacted(false);
} else if self.player1.controller.trigger_map() && self.inventory_player1.has_item(2) { } else if self.player1.controller.trigger_map() && self.inventory_player1.has_item(2) {
@ -1771,7 +1772,8 @@ impl Scene for GameScene {
TextScriptVM::run(state, self, ctx)?; TextScriptVM::run(state, self, ctx)?;
} }
ScriptMode::Inventory => { ScriptMode::Inventory => {
self.inventory_ui.tick(state, (ctx, &mut self.player1, &mut self.inventory_player1))?; self.inventory_ui
.tick(state, (ctx, &mut self.player1, &mut self.inventory_player1, &mut self.hud_player1))?;
TextScriptVM::run(state, self, ctx)?; TextScriptVM::run(state, self, ctx)?;
} }
@ -1984,7 +1986,10 @@ impl Scene for GameScene {
self.map_system.draw(state, ctx, &self.stage, [&self.player1, &self.player2])?; self.map_system.draw(state, ctx, &self.stage, [&self.player1, &self.player2])?;
self.fade.draw(state, ctx, &self.frame)?; self.fade.draw(state, ctx, &self.frame)?;
self.nikumaru.draw(state, ctx, &self.frame)?;
if state.textscript_vm.mode == ScriptMode::Map {
self.nikumaru.draw(state, ctx, &self.frame)?;
}
if state.textscript_vm.mode == ScriptMode::Map if state.textscript_vm.mode == ScriptMode::Map
&& state.textscript_vm.state != TextScriptExecutionState::MapSystem && state.textscript_vm.state != TextScriptExecutionState::MapSystem

2
src/scripting/tsc/text_script.rs
View file

@ -1523,6 +1523,8 @@ impl TextScriptVM {
game_scene.inventory_player1.consume_item(item_id); game_scene.inventory_player1.consume_item(item_id);
game_scene.inventory_player2.consume_item(item_id); game_scene.inventory_player2.consume_item(item_id);
game_scene.inventory_player1.current_item = 0;
game_scene.inventory_player2.current_item = 0;
exec_state = TextScriptExecutionState::Running(event, cursor.position() as u32); exec_state = TextScriptExecutionState::Running(event, cursor.position() as u32);
} }