-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
🥉🦣 ↝ [SSG-32 SSG-31 SSC-17]: Fixing some bugs & improved mining scene…
… w/ new inventory area
- Loading branch information
1 parent
55ec8c8
commit f432c4a
Showing
22 changed files
with
711 additions
and
25 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,12 @@ | ||
| "use client"; | ||
|
|
||
| import { MiningComponentComponent } from "@/components/(structures)/Mining/Mining"; | ||
| import React from "react"; | ||
|
|
||
| export default function TestPage() { | ||
| return ( | ||
| <div> | ||
| <MiningComponentComponent /> | ||
| </div> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| import { useState, useEffect } from 'react' | ||
| import { Button } from "@/components/ui/button" | ||
| import { Truck } from 'lucide-react' | ||
| import { useSession, useSupabaseClient } from '@supabase/auth-helpers-react' | ||
| import { useActivePlanet } from '@/context/ActivePlanet' | ||
|
|
||
| type Rover = { | ||
| id: string | ||
| name: string | ||
| speed: number | ||
| efficiency: number | ||
| miningLevel: number | ||
| } | ||
|
|
||
| type Props = { | ||
| rovers: Rover[] | ||
| selectedRover: Rover | null | ||
| onRoverSelect: (rover: Rover) => void | ||
| onStartMining: () => void | ||
| isMining: boolean | ||
| } | ||
|
|
||
| export function ControlPanel({ rovers = [], selectedRover, onRoverSelect, onStartMining, isMining }: Props) { | ||
| const [speed, setSpeed] = useState(10) | ||
| const [efficiency, setEfficiency] = useState(0.8) | ||
| const [miningLevel, setMiningLevel] = useState(1) | ||
|
|
||
| useEffect(() => { | ||
| if (selectedRover) { | ||
| setSpeed(selectedRover.speed) | ||
| setEfficiency(selectedRover.efficiency) | ||
| setMiningLevel(selectedRover.miningLevel) | ||
| } | ||
| }, [selectedRover]) | ||
|
|
||
| const handleRoverSelect = (rover: Rover) => { | ||
| onRoverSelect(rover) | ||
| } | ||
|
|
||
| return ( | ||
| <div className="h-full flex flex-col"> | ||
| <h2 className="text-xl font-bold text-[#2C4F64] mb-4">Control Panel</h2> | ||
| <div className="overflow-y-auto flex-grow pr-2"> | ||
| <div className="mb-4"> | ||
| <h3 className="font-bold mb-2">Select Rover</h3> | ||
| <div className="grid grid-cols-2 gap-2"> | ||
| {rovers.map(rover => ( | ||
| <div | ||
| key={rover.id} | ||
| className={`p-2 rounded-lg cursor-pointer ${selectedRover?.id === rover.id ? 'bg-[#5FCBC3] text-white' : 'bg-gray-100'}`} | ||
| onClick={() => handleRoverSelect(rover)} | ||
| > | ||
| <div className="flex items-center space-x-2"> | ||
| <Truck className="text-[#FFE3BA]" /> | ||
| <span className="font-bold">{rover.name}</span> | ||
| </div> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| </div> | ||
|
|
||
| {selectedRover && ( | ||
| <div className="space-y-4 mt-4"> | ||
| <h3 className="font-bold mb-2">Customize Rover</h3> | ||
| <div> | ||
| <label className="block text-sm font-medium text-[#2C4F64]">Speed</label> | ||
| <input | ||
| type="range" | ||
| min={1} | ||
| max={20} | ||
| value={speed} | ||
| onChange={(e) => setSpeed(Number(e.target.value))} | ||
| className="my-2 w-full" | ||
| /> | ||
| <span className="text-sm text-[#2C4F64]">{speed}</span> | ||
| </div> | ||
| <div> | ||
| <label className="block text-sm font-medium text-[#2C4F64]">Efficiency</label> | ||
| <input | ||
| type="range" | ||
| min={0} | ||
| max={100} | ||
| value={efficiency * 100} | ||
| onChange={(e) => setEfficiency(Number(e.target.value) / 100)} | ||
| className="my-2 w-full" | ||
| /> | ||
| <span className="text-sm text-[#2C4F64]">{(efficiency * 100).toFixed(0)}%</span> | ||
| </div> | ||
| <div> | ||
| <label className="block text-sm font-medium text-[#2C4F64]">Mining Level</label> | ||
| <input | ||
| type="range" | ||
| min={1} | ||
| max={5} | ||
| value={miningLevel} | ||
| onChange={(e) => setMiningLevel(Number(e.target.value))} | ||
| className="my-2 w-full" | ||
| /> | ||
| <span className="text-sm text-[#2C4F64]">{miningLevel}</span> | ||
| </div> | ||
| </div> | ||
| )} | ||
|
|
||
| <AddMineralDeposits /> | ||
|
|
||
| <Button | ||
| onClick={onStartMining} | ||
| disabled={isMining || !selectedRover} | ||
| className="w-full mt-4 bg-[#5FCBC3] text-white hover:bg-[#5FCBC3]/80" | ||
| > | ||
| {isMining ? 'Mining...' : 'Start Mining'} | ||
| </Button> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
|
|
||
|
|
||
| // test | ||
|
|
||
| function AddMineralDeposits() { | ||
| const supabase = useSupabaseClient(); | ||
| const session = useSession(); | ||
|
|
||
| const { activePlanet } = useActivePlanet(); | ||
|
|
||
| const [isLoading, setIsLoading] = useState(false); | ||
| const mineral = 19; | ||
|
|
||
| const handleAddDeposits = async () => { | ||
| setIsLoading(true); | ||
|
|
||
| try { | ||
| const deposits = Array.from({ length: 3 }, () => ({ | ||
| anomaly: activePlanet.id ? Number(activePlanet.id) : null, | ||
| owner: session?.user.id, | ||
| mineralconfiguration: { | ||
| mineral: mineral, | ||
| quantity: Math.floor(Math.random() * 100) + 1, | ||
| }, | ||
| })); | ||
|
|
||
| const { data, error } = await supabase | ||
| .from("mineralDeposits") | ||
| .insert(deposits); | ||
|
|
||
| if (error) { | ||
| console.error("Error inserting mineral deposits: ", error.message); | ||
| throw error; | ||
| }; | ||
|
|
||
| console.log("Mineral deposits added:", data); | ||
| } catch (error) { | ||
| console.error("Error adding mineral deposits:", error); | ||
| } finally { | ||
| setIsLoading(false); | ||
| }; | ||
| }; | ||
|
|
||
| return ( | ||
| <div className="flex flex-col space-y-4 p-4 bg-gray-100 rounded-lg shadow"> | ||
| <h3 className="font-bold text-[#2C4F64]">Add Mineral Deposits</h3> | ||
| <Button | ||
| onClick={handleAddDeposits} | ||
| disabled={isLoading} | ||
| className="bg-[#5FCBC3] text-white hover:bg-[#5FCBC3]/80" | ||
| > | ||
| {isLoading ? 'Adding...' : 'Add 3 Deposits'} | ||
| </Button> | ||
| </div> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| "use client"; | ||
|
|
||
| import React from "react"; | ||
| import { Diamond } from "lucide-react"; | ||
|
|
||
| export type MineralDeposit = { | ||
| id: string; | ||
| mineral: string; | ||
| quantity: number; | ||
| availableAmount: number; | ||
| level: number; | ||
| uses: string[]; | ||
| position: { x: number; y: number }; | ||
| }; | ||
|
|
||
| type Props = { | ||
| deposits: MineralDeposit[]; | ||
| onSelect: (deposit: MineralDeposit) => void; | ||
| selectedDeposit: MineralDeposit | null; | ||
| }; | ||
|
|
||
| export function MineralDepositList({ deposits, onSelect, selectedDeposit }: Props) { | ||
| const getIcon = (mineralId: string) => { | ||
| switch (mineralId) { | ||
| case "19": | ||
| return <Diamond className="text-[#FFE3BA]" />; | ||
| default: | ||
| return <Diamond className="text-[#FFE3BA]" />; | ||
| } | ||
| }; | ||
|
|
||
| return ( | ||
| <div className="h-full flex flex-col"> | ||
| <h2 className="text-xl font-bold text-[#2C4F64] mb-4">Mineral Deposits</h2> | ||
| <div className="overflow-y-auto flex-grow pr-2"> | ||
| {deposits.map((deposit) => ( | ||
| <div | ||
| key={deposit.id} | ||
| className={`p-4 rounded-lg cursor-pointer mb-2 ${ | ||
| selectedDeposit?.id === deposit.id ? "bg-[#5FCBC3] text-white" : "bg-gray-100" | ||
| }`} | ||
| onClick={() => onSelect(deposit)} | ||
| > | ||
| <div className="flex items-center space-x-2"> | ||
| {getIcon(deposit.mineral)} | ||
| <h3 className="font-bold">Mineral {deposit.mineral}</h3> | ||
| </div> | ||
| <p>Quantity: {deposit.quantity}</p> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| </div> | ||
| ); | ||
| } |
Oops, something went wrong.