From e062afe396da990e203d2377f28345ed90102c1d Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Sun, 19 Apr 2020 18:11:24 +0100
Subject: [PATCH] Reduced enemy spawn rate in dungeons, fixed spawning

---
 world/src/site/dungeon/mod.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs
index 4fff9c4c94..b39bd0174d 100644
--- a/world/src/site/dungeon/mod.rs
+++ b/world/src/site/dungeon/mod.rs
@@ -290,7 +290,7 @@ impl Floor {
             self.create_room(Room {
                 seed: ctx.rng.gen(),
                 loot_density: 0.00005 + level as f32 * 0.00015,
-                enemy_density: 0.0005 + level as f32 * 0.00015,
+                enemy_density: 0.0005 + level as f32 * 0.00005,
                 area,
             });
         }
@@ -367,7 +367,8 @@ impl Floor {
                         for y in 0..TILE_SIZE {
                             let pos = tile_pos * TILE_SIZE + Vec2::new(x, y);
 
-                            if (pos.x + pos.y * TILE_SIZE * FLOOR_SIZE.x).rem_euclid(room.enemy_density.recip() as i32) == 0 {
+                            let nth_block = pos.x + TILE_SIZE + (pos.y + TILE_SIZE) * TILE_SIZE * FLOOR_SIZE.x;
+                            if nth_block.rem_euclid(room.enemy_density.recip() as i32) == 0 {
                                 // Bad
                                 let entity = EntityInfo::at(
                                     (origin