From 8057ba881b97ca9269708143915fba891b914a25 Mon Sep 17 00:00:00 2001
From: "Kacper Kostka (aider)" <kacper.kostka08@gmail.com>
Date: Wed, 2 Apr 2025 11:50:23 +0200
Subject: [PATCH] refactor: Resolve import and constant duplication issues in
 AI and game modules

---
 ai.js   | 26 ++++----------------------
 game.js | 10 +++++++++-
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/ai.js b/ai.js
index af045e2..48200ce 100644
--- a/ai.js
+++ b/ai.js
@@ -1,31 +1,13 @@
 /**********************************************************************
- * CONSTANTS
+ * ANIMAL CONSTANTS
  **********************************************************************/
 const ANIMAL_HUNGER_MAX = 100;
-const RABBIT_HUNGER_INCREMENT = 0.05;
-const RABBIT_REPRO_CHANCE = 0.005;
-const RABBIT_REPRO_COOLDOWN = 1000;
-
-// Citizen constants
-const HUNGER_INCREMENT = 0.02;
-const HUNGER_MAX = 100;
-const HUNGER_THRESHOLD = 70;
-const ENERGY_DECREMENT_WORK = 0.01;
-const ENERGY_INCREMENT_REST = 0.1;
-const ENERGY_MAX = 100;
-const ENERGY_THRESHOLD = 30;
-const HEALTH_MAX = 100;
-const HEALTH_THRESHOLD = 50;
-const EDUCATION_MAX = 100;
-const FRUIT_GATHER_RATE = 2;
-const FRUIT_PLANT_COST = 5;
-const FRUIT_TREE_START_AMOUNT = 50;
-const REWARD_DELIVER_WOOD = 5;
 
 /**********************************************************************
  * CITIZEN AI
  **********************************************************************/
-function updateCitizen(cit) {
+// Export functions
+export function updateCitizen(cit) {
   cit.hunger += HUNGER_INCREMENT;
   if(cit.hunger > HUNGER_MAX) cit.hunger = HUNGER_MAX;
 
@@ -72,7 +54,7 @@ function updateCitizen(cit) {
 /**********************************************************************
  * ANIMAL AI
  **********************************************************************/
-function updateAnimal(ani) {
+export function updateAnimal(ani) {
   if(ani.type === "Rabbit") {
     updateRabbit(ani);
   }
diff --git a/game.js b/game.js
index 842d3f2..a8aba94 100644
--- a/game.js
+++ b/game.js
@@ -1,6 +1,8 @@
 /**********************************************************************
  * GAME CORE
  **********************************************************************/
+// Import AI functions
+import { updateCitizen, updateAnimal } from './ai.js';
 let frameCount = 0;
 let money = 5000;  // Start with 5000
 let purchaseMode = null;
@@ -122,7 +124,13 @@ function update() {
   frameCount++;
 
   // Citizens
-  citizens.forEach((cit) => updateCitizen(cit));
+  citizens.forEach((cit) => {
+    if(typeof updateCitizen === 'function') {
+      updateCitizen(cit);
+    } else {
+      console.error("updateCitizen function is not defined!");
+    }
+  });
 
   // Animals
   animals.forEach((ani) => {