From 4fd826c218f8ae8a041460df3574ab567989e5d7 Mon Sep 17 00:00:00 2001
From: crumblingstatue <radiantstatue@gmail.com>
Date: Sat, 8 Apr 2023 22:04:21 +0200
Subject: [PATCH] Put ticks into World

---
 src/game.rs  | 8 ++------
 src/world.rs | 3 +++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/game.rs b/src/game.rs
index a3986aa..af9e9ab 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -34,9 +34,6 @@ pub struct GameState {
     pub ambient_light: u8,
     pub light_sources: Vec<LightSource>,
     pub tile_db: TileDb,
-    /// This is the number of ticks since the world has started.
-    /// In other words, the age of the world.
-    pub ticks: u64,
 }
 
 #[derive(Debug, Inspect)]
@@ -52,7 +49,7 @@ pub enum Biome {
 
 impl GameState {
     pub fn update(&mut self) {
-        self.ticks += 1;
+        self.world.ticks += 1;
     }
     pub(crate) fn draw_world(&mut self, rt: &mut RenderTexture, res: &mut Res) {
         self.light_sources.clear();
@@ -114,7 +111,7 @@ impl GameState {
         ));
         for ls in &self.light_sources {
             let mut s = Sprite::with_texture(&res.light_texture);
-            let flicker = smoothwave(self.ticks, 40) as f32 / 64.0;
+            let flicker = smoothwave(self.world.ticks, 40) as f32 / 64.0;
             s.set_scale((4. + flicker, 4. + flicker));
             s.set_origin((128., 128.));
             s.set_position((ls.pos.x.into(), ls.pos.y.into()));
@@ -160,7 +157,6 @@ impl Default for GameState {
             ambient_light: 0,
             light_sources: Vec::new(),
             tile_db: TileDb::load_or_default(),
-            ticks: 0,
         }
     }
 }
diff --git a/src/world.rs b/src/world.rs
index b45ec49..89456e9 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -15,6 +15,9 @@ pub struct ChunkPos {
 pub struct World {
     /// The currently loaded chunks
     chunks: FnvHashMap<ChunkPos, Chunk>,
+    /// This is the number of ticks since the world has started.
+    /// In other words, the age of the world.
+    pub ticks: u64,
 }
 
 impl World {