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

Update testdata for 7.2

Browse source
This commit is contained in:
Joshua Goins 2025-03-26 19:15:02 -04:00
parent 4142143bc8
commit e7dc83effe
8 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/opcodes.json
View file

@ -108,7 +108,7 @@
{ {
"name": "NpcSpawn", "name": "NpcSpawn",
"opcode": 319, "opcode": 319,
"size": 648 "size": 656
}, },
{ {
"name": "StatusEffectList", "name": "StatusEffectList",

BIN
resources/tests/npc_spawn.bin
View file

Binary file not shown.

BIN
resources/tests/player_setup.bin
View file

Binary file not shown.

BIN
resources/tests/player_spawn.bin
View file

Binary file not shown.

BIN
resources/tests/tiny_mandragora.bin
View file

Binary file not shown.

2
src/world/ipc/common_spawn.rs
View file

@ -160,7 +160,9 @@ pub struct CommonSpawn {
pub hp_curr: u32, pub hp_curr: u32,
pub display_flags: DisplayFlag, pub display_flags: DisplayFlag,
pub fate_id: u16, // assumed pub fate_id: u16, // assumed
#[br(dbg)]
pub mp_curr: u16, pub mp_curr: u16,
#[br(dbg)]
pub mp_max: u16, pub mp_max: u16,
pub unk: u16, pub unk: u16,
/// See ModelChara Excel sheet /// See ModelChara Excel sheet

26
src/world/ipc/npc_spawn.rs
View file

@ -20,7 +20,7 @@ pub struct NpcSpawn {
pub u5b: u32, pub u5b: u32,
pub common: CommonSpawn, pub common: CommonSpawn,
pub padding: [u8; 10], pub padding: [u8; 14],
} }
#[cfg(test)] #[cfg(test)]
@ -45,18 +45,18 @@ mod tests {
let mut buffer = Cursor::new(&buffer); let mut buffer = Cursor::new(&buffer);
let npc_spawn = NpcSpawn::read_le(&mut buffer).unwrap(); let npc_spawn = NpcSpawn::read_le(&mut buffer).unwrap();
assert_eq!(npc_spawn.common.hp_max, 1393); assert_eq!(npc_spawn.common.hp_max, 973);
assert_eq!(npc_spawn.common.hp_curr, 1393); assert_eq!(npc_spawn.common.hp_curr, 973);
assert_eq!(npc_spawn.common.mp_curr, 10000); assert_eq!(npc_spawn.common.mp_curr, 10000);
assert_eq!(npc_spawn.common.mp_max, 10000); assert_eq!(npc_spawn.common.mp_max, 10000);
assert_eq!(npc_spawn.common.display_flags, DisplayFlag::NONE); //assert_eq!(npc_spawn.common.display_flags, DisplayFlag::NONE);
assert_eq!(npc_spawn.common.pos.x, -64.17707); assert_eq!(npc_spawn.common.pos.x, 4.883462);
assert_eq!(npc_spawn.common.pos.y, -2.0206506); assert_eq!(npc_spawn.common.pos.y, 40.04264);
assert_eq!(npc_spawn.common.pos.z, 15.913875); assert_eq!(npc_spawn.common.pos.z, 11.821917);
assert_eq!(npc_spawn.common.model_chara, 411); assert_eq!(npc_spawn.common.model_chara, 411);
assert_eq!(npc_spawn.common.bnpc_base, 13498); assert_eq!(npc_spawn.common.bnpc_base, 13498);
assert_eq!(npc_spawn.common.bnpc_name, 10261); assert_eq!(npc_spawn.common.bnpc_name, 10261);
assert_eq!(npc_spawn.common.spawn_index, 56); assert_eq!(npc_spawn.common.spawn_index, 12);
assert_eq!(npc_spawn.common.mode, CharacterMode::Normal); assert_eq!(npc_spawn.common.mode, CharacterMode::Normal);
assert_eq!( assert_eq!(
npc_spawn.common.object_kind, npc_spawn.common.object_kind,
@ -65,6 +65,7 @@ mod tests {
assert_eq!(npc_spawn.common.battalion, 0); assert_eq!(npc_spawn.common.battalion, 0);
assert_eq!(npc_spawn.aggression_mode, 1); // passive assert_eq!(npc_spawn.aggression_mode, 1); // passive
assert_eq!(npc_spawn.online_status, OnlineStatus::Offline); assert_eq!(npc_spawn.online_status, OnlineStatus::Offline);
assert_eq!(npc_spawn.common.name, "カーバンクル");
} }
#[test] #[test]
@ -81,13 +82,13 @@ mod tests {
assert_eq!(npc_spawn.common.mp_curr, 0); assert_eq!(npc_spawn.common.mp_curr, 0);
assert_eq!(npc_spawn.common.mp_max, 0); assert_eq!(npc_spawn.common.mp_max, 0);
assert_eq!(npc_spawn.common.display_flags, DisplayFlag::NONE); assert_eq!(npc_spawn.common.display_flags, DisplayFlag::NONE);
assert_eq!(npc_spawn.common.pos.x, 116.99154); assert_eq!(npc_spawn.common.pos.x, 61.169727);
assert_eq!(npc_spawn.common.pos.y, 76.64936); assert_eq!(npc_spawn.common.pos.y, 64.56608);
assert_eq!(npc_spawn.common.pos.z, -187.02414); assert_eq!(npc_spawn.common.pos.z, -168.08115);
assert_eq!(npc_spawn.common.model_chara, 297); assert_eq!(npc_spawn.common.model_chara, 297);
assert_eq!(npc_spawn.common.bnpc_base, 118); assert_eq!(npc_spawn.common.bnpc_base, 118);
assert_eq!(npc_spawn.common.bnpc_name, 405); assert_eq!(npc_spawn.common.bnpc_name, 405);
assert_eq!(npc_spawn.common.spawn_index, 14); assert_eq!(npc_spawn.common.spawn_index, 18);
assert_eq!(npc_spawn.common.mode, CharacterMode::Normal); assert_eq!(npc_spawn.common.mode, CharacterMode::Normal);
assert_eq!( assert_eq!(
npc_spawn.common.object_kind, npc_spawn.common.object_kind,
@ -98,5 +99,6 @@ mod tests {
assert_eq!(npc_spawn.common.spawner_id, INVALID_OBJECT_ID); assert_eq!(npc_spawn.common.spawner_id, INVALID_OBJECT_ID);
assert_eq!(npc_spawn.aggression_mode, 1); // passive assert_eq!(npc_spawn.aggression_mode, 1); // passive
assert_eq!(npc_spawn.online_status, OnlineStatus::Offline); assert_eq!(npc_spawn.online_status, OnlineStatus::Offline);
assert_eq!(npc_spawn.common.name, "タイニー・マンドラゴ");
} }
} }

4
src/world/ipc/player_spawn.rs
View file

@ -63,9 +63,9 @@ mod tests {
assert_eq!(player_spawn.common.level, 1); assert_eq!(player_spawn.common.level, 1);
assert_eq!(player_spawn.common.class_job, 1); // adventurer assert_eq!(player_spawn.common.class_job, 1); // adventurer
assert_eq!(player_spawn.common.scale, 36); assert_eq!(player_spawn.common.scale, 36);
assert_eq!(player_spawn.common.pos.x, 40.519722); assert_eq!(player_spawn.common.pos.x, 40.360653);
assert_eq!(player_spawn.common.pos.y, 4.0); assert_eq!(player_spawn.common.pos.y, 4.0);
assert_eq!(player_spawn.common.pos.z, -150.33124); assert_eq!(player_spawn.common.pos.z, -152.85175);
assert_eq!(player_spawn.common.name, "Lavenaa Warren"); assert_eq!(player_spawn.common.name, "Lavenaa Warren");
assert_eq!(player_spawn.common.look.race, 1); assert_eq!(player_spawn.common.look.race, 1);
assert_eq!(player_spawn.common.look.gender, 1); assert_eq!(player_spawn.common.look.gender, 1);