Deukhoofd/PkmnLib_rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Loads of cleanup
Some checks reported errors
continuous-integration/drone/push Build was killed
Details

Browse Source
This commit is contained in:
Deukhoofd
2022-11-27 17:29:29 +01:00
parent aa3ceaed3e
commit efd1acdfa5
45 changed files with 259 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/static_data/libraries/item_library.rs
View File

@@ -8,12 +8,12 @@ use crate::{StringKey, ValueIdentifiable, ValueIdentifier};
/// A library to store all items.
#[derive(Debug)]
#[cfg_attr(feature = "wasm", derive(unique_type_id_derive::UniqueTypeId))]
pub struct ItemLibrary {
/// A unique identifier so we know what value this is.
identifier: ValueIdentifier,
/// The underlying data structure.
map: IndexMap<StringKey, Arc<Item>>,
map: IndexMap<StringKey, Arc<dyn Item>>,
}
impl ItemLibrary {
@@ -26,12 +26,12 @@ impl ItemLibrary {
}
}
impl DataLibrary<'_, Item> for ItemLibrary {
fn map(&self) -> &IndexMap<StringKey, Arc<Item>> {
impl DataLibrary<dyn Item> for ItemLibrary {
fn map(&self) -> &IndexMap<StringKey, Arc<dyn Item>> {
&self.map
}
fn get_modify(&mut self) -> &mut IndexMap<StringKey, Arc<Item>> {
fn get_modify(&mut self) -> &mut IndexMap<StringKey, Arc<dyn Item>> {
&mut self.map
}
}
@@ -49,11 +49,11 @@ pub mod tests {
use crate::static_data::libraries::data_library::DataLibrary;
use crate::static_data::libraries::item_library::ItemLibrary;
use crate::static_data::Item;
use crate::static_data::ItemImpl;
use crate::static_data::{BattleItemCategory, ItemCategory};
fn build_item() -> Item {
Item::new(
fn build_item() -> ItemImpl {
ItemImpl::new(
&"foo".into(),
ItemCategory::MiscItem,
BattleItemCategory::MiscBattleItem,