Preparing for construction.

ryankopf · Aug 18, 2023 · ca16785 · ca16785
1 parent e87a6c8
commit ca16785
Show file tree

Hide file tree

Showing 6 changed files with 224 additions and 162 deletions.
diff --git a/src/components.rs b/src/components.rs
@@ -615,16 +615,16 @@ pub struct ZoneMarker;
 #[derive(Component)]
 pub struct Zone {
     pub zone_type: ZoneType,
-    pub plant_type: PlantType,
-    pub material_delivered: bool,
+    pub plant_type: Option<PlantType>,
+    pub item_type: Option<ItemType>,
 }
 
 impl Default for Zone {
     fn default() -> Self {
         Zone {
             zone_type: ZoneType::Farm,
-            plant_type: PlantType::Cabbage,
-            material_delivered: false,
+            plant_type: Some(PlantType::Cabbage),
+            item_type: None,
         }
     }
 }
@@ -651,160 +651,6 @@ pub enum Motivation { // Sorted in order of prioritization.
     Crisis, Rage, Order, Danger, Hunger, Thirst, Tired, Injured, Sick, Bored, Happy, Sad, Angry, Lonely, Love, Fear, Hate, Work, Personality, Meander, Idle
 }
 
-#[derive(Component, PartialEq, Copy, Clone, Debug)]
-pub enum ItemType {
-    Cabbage,
-    Carrot,
-    CedarLog,
-    PineLog,
-    OakLog,
-    StatuePillar1,
-    StatuePillar2,
-    StatuePillar3,
-    StatuePillar4,
-    StatuePillar5,
-    StatuePillar6,
-    StatuePillar7,
-    StatueElephant,
-    StatueHead,
-    StatueIDK1,
-    StatueIDK2,
-    StatueGold,
-    StatueMan,
-    StatuePlatform,
-    StatueAnd,
-    StatueAt,
-    StatueAngel,
-    StatueArcher,
-    StatueHover,
-    StatueCat,
-    StatueCentaur,
-    StatueKing,
-    StatueKnight,
-    StatueDragon,
-    StatueDwarf,
-    StatueMastodon,
-    StatueHydra,
-    StatueSpearman,
-    StatueBall,
-    StatueBigfoot,
-    StatuePrincess,
-    StatueDeath,
-    StatueSnail,
-    StatueSword,
-    StatueDragon2,
-    StatueTriangle,
-    StatueWizard,
-    StatueGhost,
-    Moss1,
-    Moss2,
-    Moss3,
-    Moss4,
-    Moss5,
-    Goo1,
-    Blood1,
-    Blood2,
-    Blood3,
-    Blood4,
-    Blood5,
-    Goo2,
-    LeafyDebris1,
-    LeafyDebris2,
-    LeafyDebris3,
-    LeafyDebris4,
-}
-
-impl ItemType {
-    pub fn sprite_row_and_col(&self) -> (usize, usize) {
-        match self {
-            ItemType::Cabbage => (94, 33),
-            ItemType::Carrot => (94, 24),
-            ItemType::CedarLog => (94, 30),
-            ItemType::PineLog => (94, 30),
-            ItemType::OakLog => (94, 30),
-            ItemType::StatuePillar1 => (12, 12),
-            ItemType::StatuePillar2 => (12, 13),
-            ItemType::StatuePillar3 => (12, 14),
-            ItemType::StatuePillar4 => (12, 15),
-            ItemType::StatuePillar5 => (12, 16),
-            ItemType::StatuePillar6 => (12, 17),
-            ItemType::StatuePillar7 => (12, 18),
-            ItemType::StatueElephant => (12, 19),
-            ItemType::StatueHead => (12, 20),
-            ItemType::StatueIDK1 => (12, 21),
-            ItemType::StatueIDK2 => (12, 22),
-            ItemType::StatueGold => (12, 23),
-            ItemType::StatueMan => (12, 24),
-            ItemType::StatuePlatform => (12, 25),
-            ItemType::StatueAnd => (12, 26),
-            ItemType::StatueAt => (12, 27),
-            ItemType::StatueAngel => (12, 28),
-            ItemType::StatueArcher => (12, 29),
-            ItemType::StatueHover => (12, 30),
-            ItemType::StatueCat => (12, 31),
-            ItemType::StatueCentaur => (12, 32),
-            ItemType::StatueKing => (12, 33),
-            ItemType::StatueKnight => (12, 34),
-            ItemType::StatueDragon => (12, 35),
-            ItemType::StatueDwarf => (12, 36),
-            ItemType::StatueMastodon => (12, 37),
-            ItemType::StatueHydra => (12, 38),
-            ItemType::StatueSpearman => (12, 39),
-            ItemType::StatueBall => (12, 40),
-            ItemType::StatueBigfoot => (12, 41),
-            ItemType::StatuePrincess => (12, 42),
-            ItemType::StatueDeath => (12, 43),
-            ItemType::StatueSnail => (12, 44),
-            ItemType::StatueSword => (12, 45),
-            ItemType::StatueDragon2 => (12, 46),
-            ItemType::StatueTriangle => (12, 47),
-            ItemType::StatueWizard => (12, 48),
-            ItemType::StatueGhost => (12, 49),
-            ItemType::Moss1 => (51, 3),
-            ItemType::Moss2 => (51, 4),
-            ItemType::Moss3 => (51, 5),
-            ItemType::Moss4 => (51, 6),
-            ItemType::Moss5 => (51, 7),
-            ItemType::Goo1 => (51, 8),
-            ItemType::Blood1 => (51, 9),
-            ItemType::Blood2 => (51, 10),
-            ItemType::Blood3 => (51, 11),
-            ItemType::Blood4 => (51, 12),
-            ItemType::Blood5 => (51, 13),
-            ItemType::Goo2 => (51, 14),
-            ItemType::LeafyDebris1 => (50, 15),
-            ItemType::LeafyDebris2 => (50, 16),
-            ItemType::LeafyDebris3 => (50, 17),
-            ItemType::LeafyDebris4 => (50, 18),
-        }
-    }
-    pub fn sprite_index(&self) -> usize {
-        let (row, col) = self.sprite_row_and_col();
-        row * 64 + col
-    }
-    pub fn nutrition(&self) -> f32 {
-        match self {
-            ItemType::Cabbage => 10.0,
-            ItemType::Carrot => 10.0,
-            _ => 0.0,
-        }
-    }
-    // pub fn spoilage(&self) -> f32 {
-    //     match self {
-    //         ItemType::Cabbage => 1.0,
-    //         ItemType::Carrot => 1.0,
-    //         _ => 0.0,
-    //     }
-    // }
-    pub fn spoilage_rate(&self) -> f32 {
-        match self {
-            ItemType::Cabbage => 0.1,
-            ItemType::Carrot => 0.1,
-            _ => 0.01,
-        }
-    }
-}
-
 #[derive(Component, PartialEq, Copy, Clone, Debug)]
 pub enum PlantType {
     Aloe,

diff --git a/src/main.rs b/src/main.rs
@@ -11,6 +11,7 @@ mod initializations;
 use initializations::*;
 mod interface;
 use interface::*;
+mod objects;
 mod main_menu;
 use main_menu::*;
 mod monstergenerator_system;