+ Player items

This commit is contained in:
Wiktor Mazur
2019-12-12 15:58:14 +01:00
parent 9296f536e7
commit 47f64a9834
21 changed files with 10266 additions and 88 deletions
+3 -3
View File
@@ -303,7 +303,7 @@ dependencies = [
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"packet_sniffer 0.1.0", "packet_sniffer 0.1.0",
"photon_decode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "photon_decode 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"simplelog 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "simplelog 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"timer 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "timer 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@@ -445,7 +445,7 @@ dependencies = [
[[package]] [[package]]
name = "photon_decode" name = "photon_decode"
version = "0.1.0" version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -953,7 +953,7 @@ dependencies = [
"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5" "checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
"checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c" "checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
"checksum photon_decode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb275db3d48ee99f079973aba12fdb70ab703b55bddd0122c101c70c184cabad" "checksum photon_decode 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c8cc6e6ca14258cdf957b3f42de7b1d6536ced87c3f9812c38b5287efa70343f"
"checksum pnet 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63d693c84430248366146e3181ff9d330243464fa9e6146c372b2f3eb2e2d8e7" "checksum pnet 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63d693c84430248366146e3181ff9d330243464fa9e6146c372b2f3eb2e2d8e7"
"checksum pnet_base 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4df28acf2fcc77436dd2b91a9a0c2bb617f9ca5f2acefee1a4135058b9f9801f" "checksum pnet_base 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4df28acf2fcc77436dd2b91a9a0c2bb617f9ca5f2acefee1a4135058b9f9801f"
"checksum pnet_datalink 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b34f8ca857599d05b6b082e9baff8d27c54cb9c26568cf3c0993a5755816966" "checksum pnet_datalink 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b34f8ca857599d05b6b082e9baff8d27c54cb9c26568cf3c0993a5755816966"
+1 -1
View File
@@ -3,7 +3,7 @@ name = "libaostats"
version = "0.1.0" version = "0.1.0"
authors = ["Wiktor Mazur <wiktormazur1@gmail.com>"] authors = ["Wiktor Mazur <wiktormazur1@gmail.com>"]
edition = "2018" edition = "2018"
build = "build.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib] [lib]
File diff suppressed because it is too large Load Diff
+32
View File
@@ -0,0 +1,32 @@
// build.rs
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::Path;
fn main() {
let out_dir = env::var("OUT_DIR").unwrap();
let dest_path = Path::new(&out_dir).join("itemdb.rs");
let mut f = File::create(&dest_path).unwrap();
let mut out = String::new();
out.push_str("use std::collections::HashMap;\n");
out.push_str("lazy_static! {\n");
out.push_str("pub static ref ITEMDB: HashMap<u32, &'static str> = {[\n");
include_str!("assets/item_ids.txt").split('\n').filter_map(|line| {
let v: Vec<&str> = line.split(',').collect();
let id : u32 = v.get(0)?.parse().ok()?;
let item = v.get(1)?.to_owned();
Some((id, item))
}).for_each(|(id, item)| {
out.push_str(&format!("({}, \"{}\"),\n", id, item))
});
out.push_str("].iter().cloned().collect()\n");
out.push_str("};\n");
out.push_str("}");
f.write_all(out.as_bytes()).unwrap();
}
+59 -26
View File
@@ -15,18 +15,19 @@ use crate::game_protocol;
use crate::meter; use crate::meter;
pub use meter::GameStats; pub use meter::GameStats;
pub use meter::LastFightStats; pub use meter::LastFightStats;
pub use meter::MeterConfig;
pub use meter::OverallStats; pub use meter::OverallStats;
pub use meter::PartyEvents; pub use meter::PartyEvents;
pub use meter::PlayerEvents; pub use meter::PlayerEvents;
pub use meter::ZoneStats;
pub use meter::MeterConfig;
pub use meter::PlayerStatistics; pub use meter::PlayerStatistics;
pub use meter::PlayerStatisticsVec; pub use meter::PlayerStatisticsVec;
pub use meter::ZoneStats;
pub use meter::StatType; pub use meter::StatType;
pub use crate::game_protocol::Items;
pub enum InitializationError { pub enum InitializationError {
NetworkInterfaceListMissing NetworkInterfaceListMissing,
} }
lazy_static! { lazy_static! {
@@ -97,8 +98,11 @@ pub fn initialize() -> Result<Arc<Mutex<meter::Meter>>, InitializationError> {
continue; continue;
} }
if let Ok(ref mut meter) = cloned_meter.lock() { if let Ok(ref mut meter) = cloned_meter.lock() {
let game_messages = photon.decode(&packet.payload) let game_messages = photon
.into_iter().filter_map(into_game_message).collect(); .decode(&packet.payload)
.into_iter()
.filter_map(into_game_message)
.collect();
register_messages(meter, &game_messages); register_messages(meter, &game_messages);
} }
} }
@@ -117,13 +121,20 @@ pub fn register_messages(meter: &mut meter::Meter, messages: &Vec<game_protocol:
.for_each(|message| register_message(meter, &message)); .for_each(|message| register_message(meter, &message));
} }
fn register_message(events: &mut meter::Meter, message: &game_protocol::Message) { fn register_message<Events>(events: &mut Events, message: &game_protocol::Message)
where
Events: PlayerEvents + PartyEvents,
{
info!("Found message {:?}", message); info!("Found message {:?}", message);
match message { match message {
game_protocol::Message::Leave(msg) => events.register_leave(msg.source).unwrap_or(()), game_protocol::Message::Leave(msg) => events.register_leave(msg.source).unwrap_or(()),
game_protocol::Message::NewCharacter(msg) => { game_protocol::Message::NewCharacter(msg) => {
events.register_player(&msg.character_name, msg.source) events.register_player(&msg.character_name, msg.source);
} events.register_item_update(msg.source, &msg.items);
},
game_protocol::Message::PlayerItems(msg) => {
events.register_item_update(msg.source, &msg.items);
},
game_protocol::Message::CharacterStats(msg) => { game_protocol::Message::CharacterStats(msg) => {
events.register_main_player(&msg.character_name, msg.source) events.register_main_player(&msg.character_name, msg.source)
} }
@@ -151,29 +162,41 @@ fn register_message(events: &mut meter::Meter, message: &game_protocol::Message)
} }
} }
fn into_game_message(photon_message : photon_decode::Message) -> Option<game_protocol::Message> fn into_game_message(photon_message: photon_decode::Message) -> Option<game_protocol::Message> {
{
static REQUEST_CONSTANT: usize = 10000; static REQUEST_CONSTANT: usize = 10000;
static RESPONSE_CONSTANT: usize = 1000; static RESPONSE_CONSTANT: usize = 1000;
match photon_message { match photon_message {
photon_decode::Message::Event(e) => { photon_decode::Message::Event(e) => {
if e.code != 2 && e.parameters.get(&252u8).is_some() { if e.code != 2 && e.parameters.get(&252u8).is_some() {
if let photon_decode::Value::Short(event_code) = e.parameters.get(&252u8).unwrap() { if let photon_decode::Value::Short(event_code) = e.parameters.get(&252u8).unwrap() {
return game_protocol::Packet{code: *event_code as usize, parameters: e.parameters}.decode() return game_protocol::Packet {
code: *event_code as usize,
parameters: e.parameters,
}
.decode();
} }
} }
game_protocol::Packet{code: 0, parameters: e.parameters} game_protocol::Packet {
}, code: 0,
parameters: e.parameters,
}
}
photon_decode::Message::Request(r) => { photon_decode::Message::Request(r) => {
let code = r.code as usize + REQUEST_CONSTANT; let code = r.code as usize + REQUEST_CONSTANT;
game_protocol::Packet{code, parameters: r.parameters} game_protocol::Packet {
}, code,
parameters: r.parameters,
}
}
photon_decode::Message::Response(r) => { photon_decode::Message::Response(r) => {
let code = r.code as usize + RESPONSE_CONSTANT; let code = r.code as usize + RESPONSE_CONSTANT;
game_protocol::Packet{code, parameters: r.parameters} game_protocol::Packet {
code,
parameters: r.parameters,
}
} }
}.decode() }
.decode()
} }
#[cfg(test)] #[cfg(test)]
@@ -181,6 +204,7 @@ mod tests {
use super::*; use super::*;
use game_protocol::message; use game_protocol::message;
use game_protocol::Items;
use game_protocol::Message; use game_protocol::Message;
mod helpers { mod helpers {
@@ -222,6 +246,7 @@ mod tests {
max_health: 10.0, max_health: 10.0,
energy: 1.0, energy: 1.0,
max_energy: 1.0, max_energy: 1.0,
items: Items::from(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
} }
} }
} }
@@ -507,7 +532,9 @@ mod tests {
($meter:expr, $id:expr) => { ($meter:expr, $id:expr) => {
register_message( register_message(
&mut $meter, &mut $meter,
&Message::RegenerationHealthChanged(message::RegenerationHealthChanged::disabled($id)), &Message::RegenerationHealthChanged(message::RegenerationHealthChanged::disabled(
$id,
)),
); );
register_message( register_message(
&mut $meter, &mut $meter,
@@ -520,7 +547,9 @@ mod tests {
($meter:expr, $id:expr) => { ($meter:expr, $id:expr) => {
register_message( register_message(
&mut $meter, &mut $meter,
&Message::RegenerationHealthChanged(message::RegenerationHealthChanged::enabled($id)), &Message::RegenerationHealthChanged(message::RegenerationHealthChanged::enabled(
$id,
)),
); );
}; };
} }
@@ -552,7 +581,6 @@ mod tests {
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap(); let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.damage, 0.0); assert_eq!(player_stats.damage, 0.0);
attack!(meter, 1); attack!(meter, 1);
let zone_stats = stats(&meter, StatType::Zone); let zone_stats = stats(&meter, StatType::Zone);
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap(); let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
@@ -666,7 +694,7 @@ mod tests {
($meter:expr, $members:expr, $party_id:expr) => { ($meter:expr, $members:expr, $party_id:expr) => {
register_message( register_message(
&mut $meter, &mut $meter,
&Message::PartyNew(message::PartyNew::new_list_of_named($members, $party_id)) &Message::PartyNew(message::PartyNew::new_list_of_named($members, $party_id)),
); );
}; };
} }
@@ -675,7 +703,7 @@ mod tests {
($meter:expr, $player:expr, $party_id:expr) => { ($meter:expr, $player:expr, $party_id:expr) => {
register_message( register_message(
&mut $meter, &mut $meter,
&Message::PartyJoin(message::PartyJoin::new_named($player, $party_id)) &Message::PartyJoin(message::PartyJoin::new_named($player, $party_id)),
); );
}; };
} }
@@ -695,7 +723,6 @@ mod tests {
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some()); assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_none()); assert!(zone_stats.iter().find(|s| s.player == "CH1").is_none());
new_party!(meter, &["MAIN_CH1", "CH1"], 1); new_party!(meter, &["MAIN_CH1", "CH1"], 1);
let zone_stats = stats(&meter, StatType::Zone); let zone_stats = stats(&meter, StatType::Zone);
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some()); assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
@@ -713,7 +740,10 @@ mod tests {
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_some()); assert!(zone_stats.iter().find(|s| s.player == "CH1").is_some());
assert!(zone_stats.iter().find(|s| s.player == "CH2").is_some()); assert!(zone_stats.iter().find(|s| s.player == "CH2").is_some());
register_message(&mut meter, &Message::PartyDisbanded(message::PartyDisbanded::new(1))); register_message(
&mut meter,
&Message::PartyDisbanded(message::PartyDisbanded::new(1)),
);
let zone_stats = stats(&meter, StatType::Zone); let zone_stats = stats(&meter, StatType::Zone);
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some()); assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_none()); assert!(zone_stats.iter().find(|s| s.player == "CH1").is_none());
@@ -734,7 +764,10 @@ mod tests {
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap(); let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.fame_per_minute, 0); assert_eq!(player_stats.fame_per_minute, 0);
register_message(&mut meter, &Message::FameUpdate(message::FameUpdate::new(1))); register_message(
&mut meter,
&Message::FameUpdate(message::FameUpdate::new(1)),
);
let zone_stats = stats(&meter, StatType::Zone); let zone_stats = stats(&meter, StatType::Zone);
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap(); let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.fame_per_minute, 100); assert_eq!(player_stats.fame_per_minute, 100);
+78 -15
View File
@@ -1,5 +1,6 @@
use log::*; use log::*;
use super::Items;
use super::packet::Packet; use super::packet::Packet;
use photon_decode::Parameters; use photon_decode::Parameters;
use photon_decode::Value; use photon_decode::Value;
@@ -52,7 +53,7 @@ macro_rules! deserialize_string_vec {
} }
Some(ret) Some(ret)
}, }
_ => { _ => {
error!("Failed to deserialize {}", $name); error!("Failed to deserialize {}", $name);
None None
@@ -64,6 +65,39 @@ macro_rules! deserialize_string_vec {
}; };
} }
macro_rules! deserialize_number_vec {
($val:expr, $index:expr, $name:expr) => {
if let Some(p) = $val.get(&$index) {
match p {
Value::Array(arr) => {
let mut ret = vec![];
for v in arr {
match v {
Value::Short(v) => {
ret.push(*v as u32);
},
Value::Byte(v) => {
ret.push(*v as u32);
},
_ => {}
}
}
Some(ret)
},
Value::ByteArray(v) => {
Some(v.iter().map(|b| *b as u32).collect::<Vec<u32>>())
},
_ => {
error!("Failed to deserialize {}", $name);
None
}
}
} else {
None
}
};
}
macro_rules! deserialize_float { macro_rules! deserialize_float {
($val:expr, $index:expr, $name:expr) => { ($val:expr, $index:expr, $name:expr) => {
@@ -81,7 +115,6 @@ macro_rules! deserialize_float {
}; };
} }
#[derive(Debug)] #[derive(Debug)]
pub struct ChatSay { pub struct ChatSay {
pub source: usize, pub source: usize,
@@ -110,10 +143,12 @@ pub struct NewCharacter {
pub max_health: f32, pub max_health: f32,
pub energy: f32, pub energy: f32,
pub max_energy: f32, pub max_energy: f32,
pub items: Items,
} }
impl NewCharacter { impl NewCharacter {
fn encode(val: Parameters) -> Option<Message> { fn encode(val: Parameters) -> Option<Message> {
info!("NewCharacter parameters: {:?}", val);
let source = deserialize_number!(val, 0, "NewCharacter::source")?; let source = deserialize_number!(val, 0, "NewCharacter::source")?;
let character_name = deserialize_string!(val, 1, "NewCharacter::character_name")?; let character_name = deserialize_string!(val, 1, "NewCharacter::character_name")?;
@@ -123,6 +158,8 @@ impl NewCharacter {
let energy = deserialize_float!(val, 22, "NewCharacter::energy")?; let energy = deserialize_float!(val, 22, "NewCharacter::energy")?;
let max_energy = deserialize_float!(val, 23, "NewCharacter::max_energy")?; let max_energy = deserialize_float!(val, 23, "NewCharacter::max_energy")?;
let item_array = deserialize_number_vec!(val, 33, "NewCharacter::items")?;
let items = Items::from(&item_array);
Some(Message::NewCharacter(Self { Some(Message::NewCharacter(Self {
source, source,
@@ -131,6 +168,7 @@ impl NewCharacter {
max_health, max_health,
energy, energy,
max_energy, max_energy,
items,
})) }))
} }
} }
@@ -171,7 +209,8 @@ impl RegenerationHealthChanged {
let source = deserialize_number!(val, 0, "RegenerationHealthChanged::source")?; let source = deserialize_number!(val, 0, "RegenerationHealthChanged::source")?;
let health = deserialize_float!(val, 3, "RegenerationHealthChanged::health")?; let health = deserialize_float!(val, 3, "RegenerationHealthChanged::health")?;
let max_health = deserialize_float!(val, 4, "RegenerationHealthChanged::max_health")?; let max_health = deserialize_float!(val, 4, "RegenerationHealthChanged::max_health")?;
let regeneration_rate = deserialize_float!(val, 5, "RegenerationHealthChanged::regeneration_rate"); let regeneration_rate =
deserialize_float!(val, 5, "RegenerationHealthChanged::regeneration_rate");
Some(Message::RegenerationHealthChanged(Self { Some(Message::RegenerationHealthChanged(Self {
source, source,
@@ -209,7 +248,6 @@ impl CharacterStats {
let energy = deserialize_float!(val, 15, "CharacterStats::energy")?; let energy = deserialize_float!(val, 15, "CharacterStats::energy")?;
let max_energy = deserialize_float!(val, 16, "CharacterStats::max_energy")?; let max_energy = deserialize_float!(val, 16, "CharacterStats::max_energy")?;
Some(Message::CharacterStats(Self { Some(Message::CharacterStats(Self {
source, source,
character_name, character_name,
@@ -223,7 +261,7 @@ impl CharacterStats {
#[derive(Debug)] #[derive(Debug)]
pub struct Leave { pub struct Leave {
pub source: usize pub source: usize,
} }
impl Leave { impl Leave {
@@ -231,7 +269,7 @@ impl Leave {
info!("Leave parameters: {:?}", val); info!("Leave parameters: {:?}", val);
let source = deserialize_number!(val, 0, "Leave::source")?; let source = deserialize_number!(val, 0, "Leave::source")?;
Some(Message::Leave(Leave{source})) Some(Message::Leave(Leave { source }))
} }
} }
@@ -239,7 +277,7 @@ impl Leave {
pub struct Died { pub struct Died {
pub source: usize, pub source: usize,
pub target: usize, pub target: usize,
pub target_name: String pub target_name: String,
} }
impl Died { impl Died {
@@ -249,7 +287,11 @@ impl Died {
let target = deserialize_number!(val, 3, "Died::target")?; let target = deserialize_number!(val, 3, "Died::target")?;
let target_name = deserialize_string!(val, 4, "Died::target_name")?; let target_name = deserialize_string!(val, 4, "Died::target_name")?;
Some(Message::Died(Died{source, target, target_name})) Some(Message::Died(Died {
source,
target,
target_name,
}))
} }
} }
@@ -265,14 +307,14 @@ impl PartyNew {
let source = deserialize_number!(val, 0, "PartyNew::source")?; let source = deserialize_number!(val, 0, "PartyNew::source")?;
let players = deserialize_string_vec!(val, 5, "PartyNew::players")?; let players = deserialize_string_vec!(val, 5, "PartyNew::players")?;
Some(Message::PartyNew(PartyNew{source, players})) Some(Message::PartyNew(PartyNew { source, players }))
} }
} }
#[derive(Debug)] #[derive(Debug)]
pub struct PartyJoin { pub struct PartyJoin {
pub source: usize, pub source: usize,
pub target_name: String pub target_name: String,
} }
impl PartyJoin { impl PartyJoin {
@@ -281,7 +323,10 @@ impl PartyJoin {
let source = deserialize_number!(val, 0, "PartyJoin::source")?; let source = deserialize_number!(val, 0, "PartyJoin::source")?;
let target_name = deserialize_string!(val, 2, "PartyJoin::target_name")?; let target_name = deserialize_string!(val, 2, "PartyJoin::target_name")?;
Some(Message::PartyJoin(PartyJoin{source, target_name})) Some(Message::PartyJoin(PartyJoin {
source,
target_name,
}))
} }
} }
@@ -295,14 +340,14 @@ impl PartyDisbanded {
info!("PartyDisbanded parameters: {:?}", val); info!("PartyDisbanded parameters: {:?}", val);
let source = deserialize_number!(val, 0, "PartyDisbanded::source")?; let source = deserialize_number!(val, 0, "PartyDisbanded::source")?;
Some(Message::PartyDisbanded(PartyDisbanded{source})) Some(Message::PartyDisbanded(PartyDisbanded { source }))
} }
} }
#[derive(Debug)] #[derive(Debug)]
pub struct FameUpdate { pub struct FameUpdate {
pub source: usize, pub source: usize,
pub fame: f32 pub fame: f32,
} }
impl FameUpdate { impl FameUpdate {
@@ -312,14 +357,31 @@ impl FameUpdate {
let raw_fame = deserialize_number!(val, 2, "FameUpdate::fame")?; let raw_fame = deserialize_number!(val, 2, "FameUpdate::fame")?;
let fame = raw_fame as f32 / 10000.0; let fame = raw_fame as f32 / 10000.0;
Some(Message::FameUpdate(FameUpdate{source, fame})) Some(Message::FameUpdate(FameUpdate { source, fame }))
} }
} }
#[derive(Debug)]
pub struct PlayerItems {
pub source: usize,
pub items: Items,
}
impl PlayerItems {
fn encode(val: Parameters) -> Option<Message> {
info!("PlayerItems parameters: {:?}", val);
let source = deserialize_number!(val, 0, "PlayerItems::source")?;
let item_array = deserialize_number_vec!(val, 3, "PlayerItems::items")?;
let items = Items::from(&item_array);
Some(Message::PlayerItems(PlayerItems { source, items }))
}
}
#[derive(Debug)] #[derive(Debug)]
pub enum Message { pub enum Message {
FameUpdate(FameUpdate), FameUpdate(FameUpdate),
PlayerItems(PlayerItems),
Leave(Leave), Leave(Leave),
ChatSay(ChatSay), ChatSay(ChatSay),
NewCharacter(NewCharacter), NewCharacter(NewCharacter),
@@ -329,7 +391,7 @@ pub enum Message {
Died(Died), Died(Died),
PartyNew(PartyNew), PartyNew(PartyNew),
PartyJoin(PartyJoin), PartyJoin(PartyJoin),
PartyDisbanded(PartyDisbanded) PartyDisbanded(PartyDisbanded),
} }
impl Packet { impl Packet {
@@ -347,6 +409,7 @@ impl Packet {
211 => PartyJoin::encode(self.parameters), 211 => PartyJoin::encode(self.parameters),
213 => PartyDisbanded::encode(self.parameters), 213 => PartyDisbanded::encode(self.parameters),
72 => FameUpdate::encode(self.parameters), 72 => FameUpdate::encode(self.parameters),
79 => PlayerItems::encode(self.parameters),
1001 => CharacterStats::encode(self.parameters), 1001 => CharacterStats::encode(self.parameters),
_ => None, _ => None,
} }
+46
View File
@@ -1,5 +1,51 @@
include!(concat!(env!("OUT_DIR"), "/itemdb.rs"));
mod packet; mod packet;
pub mod message; pub mod message;
pub use message::Message; pub use message::Message;
pub use packet::Packet; pub use packet::Packet;
#[derive(Debug, Clone, PartialEq, Default)]
pub struct Items {
pub weapon: Option<String>,
pub offhand: Option<String>,
pub helmet: Option<String>,
pub armor: Option<String>,
pub boots: Option<String>,
pub bag: Option<String>,
pub cape: Option<String>,
pub mount: Option<String>,
pub potion: Option<String>,
pub food: Option<String>,
}
impl Items {
pub fn from(item_array: &[u32]) -> Self {
macro_rules! extract {
($id:expr) => {
item_array
.get($id)
.iter()
.filter(|id| **id != &0u32)
.map(|code| ITEMDB.get(code).map(|s| s.to_string()))
.filter_map(|o| o)
.next()
};
}
Self{
weapon: extract!(0),
offhand: extract!(1),
helmet: extract!(2),
armor: extract!(3),
boots: extract!(4),
bag: extract!(5),
cape: extract!(6),
mount: extract!(7),
potion: extract!(8),
food: extract!(9),
}
}
}
+28 -2
View File
@@ -4,7 +4,7 @@ extern crate cpython;
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;
mod game_protocol; pub mod game_protocol;
mod meter; mod meter;
mod core; mod core;
@@ -71,6 +71,7 @@ impl ToPyObject for core::PlayerStatistics {
set_dict_item!(py, stats, self, fame); set_dict_item!(py, stats, self, fame);
set_dict_item!(py, stats, self, fame_per_minute); set_dict_item!(py, stats, self, fame_per_minute);
set_dict_item!(py, stats, self, fame_per_hour); set_dict_item!(py, stats, self, fame_per_hour);
set_dict_item!(py, stats, self, items);
stats.into_object() stats.into_object()
} }
@@ -88,6 +89,31 @@ impl ToPyObject for core::PlayerStatisticsVec {
} }
} }
impl ToPyObject for core::Items {
type ObjectType = PyDict;
fn into_py_object(self, py: Python) -> Self::ObjectType {
self.to_py_object(py)
}
fn to_py_object(&self, py: Python) -> Self::ObjectType {
let items = PyDict::new(py);
set_dict_item!(py, items, self, weapon);
set_dict_item!(py, items, self, offhand);
set_dict_item!(py, items, self, helmet);
set_dict_item!(py, items, self, armor);
set_dict_item!(py, items, self, boots);
set_dict_item!(py, items, self, bag);
set_dict_item!(py, items, self, cape);
set_dict_item!(py, items, self, mount);
set_dict_item!(py, items, self, potion);
set_dict_item!(py, items, self, food);
items
}
}
impl <'source> FromPyObject<'source> for StatType { impl <'source> FromPyObject<'source> for StatType {
fn extract(py: Python, obj: &'source PyObject) -> PyResult<Self> { fn extract(py: Python, obj: &'source PyObject) -> PyResult<Self> {
match obj.extract(py) { match obj.extract(py) {
@@ -111,7 +137,7 @@ pub fn stats(py: Python, stat_type: StatType) -> PyResult<PyList> {
if let Ok(ref mut meter) = m.lock() { if let Ok(ref mut meter) = m.lock() {
return Ok(core::stats(&meter, stat_type) return Ok(core::stats(&meter, stat_type)
.into_iter() .into_iter()
.filter(|s| s.damage != 0.0 || s.fame != 0.0) // .filter(|s| s.damage != 0.0 || s.fame != 0.0)
.collect::<Vec<meter::PlayerStatistics>>() .collect::<Vec<meter::PlayerStatistics>>()
.into_py_object(py)) .into_py_object(py))
} }
+9
View File
@@ -13,6 +13,7 @@ use player::Player;
pub use traits::*; pub use traits::*;
pub use types::*; pub use types::*;
pub use super::game_protocol;
#[derive(Debug)] #[derive(Debug)]
pub struct Session { pub struct Session {
@@ -56,6 +57,7 @@ impl Session {
fame: player.fame(), fame: player.fame(),
fame_per_minute: player.fame_per_minute(), fame_per_minute: player.fame_per_minute(),
fame_per_hour: player.fame_per_hour(), fame_per_hour: player.fame_per_hour(),
items: player.items()
}) })
.collect(), .collect(),
) )
@@ -190,6 +192,13 @@ impl PlayerEvents for Meter {
Some(vec![zone_player, las_fight_session_player]) Some(vec![zone_player, las_fight_session_player])
} }
fn get_item_carriers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn ItemCarrier>> {
let (zone, last_fight) = self.sessions_mut()?;
let las_fight_session_player = last_fight.get_player_by_id(player_id)?;
let zone_player = zone.get_player_by_id(player_id)?;
Some(vec![zone_player, las_fight_session_player])
}
fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>> { fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>> {
let main_player_id = self.main_player_id?; let main_player_id = self.main_player_id?;
let (zone, last_fight) = self.sessions_mut()?; let (zone, last_fight) = self.sessions_mut()?;
+18 -2
View File
@@ -3,11 +3,14 @@ use fake_clock::FakeClock as Instant;
#[cfg(not(test))] #[cfg(not(test))]
use std::time::Instant; use std::time::Instant;
use super::game_protocol::Items;
use super::traits::CombatState; use super::traits::CombatState;
use super::traits::DamageDealer; use super::traits::DamageDealer;
use super::traits::DamageStats; use super::traits::DamageStats;
use super::traits::FameStats; use super::traits::FameStats;
use super::traits::FameGatherer; use super::traits::FameGatherer;
use super::traits::ItemCarrier;
#[derive(Debug)] #[derive(Debug)]
struct CombatTime struct CombatTime
@@ -32,7 +35,8 @@ pub struct Player {
combat_time: CombatTime, combat_time: CombatTime,
combat_state: CombatState, combat_state: CombatState,
time_started: Instant, time_started: Instant,
fame: f32 fame: f32,
items: Items
} }
@@ -44,7 +48,8 @@ impl Player {
combat_time: CombatTime::new(), combat_time: CombatTime::new(),
combat_state: CombatState::OutOfCombat, combat_state: CombatState::OutOfCombat,
time_started: Instant::now(), time_started: Instant::now(),
fame: 0.0 fame: 0.0,
items: Default::default(),
} }
} }
} }
@@ -101,6 +106,17 @@ impl FameGatherer for Player {
} }
} }
impl ItemCarrier for Player {
fn items_update(&mut self, items: &Items) {
self.items = items.clone();
}
fn items(&self) -> Items {
self.items.clone()
}
}
impl FameStats for Player { impl FameStats for Player {
fn fame(&self) -> f32 { fn fame(&self) -> f32 {
self.fame self.fame
+16
View File
@@ -4,6 +4,7 @@ use fake_clock::FakeClock as Instant;
use std::time::Instant; use std::time::Instant;
use super::types::PlayerStatisticsVec; use super::types::PlayerStatisticsVec;
use super::game_protocol::Items;
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
pub enum CombatState { pub enum CombatState {
@@ -55,11 +56,18 @@ pub trait DamageDealer {
fn combat_state(&self) -> CombatState; fn combat_state(&self) -> CombatState;
} }
pub trait ItemCarrier {
fn items_update(&mut self, items: &Items);
fn items(&self) -> Items;
}
pub trait PlayerEvents { pub trait PlayerEvents {
fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn DamageDealer>>; fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn DamageDealer>>;
fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>>; fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>>;
fn get_item_carriers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn ItemCarrier>>;
fn register_main_player(&mut self, name: &str, id: usize); fn register_main_player(&mut self, name: &str, id: usize);
fn register_leave(&mut self, id: usize) -> Option<()>; fn register_leave(&mut self, id: usize) -> Option<()>;
@@ -74,6 +82,14 @@ pub trait PlayerEvents {
Some(()) Some(())
} }
fn register_item_update(&mut self, player_id: usize, items: &Items) -> Option<()> {
for player in self.get_item_carriers_in_zone(player_id)? {
player.items_update(items);
}
Some(())
}
fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> { fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> {
for player in self.get_damage_dealers_in_zone(player_id)? { for player in self.get_damage_dealers_in_zone(player_id)? {
if damage < 0.0 { if damage < 0.0 {
+3 -1
View File
@@ -7,6 +7,7 @@ use fake_clock::FakeClock as Instant;
#[cfg(not(test))] #[cfg(not(test))]
use std::time::Instant; use std::time::Instant;
use super::game_protocol::Items;
use super::traits::DamageStats; use super::traits::DamageStats;
use super::traits::FameStats; use super::traits::FameStats;
@@ -42,7 +43,8 @@ pub struct PlayerStatistics {
pub seconds_in_game: f32, pub seconds_in_game: f32,
pub fame: f32, pub fame: f32,
pub fame_per_minute: u32, pub fame_per_minute: u32,
pub fame_per_hour: u32 pub fame_per_hour: u32,
pub items: Items
} }
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
+1
View File
@@ -2,4 +2,5 @@ pyside2~=5.13
pyinstaller pyinstaller
toml~=0.10 toml~=0.10
requests~=2.22 requests~=2.22
Pillow~=6.2
./backend ./backend
+6
View File
@@ -0,0 +1,6 @@
import os
assets_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'assets')
def path(file):
return os.path.join(assets_path, file)
File diff suppressed because it is too large Load Diff
+70 -10
View File
@@ -1,3 +1,10 @@
import collections
import functools
import requests
from PIL import Image, ImageQt
from io import BytesIO
from PySide2.QtCore import Qt from PySide2.QtCore import Qt
from PySide2.QtWidgets import QApplication from PySide2.QtWidgets import QApplication
from PySide2.QtWidgets import QMessageBox from PySide2.QtWidgets import QMessageBox
@@ -14,31 +21,82 @@ from PySide2.QtGui import QStandardItem
from PySide2 import QtGui from PySide2 import QtGui
from PySide2 import QtCore from PySide2 import QtCore
from . import weapon
from . import assets
Style = collections.namedtuple('Style', 'bg')
def player_style(items):
weapon_type = weapon.get_weapon_type(items)
if weapon_type == weapon.WeaponType.Arcane:
return Style(bg = '#f032e6')
elif weapon_type == weapon.WeaponType.Axe:
return Style(bg = '#800000')
elif weapon_type == weapon.WeaponType.Bow:
return Style(bg = '#469990')
elif weapon_type == weapon.WeaponType.Crossbow:
return Style(bg = '#000075')
elif weapon_type == weapon.WeaponType.Curse:
return Style(bg = '#911eb4')
elif weapon_type == weapon.WeaponType.Dagger:
return Style(bg = '#4d5f20')
elif weapon_type == weapon.WeaponType.Fire:
return Style(bg = '#e6194B')
elif weapon_type == weapon.WeaponType.Frost:
return Style(bg = '#4363d8')
elif weapon_type == weapon.WeaponType.Hammer:
return Style(bg = '#9A6324')
elif weapon_type == weapon.WeaponType.Holy:
return Style(bg = '#42d4f4')
elif weapon_type == weapon.WeaponType.Mace:
return Style(bg = '#808000')
elif weapon_type == weapon.WeaponType.Nature:
return Style(bg = '#3cb44b')
elif weapon_type == weapon.WeaponType.Quarterstaff:
return Style(bg = '#f58231')
elif weapon_type == weapon.WeaponType.Spear:
return Style(bg = '#a9a9a9')
elif weapon_type == weapon.WeaponType.Sword:
return Style(bg = '#ffe119')
else:
return Style(bg = '#42413c')
@functools.lru_cache(maxsize=None)
def player_icon(weapon):
url = f'https://albiononline2d.ams3.cdn.digitaloceanspaces.com/thumbnails/orig/{weapon}'
r = requests.get(url)
img = Image.open(BytesIO(r.content))
img_qt = ImageQt.ImageQt(img)
pix = QtGui.QPixmap.fromImage(img_qt)
return QtGui.QIcon(pix)
class DmgList(QListView): class DmgList(QListView):
class DmgItem(QtGui.QStandardItem): class DmgItem(QtGui.QStandardItem):
def __init__(self, player, parent): def __init__(self, player, parent):
QtGui.QStandardItem .__init__(self) QtGui.QStandardItem .__init__(self)
self.parent = parent self.parent = parent
self.player = player
self.player_style = player_style(player.items)
self.update(player) self.update(player)
self.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter) self.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter)
def update(self, player): def update(self, player):
self.name = player.name self.player = player
self.damage = player.damage
self.dps = player.dps
self.percentage = player.percentage
self.best_damage = player.best_damage
self.setText("{} {} ({}, {}%)".format( self.setText("{} {} ({}, {}%)".format(
self.name, self.damage, self.dps, self.percentage self.player.name, self.player.damage, self.player.dps, self.player.percentage
)) ))
self.refresh() self.refresh()
def refresh(self): def refresh(self):
value = round(self.damage / self.best_damage, 2) value = round(self.player.damage / self.player.best_damage, 2)
QRectF = QtCore.QRectF(self.parent.rect()) QRectF = QtCore.QRectF(self.parent.rect())
gradient = QtGui.QLinearGradient(QRectF.topLeft(), QRectF.topRight()) gradient = QtGui.QLinearGradient(QRectF.topLeft(), QRectF.topRight())
gradient.setColorAt(value-0.001 if value > 0 else 0, QtGui.QColor('#42413c')) gradient.setColorAt(value-0.001 if value > 0 else 0, QtGui.QColor(self.player_style.bg))
gradient.setColorAt(value, QtGui.QColor('#000000')) gradient.setColorAt(value, QtGui.QColor('#000000'))
gradient.setColorAt(value+0.001 if value < 1 else 1, QtGui.QColor('#000000')) gradient.setColorAt(value+0.001 if value < 1 else 1, QtGui.QColor('#000000'))
@@ -46,11 +104,13 @@ class DmgList(QListView):
self.setBackground(brush) self.setBackground(brush)
self.setIcon(player_icon(self.player.items['weapon']))
class SortProxyModel(QtCore.QSortFilterProxyModel): class SortProxyModel(QtCore.QSortFilterProxyModel):
def lessThan(self, left, right): def lessThan(self, left, right):
l = self.sourceModel().item(left.row()) l = self.sourceModel().item(left.row())
r = self.sourceModel().item(right.row()) r = self.sourceModel().item(right.row())
return l.percentage < r.percentage return l.player.percentage < r.player.percentage
class DmgItemModel(QStandardItemModel): class DmgItemModel(QStandardItemModel):
def __init__(self, view): def __init__(self, view):
@@ -69,7 +129,7 @@ class DmgList(QListView):
visible_names = [] visible_names = []
for player in players: for player in players:
items = (self.model.item(i) for i in range(self.model.rowCount())) items = (self.model.item(i) for i in range(self.model.rowCount()))
found = next((i for i in items if i.name == player.name), None) found = next((i for i in items if i.player.name == player.name), None)
if found: if found:
found.update(player) found.update(player)
else: else:
+52 -15
View File
@@ -38,8 +38,9 @@ INITIALIZATION_RESULT = {
} }
class DamageStat: class DamageStat:
def __init__(self, name, damage, time_in_combat, dps, percentage, best_damage): def __init__(self, name, items, damage, time_in_combat, dps, percentage, best_damage):
self.name = name self.name = name
self.items = items
self.damage = Number(damage) self.damage = Number(damage)
self.time_in_combat = Number(time_in_combat) self.time_in_combat = Number(time_in_combat)
self.dps = Number(dps) self.dps = Number(dps)
@@ -60,10 +61,10 @@ class FameStat:
def stats(session): def stats(session):
with_damage = [s for s in session if s['damage'] != 0.0] extended_session = with_percentage(session)
extended_session = with_percentage(with_damage)
statistics = [DamageStat( statistics = [DamageStat(
s['player'], s['player'],
s['items'],
s['damage'], s['damage'],
s['time_in_combat'], s['time_in_combat'],
s['dps'], s['dps'],
@@ -93,7 +94,7 @@ def with_percentage(session):
damage_done += damage damage_done += damage
for s in session: for s in session:
s['dmg_percentage'] = s['damage'] / damage_done * 100 s['dmg_percentage'] = s['damage'] / damage_done * 100 if s['damage'] else 0.0
s['best_damage'] = best_damage s['best_damage'] = best_damage
return session return session
@@ -101,15 +102,51 @@ def with_percentage(session):
def zone_stats(): def zone_stats():
if TESTING_ENABLED: if TESTING_ENABLED:
session = [ session = [
{'player': 'John Wick', 'damage': 1234.02, {'player': 'Arcane', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30, 'items': {
'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30}, 'weapon': 'T3_MAIN_ARCANESTAFF'
{'player': 'The Warrior', 'damage': 5435.02, 'time_in_combat': 12.0, 'dps': 12}, }},
{'player': 'The Mage', 'damage': 23000.02, 'time_in_combat': 12.0, 'dps': 13}, {'player': 'Cursed', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 12, 'items': {
{'player': 'Someone', 'damage': 2000.02, 'time_in_combat': 12.0, 'dps': 13}, 'weapon': 'T5_MAIN_CURSEDSTAFF'
{'player': 'The chosen one', 'damage': 230.02, 'time_in_combat': 12.0, 'dps': 13}, }},
{'player': 'Party filler', 'damage': 20.02, 'time_in_combat': 12.0, 'dps': 13}, {'player': 'Fire', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
{'player': 'OneMoreToGo', 'damage': 2000.02, 'time_in_combat': 12.0, 'dps': 13}, 'weapon': 'T5_MAIN_FIRESTAFF'
{'player': 'D'*20, 'damage': 0, 'time_in_combat': 12.0, 'dps': 0} }},
{'player': 'Frost', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T5_MAIN_FROSTSTAFF@1'
}},
{'player': 'Holy', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T6_MAIN_HOLYSTAFF'
}},
{'player': 'Nature', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T8_MAIN_NATURESTAFF@3'
}},
{'player': 'Axe', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T8_MAIN_AXE'
}},
{'player': 'Dagger', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T8_MAIN_DAGGER@2'
}},
{'player': 'Hammer', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T7_MAIN_HAMMER@2'
}},
{'player': 'Mace', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T6_MAIN_MACE@2'
}},
{'player': 'Quarterstaff', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T5_2H_IRONCLADEDSTAFF'
}},
{'player': 'Spear', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T8_MAIN_SPEAR@2'
}},
{'player': 'Sword', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T7_2H_CLAYMORE@1'
}},
{'player': 'Bow', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T8_2H_BOW'
}},
{'player': 'Crossbow', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': {
'weapon': 'T8_2H_CROSSBOWLARGE@3'
}},
] ]
else: else:
session = aostats.stats(StatType.Zone) session = aostats.stats(StatType.Zone)
@@ -120,7 +157,7 @@ def zone_stats():
def overall_stats(): def overall_stats():
if TESTING_ENABLED: if TESTING_ENABLED:
session = [ session = [
{'player': 'overall', 'damage': 1234.02, {'player': 'overall', 'damage': 1000.0,
'time_in_combat': 12.0, 'dps': 12.4234}, 'time_in_combat': 12.0, 'dps': 12.4234},
] ]
else: else:
@@ -132,7 +169,7 @@ def overall_stats():
def last_fight_stats(): def last_fight_stats():
if TESTING_ENABLED: if TESTING_ENABLED:
session = [ session = [
{'player': 'last fight', 'damage': 1234.02, {'player': 'last fight', 'damage': 1000.0,
'time_in_combat': 12.0, 'dps': 12.4234}, 'time_in_combat': 12.0, 'dps': 12.4234},
] ]
else: else:
+5 -7
View File
@@ -1,5 +1,4 @@
import sys import sys
import os
from PySide2.QtCore import QTimer from PySide2.QtCore import QTimer
from PySide2.QtCore import Qt from PySide2.QtCore import Qt
@@ -17,8 +16,7 @@ from PySide2 import QtCore
from .dmg_list import DmgList from .dmg_list import DmgList
from . import about from . import about
from . import engine from . import engine
from . import assets
assets_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'assets')
class Mode: class Mode:
CURRENT_ZONE = 'Statistics: Current zone' CURRENT_ZONE = 'Statistics: Current zone'
@@ -37,16 +35,16 @@ class InteractiveBar(QWidget):
self.clipboard = clipboard self.clipboard = clipboard
self.copy_button = QPushButton(self) self.copy_button = QPushButton(self)
self.copy_button.setIcon(QtGui.QIcon(os.path.join(assets_path, 'copy.png'))) self.copy_button.setIcon(QtGui.QIcon(assets.path('copy.png')))
self.reset_button = QPushButton() self.reset_button = QPushButton()
self.reset_button.setIcon(QtGui.QIcon(os.path.join(assets_path, 'reset.png'))) self.reset_button.setIcon(QtGui.QIcon(assets.path('reset.png')))
self.close_button = QPushButton(self) self.close_button = QPushButton(self)
self.close_button.setIcon(QtGui.QIcon(os.path.join(assets_path, 'close.png'))) self.close_button.setIcon(QtGui.QIcon(assets.path('close.png')))
self.about_button = QPushButton(self) self.about_button = QPushButton(self)
self.about_button.setIcon(QtGui.QIcon(os.path.join(assets_path, 'about.png'))) self.about_button.setIcon(QtGui.QIcon(assets.path('about.png')))
self.layout.addWidget(self.mode) self.layout.addWidget(self.mode)
self.layout.addWidget(self.copy_button) self.layout.addWidget(self.copy_button)
+68
View File
@@ -0,0 +1,68 @@
import json
from . import assets
class WeaponType:
Arcane = 'arcanestaff'
Axe = 'axe'
Bow = 'bow'
Crossbow = 'crossbow'
Curse = 'cursestaff'
Dagger = 'dagger'
Fire = 'firestaff'
Frost = 'froststaff'
Hammer = 'hammer'
Holy = 'holystaff'
Mace = 'mace'
Nature = 'naturestaff'
Quarterstaff = 'quarterstaff'
Spear = 'spear'
Sword = 'sword'
_mappings = None
def map_weapon(weapon):
global _mappings
if not _mappings:
with open(assets.path('item_category_map.json')) as m:
_mappings = json.loads(m.read())
return _mappings[weapon]
def get_weapon_type(items):
weapon = map_weapon(items['weapon'])
if weapon == WeaponType.Arcane:
return WeaponType.Arcane
elif weapon == WeaponType.Axe:
return WeaponType.Axe
elif weapon == WeaponType.Bow:
return WeaponType.Bow
elif weapon == WeaponType.Crossbow:
return WeaponType.Crossbow
elif weapon == WeaponType.Curse:
return WeaponType.Curse
elif weapon == WeaponType.Dagger:
return WeaponType.Dagger
elif weapon == WeaponType.Fire:
return WeaponType.Fire
elif weapon == WeaponType.Frost:
return WeaponType.Frost
elif weapon == WeaponType.Hammer:
return WeaponType.Hammer
elif weapon == WeaponType.Holy:
return WeaponType.Holy
elif weapon == WeaponType.Mace:
return WeaponType.Mace
elif weapon == WeaponType.Nature:
return WeaponType.Nature
elif weapon == WeaponType.Quarterstaff:
return WeaponType.Quarterstaff
elif weapon == WeaponType.Spear:
return WeaponType.Spear
elif weapon == WeaponType.Sword:
return WeaponType.Sword
else:
return None
+26
View File
@@ -0,0 +1,26 @@
import json
import re
import sys
import xml.etree.ElementTree as ET
file = sys.argv[1]
def add_item(db, name, item):
if 'craftingcategory' in item:
db[name] = item['craftingcategory']
nd = {}
tree = ET.parse(file)
root = tree.getroot()
for child in root:
add_item(nd, child.attrib['uniquename'], child.attrib)
ench = child.find("enchantments")
if ench:
for e in ench:
add_item(nd, f"{child.attrib['uniquename']}@{e.attrib['enchantmentlevel']}", child.attrib)
print(json.dumps(nd))
+29
View File
@@ -0,0 +1,29 @@
import json
import re
import sys
import xml.etree.ElementTree as ET
file = sys.argv[1]
id = 0
def add_item(db, name):
global id
db[id] = name
print(f'{id},{name}')
id = id + 1
nd = {}
tree = ET.parse(file)
root = tree.getroot()
for child in root:
add_item(nd, child.attrib['uniquename'])
ench = child.find("enchantments")
if ench:
for e in ench:
add_item(nd, f"{child.attrib['uniquename']}@{e.attrib['enchantmentlevel']}")