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

A bunch of fixes and improvements
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Deukhoofd
2022-09-17 09:38:02 +02:00
parent 7bcfd92d45
commit a4fd112a07
15 changed files with 179 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
tests/common/library_loader.rs
View File

@@ -52,13 +52,13 @@ pub fn load_types(path: &String, type_library: &mut TypeLibrary) {
.unwrap();
let headers = reader.headers().unwrap();
for header in headers.iter().skip(1) {
type_library.register_type(&StringKey::new(header));
type_library.register_type(&StringKey::new(header.into()));
}
for record in reader.records() {
let record = record.unwrap();
let offensive_type = record.get(0).unwrap();
let offensive_type_id = type_library.get_type_id(&StringKey::new(offensive_type));
let offensive_type_id = type_library.get_type_id(&StringKey::new(offensive_type.into()));
for (i, v) in record.iter().skip(1).enumerate() {
let effectiveness = v.parse::<f32>().unwrap();
@@ -75,7 +75,7 @@ pub fn load_natures(path: &String, nature_library: &mut NatureLibrary) {
for record in reader.records() {
let record = record.unwrap();
let nature_name = StringKey::new(record.get(0).unwrap());
let nature_name = StringKey::new(record.get(0).unwrap().into());
let increased_statistic_str = record.get(1).unwrap();
let decreased_statistic_str = record.get(2).unwrap();
if increased_statistic_str.is_empty() || decreased_statistic_str.is_empty() {
@@ -99,18 +99,18 @@ pub fn load_items(path: &String, lib: &mut ItemLibrary) {
let json_array = json.as_array().unwrap();
for v in json_array {
let name = StringKey::new(v["name"].as_str().unwrap());
let category = serde_json::from_value(v["itemType"].clone()).unwrap();
let name = StringKey::new(v.get("name").unwrap().as_str().unwrap().into());
let category = serde_json::from_value(v.get("itemType").unwrap().clone()).unwrap();
let mut battle_category = BattleItemCategory::None;
if let Some(c) = v.get("battleType") {
battle_category = serde_json::from_value(c.clone()).unwrap();
}
let price = v["price"].as_i64().unwrap();
let price = v.get("price").unwrap().as_i64().unwrap();
let mut flags = HashSet::new();
if let Some(f) = v.get("flags") {
let a = f.as_array().unwrap();
for flag in a {
flags.insert(StringKey::new(flag.as_str().unwrap()));
flags.insert(StringKey::new(flag.as_str().unwrap().into()));
}
}
@@ -148,7 +148,7 @@ pub fn load_abilities(path: &String, ability_library: &mut AbilityLibrary) {
let name = StringKey::new(key);
let mut effect = StringKey::empty();
if let Some(e) = value.get("effect") {
effect = StringKey::new(e.as_str().unwrap());
effect = StringKey::new(e.as_str().unwrap().into());
}
let mut parameters = Vec::new();
if let Some(p) = value.get("parameters") {
@@ -169,15 +169,15 @@ pub fn load_moves(path: &String, lib: &mut StaticData) {
let data = json.as_object().unwrap().get("data").unwrap().as_array().unwrap();
for move_data in data {
let move_data = move_data.as_object().unwrap();
let move_name = StringKey::new(move_data["name"].as_str().unwrap());
let move_type = StringKey::new(move_data["type"].as_str().unwrap());
let move_name = StringKey::new(move_data.get("name").unwrap().as_str().unwrap().into());
let move_type = StringKey::new(move_data.get("type").unwrap().as_str().unwrap().into());
let move_type_id = lib.types().get_type_id(&move_type);
let move_category = serde_json::from_value(move_data["category"].clone()).unwrap();
let base_power = move_data["power"].as_i64().unwrap() as u8;
let accuracy = move_data["accuracy"].as_i64().unwrap() as u8;
let pp = move_data["pp"].as_i64().unwrap() as u8;
let target = serde_json::from_value(move_data["target"].clone()).unwrap();
let priority = move_data["priority"].as_i64().unwrap() as i8;
let move_category = serde_json::from_value(move_data.get("category").unwrap().clone()).unwrap();
let base_power = move_data.get("power").unwrap().as_i64().unwrap() as u8;
let accuracy = move_data.get("accuracy").unwrap().as_i64().unwrap() as u8;
let pp = move_data.get("pp").unwrap().as_i64().unwrap() as u8;
let target = serde_json::from_value(move_data.get("target").unwrap().clone()).unwrap();
let priority = move_data.get("priority").unwrap().as_i64().unwrap() as i8;
let secondary_effect = if let Some(v) = move_data.get("effect") {
let mut chance = -1.0;
if let Some(chance_value) = v.get("chance") {
@@ -193,7 +193,7 @@ pub fn load_moves(path: &String, lib: &mut StaticData) {
Some(SecondaryEffect::new(
chance,
StringKey::new(v["name"].as_str().unwrap()),
StringKey::new(v.get("name").unwrap().as_str().unwrap().into()),
parameters,
))
} else {
@@ -204,7 +204,7 @@ pub fn load_moves(path: &String, lib: &mut StaticData) {
if let Some(f) = move_data.get("flags") {
let f = f.as_array().unwrap();
for flag in f {
flags.insert(StringKey::new(flag.as_str().unwrap()));
flags.insert(StringKey::new(flag.as_str().unwrap().into()));
}
}
@@ -233,29 +233,29 @@ pub fn load_species(path: &String, library: &mut StaticData) {
let json: Value = serde_json::from_str(&data).unwrap();
let o = json.as_object().unwrap();
for (key, value) in o {
for (key, value) in o.iter() {
if key.starts_with('$') {
continue;
}
let name = StringKey::new(key);
let id = value["id"].as_i64().unwrap();
let gender_rate = value["genderRatio"].as_f64().unwrap();
let growth_rate_name = StringKey::new(value["growthRate"].as_str().unwrap());
let _base_happiness = value["baseHappiness"].as_i64().unwrap();
let catch_rate = value["catchRate"].as_i64().unwrap();
let _color = value["color"].as_str().unwrap();
// let egg_groups = value["eggGroups"]
let id = value.get("id").unwrap().as_i64().unwrap();
let gender_rate = value.get("genderRatio").unwrap().as_f64().unwrap();
let growth_rate_name = StringKey::new(value.get("growthRate").unwrap().as_str().unwrap().into());
let _base_happiness = value.get("baseHappiness").unwrap().as_i64().unwrap();
let catch_rate = value.get("catchRate").unwrap().as_i64().unwrap();
let _color = value.get("color").unwrap().as_str().unwrap();
// let egg_groups = value.get("eggGroups").unwrap()
// .as_array()
// .unwrap()
// .iter()
// .map(|&a| a.as_str().unwrap())
// .collect();
let _egg_cycle = value["eggCycles"].as_i64().unwrap();
let _egg_cycle = value.get("eggCycles").unwrap().as_i64().unwrap();
// TODO: tags
// TODO: evolutions
let forms = value["formes"].as_object().unwrap();
let default_form_value = &forms["default"];
let forms = value.get("formes").unwrap().as_object().unwrap();
let default_form_value = forms.get("default").unwrap();
let default_form = parse_form("default".into(), default_form_value, library);
let species = Species::new(
@@ -282,26 +282,28 @@ fn load_wasm(path: &String, library: &mut WebAssemblyScriptResolver) {
fn parse_form(name: StringKey, value: &Value, library: &mut StaticData) -> Form {
let mut abilities = Vec::new();
for a in value["abilities"].as_array().unwrap() {
abilities.push(StringKey::new(a.as_str().unwrap()));
for a in value.get("abilities").unwrap().as_array().unwrap() {
abilities.push(StringKey::new(a.as_str().unwrap().into()));
}
let mut hidden_abilities = Vec::new();
for a in value["hiddenAbilities"].as_array().unwrap() {
hidden_abilities.push(StringKey::new(a.as_str().unwrap()));
for a in value.get("hiddenAbilities").unwrap().as_array().unwrap() {
hidden_abilities.push(StringKey::new(a.as_str().unwrap().into()));
}
let base_stats = parse_statistics(&value["baseStats"]);
let base_stats = parse_statistics(&value.get("baseStats").unwrap());
// TODO: ev reward
let height = value["height"].as_f64().unwrap();
let weight = value["weight"].as_f64().unwrap();
let base_experience = value["baseExp"].as_u64().unwrap();
let types = value["types"]
let height = value.get("height").unwrap().as_f64().unwrap();
let weight = value.get("weight").unwrap().as_f64().unwrap();
let base_experience = value.get("baseExp").unwrap().as_u64().unwrap();
let types = value
.get("types")
.unwrap()
.as_array()
.unwrap()
.iter()
.map(|a| library.types().get_type_id(&StringKey::new(a.as_str().unwrap())))
.map(|a| library.types().get_type_id(&StringKey::new(a.as_str().unwrap().into())))
.collect();
let moves = parse_moves(&value["moves"], library.moves());
let moves = parse_moves(&value.get("moves").unwrap(), library.moves());
Form::new(
&name,
@@ -364,10 +366,10 @@ where
fn parse_moves(value: &Value, move_library: &MoveLibrary) -> LearnableMoves {
let mut moves = LearnableMoves::default();
let level_moves = value["levelMoves"].as_array().unwrap();
let level_moves = value.get("levelMoves").unwrap().as_array().unwrap();
for level_move in level_moves {
let name = StringKey::new(level_move["name"].as_str().unwrap());
let level = level_move["level"].as_u64().unwrap() as LevelInt;
let name = StringKey::new(level_move.get("name").unwrap().as_str().unwrap().into());
let level = level_move.get("level").unwrap().as_u64().unwrap() as LevelInt;
assert!(move_library.get(&name).is_some());
moves.add_level_move(level, &name);
}
@@ -388,7 +390,7 @@ fn parse_effect_parameter(value: &Value) -> EffectParameter {
EffectParameter::Int(n.as_i64().unwrap())
}
}
Value::String(s) => EffectParameter::String(StringKey::new(s.as_str())),
Value::String(s) => EffectParameter::String(StringKey::new(s.as_str().into())),
Value::Array(_) => {
panic!("Unexpected type")
}
@@ -408,8 +410,8 @@ fn test_type_library_loaded() {
assert_eq!(
lib.get_effectiveness(
lib.get_type_id(&StringKey::new("fire")),
&[lib.get_type_id(&StringKey::new("grass"))],
lib.get_type_id(&StringKey::new("fire".into())),
&[lib.get_type_id(&StringKey::new("grass".into()))],
),
2.0
);

2
tests/common/test_case.rs
View File

@@ -74,7 +74,7 @@ impl TestCase {
impl TestPokemon {
fn to_pokemon(&self, library: Arc<DynamicLibrary>) -> Pokemon {
let mut builder = PokemonBuilder::new(library, StringKey::new(self.species.as_str()), self.level);
let mut builder = PokemonBuilder::new(library, StringKey::new(self.species.as_str().into()), self.level);
for move_name in &self.moves {
builder = builder.learn_move(StringKey::new(move_name));
}

BIN
tests/data/gen7_scripts.wasm
View File

Binary file not shown.

15
tests/main.rs
View File

@@ -7,8 +7,6 @@ use std::io::Read;
use std::path::Path;
use std::sync::Arc;
use conquer_once::OnceCell;
use pkmn_lib::dynamic_data::{
Battle, BattleParty, DamageSource, DynamicLibrary, ExecutingMove, MoveChoice, PokemonBuilder, PokemonParty, Script,
ScriptCategory, ScriptContainer, ScriptOwnerData, TurnChoice, VolatileScriptsOwner,
@@ -19,22 +17,11 @@ use crate::common::{library_loader, TestCase};
pub mod common;
static LIBRARY: OnceCell<Arc<DynamicLibrary>> = OnceCell::uninit();
fn get_library() -> Arc<DynamicLibrary> {
LIBRARY
.get_or_init(|| {
let start_time = chrono::Utc::now();
let lib = library_loader::load_library();
let end_time = chrono::Utc::now();
println!("Built library in {} ms", (end_time - start_time).num_milliseconds());
Arc::new(lib)
})
.clone()
Arc::new(library_loader::load_library())
}
#[test]
#[cfg_attr(miri, ignore)]
fn validate_library_load() {
let start_time = chrono::Utc::now();
library_loader::load_library();