src/App.tsx

@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react'
+import React, { useState, useEffect } from 'react'
 import { styled } from '@linaria/react'
 import { useGameTick } from './hooks/useGameTick'
 import Field from './components/Field'

src/components/Field.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 import { useGameStore } from '../store/useGameStore'
-import { CROPS, ITEMS, secondsToTicks } from '../constants'
+import { CROPS, ITEMS } from '../constants'
 import { FieldTool, PlotState } from '../types'
 import Modal from './Modal'
 
@@ -105,15 +105,17 @@ const getMaturityProgressContainerStyle = (): React.CSSProperties => ({
 
 const getMaturityProgressBarStyle = (
   progress: number,
-  cropId: string,
+  total: number,
 ): React.CSSProperties => ({
-  width: `${Math.min(
-    100,
-    (progress / secondsToTicks(CROPS[cropId].growthTimeSeconds)) * 100,
-  )}%`,
-  height: '100%',
-  backgroundColor: '#22c55e',
-  transition: 'width 0.5s ease-in-out',
+  position: 'absolute',
+  bottom: 0,
+  left: 0,
+  width: `${Math.min((progress / total) * 100, 100)}%`,
+  height: '10px',
+  backgroundColor: '#ff5722',
+  transition: 'width 0.3s',
+  zIndex: 6,
+  boxShadow: '0 0 3px rgba(0, 0, 0, 0.5)',
 })
 
 const plotInfoStyle: React.CSSProperties = {
@@ -166,7 +168,7 @@ const PlotInfoModal: React.FC<PlotInfoModalProps> = ({ plot, onClose }) => {
             <span>
               {formatPercentage(
                 plot.current.progress /
-                  secondsToTicks(CROPS[plot.current.cropId].growthTimeSeconds),
+                  CROPS[plot.current.cropId].growthTicks,
               )}
             </span>
           </div>
@@ -322,7 +324,7 @@ const FieldComponent: React.FC = () => {
                     <div
                       style={getMaturityProgressBarStyle(
                         plot.current.progress,
-                        plot.current.cropId,
+                        CROPS[plot.current.cropId].growthTicks,
                       )}
                     />
                   </div>

src/components/FloatingMessages.tsx

@@ -1,4 +1,4 @@
-import {
+import React, {
   useState,
   useImperativeHandle,
   forwardRef,

src/components/Temple.tsx

@@ -115,7 +115,6 @@ const TempleComponent: React.FC = () => {
     pray,
     piety,
     stamina,
-    milestones,
   } = useGameStore()
 
   const handlePurchase = (upgradeId: string) => {
@@ -137,13 +136,44 @@ const TempleComponent: React.FC = () => {
     }
 
     // Check if can afford
-    return canAffordUpgrade(upgrade.cost)
+    if (!canAffordUpgrade(upgrade.cost)) {
+      return false
+    }
+
+    // Check requirements
+    if (
+      upgrade.id === 'aqueous_vigor_2' &&
+      !purchasedUpgrades.includes('aqueous_vigor_1')
+    ) {
+      return false
+    }
+
+    if (
+      upgrade.id === 'aqua_diffundere_2' &&
+      !purchasedUpgrades.includes('aqua_diffundere_1')
+    ) {
+      return false
+    }
+
+    return true
   }
 
   const getUpgradeStatus = (upgrade: Upgrade) => {
     if (purchasedUpgrades.includes(upgrade.id)) {
       return 'Purchased'
     }
+    if (
+      upgrade.id === 'aqueous_vigor_2' &&
+      !purchasedUpgrades.includes('aqueous_vigor_1')
+    ) {
+      return 'Requires Aqueous Vigor I'
+    }
+    if (
+      upgrade.id === 'aqua_diffundere_2' &&
+      !purchasedUpgrades.includes('aqua_diffundere_1')
+    ) {
+      return 'Requires Aqua Diffundere I'
+    }
     if (!canAffordUpgrade(upgrade.cost)) {
       return 'Cannot Afford'
     }
@@ -163,37 +193,35 @@ const TempleComponent: React.FC = () => {
       </PrayerSection>
 
       <UpgradesGrid>
-        {Object.values(UPGRADES)
-          .filter(upgrade => !upgrade.isAvailable || upgrade.isAvailable({ purchasedUpgrades, milestones }))
-          .map((upgrade) => {
-            const isPurchased = purchasedUpgrades.includes(upgrade.id)
-            const canPurchase = canPurchaseUpgrade(upgrade)
-            const status = getUpgradeStatus(upgrade)
+        {Object.values(UPGRADES).map((upgrade) => {
+          const isPurchased = purchasedUpgrades.includes(upgrade.id)
+          const canPurchase = canPurchaseUpgrade(upgrade)
+          const status = getUpgradeStatus(upgrade)
 
-            return (
-              <UpgradeCard key={upgrade.id} purchased={isPurchased}>
-                <UpgradeName>{upgrade.name}</UpgradeName>
-                <UpgradeDescription>{upgrade.description}</UpgradeDescription>
-                <UpgradeCost>
-                  <span>Cost:</span>
-                  {upgrade.cost.map((cost, index) => (
-                    <CostItem key={index}>
-                      <span>
-                        {cost.amount} {cost.itemId}
-                      </span>
-                      <span>(You have: {inventory[cost.itemId] || 0})</span>
-                    </CostItem>
-                  ))}
-                </UpgradeCost>
-                <PurchaseButton
-                  onClick={() => handlePurchase(upgrade.id)}
-                  disabled={!canPurchase}
-                >
-                  {status}
-                </PurchaseButton>
-              </UpgradeCard>
-            )
-          })}
+          return (
+            <UpgradeCard key={upgrade.id} purchased={isPurchased}>
+              <UpgradeName>{upgrade.name}</UpgradeName>
+              <UpgradeDescription>{upgrade.description}</UpgradeDescription>
+              <UpgradeCost>
+                <span>Cost:</span>
+                {upgrade.cost.map((cost, index) => (
+                  <CostItem key={index}>
+                    <span>
+                      {cost.amount} {cost.itemId}
+                    </span>
+                    <span>(You have: {inventory[cost.itemId] || 0})</span>
+                  </CostItem>
+                ))}
+              </UpgradeCost>
+              <PurchaseButton
+                onClick={() => handlePurchase(upgrade.id)}
+                disabled={!canPurchase}
+              >
+                {status}
+              </PurchaseButton>
+            </UpgradeCard>
+          )
+        })}
       </UpgradesGrid>
     </TempleContainer>
   )

src/constants/index.ts

@@ -3,7 +3,7 @@ import { CropDefinitions, Upgrade, Equipment } from '../types'
 export const INITIAL_CASH = 50
 export const INITIAL_FIELD_SIZE = 3
 export const COOLDOWN_DURATION = 2000 // 2 seconds in milliseconds
-export const TICK_INTERVAL = 1000 // 1 second in milliseconds
+export const TICK_INTERVAL = 5000 
 export const GAME_SPEEDS = {
   NORMAL: 1,
   FAST: 5,
@@ -13,17 +13,12 @@ export const INITIAL_GAME_SPEED = GAME_SPEEDS.NORMAL
 
 export const FIELD_UPGRADE_COSTS = [100, 1000, 10000, 100000]
 
-// Helper function to convert seconds to ticks based on current tick interval
-export const secondsToTicks = (seconds: number): number => {
-  return Math.ceil((seconds * 1000) / TICK_INTERVAL)
-}
-
 export const CROPS: CropDefinitions = {
   celery: {
     id: 'celery',
     name: 'Celery',
-    growthTimeSeconds: 10,
-    waterPerSecond: 0.20, // 1/5 water per tick = 0.04 water per second
+    growthTicks: 36,
+    waterPerTick: 1 / 20,
     yield: 1,
     yieldType: 'celery',
     fertilityDepletion: 0.1,
@@ -32,8 +27,8 @@ export const CROPS: CropDefinitions = {
   corn: {
     id: 'corn',
     name: 'Corn',
-    growthTimeSeconds: 600,
-    waterPerSecond: 0.005, // 1/40 water per tick = 0.005 water per second
+    growthTicks: 120,
+    waterPerTick: 1 / 40,
     yield: 5,
     yieldType: 'corn',
     fertilityDepletion: 0.3,
@@ -42,26 +37,26 @@ export const CROPS: CropDefinitions = {
   olive: {
     id: 'olive',
     name: 'Olive Tree',
-    growthTimeSeconds: 1000,
-    waterPerSecond: 0.004, // 1/50 water per tick = 0.004 water per second
+    growthTicks: 200,
+    waterPerTick: 1 / 50,
     yield: 5,
     yieldType: 'olive',
     fertilityDepletion: 0.1,
     seedType: 'olive',  // Uses olives as seeds
     isPerennial: true,
-    regrowthTimeSeconds: 750,  // 150 ticks = 750 seconds
+    regrowthProgress: 150,  // Resets to 150 ticks after harvest
   },
   grape_vine: {
     id: 'grape_vine',
     name: 'Grape Vine',
-    growthTimeSeconds: 1250,
-    waterPerSecond: 0.00444, // 1/45 water per tick = 0.00444 water per second
+    growthTicks: 250,
+    waterPerTick: 1 / 45,
     yield: 2,
     yieldType: 'grape',
     fertilityDepletion: 0.15,
     seedType: 'grape_seed',
     isPerennial: true,
-    regrowthTimeSeconds: 1000,  // 200 ticks = 1000 seconds
+    regrowthProgress: 200,  // Resets to 200 ticks after harvest
   },
 }
 
@@ -70,50 +65,6 @@ export const INITIAL_INVENTORY = {
 }
 
 export const UPGRADES: Record<string, Upgrade> = {
-  stamina_1: {
-    id: 'stamina_1',
-    name: 'Stamina I',
-    description: 'Increases maximum stamina by 5',
-    cost: [
-      {
-        itemId: 'celery',
-        amount: 20,
-      },
-    ],
-  },
-  stamina_2: {
-    id: 'stamina_2',
-    name: 'Stamina II',
-    description: 'Increases maximum stamina by 8',
-    cost: [
-      {
-        itemId: 'corn',
-        amount: 20,
-      },
-    ],
-  },
-  stamina_3: {
-    id: 'stamina_3',
-    name: 'Stamina III',
-    description: 'Increases maximum stamina by 12',
-    cost: [
-      {
-        itemId: 'olives',
-        amount: 100,
-      },
-    ],
-  },
-  stamina_4: {
-    id: 'stamina_4',
-    name: 'Stamina IV',
-    description: 'Increases maximum stamina by 15',
-    cost: [
-      {
-        itemId: 'grapes',
-        amount: 100,
-      },
-    ],
-  },
   aqueous_vigor_1: {
     id: 'aqueous_vigor_1',
     name: 'Aqueous Vigor I',

src/store/useGameStore.ts

@@ -10,8 +10,6 @@ import {
   ITEMS,
   UPGRADES,
   EQUIPMENT,
-  TICK_INTERVAL,
-  secondsToTicks,
 } from '../constants'
 import { GameState, PlotState, Equipment } from '../types'
 
@@ -66,10 +64,9 @@ const progressRandomImmaturePlot = (
     const plot = state.plots[randomPlot.row][randomPlot.col]
 
     const crop = CROPS[plot.current!.cropId]
-    const growthTicks = secondsToTicks(crop.growthTimeSeconds)
-    const actualGrowthAmount = growthTicks * growthAmount
+    const actualGrowthAmount = crop.growthTicks * growthAmount
     plot.current!.progress = Math.min(
-      growthTicks,
+      crop.growthTicks,
       plot.current!.progress + actualGrowthAmount,
     )
     return true
@@ -225,10 +222,9 @@ export const useGameStore = create<
           produce((state) => {
             if (crop.isPerennial) {
               // For perennial crops, reset progress instead of clearing
-              const regrowthTicks = secondsToTicks(crop.regrowthTimeSeconds!)
               state.plots[row][col].current = {
                 cropId: plot.current!.cropId,
-                progress: regrowthTicks,
+                progress: crop.regrowthProgress!,
                 mature: false,
               }
             } else {
@@ -274,52 +270,67 @@ export const useGameStore = create<
       set(
         produce((state) => {
           // Regenerate stamina
-          state.stamina = Math.min(
-            state.maxStamina,
-            state.stamina + 0.5,
-          )
-
-          // Process each plot
+          if (state.stamina < state.maxStamina) {
+            const oldStamina = state.stamina
+            state.stamina = Math.min(state.maxStamina, state.stamina + 1)
+            
+            // Increment milestone counter for stamina gained
+            if (state.stamina > oldStamina) {
+              const staminaGained = state.stamina - oldStamina
+              state.milestones.stamina_gained = (state.milestones.stamina_gained || 0) + staminaGained
+            }
+          }
+        
+          // Update plots
           state.plots.forEach((row: PlotState[], rowIndex: number) => {
             row.forEach((plot: PlotState, colIndex: number) => {
               // Regenerate fertility every 100 ticks
-              if (state.tickCount % 100 === 0) {
+              if (state.tickCount % 100 === 0 && plot.fertility < 1) {
                 state.plots[rowIndex][colIndex].fertility = Math.min(
                   1,
-                  plot.fertility + 0.01,
+                  plot.fertility + 0.1,
                 )
               }
 
-              if (plot.current && !plot.current.mature) {
-                const crop = CROPS[plot.current.cropId]
-                const growthTicks = secondsToTicks(crop.growthTimeSeconds)
-                const waterNeeded = crop.waterPerSecond * (TICK_INTERVAL / 1000)
+              if (!plot.current || plot.current.mature) {
+                return
+              }
 
-                // Only grow if fertility is above 0.2
-                if (plot.moisture >= waterNeeded && plot.fertility >= 0.2) {
-                  let growthRate = 1
-                  // Half growth rate if fertility is between 0.2 and 0.5
-                  if (plot.fertility < 0.5) {
-                    growthRate = 0.5
-                  }
+              const crop = CROPS[plot.current.cropId]
+              const waterNeeded = crop.waterPerTick
 
-                  const newProgress = plot.current.progress + growthRate
-                  const mature = newProgress >= growthTicks
+              // Check if water is running low (less than 25% of what's needed)
+              if (plot.moisture < waterNeeded * 0.25 && plot.moisture > 0) {
+                addConsoleMessage(
+                  state,
+                  `Plot (${rowIndex + 1},${colIndex + 1}) ${crop.name} is running low on water!`,
+                )
+              }
 
-                  state.plots[rowIndex][colIndex].moisture =
-                    plot.moisture - waterNeeded
-                  state.plots[rowIndex][colIndex].current.progress = newProgress
-
-                  // If the plot just became mature, add a message
-                  if (mature && !plot.current.mature) {
-                    addConsoleMessage(
-                      state,
-                      `Plot (${rowIndex + 1},${colIndex + 1}) ${crop.name} is ready to harvest!`,
-                    )
-                  }
-
-                  state.plots[rowIndex][colIndex].current.mature = mature
+              // Only grow if fertility is above 0.2
+              if (plot.moisture >= waterNeeded && plot.fertility >= 0.2) {
+                let growthRate = 1
+                // Half growth rate if fertility is between 0.2 and 0.5
+                if (plot.fertility < 0.5) {
+                  growthRate = 0.5
                 }
+
+                const newProgress = plot.current.progress + growthRate
+                const mature = newProgress >= crop.growthTicks
+
+                state.plots[rowIndex][colIndex].moisture =
+                  plot.moisture - waterNeeded
+                state.plots[rowIndex][colIndex].current.progress = newProgress
+
+                // If the plot just became mature, add a message
+                if (mature && !plot.current.mature) {
+                  addConsoleMessage(
+                    state,
+                    `Plot (${rowIndex + 1},${colIndex + 1}) ${crop.name} is ready to harvest!`,
+                  )
+                }
+
+                state.plots[rowIndex][colIndex].current.mature = mature
               }
             })
           })
@@ -494,21 +505,6 @@ export const useGameStore = create<
           })
           state.purchasedUpgrades.push(upgradeId)
           addConsoleMessage(state, `Purchased upgrade: ${upgrade.name}`)
-
-          // Handle stamina upgrades
-          if (upgradeId === 'stamina_1') {
-            state.maxStamina += 5
-            state.stamina = Math.min(state.maxStamina, state.stamina + 5)
-          } else if (upgradeId === 'stamina_2') {
-            state.maxStamina += 8
-            state.stamina = Math.min(state.maxStamina, state.stamina + 8)
-          } else if (upgradeId === 'stamina_3') {
-            state.maxStamina += 12
-            state.stamina = Math.min(state.maxStamina, state.stamina + 12)
-          } else if (upgradeId === 'stamina_4') {
-            state.maxStamina += 15
-            state.stamina = Math.min(state.maxStamina, state.stamina + 15)
-          }
         }),
       )
     },

src/types/index.ts

@@ -1,14 +1,14 @@
 export interface Crop {
   id: string
   name: string
-  growthTimeSeconds: number
-  waterPerSecond: number
+  growthTicks: number
+  waterPerTick: number
   yield: number
   yieldType: string
   fertilityDepletion: number
   seedType: string
   isPerennial?: boolean
-  regrowthTimeSeconds?: number
+  regrowthProgress?: number
 }
 
 export interface CropDefinitions {
@@ -48,7 +48,6 @@ export interface Upgrade {
   name: string
   description: string
   cost: UpgradeCost[]
-  isAvailable?: (state: Pick<GameState, 'purchasedUpgrades' | 'milestones'>) => boolean
 }
 
 export interface Recipe {