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

fix friendly fire

Browse source
This commit is contained in:
bgkillas 2024-11-02 17:48:37 -04:00
parent ab76f5329d
commit 2195f70e48
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
noita-proxy/src/lib.rs
View file

@ -1098,7 +1098,8 @@ impl eframe::App for App {
if netman.friendly_fire.load(Ordering::Relaxed) { if netman.friendly_fire.load(Ordering::Relaxed) {
let last = self.app_saved_state.game_settings.friendly_fire_team; let last = self.app_saved_state.game_settings.friendly_fire_team;
ui.add(Slider::new(&mut self.app_saved_state.game_settings.friendly_fire_team, -1..=16)); ui.add(Slider::new(&mut self.app_saved_state.game_settings.friendly_fire_team, -1..=16));
if last != self.app_saved_state.game_settings.friendly_fire_team { if last != self.app_saved_state.game_settings.friendly_fire_team
|| netman.friendly_fire_team.load(Ordering::Relaxed) == -2 {
netman.friendly_fire_team.store(self.app_saved_state.game_settings.friendly_fire_team, Ordering::Relaxed); netman.friendly_fire_team.store(self.app_saved_state.game_settings.friendly_fire_team, Ordering::Relaxed);
} }
ui.label("what team number you are on, 0 means no team, -1 means friendly"); ui.label("what team number you are on, 0 means no team, -1 means friendly");

8
noita-proxy/src/net.rs
View file

@ -248,12 +248,10 @@ impl NetManager {
cli = false cli = false
} }
} }
if self.friendly_fire.load(atomic::Ordering::Relaxed) { if self.friendly_fire.load(atomic::Ordering::Relaxed) && timer.elapsed().as_secs() > 4 {
let team = self.friendly_fire_team.load(atomic::Ordering::Relaxed); let team = self.friendly_fire_team.load(atomic::Ordering::Relaxed);
if timer.elapsed().as_secs() > 4 { state.try_ws_write_option("friendly_fire_team", (team + 1) as u32);
state.try_ws_write_option("friendly_fire_team", (team + 1) as u32); timer = Instant::now()
timer = Instant::now()
}
} }
if self.end_run.load(atomic::Ordering::Relaxed) { if self.end_run.load(atomic::Ordering::Relaxed) {
for id in self.peer.iter_peer_ids() { for id in self.peer.iter_peer_ids() {