redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-07-23 21:17:45 +00:00
Code Activity

Move inventory iterators to their own file

Browse source
This commit is contained in:
Joshua Goins 2025-07-17 23:17:48 -04:00
parent b679158dfc
commit d98a9e4f9c
2 changed files with 75 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/inventory/iterators.rs Normal file
View file

@ -0,0 +1,71 @@
use super::{ContainerType, Inventory, Storage};
pub struct InventoryIterator<'a> {
inventory: &'a Inventory,
curr: u16,
}
impl<'a> IntoIterator for &'a Inventory {
type Item = (ContainerType, &'a dyn Storage);
type IntoIter = InventoryIterator<'a>;
fn into_iter(self) -> InventoryIterator<'a> {
InventoryIterator {
inventory: self,
curr: 0,
}
}
}
// TODO: why is this public API? :D
pub fn get_container_type(container_index: u32) -> Option<ContainerType> {
match container_index {
// inventory
0 => Some(ContainerType::Inventory0),
1 => Some(ContainerType::Inventory1),
2 => Some(ContainerType::Inventory2),
3 => Some(ContainerType::Inventory3),
// armory
4 => Some(ContainerType::ArmoryOffWeapon),
5 => Some(ContainerType::ArmoryHead),
6 => Some(ContainerType::ArmoryBody),
7 => Some(ContainerType::ArmoryHand),
8 => Some(ContainerType::ArmoryLeg),
9 => Some(ContainerType::ArmoryFoot),
10 => Some(ContainerType::ArmoryEarring),
11 => Some(ContainerType::ArmoryNeck),
12 => Some(ContainerType::ArmoryWrist),
13 => Some(ContainerType::ArmoryRing),
14 => Some(ContainerType::ArmorySoulCrystal),
15 => Some(ContainerType::ArmoryWeapon),
// equipped
16 => Some(ContainerType::Equipped),
// currency
17 => Some(ContainerType::Currency),
_ => panic!(
"Inventory iterator invalid or the client sent a very weird packet! {container_index}"
),
}
}
impl<'a> Iterator for InventoryIterator<'a> {
type Item = (ContainerType, &'a dyn Storage);
fn next(&mut self) -> Option<Self::Item> {
let curr = self.curr;
self.curr += 1;
if curr >= 18 {
return None;
}
let container_type = get_container_type(curr as u32).unwrap();
Some((
container_type,
self.inventory.get_container(&container_type),
))
}
}

75
src/inventory/mod.rs
View file

@ -22,8 +22,10 @@ mod storage;
pub use storage::{ContainerType, Storage};
mod currency;
pub use currency::CurrencyKind;
pub use currency::CurrencyStorage;
pub use currency::{CurrencyKind, CurrencyStorage};
mod iterators;
pub use iterators::{InventoryIterator, get_container_type};
use crate::BASE_INVENTORY_ACTION;
@ -130,17 +132,6 @@ impl Default for Inventory {
}
}
impl<'a> IntoIterator for &'a Inventory {
type Item = (ContainerType, &'a dyn Storage);
type IntoIter = InventoryIterator<'a>;
fn into_iter(self) -> InventoryIterator<'a> {
InventoryIterator {
inventory: self,
curr: 0,
}
}
}
#[cfg(not(target_family = "wasm"))]
impl rusqlite::types::FromSql for Inventory {
fn column_result(value: rusqlite::types::ValueRef<'_>) -> rusqlite::types::FromSqlResult<Self> {
@ -148,64 +139,6 @@ impl rusqlite::types::FromSql for Inventory {
}
}
pub struct InventoryIterator<'a> {
inventory: &'a Inventory,
curr: u16,
}
pub fn get_container_type(container_index: u32) -> Option<ContainerType> {
match container_index {
// inventory
0 => Some(ContainerType::Inventory0),
1 => Some(ContainerType::Inventory1),
2 => Some(ContainerType::Inventory2),
3 => Some(ContainerType::Inventory3),
// armory
4 => Some(ContainerType::ArmoryOffWeapon),
5 => Some(ContainerType::ArmoryHead),
6 => Some(ContainerType::ArmoryBody),
7 => Some(ContainerType::ArmoryHand),
8 => Some(ContainerType::ArmoryLeg),
9 => Some(ContainerType::ArmoryFoot),
10 => Some(ContainerType::ArmoryEarring),
11 => Some(ContainerType::ArmoryNeck),
12 => Some(ContainerType::ArmoryWrist),
13 => Some(ContainerType::ArmoryRing),
14 => Some(ContainerType::ArmorySoulCrystal),
15 => Some(ContainerType::ArmoryWeapon),
// equipped
16 => Some(ContainerType::Equipped),
// currency
17 => Some(ContainerType::Currency),
_ => panic!(
"Inventory iterator invalid or the client sent a very weird packet! {container_index}"
),
}
}
impl<'a> Iterator for InventoryIterator<'a> {
type Item = (ContainerType, &'a dyn Storage);
fn next(&mut self) -> Option<Self::Item> {
let curr = self.curr;
self.curr += 1;
if curr >= 18 {
return None;
}
let container_type = get_container_type(curr as u32).unwrap();
Some((
container_type,
self.inventory.get_container(&container_type),
))
}
}
impl Inventory {
/// Equip the starting items for a given classjob
pub fn equip_classjob_items(&mut self, classjob_id: u16, game_data: &mut GameData) {