popertots/dorf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more debug

Browse Source
This commit is contained in:
popertots
2026-03-22 01:32:22 +00:00
parent 64a69d6a40
commit 9afcb0f612
4 changed files with 65 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/entities/livestock/pig.rs
+17 -14
View File
@@ -6,7 +6,7 @@ use crate::game::SpawnDelay;
use crate::world::VisibleGameEntity; use crate::world::VisibleGameEntity;
use bevy::prelude::*; use bevy::prelude::*;
use bevy_rand::prelude::*; use bevy_rand::prelude::*;
use rand::RngExt; use rand::{RngExt, SeedableRng};
#[derive(Bundle)] #[derive(Bundle)]
pub struct Pig { pub struct Pig {
@@ -47,7 +47,6 @@ impl Pig {
pub fn spawn_pigs( pub fn spawn_pigs(
mut commands: Commands, mut commands: Commands,
asset_server: Res<AssetServer>, asset_server: Res<AssetServer>,
mut rng_q: Query<&mut WyRand, With<GlobalRng>>,
config: Res<GameConfig>, config: Res<GameConfig>,
mut delay: ResMut<SpawnDelay>, mut delay: ResMut<SpawnDelay>,
mut has_spawned: Local<bool>, mut has_spawned: Local<bool>,
@@ -63,18 +62,22 @@ pub fn spawn_pigs(
*has_spawned = true; *has_spawned = true;
if let Ok(mut rng) = rng_q.single_mut() { use std::collections::hash_map::DefaultHasher;
for _ in 0..config.spawn_counts.pigs { use std::hash::{Hash, Hasher};
let raw_x = rng.random_range(-32.0f32..32.0f32); let mut hasher = DefaultHasher::new();
let raw_y = rng.random_range(-32.0f32..32.0f32); (crate::constants::SEED + 1).hash(&mut hasher);
let grid_x = (raw_x / TILE_SIZE).round() * TILE_SIZE; let seed = hasher.finish();
let grid_y = (raw_y / TILE_SIZE).round() * TILE_SIZE; let mut rng = WyRand::seed_from_u64(seed);
let grid_z = 35.0 * TILE_SIZE; for _ in 0..config.spawn_counts.pigs {
let raw_x = rng.random_range(-32.0f32..32.0f32);
let raw_y = rng.random_range(-32.0f32..32.0f32);
let grid_x = (raw_x / TILE_SIZE).round() * TILE_SIZE;
let grid_y = (raw_y / TILE_SIZE).round() * TILE_SIZE;
let grid_z = 35.0 * TILE_SIZE;
let pig = commands let pig = commands
.spawn(Pig::new(&asset_server, Vec3::new(grid_x, grid_y, grid_z))) .spawn(Pig::new(&asset_server, Vec3::new(grid_x, grid_y, grid_z)))
.id(); .id();
commands.entity(pig).insert(VisibleGameEntity); commands.entity(pig).insert(VisibleGameEntity);
}
} }
} }
src/entities/livestock/rabbit.rs
+20 -17
View File
@@ -7,7 +7,7 @@ use crate::game::SpawnDelay;
use crate::world::VisibleGameEntity; use crate::world::VisibleGameEntity;
use bevy::prelude::*; use bevy::prelude::*;
use bevy_rand::prelude::*; use bevy_rand::prelude::*;
use rand::RngExt; use rand::{RngExt, SeedableRng};
#[derive(Bundle)] #[derive(Bundle)]
pub struct Rabbit { pub struct Rabbit {
@@ -49,7 +49,6 @@ impl Rabbit {
pub fn spawn_rabbits( pub fn spawn_rabbits(
mut commands: Commands, mut commands: Commands,
asset_server: Res<AssetServer>, asset_server: Res<AssetServer>,
mut rng_q: Query<&mut WyRand, With<GlobalRng>>,
config: Res<GameConfig>, config: Res<GameConfig>,
mut delay: ResMut<SpawnDelay>, mut delay: ResMut<SpawnDelay>,
mut has_spawned: Local<bool>, mut has_spawned: Local<bool>,
@@ -65,21 +64,25 @@ pub fn spawn_rabbits(
*has_spawned = true; *has_spawned = true;
if let Ok(mut rng) = rng_q.single_mut() { use std::collections::hash_map::DefaultHasher;
for _ in 0..config.spawn_counts.rabbits { use std::hash::{Hash, Hasher};
let raw_x = rng.random_range(-32.0f32..32.0f32); let mut hasher = DefaultHasher::new();
let raw_y = rng.random_range(-32.0f32..32.0f32); (crate::constants::SEED + 2).hash(&mut hasher);
let grid_x = (raw_x / TILE_SIZE).round() * TILE_SIZE; let seed = hasher.finish();
let grid_y = (raw_y / TILE_SIZE).round() * TILE_SIZE; let mut rng = WyRand::seed_from_u64(seed);
let grid_z = 35.0 * TILE_SIZE; for _ in 0..config.spawn_counts.rabbits {
let raw_x = rng.random_range(-32.0f32..32.0f32);
let raw_y = rng.random_range(-32.0f32..32.0f32);
let grid_x = (raw_x / TILE_SIZE).round() * TILE_SIZE;
let grid_y = (raw_y / TILE_SIZE).round() * TILE_SIZE;
let grid_z = 35.0 * TILE_SIZE;
let rab = commands let rab = commands
.spawn(Rabbit::new( .spawn(Rabbit::new(
&asset_server, &asset_server,
Vec3::new(grid_x, grid_y, grid_z), Vec3::new(grid_x, grid_y, grid_z),
)) ))
.id(); .id();
commands.entity(rab).insert(VisibleGameEntity); commands.entity(rab).insert(VisibleGameEntity);
}
} }
} }
src/entities/sentient/dorf.rs
+19 -14
View File
@@ -8,7 +8,7 @@ use crate::game::SpawnDelay;
use crate::world::VisibleGameEntity; use crate::world::VisibleGameEntity;
use bevy::prelude::*; use bevy::prelude::*;
use bevy_rand::prelude::*; use bevy_rand::prelude::*;
use rand::RngExt; use rand::{RngExt, SeedableRng};
use std::collections::VecDeque; use std::collections::VecDeque;
#[derive(Bundle)] #[derive(Bundle)]
@@ -67,7 +67,6 @@ impl Dorf {
pub fn spawn_dorfs( pub fn spawn_dorfs(
mut commands: Commands, mut commands: Commands,
asset_server: Res<AssetServer>, asset_server: Res<AssetServer>,
mut rng_q: Query<&mut WyRand, With<GlobalRng>>,
config: Res<GameConfig>, config: Res<GameConfig>,
mut delay: ResMut<SpawnDelay>, mut delay: ResMut<SpawnDelay>,
mut has_spawned: Local<bool>, mut has_spawned: Local<bool>,
@@ -83,18 +82,24 @@ pub fn spawn_dorfs(
*has_spawned = true; *has_spawned = true;
if let Ok(mut rng) = rng_q.single_mut() { // Create deterministic RNG from SEED - same pattern as forestry.rs
for _ in 0..config.spawn_counts.dorfs { use std::collections::hash_map::DefaultHasher;
let raw_x = rng.random_range(-8.0f32..8.0f32); use std::hash::{Hash, Hasher};
let raw_y = rng.random_range(-8.0f32..8.0f32); let mut hasher = DefaultHasher::new();
let grid_x = (raw_x / TILE_SIZE).round() * TILE_SIZE; crate::constants::SEED.hash(&mut hasher);
let grid_y = (raw_y / TILE_SIZE).round() * TILE_SIZE; let seed = hasher.finish();
let grid_z = 35.0 * TILE_SIZE; let mut rng = WyRand::seed_from_u64(seed);
let cit = commands for _ in 0..config.spawn_counts.dorfs {
.spawn(Dorf::new(&asset_server, Vec3::new(grid_x, grid_y, grid_z))) let raw_x = rng.random_range(-8.0f32..8.0f32);
.id(); let raw_y = rng.random_range(-8.0f32..8.0f32);
commands.entity(cit).insert(VisibleGameEntity); let grid_x = (raw_x / TILE_SIZE).round() * TILE_SIZE;
} let grid_y = (raw_y / TILE_SIZE).round() * TILE_SIZE;
let grid_z = 35.0 * TILE_SIZE;
let cit = commands
.spawn(Dorf::new(&asset_server, Vec3::new(grid_x, grid_y, grid_z)))
.id();
commands.entity(cit).insert(VisibleGameEntity);
} }
} }
src/entities/tasks/executor.rs
+9
View File
@@ -34,14 +34,23 @@ pub fn task_executor_system(
mut completed_writer: MessageWriter<TaskCompleted>, mut completed_writer: MessageWriter<TaskCompleted>,
mut failed_writer: MessageWriter<TaskFailed>, mut failed_writer: MessageWriter<TaskFailed>,
) { ) {
eprintln!("[TASK_EXEC] Running");
use std::collections::hash_map::DefaultHasher; use std::collections::hash_map::DefaultHasher;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
let mut hasher = DefaultHasher::new(); let mut hasher = DefaultHasher::new();
crate::constants::SEED.hash(&mut hasher); crate::constants::SEED.hash(&mut hasher);
time.elapsed_secs().to_bits().hash(&mut hasher); time.elapsed_secs().to_bits().hash(&mut hasher);
let seed = hasher.finish(); let seed = hasher.finish();
eprintln!("[TASK_EXEC] RNG seed: {}", seed);
let mut rng = WyRand::seed_from_u64(seed); let mut rng = WyRand::seed_from_u64(seed);
let count = query.iter().count();
eprintln!("[TASK_EXEC] Query returned {} entities", count);
if count == 0 {
return;
}
for (entity, mut queue, mut state, mut ambulatory, transform) in query.iter_mut() { for (entity, mut queue, mut state, mut ambulatory, transform) in query.iter_mut() {
// If queue empty, assign default Idle task // If queue empty, assign default Idle task
if queue.is_empty() { if queue.is_empty() {