Stowage/noita_entangled_worlds
2
0
Fork 0
mirror of https://github.com/IntQuant/noita_entangled_worlds.git synced 2025-10-19 07:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

cache file names for animations

Browse source
This commit is contained in:
bgkillas 2025-06-25 01:05:19 -04:00
parent c7cbbb9c97
commit 19de23e914
3 changed files with 106 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ewext/noita_api/src/lib.rs
View file

@ -525,11 +525,14 @@ impl EntityID {
Ok(current)
}
pub fn set_current_stains(self, current_stains: u64) -> eyre::Result<()> {
pub fn set_current_stains(
self,
current_stains: u64,
entity_manager: &mut EntityManager,
) -> eyre::Result<()> {
if let Ok(Some(status)) = self.try_get_first_component::<StatusEffectDataComponent>(None) {
let file = raw::mod_text_file_get_content(
"data/scripts/status_effects/status_list.lua".into(),
)?;
let file =
entity_manager.get_file("data/scripts/status_effects/status_list.lua".into())?;
let to_id = file
.lines()
.filter(|l| {
@ -1259,6 +1262,7 @@ pub struct EntityManager {
current_entity: EntityID,
current_data: EntityData,
has_ran: bool,
pub files: Option<FxHashMap<Cow<'static, str>, Cow<'static, str>>>,
}
impl Default for EntityManager {
fn default() -> Self {
@ -1267,6 +1271,7 @@ impl Default for EntityManager {
current_entity: EntityID(NonZeroIsize::new(-1).unwrap()),
current_data: Default::default(),
has_ran: false,
files: Some(FxHashMap::with_capacity_and_hasher(512, FxBuildHasher)),
}
}
}
@ -1318,6 +1323,9 @@ impl EntityData {
}
}
impl EntityManager {
pub fn get_file(&mut self, file: Cow<'static, str>) -> eyre::Result<&Cow<'static, str>> {
get_file(&mut self.files, file)
}
pub fn cache_entity(&mut self, ent: EntityID) -> eyre::Result<()> {
self.cache.insert(ent, EntityData::new(ent)?);
Ok(())
@ -1601,3 +1609,15 @@ impl EntityManager {
self.current_entity.remove_component(id)
}
}
pub fn get_file<'a>(
files: &'a mut Option<FxHashMap<Cow<'static, str>, Cow<'static, str>>>,
file: Cow<'static, str>,
) -> eyre::Result<&'a Cow<'static, str>> {
match files.as_mut().unwrap().entry(file) {
std::collections::hash_map::Entry::Occupied(entry) => Ok(entry.into_mut()),
std::collections::hash_map::Entry::Vacant(entry) => {
let content = raw::mod_text_file_get_content(entry.key().clone())?;
Ok(entry.insert(content))
}
}
}

151
ewext/src/modules/entity_sync/diff_model.rs
View file

@ -542,53 +542,58 @@ impl LocalDiffModelTracker {
info.ai_state = ai.ai_state()?;
info.ai_rotation = ai.m_ranged_attack_current_aim_angle()?;
}
} else if let Ok(sprites) =
entity_manager.iter_all_components_of_type::<SpriteComponent>(ComponentTag::None)
{
info.facing_direction = (sx.is_sign_positive(), sy.is_sign_positive());
info.animations = sprites
.filter_map(|sprite| {
let file = sprite.image_file().ok()?;
if file.ends_with(".xml") {
let text = noita_api::raw::mod_text_file_get_content(file).ok()?;
let mut split = text.split("name=\"");
split.next();
let mut data = split.filter_map(|piece| piece.split("\"").next());
let animation = sprite.rect_animation().unwrap_or("".into());
Some(
data.position(|name| name == animation)
.unwrap_or(usize::MAX) as u16,
)
} else {
None
}
})
.collect();
if let Some(ai) =
entity_manager.try_get_first_component::<AnimalAIComponent>(ComponentTag::None)?
} else {
let mut files = std::mem::take(&mut entity_manager.files);
if let Ok(sprites) =
entity_manager.iter_all_components_of_type::<SpriteComponent>(ComponentTag::None)
{
if ai.attack_ranged_use_laser_sight()? && !ai.is_static_turret()? {
info.laser = if let Some(target) = ai.m_greatest_prey()? {
if ![15, 16].contains(&ai.ai_state()?) {
Target::None
} else if let Some(peer) = ctx.player_map.get_by_right(&target) {
Target::Peer(*peer)
} else if let Some(var) = target.get_var("ew_gid_lid") {
if var.value_bool()? {
Target::Gid(Gid(var.value_string()?.parse::<u64>()?))
info.facing_direction = (sx.is_sign_positive(), sy.is_sign_positive());
info.animations = sprites
.filter_map(|sprite| {
let file = sprite.image_file().ok()?;
if file.ends_with(".xml") {
let text = noita_api::get_file(&mut files, file).ok()?;
let mut split = text.split("name=\"");
split.next();
let animation =
sprite.rect_animation().unwrap_or("".into()).to_string();
Some(
split
.position(|name| name.starts_with(&animation))
.unwrap_or(usize::MAX) as u16,
)
} else {
None
}
})
.collect();
if let Some(ai) = entity_manager
.try_get_first_component::<AnimalAIComponent>(ComponentTag::None)?
{
if ai.attack_ranged_use_laser_sight()? && !ai.is_static_turret()? {
info.laser = if let Some(target) = ai.m_greatest_prey()? {
if ![15, 16].contains(&ai.ai_state()?) {
Target::None
} else if let Some(peer) = ctx.player_map.get_by_right(&target) {
Target::Peer(*peer)
} else if let Some(var) = target.get_var("ew_gid_lid") {
if var.value_bool()? {
Target::Gid(Gid(var.value_string()?.parse::<u64>()?))
} else {
Target::None
}
} else {
Target::None
}
} else {
Target::None
}
} else {
Target::None
}
}
} else {
info.animations.clear()
}
} else {
info.animations.clear()
entity_manager.files = files;
}
info.synced_var = entity_manager
@ -1898,48 +1903,54 @@ impl RemoteDiffModel {
var.set_value_int(0)?;
}
} else {
entity.set_current_stains(entity_info.current_stains)?;
entity.set_current_stains(entity_info.current_stains, entity_manager)?;
}
if let Some(ai) = entity_manager
.try_get_first_component_including_disabled::<AnimalAIComponent>(ComponentTag::None)?
{
ai.set_ai_state(entity_info.ai_state)?;
ai.set_m_ranged_attack_current_aim_angle(entity_info.ai_rotation)?;
} else if let Ok(sprites) =
entity_manager.iter_all_components_of_type::<SpriteComponent>(ComponentTag::None)
{
for (sprite, animation) in sprites
.filter(|sprite| {
sprite
.image_file()
.map(|c| c.ends_with(".xml"))
.unwrap_or(false)
})
.zip(entity_info.animations.iter())
} else {
let mut files = std::mem::take(&mut entity_manager.files);
if let Ok(sprites) =
entity_manager.iter_all_components_of_type::<SpriteComponent>(ComponentTag::None)
{
sprite.set_special_scale_x(if entity_info.facing_direction.0 {
1.0
} else {
-1.0
})?;
sprite.set_special_scale_y(if entity_info.facing_direction.1 {
1.0
} else {
-1.0
})?;
if *animation == u16::MAX {
continue;
}
let file = sprite.image_file()?;
let text = noita_api::raw::mod_text_file_get_content(file)?;
let mut split = text.split("name=\"");
split.next();
let data: Vec<&str> = split.filter_map(|piece| piece.split("\"").next()).collect();
if data.len() > *animation as usize {
sprite.set_rect_animation(data[*animation as usize].into())?;
sprite.set_next_rect_animation(data[*animation as usize].into())?;
for (sprite, animation) in sprites
.filter(|sprite| {
sprite
.image_file()
.map(|c| c.ends_with(".xml"))
.unwrap_or(false)
})
.zip(entity_info.animations.iter())
{
sprite.set_special_scale_x(if entity_info.facing_direction.0 {
1.0
} else {
-1.0
})?;
sprite.set_special_scale_y(if entity_info.facing_direction.1 {
1.0
} else {
-1.0
})?;
if *animation == u16::MAX {
continue;
}
let file = sprite.image_file()?;
let text = noita_api::get_file(&mut files, file)?;
let mut split = text.split("name=\"");
split.next();
if let Some(ani) = split
.nth(*animation as usize)
.map(|piece| piece.split_once("\"").unwrap().0)
{
sprite.set_rect_animation(ani.into())?;
sprite.set_next_rect_animation(ani.into())?;
}
}
}
entity_manager.files = files;
}
let laser =
entity_manager.try_get_first_component::<LaserEmitterComponent>(ComponentTag::None)?;

1
quant.ew/files/system/orb_sync/orb_sync.lua
View file

@ -40,6 +40,7 @@ local function actual_orbs_update(found_orbs)
last_orb_count = GameGetOrbCountThisRun()
end
rpc.opts_reliable()
function rpc.update_orbs(found_orbs)
if ctx.rpc_peer_id ~= ctx.host_id and not ctx.is_host then
return