Finish refactoring fishing market

Author: Iapetus-11

karen/data/fishing.json

@@ -3,59 +3,86 @@
     "fish": {
         "cod": {
             "name": "Cod",
-            "sell_price_range": [
-                2,
-                15
-            ],
-            "rarity": 0
+            "rarity": 0,
+            "pricing": {
+                "base": 2,
+                "time_offset": 0,
+                "periods": [
+                    {"unit": "day", "period": 4, "max": 15}
+                ]
+            }
         },
         "salmon": {
             "name": "Salmon",
-            "sell_price_range": [
-                10,
-                40
-            ],
-            "rarity": 0
+            "rarity": 0,
+            "pricing": {
+                "base": 10,
+                "time_offset": 1,
+                "periods": [
+                    {"unit": "day", "period": 4, "max": 35},
+                    {"unit": "hour", "period": 10, "max": 10}
+                ]
+            }
         },
         "tropical fish": {
             "name": "Tropical Fish",
-            "sell_price_range": [
-                30,
-                120
-            ],
-            "rarity": 1
+            "rarity": 1,
+            "pricing": {
+                "base": 30,
+                "time_offset": 4,
+                "periods": [
+                    {"unit": "day", "period": 20, "max": 115},
+                    {"unit": "hour", "period": 14, "max": 20}
+                ]
+            }
         },
         "pufferfish": {
             "name": "Pufferfish",
-            "sell_price_range": [
-                60,
-                200
-            ],
-            "rarity": 3
+            "rarity": 3,
+            "pricing": {
+                "base": 60,
+                "time_offset": 1,
+                "periods": [
+                    {"unit": "day", "period": 20, "max": 200},
+                    {"unit": "hour", "period": 3, "max": 10}
+                ]
+            }
         },
         "rainbow trout": {
             "name": "Rainbow Trout",
-            "sell_price_range": [
-                180,
-                290
-            ],
-            "rarity": 4
+            "rarity": 4,
+            "pricing": {
+                "base": 100,
+                "time_offset": 3,
+                "periods": [
+                    {"unit": "day", "period": 30, "max": 275},
+                    {"unit": "day", "period": 5, "max": 25}
+                ]
+            }
         },
         "gold fish": {
             "name": "Gold Fish",
-            "sell_price_range": [
-                200,
-                300
-            ],
-            "rarity": 4
+            "rarity": 4,
+            "pricing": {
+                "base": 280,
+                "time_offset": 0,
+                "periods": [
+                    {"unit": "day", "period": 3, "max": 20},
+                    {"unit": "hour", "period": 3, "max": 20}
+                ]
+            }
         },
         "emerald fish": {
             "name": "Emerald Fish",
-            "sell_price_range": [
-                600,
-                800
-            ],
-            "rarity": 5
+            "rarity": 5,
+            "pricing": {
+                "base": 700,
+                "time_offset": 0,
+                "periods": [
+                    {"unit": "day", "period": 2, "max": 100},
+                    {"unit": "hour", "period": 3, "max": 24}
+                ]
+            }
         }
     }
 }

karen/src/logic/fishing.rs

@@ -3,28 +3,57 @@ use std::collections::HashMap;
 use chrono::{Datelike, Timelike, Utc};
 use sqlx::PgConnection;
 
-use crate::common::data::FISHING_DATA;
+use crate::{common::data::FISHING_DATA, models::data::fishing::FishPeriodUnit};
 
-pub fn get_current_fish_prices() -> HashMap<String, i64> {
-    let duration_since_start_of_year = Utc::now() - Utc::now().with_month(1).unwrap().with_day(1).unwrap().with_minute(0).unwrap();
+pub fn get_current_fish_prices() -> HashMap<String, i32> {
+    let mut fish_pricing = HashMap::with_capacity(7);
 
-    let elapsed_weeks = duration_since_start_of_year.num_weeks();
-    let elapsed_days = duration_since_start_of_year.num_days();
-    let elapsed_hours = duration_since_start_of_year.num_hours();
+    let duration_since_start_of_year = Utc::now()
+        - Utc::now()
+            .with_month(1)
+            .unwrap()
+            .with_day(1)
+            .unwrap()
+            .with_minute(0)
+            .unwrap();
 
-    
+    let days = duration_since_start_of_year.num_days();
+    let hours = duration_since_start_of_year.num_hours();
+
+    for fish in FISHING_DATA.fish.values() {
+        let mut fish_price = fish.pricing.base;
+
+        for period in fish.pricing.periods.iter() {
+            let period_value = match period.unit {
+                FishPeriodUnit::Day => days,
+                FishPeriodUnit::Hour => hours,
+            } as i32;
+            let period_value = ((period_value + fish.pricing.time_offset) % period.period) + 1;
+
+            let rate = period_value as f32 / period.period as f32;
+            let period_price = (rate * period.max as f32) as i32;
+
+            fish_price += period_price;
+        }
+
+        fish_pricing.insert(fish.name.clone(), fish_price);
+    }
+
+    fish_pricing
 }
 
-pub async fn randomize_fish_prices(db: &mut PgConnection) -> Result<(), sqlx::Error> {
+pub async fn update_fishing_prices(db: &mut PgConnection) -> Result<(), sqlx::Error> {
+    let fish_pricing = get_current_fish_prices();
+
     for fish in FISHING_DATA.fish.values() {
         sqlx::query!(
             "UPDATE items SET sell_price = $2 WHERE name = $1",
             fish.name,
-            fastrand::choice(fish.sell_price_range.0..fish.sell_price_range.1).unwrap()
+            fish_pricing[&fish.name],
         )
         .execute(&mut *db)
         .await?;
     }
 
     Ok(())
-}
+}

karen/src/main.rs

@@ -8,7 +8,7 @@ use poem::{
 };
 use thiserror::Error;
 use tokio_schedule::Job;
-use tracing::{event, span, Level};
+use tracing::{Level, event};
 
 mod common;
 mod config;
@@ -53,12 +53,12 @@ async fn setup_recurring_tasks(db_pool: sqlx::Pool<sqlx::Postgres>) {
             .perform(move || {
                 let db_pool = db_pool_c2.clone();
                 async move {
-                    use logic::fishing::randomize_fish_prices;
-                    
-                    event!(Level::INFO, "Randomizing fish market prices...");
+                    use logic::fishing::update_fishing_prices;
+
+                    event!(Level::INFO, "Updating fish market prices...");
 
                     let mut db = db_pool.acquire().await.unwrap();
-                    randomize_fish_prices(&mut db).await.unwrap();
+                    update_fishing_prices(&mut db).await.unwrap();
                 }
             }),
     );

karen/src/models/data/fishing.rs

@@ -2,11 +2,33 @@ use std::collections::HashMap;
 
 use serde::Deserialize;
 
+#[derive(Debug, Deserialize)]
+pub enum FishPeriodUnit {
+    #[serde(rename = "day")]
+    Day,
+    #[serde(rename = "hour")]
+    Hour,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct FishPricingPeriod {
+    pub unit: FishPeriodUnit,
+    pub period: i32,
+    pub max: i32,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct FishPricing {
+    pub base: i32,
+    pub time_offset: i32,
+    pub periods: Vec<FishPricingPeriod>,
+}
+
 #[derive(Debug, Deserialize)]
 pub struct FishEntry {
     pub name: String,
-    pub sell_price_range: (i32, i32),
     pub rarity: f32,
+    pub pricing: FishPricing,
 }
 
 #[derive(Debug, Deserialize)]