Compare commits
No commits in common. "7c015787dd6d04e47de60d376e2b6480f0f59d9d" and "5eda5c158b3a7e44391f6977047b9cc796b8f71e" have entirely different histories.
7c015787dd
...
5eda5c158b
16
index.html
16
index.html
|
|
@ -2,21 +2,7 @@
|
|||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<!-- Favicon -->
|
||||
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
|
||||
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
|
||||
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
|
||||
|
||||
<!-- Apple Touch Icon -->
|
||||
<link rel="apple-touch-icon" href="/apple-touch-icon.png" />
|
||||
|
||||
<!-- Android Chrome Icons -->
|
||||
<link rel="icon" type="image/png" sizes="192x192" href="/android-chrome-192x192.png" />
|
||||
<link rel="icon" type="image/png" sizes="512x512" href="/android-chrome-512x512.png" />
|
||||
|
||||
<!-- Web Manifest -->
|
||||
<link rel="manifest" href="/site.webmanifest" />
|
||||
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Dionysian Idle</title>
|
||||
</head>
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 214 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 736 B |
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
|
|
@ -1 +0,0 @@
|
|||
{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
|
||||
1
public/vite.svg
Normal file
1
public/vite.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
71
src/App.tsx
71
src/App.tsx
|
|
@ -1,55 +1,42 @@
|
|||
import React, { useState, useEffect } from 'react'
|
||||
import { styled } from '@linaria/react'
|
||||
import { useGameTick } from './hooks/useGameTick'
|
||||
import Field from './components/Field'
|
||||
import Warehouse from './components/Warehouse'
|
||||
import Market from './components/Market'
|
||||
import Temple from './components/Temple'
|
||||
import { StaminaDisplay } from './components/StaminaDisplay'
|
||||
import { useSaveSystem } from './store/useSaveSystem'
|
||||
import { Console } from './components/Console'
|
||||
import { GodModal } from './components/GodModal'
|
||||
import {
|
||||
Tabs,
|
||||
TabsContent,
|
||||
TabsList,
|
||||
TabsTrigger,
|
||||
} from './components/CustomTabs'
|
||||
import { useGameTick } from './hooks/useGameTick'
|
||||
import Field from './components/Field'
|
||||
import Warehouse from './components/Warehouse'
|
||||
import Market from './components/Market'
|
||||
import Temple from './components/Temple'
|
||||
import { ActionCooldown } from './components/ActionCooldown'
|
||||
import { useSaveSystem } from './store/useSaveSystem'
|
||||
import { Console } from './components/Console'
|
||||
import { GodModal } from './components/GodModal'
|
||||
|
||||
const AppContainer = styled.div`
|
||||
max-width: 1200px;
|
||||
margin: 0 auto;
|
||||
padding: 4rem 2rem 2rem;
|
||||
`
|
||||
const appContainerStyle: React.CSSProperties = {
|
||||
maxWidth: '1200px',
|
||||
margin: '0 auto',
|
||||
padding: '2rem',
|
||||
}
|
||||
|
||||
const StyledTabsList = styled(TabsList)`
|
||||
display: grid;
|
||||
width: 100%;
|
||||
grid-template-columns: repeat(4, 1fr);
|
||||
`
|
||||
const tabsListStyles: React.CSSProperties = {
|
||||
display: 'grid',
|
||||
width: '100%',
|
||||
gridTemplateColumns: 'repeat(4, 1fr)',
|
||||
}
|
||||
|
||||
function App() {
|
||||
useGameTick()
|
||||
useSaveSystem()
|
||||
const [isGodModalOpen, setIsGodModalOpen] = useState(false)
|
||||
const [activeTab, setActiveTab] = useState('fields')
|
||||
|
||||
useEffect(() => {
|
||||
const handleKeyPress = (event: KeyboardEvent) => {
|
||||
if (event.key.toLowerCase() === 'g') {
|
||||
setIsGodModalOpen(prev => !prev)
|
||||
}
|
||||
// Handle number keys 1-4 for tab selection
|
||||
const tabMap: { [key: string]: string } = {
|
||||
'1': 'fields',
|
||||
'2': 'warehouse',
|
||||
'3': 'market',
|
||||
'4': 'temple'
|
||||
}
|
||||
const tabValue = tabMap[event.key]
|
||||
if (tabValue) {
|
||||
setActiveTab(tabValue)
|
||||
}
|
||||
}
|
||||
|
||||
window.addEventListener('keydown', handleKeyPress)
|
||||
|
|
@ -58,15 +45,15 @@ function App() {
|
|||
|
||||
return (
|
||||
<div>
|
||||
<StaminaDisplay />
|
||||
<AppContainer>
|
||||
<Tabs value={activeTab} onValueChange={setActiveTab}>
|
||||
<StyledTabsList>
|
||||
<TabsTrigger value="fields">Fields (1)</TabsTrigger>
|
||||
<TabsTrigger value="warehouse">Warehouse (2)</TabsTrigger>
|
||||
<TabsTrigger value="market">Market (3)</TabsTrigger>
|
||||
<TabsTrigger value="temple">Temple (4)</TabsTrigger>
|
||||
</StyledTabsList>
|
||||
<ActionCooldown />
|
||||
<div style={appContainerStyle}>
|
||||
<Tabs defaultValue="fields">
|
||||
<TabsList style={tabsListStyles}>
|
||||
<TabsTrigger value="fields">Fields</TabsTrigger>
|
||||
<TabsTrigger value="warehouse">Warehouse</TabsTrigger>
|
||||
<TabsTrigger value="market">Market</TabsTrigger>
|
||||
<TabsTrigger value="temple">Temple</TabsTrigger>
|
||||
</TabsList>
|
||||
<TabsContent value="fields">
|
||||
<Field />
|
||||
</TabsContent>
|
||||
|
|
@ -81,7 +68,7 @@ function App() {
|
|||
</TabsContent>
|
||||
</Tabs>
|
||||
<Console />
|
||||
</AppContainer>
|
||||
</div>
|
||||
{isGodModalOpen && <GodModal onClose={() => setIsGodModalOpen(false)} />}
|
||||
</div>
|
||||
)
|
||||
|
|
|
|||
110
src/components/ActionCooldown.tsx
Normal file
110
src/components/ActionCooldown.tsx
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
import { useEffect, useState } from 'react'
|
||||
import { styled } from '@linaria/react'
|
||||
|
||||
import { useGameStore } from '../store/useGameStore'
|
||||
|
||||
const CooldownContainer = styled.div`
|
||||
position: fixed;
|
||||
top: 1rem;
|
||||
left: 1rem;
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
`
|
||||
|
||||
const DialSVG = styled.svg`
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
`
|
||||
|
||||
const DialBackground = styled.circle`
|
||||
fill: #e5e7eb;
|
||||
`
|
||||
|
||||
const DialProgress = styled.path`
|
||||
fill: #3b82f6;
|
||||
`
|
||||
|
||||
const calculatePieWedge = (progress: number, size: number) => {
|
||||
// Convert progress to go counter-clockwise from top
|
||||
const adjustedProgress = 100 - progress
|
||||
const center = size / 2
|
||||
const radius = size / 2 - 1
|
||||
const angle = (adjustedProgress / 100) * 360
|
||||
|
||||
// Always start from top (90 degrees in SVG coordinates)
|
||||
const startAngle = 90
|
||||
const endAngle = startAngle + angle
|
||||
|
||||
// Convert angles to radians
|
||||
const startAngleRad = (startAngle * Math.PI) / 180
|
||||
const endAngleRad = (endAngle * Math.PI) / 180
|
||||
|
||||
// Calculate points
|
||||
const startX = center + radius * Math.cos(startAngleRad)
|
||||
const startY = center - radius * Math.sin(startAngleRad)
|
||||
const endX = center + radius * Math.cos(endAngleRad)
|
||||
const endY = center - radius * Math.sin(endAngleRad)
|
||||
|
||||
// Create the arc flag
|
||||
const largeArcFlag = angle <= 180 ? '0' : '1'
|
||||
|
||||
// Create the SVG path - moving counter-clockwise
|
||||
return `
|
||||
M ${center},${center}
|
||||
L ${startX},${startY}
|
||||
A ${radius} ${radius} 0 ${largeArcFlag} 0 ${endX} ${endY}
|
||||
L ${center},${center}
|
||||
`.trim()
|
||||
}
|
||||
|
||||
export const ActionCooldown = () => {
|
||||
const { actionCooldown, setActionCooldown } = useGameStore()
|
||||
const [progress, setProgress] = useState(0)
|
||||
|
||||
useEffect(() => {
|
||||
if (actionCooldown <= 0) {
|
||||
setProgress(0)
|
||||
return
|
||||
}
|
||||
|
||||
const startTime = Date.now()
|
||||
const duration = actionCooldown
|
||||
|
||||
const updateProgress = () => {
|
||||
const elapsed = Date.now() - startTime
|
||||
const newProgress = Math.min(100, (elapsed / duration) * 100)
|
||||
|
||||
if (newProgress >= 100) {
|
||||
setProgress(0)
|
||||
setActionCooldown(0)
|
||||
return
|
||||
}
|
||||
|
||||
setProgress(newProgress)
|
||||
requestAnimationFrame(updateProgress)
|
||||
}
|
||||
|
||||
const animationFrame = requestAnimationFrame(updateProgress)
|
||||
|
||||
return () => {
|
||||
cancelAnimationFrame(animationFrame)
|
||||
}
|
||||
}, [actionCooldown, setActionCooldown])
|
||||
|
||||
// Don't render if there's no active cooldown
|
||||
if (actionCooldown <= 0) {
|
||||
return null
|
||||
}
|
||||
|
||||
return (
|
||||
<CooldownContainer>
|
||||
<DialSVG viewBox="0 0 32 32">
|
||||
<DialBackground cx="16" cy="16" r="15" />
|
||||
<DialProgress d={calculatePieWedge(progress, 32)} />
|
||||
</DialSVG>
|
||||
</CooldownContainer>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
import React from 'react'
|
||||
import React, { useState } from 'react'
|
||||
|
||||
export interface TabProps {
|
||||
value: string
|
||||
|
|
@ -6,8 +6,7 @@ export interface TabProps {
|
|||
}
|
||||
|
||||
export interface TabsProps {
|
||||
value: string
|
||||
onValueChange: (value: string) => void
|
||||
defaultValue: string
|
||||
children: React.ReactNode
|
||||
}
|
||||
|
||||
|
|
@ -77,16 +76,18 @@ const TabsContext = React.createContext<{
|
|||
setValue: () => {},
|
||||
})
|
||||
|
||||
export const Tabs: React.FC<TabsProps> = ({ value, onValueChange, children }) => {
|
||||
export const Tabs: React.FC<TabsProps> = ({ defaultValue, children }) => {
|
||||
const [value, setValue] = useState(defaultValue)
|
||||
|
||||
return (
|
||||
<TabsContext.Provider value={{ value, setValue: onValueChange }}>
|
||||
<TabsContext.Provider value={{ value, setValue }}>
|
||||
<div style={tabsContainerStyle}>{children}</div>
|
||||
</TabsContext.Provider>
|
||||
)
|
||||
}
|
||||
|
||||
export const TabsList: React.FC<TabsListProps> = ({ children, ...props }) => {
|
||||
return <div style={{ ...tabsListContainerStyle }} {...props}>{children}</div>
|
||||
export const TabsList: React.FC<TabsListProps> = ({ children, style }) => {
|
||||
return <div style={{ ...tabsListContainerStyle, ...style }}>{children}</div>
|
||||
}
|
||||
|
||||
export const TabsTrigger: React.FC<TabsTriggerProps> = ({
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ const RecipeDetails = styled.div`
|
|||
`
|
||||
|
||||
const EquipmentModal = ({ equipmentId, onClose }: EquipmentModalProps) => {
|
||||
const { inventory, configureEquipment, useEquipment, stamina, equipment } = useGameStore()
|
||||
const { inventory, configureEquipment, useEquipment, actionCooldown, equipment } = useGameStore()
|
||||
const equipmentInstance = equipment[equipmentId]
|
||||
const equipmentDef = EQUIPMENT[equipmentInstance.type]
|
||||
|
||||
|
|
@ -99,7 +99,7 @@ const EquipmentModal = ({ equipmentId, onClose }: EquipmentModalProps) => {
|
|||
|
||||
const canUse =
|
||||
!equipmentInstance.isProcessing &&
|
||||
stamina >= 1 &&
|
||||
actionCooldown === 0 &&
|
||||
selectedRecipe &&
|
||||
(inventory[selectedRecipe.inputItem] || 0) >= selectedRecipe.inputAmount
|
||||
|
||||
|
|
@ -163,14 +163,14 @@ const EquipmentModal = ({ equipmentId, onClose }: EquipmentModalProps) => {
|
|||
Output: {selectedRecipe.outputAmount} {ITEMS[selectedRecipe.outputItem].name}
|
||||
</p>
|
||||
<p>Processing time: {selectedRecipe.processTicks} ticks</p>
|
||||
<p>Stamina cost: 1</p>
|
||||
<p>Cooldown: {selectedRecipe.cooldownDuration / 1000} seconds</p>
|
||||
</Section>
|
||||
|
||||
<ActionButton
|
||||
disabled={!canUse}
|
||||
onClick={handleUse}
|
||||
>
|
||||
{equipmentInstance.isProcessing ? 'Processing...' : stamina < 1 ? 'No Stamina' : 'Use'}
|
||||
{equipmentInstance.isProcessing ? 'Processing...' : 'Use'}
|
||||
</ActionButton>
|
||||
</>
|
||||
)}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import React, { useState } from 'react'
|
||||
import { useGameStore } from '../store/useGameStore'
|
||||
import { CROPS, ITEMS } from '../constants'
|
||||
import { CROPS } from '../constants'
|
||||
import { FieldTool, PlotState } from '../types'
|
||||
import Modal from './Modal'
|
||||
|
||||
|
|
@ -154,6 +154,10 @@ const PlotInfoModal: React.FC<PlotInfoModalProps> = ({ plot, onClose }) => {
|
|||
: 'None'}
|
||||
</span>
|
||||
</div>
|
||||
<div style={plotInfoItemStyle}>
|
||||
<span>Intended Crop:</span>
|
||||
<span>{plot.intended ? CROPS[plot.intended].name : 'None'}</span>
|
||||
</div>
|
||||
<div style={plotInfoItemStyle}>
|
||||
<span>Water Level:</span>
|
||||
<span>{formatPercentage(plot.moisture)}</span>
|
||||
|
|
@ -186,12 +190,12 @@ const FieldComponent: React.FC = () => {
|
|||
water,
|
||||
harvest,
|
||||
remove,
|
||||
inventory,
|
||||
stamina,
|
||||
assignCrop,
|
||||
actionCooldown,
|
||||
} = useGameStore()
|
||||
|
||||
const [selectedSeed, setSelectedSeed] = useState<string | null>(null)
|
||||
const [selectedTool, setSelectedTool] = useState<FieldTool>('plant')
|
||||
const [selectedCrop, setSelectedCrop] = useState<string | null>(null)
|
||||
const [selectedTool, setSelectedTool] = useState<FieldTool>('mark')
|
||||
const [inspectedPlot, setInspectedPlot] = useState<{
|
||||
plot: PlotState
|
||||
row: number
|
||||
|
|
@ -199,16 +203,16 @@ const FieldComponent: React.FC = () => {
|
|||
} | null>(null)
|
||||
|
||||
const handlePlotClick = (row: number, col: number) => {
|
||||
if (stamina < 1) return
|
||||
if (actionCooldown > 0) return
|
||||
|
||||
switch (selectedTool) {
|
||||
case 'mark':
|
||||
if (selectedCrop) {
|
||||
assignCrop(row, col, selectedCrop)
|
||||
}
|
||||
break
|
||||
case 'plant':
|
||||
if (selectedSeed) {
|
||||
const crop = Object.values(CROPS).find(c => c.seedType === selectedSeed)
|
||||
if (crop && inventory[selectedSeed] > 0) {
|
||||
plant(row, col, crop.id)
|
||||
}
|
||||
}
|
||||
plant(row, col)
|
||||
break
|
||||
case 'water':
|
||||
water(row, col)
|
||||
|
|
@ -242,6 +246,7 @@ const FieldComponent: React.FC = () => {
|
|||
}
|
||||
|
||||
const tools: { id: FieldTool; label: string; icon: string }[] = [
|
||||
{ id: 'mark', label: 'Mark', icon: '🎯' },
|
||||
{ id: 'plant', label: 'Plant', icon: '🌱' },
|
||||
{ id: 'water', label: 'Water', icon: '💧' },
|
||||
{ id: 'harvest', label: 'Harvest', icon: '✂️' },
|
||||
|
|
@ -249,14 +254,6 @@ const FieldComponent: React.FC = () => {
|
|||
{ id: 'inspect', label: 'Inspect', icon: '🔍' },
|
||||
]
|
||||
|
||||
// Get available seeds from inventory
|
||||
const availableSeeds = Object.entries(inventory)
|
||||
.filter(([itemId, count]) => {
|
||||
const crop = Object.values(CROPS).find(c => c.seedType === itemId)
|
||||
return crop && count > 0
|
||||
})
|
||||
.map(([itemId]) => itemId)
|
||||
|
||||
return (
|
||||
<div style={fieldContainerStyle}>
|
||||
<h2 style={titleStyle}>Fields</h2>
|
||||
|
|
@ -274,28 +271,18 @@ const FieldComponent: React.FC = () => {
|
|||
))}
|
||||
</div>
|
||||
|
||||
{selectedTool === 'plant' && (
|
||||
{selectedTool === 'mark' && (
|
||||
<div style={cropSelectionContainerStyle}>
|
||||
<p style={cropSelectionLabelStyle}>Select a seed to plant:</p>
|
||||
{availableSeeds.length > 0 ? (
|
||||
availableSeeds.map((seedId) => {
|
||||
const crop = Object.values(CROPS).find(c => c.seedType === seedId)
|
||||
if (!crop) return null
|
||||
return (
|
||||
<p style={cropSelectionLabelStyle}>Select a crop to mark:</p>
|
||||
{Object.values(CROPS).map((crop) => (
|
||||
<button
|
||||
key={seedId}
|
||||
style={getCropButtonStyle(selectedSeed === seedId)}
|
||||
onClick={() => setSelectedSeed(seedId)}
|
||||
key={crop.id}
|
||||
style={getCropButtonStyle(selectedCrop === crop.id)}
|
||||
onClick={() => setSelectedCrop(crop.id)}
|
||||
>
|
||||
{ITEMS[seedId].emoji} {crop.name} ({inventory[seedId]})
|
||||
{crop.name}
|
||||
</button>
|
||||
)
|
||||
})
|
||||
) : (
|
||||
<p style={{ width: '100%', textAlign: 'center', color: '#666' }}>
|
||||
No seeds available in inventory
|
||||
</p>
|
||||
)}
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
|
||||
|
|
@ -312,6 +299,9 @@ const FieldComponent: React.FC = () => {
|
|||
style={getPlotStyle(bgColor)}
|
||||
onClick={() => handlePlotClick(rowIndex, colIndex)}
|
||||
>
|
||||
{plot.intended && !plot.current && (
|
||||
<div>🌱 {CROPS[plot.intended]?.name}</div>
|
||||
)}
|
||||
{plot.current && (
|
||||
<div>
|
||||
{plot.current.mature ? '🌿' : '🌱'}{' '}
|
||||
|
|
|
|||
|
|
@ -1,66 +0,0 @@
|
|||
import { styled } from '@linaria/react'
|
||||
import { useGameStore } from '../store/useGameStore'
|
||||
|
||||
const StaminaContainer = styled.div`
|
||||
position: fixed;
|
||||
top: 1rem;
|
||||
left: 1rem;
|
||||
width: 200px;
|
||||
height: 24px;
|
||||
display: flex;
|
||||
justify-content: left;
|
||||
background-color: #4b5563; /* Grey for depleted stamina */
|
||||
border: 3px solid #000;
|
||||
border-radius: 4px;
|
||||
box-shadow: 2px 2px 0 rgba(0, 0, 0, 0.2);
|
||||
overflow: hidden;
|
||||
z-index: 2;
|
||||
`
|
||||
|
||||
const StaminaFill = styled.div<{ width: number }>`
|
||||
height: 100%;
|
||||
width: ${props => props.width + '%'};
|
||||
background-color: #22c55e;
|
||||
transition: width 0.2s linear;
|
||||
position: relative;
|
||||
|
||||
&::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background: linear-gradient(
|
||||
to bottom,
|
||||
rgba(255, 255, 255, 0.2) 0%,
|
||||
rgba(255, 255, 255, 0) 50%,
|
||||
rgba(0, 0, 0, 0.1) 100%
|
||||
);
|
||||
}
|
||||
`
|
||||
|
||||
const StaminaText = styled.div`
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
color: #fff;
|
||||
font-weight: bold;
|
||||
text-shadow: 1px 1px 0 #000;
|
||||
font-size: 0.875rem;
|
||||
z-index: 1;
|
||||
`
|
||||
|
||||
export const StaminaDisplay = () => {
|
||||
const { stamina, maxStamina } = useGameStore()
|
||||
const staminaPercentage = (stamina / maxStamina) * 100
|
||||
|
||||
return (
|
||||
<StaminaContainer>
|
||||
<StaminaFill width={staminaPercentage} />
|
||||
<StaminaText>
|
||||
{stamina}/{maxStamina}
|
||||
</StaminaText>
|
||||
</StaminaContainer>
|
||||
)
|
||||
}
|
||||
|
|
@ -114,7 +114,7 @@ const TempleComponent: React.FC = () => {
|
|||
purchaseUpgrade,
|
||||
pray,
|
||||
piety,
|
||||
stamina,
|
||||
actionCooldown,
|
||||
} = useGameStore()
|
||||
|
||||
const handlePurchase = (upgradeId: string) => {
|
||||
|
|
@ -186,9 +186,9 @@ const TempleComponent: React.FC = () => {
|
|||
|
||||
<PrayerSection>
|
||||
<PietyDisplay>Piety Level: {piety}</PietyDisplay>
|
||||
<PrayerButton onClick={() => pray()} disabled={stamina < 1}>
|
||||
<PrayerButton onClick={() => pray()} disabled={actionCooldown > 0}>
|
||||
🙏 Pray to the Gods
|
||||
{stamina < 1 && ' (No Stamina)'}
|
||||
{actionCooldown > 0 && ` (${(actionCooldown / 1000).toFixed(1)}s)`}
|
||||
</PrayerButton>
|
||||
</PrayerSection>
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = 5000
|
||||
export const TICK_INTERVAL = 12000 // 12 seconds in milliseconds
|
||||
export const GAME_SPEEDS = {
|
||||
NORMAL: 1,
|
||||
FAST: 5,
|
||||
|
|
@ -68,7 +68,7 @@ export const UPGRADES: Record<string, Upgrade> = {
|
|||
aqueous_vigor_1: {
|
||||
id: 'aqueous_vigor_1',
|
||||
name: 'Aqueous Vigor I',
|
||||
description: 'Reduces watering stamina cost by 25%',
|
||||
description: 'Reduces watering cooldown by 25%',
|
||||
cost: [
|
||||
{
|
||||
itemId: 'celery',
|
||||
|
|
@ -80,7 +80,7 @@ export const UPGRADES: Record<string, Upgrade> = {
|
|||
id: 'aqueous_vigor_2',
|
||||
name: 'Aqueous Vigor II',
|
||||
description:
|
||||
'Reduces watering stamina cost by an additional 25% (requires Aqueous Vigor I)',
|
||||
'Reduces watering cooldown by an additional 25% (requires Aqueous Vigor I)',
|
||||
cost: [
|
||||
{
|
||||
itemId: 'celery',
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
import { GameState } from '../types'
|
||||
|
||||
const SAVE_SLOT_PREFIX = 'dionysian_idle_save_'
|
||||
|
||||
const saveGame = (slot: number, state: GameState) => {
|
||||
try {
|
||||
const saveData = JSON.stringify(state)
|
||||
localStorage.setItem(`${SAVE_SLOT_PREFIX}${slot}`, saveData)
|
||||
return true
|
||||
} catch (error) {
|
||||
console.error('Failed to save game:', error)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
const loadGame = (slot: number): GameState | null => {
|
||||
try {
|
||||
const saveData = localStorage.getItem(`${SAVE_SLOT_PREFIX}${slot}`)
|
||||
if (!saveData) return null
|
||||
return JSON.parse(saveData)
|
||||
} catch (error) {
|
||||
console.error('Failed to load game:', error)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
export const hasSaveInSlot = (slot: number): boolean => {
|
||||
return !!localStorage.getItem(`${SAVE_SLOT_PREFIX}${slot}`)
|
||||
}
|
||||
|
||||
// Create the global saves object
|
||||
declare global {
|
||||
interface Window {
|
||||
saves: {
|
||||
save: (slot: number) => void
|
||||
load: (slot: number) => void
|
||||
hasSave: (slot: number) => boolean
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize the global saves object
|
||||
window.saves = {
|
||||
save: (slot: number) => {
|
||||
const state = (window as any).gameStore?.getState()
|
||||
if (state) {
|
||||
saveGame(slot, state)
|
||||
console.log(`Game saved to slot ${slot}`)
|
||||
}
|
||||
},
|
||||
load: (slot: number) => {
|
||||
const savedState = loadGame(slot)
|
||||
if (savedState && (window as any).gameStore?.setState) {
|
||||
(window as any).gameStore.setState(savedState)
|
||||
console.log(`Game loaded from slot ${slot}`)
|
||||
}
|
||||
},
|
||||
hasSave: hasSaveInSlot
|
||||
}
|
||||
|
|
@ -7,6 +7,7 @@ import {
|
|||
INITIAL_INVENTORY,
|
||||
CROPS,
|
||||
INITIAL_GAME_SPEED,
|
||||
COOLDOWN_DURATION,
|
||||
ITEMS,
|
||||
UPGRADES,
|
||||
EQUIPMENT,
|
||||
|
|
@ -28,6 +29,27 @@ const initializeField = (size: number): PlotState[][] => {
|
|||
|
||||
const SAVE_SLOT_PREFIX = 'dionysian_idle_save_'
|
||||
|
||||
const saveGame = (slot: number, state: GameState) => {
|
||||
try {
|
||||
const saveData = JSON.stringify(state)
|
||||
localStorage.setItem(`${SAVE_SLOT_PREFIX}${slot}`, saveData)
|
||||
return true
|
||||
} catch (error) {
|
||||
console.error('Failed to save game:', error)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
const loadGame = (slot: number): GameState | null => {
|
||||
try {
|
||||
const saveData = localStorage.getItem(`${SAVE_SLOT_PREFIX}${slot}`)
|
||||
if (!saveData) return null
|
||||
return JSON.parse(saveData)
|
||||
} catch (error) {
|
||||
console.error('Failed to load game:', error)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
export const hasSaveInSlot = (slot: number): boolean => {
|
||||
return !!localStorage.getItem(`${SAVE_SLOT_PREFIX}${slot}`)
|
||||
|
|
@ -76,15 +98,19 @@ const progressRandomImmaturePlot = (
|
|||
|
||||
export const useGameStore = create<
|
||||
GameState & {
|
||||
plant: (row: number, col: number, cropId: string) => void
|
||||
plant: (row: number, col: number) => void
|
||||
water: (row: number, col: number) => void
|
||||
harvest: (row: number, col: number) => void
|
||||
remove: (row: number, col: number) => void
|
||||
tick: () => void
|
||||
assignCrop: (row: number, col: number, cropId: string) => void
|
||||
upgradeField: () => void
|
||||
setGameSpeed: (speed: number) => void
|
||||
setActionCooldown: (cooldown: number) => void
|
||||
buyItem: (itemId: string) => void
|
||||
sellItem: (itemId: string) => void
|
||||
saveToSlot: (slot: number) => void
|
||||
loadFromSlot: (slot: number) => void
|
||||
purchaseUpgrade: (upgradeId: string) => void
|
||||
pray: () => void
|
||||
buyEquipment: (equipmentId: string) => void
|
||||
|
|
@ -92,14 +118,7 @@ export const useGameStore = create<
|
|||
useEquipment: (equipmentId: string) => void
|
||||
addCash: (amount: number) => void
|
||||
}
|
||||
>((set, get) => {
|
||||
// Expose store methods to window for the save system
|
||||
;(window as any).gameStore = {
|
||||
getState: get,
|
||||
setState: set
|
||||
}
|
||||
|
||||
return {
|
||||
>((set, get) => ({
|
||||
cash: INITIAL_CASH,
|
||||
inventory: INITIAL_INVENTORY,
|
||||
fieldSize: INITIAL_FIELD_SIZE,
|
||||
|
|
@ -107,8 +126,7 @@ export const useGameStore = create<
|
|||
fieldUpgradeCosts: FIELD_UPGRADE_COSTS,
|
||||
plots: initializeField(INITIAL_FIELD_SIZE),
|
||||
gameSpeed: INITIAL_GAME_SPEED,
|
||||
stamina: 10,
|
||||
maxStamina: 10,
|
||||
actionCooldown: 0,
|
||||
tickCount: 0,
|
||||
consoleMessages: [],
|
||||
purchasedUpgrades: [],
|
||||
|
|
@ -117,57 +135,67 @@ export const useGameStore = create<
|
|||
equipment: {},
|
||||
milestones: {},
|
||||
|
||||
plant: (row, col, cropId) => {
|
||||
const { plots, inventory, stamina } = get()
|
||||
assignCrop: (row, col, cropId) => {
|
||||
set(
|
||||
produce((state) => {
|
||||
state.plots[row][col].intended = cropId
|
||||
}),
|
||||
)
|
||||
},
|
||||
|
||||
if (stamina < 1) {
|
||||
plant: (row, col) => {
|
||||
const { plots, inventory, actionCooldown } = get()
|
||||
|
||||
if (actionCooldown > 0) {
|
||||
return
|
||||
}
|
||||
|
||||
const plot = plots[row][col]
|
||||
const crop = CROPS[cropId]
|
||||
if (plot.intended && !plot.current) {
|
||||
const crop = CROPS[plot.intended]
|
||||
const seedId = crop.seedType
|
||||
|
||||
if (!plot.current && inventory[seedId] && inventory[seedId] > 0) {
|
||||
if (inventory[seedId] && inventory[seedId] > 0) {
|
||||
set(
|
||||
produce((state) => {
|
||||
state.plots[row][col].current = {
|
||||
cropId: cropId,
|
||||
cropId: plot.intended!,
|
||||
progress: 0,
|
||||
mature: false,
|
||||
}
|
||||
|
||||
state.inventory[seedId] = state.inventory[seedId] - 1
|
||||
state.stamina = Math.max(0, state.stamina - 1)
|
||||
state.actionCooldown = COOLDOWN_DURATION
|
||||
}),
|
||||
)
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
water: (row, col) => {
|
||||
const { plots, stamina, purchasedUpgrades } = get()
|
||||
const { plots, actionCooldown, purchasedUpgrades } = get()
|
||||
|
||||
if (actionCooldown > 0) {
|
||||
return
|
||||
}
|
||||
|
||||
const plot = plots[row][col]
|
||||
if (plot.current && plot.moisture < 1) {
|
||||
// Calculate stamina cost reduction from upgrades (multiplicative)
|
||||
let staminaMultiplier = 1
|
||||
// Calculate cooldown reduction from upgrades (multiplicative)
|
||||
let cooldownMultiplier = 1
|
||||
if (purchasedUpgrades.includes('aqueous_vigor_1')) {
|
||||
staminaMultiplier *= 0.75 // 25% reduction
|
||||
cooldownMultiplier *= 0.75 // 25% reduction
|
||||
}
|
||||
if (purchasedUpgrades.includes('aqueous_vigor_2')) {
|
||||
staminaMultiplier *= 0.75 // Additional 25% reduction
|
||||
cooldownMultiplier *= 0.75 // Additional 25% reduction
|
||||
}
|
||||
|
||||
const staminaCost = Math.max(1, Math.floor(staminaMultiplier))
|
||||
|
||||
if (stamina < staminaCost) {
|
||||
return
|
||||
}
|
||||
const finalCooldown = Math.max(0, COOLDOWN_DURATION * cooldownMultiplier)
|
||||
|
||||
set(
|
||||
produce((state) => {
|
||||
state.plots[row][col].moisture = 1
|
||||
state.stamina = Math.max(0, state.stamina - staminaCost)
|
||||
state.actionCooldown = finalCooldown
|
||||
|
||||
// Handle water diffusion to adjacent plots
|
||||
const diffusionAmount = purchasedUpgrades.includes('aqua_diffundere_2')
|
||||
|
|
@ -177,24 +205,26 @@ export const useGameStore = create<
|
|||
: 0
|
||||
|
||||
if (diffusionAmount > 0) {
|
||||
// Apply diffusion to adjacent plots
|
||||
const adjacentCoords = [
|
||||
[row - 1, col],
|
||||
[row + 1, col],
|
||||
[row, col - 1],
|
||||
[row, col + 1],
|
||||
// Check and water adjacent plots (up, right, down, left)
|
||||
const adjacentPositions = [
|
||||
[row - 1, col], // up
|
||||
[row, col + 1], // right
|
||||
[row + 1, col], // down
|
||||
[row, col - 1], // left
|
||||
]
|
||||
|
||||
adjacentCoords.forEach(([r, c]) => {
|
||||
adjacentPositions.forEach(([adjRow, adjCol]) => {
|
||||
// Check if the adjacent position is within bounds
|
||||
if (
|
||||
r >= 0 &&
|
||||
r < state.plots.length &&
|
||||
c >= 0 &&
|
||||
c < state.plots[0].length
|
||||
adjRow >= 0 &&
|
||||
adjRow < state.plots.length &&
|
||||
adjCol >= 0 &&
|
||||
adjCol < state.plots[0].length
|
||||
) {
|
||||
state.plots[r][c].moisture = Math.min(
|
||||
const adjPlot = state.plots[adjRow][adjCol]
|
||||
state.plots[adjRow][adjCol].moisture = Math.min(
|
||||
1,
|
||||
state.plots[r][c].moisture + diffusionAmount,
|
||||
adjPlot.moisture + diffusionAmount
|
||||
)
|
||||
}
|
||||
})
|
||||
|
|
@ -205,9 +235,9 @@ export const useGameStore = create<
|
|||
},
|
||||
|
||||
harvest: (row, col) => {
|
||||
const { plots, stamina } = get()
|
||||
const { plots, actionCooldown } = get()
|
||||
|
||||
if (stamina < 1) {
|
||||
if (actionCooldown > 0) {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -237,7 +267,7 @@ export const useGameStore = create<
|
|||
0,
|
||||
state.plots[row][col].fertility - crop.fertilityDepletion,
|
||||
)
|
||||
state.stamina = Math.max(0, state.stamina - 1)
|
||||
state.actionCooldown = COOLDOWN_DURATION
|
||||
|
||||
// Track milestone for crop harvest
|
||||
const milestoneKey = `crops_harvested_${crop.id}`
|
||||
|
|
@ -248,9 +278,9 @@ export const useGameStore = create<
|
|||
},
|
||||
|
||||
remove: (row, col) => {
|
||||
const { plots, stamina } = get()
|
||||
const { plots, actionCooldown } = get()
|
||||
|
||||
if (stamina < 1) {
|
||||
if (actionCooldown > 0) {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -259,7 +289,7 @@ export const useGameStore = create<
|
|||
set(
|
||||
produce((state) => {
|
||||
state.plots[row][col].current = undefined
|
||||
state.stamina = Math.max(0, state.stamina - 1)
|
||||
state.actionCooldown = COOLDOWN_DURATION
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
|
@ -268,18 +298,6 @@ export const useGameStore = create<
|
|||
tick: () => {
|
||||
set(
|
||||
produce((state) => {
|
||||
// Regenerate stamina
|
||||
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) => {
|
||||
|
|
@ -400,6 +418,14 @@ export const useGameStore = create<
|
|||
)
|
||||
},
|
||||
|
||||
setActionCooldown: (cooldown) => {
|
||||
set(
|
||||
produce((state) => {
|
||||
state.actionCooldown = cooldown
|
||||
}),
|
||||
)
|
||||
},
|
||||
|
||||
buyItem: (itemId) => {
|
||||
const { cash, landPurchases } = get()
|
||||
const item = ITEMS[itemId]
|
||||
|
|
@ -477,6 +503,19 @@ export const useGameStore = create<
|
|||
)
|
||||
},
|
||||
|
||||
saveToSlot: (slot: number) => {
|
||||
const state = get()
|
||||
const { ...gameState } = state
|
||||
saveGame(slot, gameState)
|
||||
},
|
||||
|
||||
loadFromSlot: (slot: number) => {
|
||||
const savedState = loadGame(slot)
|
||||
if (savedState) {
|
||||
set(savedState)
|
||||
}
|
||||
},
|
||||
|
||||
purchaseUpgrade: (upgradeId) => {
|
||||
const { inventory, purchasedUpgrades } = get()
|
||||
const upgrade = UPGRADES[upgradeId]
|
||||
|
|
@ -509,9 +548,9 @@ export const useGameStore = create<
|
|||
},
|
||||
|
||||
pray: () => {
|
||||
const { stamina, piety } = get()
|
||||
const { actionCooldown, piety } = get()
|
||||
|
||||
if (stamina < 1) {
|
||||
if (actionCooldown > 0) {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -542,7 +581,7 @@ export const useGameStore = create<
|
|||
}
|
||||
}
|
||||
|
||||
state.stamina = Math.max(0, state.stamina - 1)
|
||||
state.actionCooldown = 3000
|
||||
}),
|
||||
)
|
||||
},
|
||||
|
|
@ -594,13 +633,13 @@ export const useGameStore = create<
|
|||
},
|
||||
|
||||
useEquipment: (equipmentId) => {
|
||||
const { equipment, inventory, stamina } = get()
|
||||
const { equipment, inventory, actionCooldown } = get()
|
||||
const equipmentInstance = equipment[equipmentId]
|
||||
|
||||
if (
|
||||
!equipmentInstance ||
|
||||
equipmentInstance.isProcessing ||
|
||||
stamina < 1 ||
|
||||
actionCooldown > 0 ||
|
||||
!equipmentInstance.selectedRecipeId
|
||||
) {
|
||||
return
|
||||
|
|
@ -625,7 +664,7 @@ export const useGameStore = create<
|
|||
// Start processing
|
||||
state.equipment[equipmentId].isProcessing = true
|
||||
state.equipment[equipmentId].progress = 0
|
||||
state.stamina = Math.max(0, state.stamina - 1)
|
||||
state.actionCooldown = recipe.cooldownDuration
|
||||
}),
|
||||
)
|
||||
},
|
||||
|
|
@ -635,5 +674,4 @@ export const useGameStore = create<
|
|||
produce((state) => { state.cash += amount }),
|
||||
)
|
||||
},
|
||||
}
|
||||
})
|
||||
}))
|
||||
|
|
|
|||
|
|
@ -1,23 +1,51 @@
|
|||
import { useEffect } from 'react'
|
||||
import { useGameStore } from './useGameStore'
|
||||
import './saves' // Import the saves module to initialize the global saves object
|
||||
import { hasSaveInSlot, useGameStore } from './useGameStore'
|
||||
|
||||
export const useSaveSystem = () => {
|
||||
const { saveToSlot, loadFromSlot } = useGameStore()
|
||||
|
||||
useEffect(() => {
|
||||
// Auto-save every 30 seconds
|
||||
const handleKeyDown = (e: KeyboardEvent) => {
|
||||
if (e.key === 'r' && e.ctrlKey) {
|
||||
localStorage.clear()
|
||||
}
|
||||
|
||||
const slot =
|
||||
{
|
||||
'1': 1,
|
||||
'2': 2,
|
||||
'3': 3,
|
||||
'!': 1,
|
||||
'@': 2,
|
||||
'#': 3,
|
||||
}[e.key] ?? null
|
||||
|
||||
if (slot !== null) {
|
||||
if (e.shiftKey) {
|
||||
saveToSlot(slot)
|
||||
console.log(`Game saved to slot ${slot}`)
|
||||
} else if (hasSaveInSlot(slot)) {
|
||||
loadFromSlot(slot)
|
||||
console.log(`Game loaded from slot ${slot}`)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
window.addEventListener('keydown', handleKeyDown)
|
||||
const interval = setInterval(() => {
|
||||
window.saves.save(0) // Save to autosave slot
|
||||
saveToSlot(0)
|
||||
}, 30000)
|
||||
|
||||
console.log('Initialized save system')
|
||||
console.log('Initalized save system')
|
||||
|
||||
return () => {
|
||||
window.removeEventListener('keydown', handleKeyDown)
|
||||
clearInterval(interval)
|
||||
}
|
||||
}, [])
|
||||
}, [saveToSlot, loadFromSlot])
|
||||
|
||||
// When starting the game, load from the autosave slot
|
||||
useEffect(() => {
|
||||
window.saves.load(0)
|
||||
loadFromSlot(0)
|
||||
}, [])
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ export interface CropDefinitions {
|
|||
}
|
||||
|
||||
export interface PlotState {
|
||||
intended?: string
|
||||
current?: {
|
||||
cropId: string
|
||||
progress: number
|
||||
|
|
@ -30,7 +31,7 @@ export interface InventoryItem {
|
|||
count: number
|
||||
}
|
||||
|
||||
export type FieldTool = 'plant' | 'water' | 'harvest' | 'inspect' | 'remove'
|
||||
export type FieldTool = 'mark' | 'plant' | 'water' | 'harvest' | 'inspect' | 'remove'
|
||||
|
||||
export interface ConsoleMessage {
|
||||
id: string
|
||||
|
|
@ -85,8 +86,7 @@ export interface GameState {
|
|||
fieldUpgradeCosts: number[]
|
||||
plots: PlotState[][]
|
||||
gameSpeed: number
|
||||
stamina: number
|
||||
maxStamina: number
|
||||
actionCooldown: number
|
||||
consoleMessages: ConsoleMessage[]
|
||||
purchasedUpgrades: string[]
|
||||
piety: number
|
||||
|
|
|
|||
Loading…
Reference in a new issue