hodasemi/engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Implement tool tip builder

Browse source
This commit is contained in:
hodasemi 2024-08-25 11:44:44 +02:00
parent 380c465369
commit 4226d72b1d
6 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gavania-core/src/game/game.rs
View file

@ -12,7 +12,7 @@ use rpg_components::config::abilities::AbilitySettings;
use rpg_components::config::attributes::AttributeSettings; use rpg_components::config::attributes::AttributeSettings;
use rpg_components::config::experience::ExperienceSettings; use rpg_components::config::experience::ExperienceSettings;
use rpg_components::config::items::ItemSettings; use rpg_components::config::items::ItemSettings;
use rpg_components::items::ItemSystem; use rpg_components::items::{ItemSystem, ToolTipBuilder};
// std // std
use std::collections::HashMap; use std::collections::HashMap;
@ -101,6 +101,16 @@ impl GameHandle {
} }
} }
impl ToolTipBuilder for GameHandle {
fn asset_path(&self, s: &str) -> AssetPath {
self.build_data_path(s)
}
fn gui_handler(&self) -> Arc<GuiHandler> {
self.upgrade().engine().gui_handler().clone()
}
}
pub struct Settings { pub struct Settings {
pub core_settings: CoreSettings, pub core_settings: CoreSettings,
pub user_settings: UserSettings, pub user_settings: UserSettings,

2
rpg_components/src/items/ability_addon.rs
View file

@ -278,7 +278,7 @@ impl AbilityAddon {
position: (i32, i32), position: (i32, i32),
) -> Result<Tooltip> { ) -> Result<Tooltip> {
let gui = GuiBuilder::new( let gui = GuiBuilder::new(
tooltip_builder.gui_handler(), &tooltip_builder.gui_handler(),
&tooltip_builder.asset_path("gui/xml/ingame/loot/addon_snippet.xml"), &tooltip_builder.asset_path("gui/xml/ingame/loot/addon_snippet.xml"),
)?; )?;

2
rpg_components/src/items/ability_book.rs
View file

@ -287,7 +287,7 @@ impl AbilityBook {
position: (i32, i32), position: (i32, i32),
) -> Result<Tooltip> { ) -> Result<Tooltip> {
let gui = GuiBuilder::new( let gui = GuiBuilder::new(
tooltip_builder.gui_handler(), &tooltip_builder.gui_handler(),
&tooltip_builder.asset_path("gui/xml/ingame/loot/book_snippet.xml"), &tooltip_builder.asset_path("gui/xml/ingame/loot/book_snippet.xml"),
)?; )?;

6
rpg_components/src/items/item.rs
View file

@ -230,7 +230,7 @@ impl Item {
let count = stats.len() + jewels.len(); let count = stats.len() + jewels.len();
let inspector_snippet = GuiBuilder::new( let inspector_snippet = GuiBuilder::new(
tooltip_builder.gui_handler(), &tooltip_builder.gui_handler(),
&tooltip_builder.asset_path(&format!("gui/xml/ingame/loot/items/slots_{}.xml", count)), &tooltip_builder.asset_path(&format!("gui/xml/ingame/loot/items/slots_{}.xml", count)),
)?; )?;
@ -269,7 +269,7 @@ impl Item {
for stat in stats { for stat in stats {
let stat_type_snippet = GuiSnippet::new( let stat_type_snippet = GuiSnippet::new(
tooltip_builder.gui_handler(), &tooltip_builder.gui_handler(),
&tooltip_builder.asset_path("gui/xml/ingame/loot/snippets/stat_type_snippet.xml"), &tooltip_builder.asset_path("gui/xml/ingame/loot/snippets/stat_type_snippet.xml"),
)?; )?;
@ -286,7 +286,7 @@ impl Item {
for jewel in jewels { for jewel in jewels {
let socket_snippet = GuiSnippet::new( let socket_snippet = GuiSnippet::new(
tooltip_builder.gui_handler(), &tooltip_builder.gui_handler(),
&tooltip_builder.asset_path("gui/xml/ingame/loot/snippets/item_socket_snippet.xml"), &tooltip_builder.asset_path("gui/xml/ingame/loot/snippets/item_socket_snippet.xml"),
)?; )?;

2
rpg_components/src/items/jewel.rs
View file

@ -65,7 +65,7 @@ impl Jewel {
position: (i32, i32), position: (i32, i32),
) -> Result<Tooltip> { ) -> Result<Tooltip> {
let inspector_snippet: Arc<GuiBuilder> = GuiBuilder::new( let inspector_snippet: Arc<GuiBuilder> = GuiBuilder::new(
tooltip_builder.gui_handler(), &tooltip_builder.gui_handler(),
&tooltip_builder.asset_path("gui/xml/ingame/loot/jewel_tooltip.xml"), &tooltip_builder.asset_path("gui/xml/ingame/loot/jewel_tooltip.xml"),
)?; )?;

2
rpg_components/src/items/tooltip.rs
View file

@ -5,7 +5,7 @@ use std::sync::Arc;
pub trait ToolTipBuilder { pub trait ToolTipBuilder {
fn asset_path(&self, s: &str) -> AssetPath; fn asset_path(&self, s: &str) -> AssetPath;
fn gui_handler(&self) -> &Arc<GuiHandler>; fn gui_handler(&self) -> Arc<GuiHandler>;
} }
pub struct FittingResult { pub struct FittingResult {