diff --git a/client/src/components/cityview/realm/trade/CreateOffer.tsx b/client/src/components/cityview/realm/trade/CreateOffer.tsx index 823ff1c0b1..05c4433e0b 100644 --- a/client/src/components/cityview/realm/trade/CreateOffer.tsx +++ b/client/src/components/cityview/realm/trade/CreateOffer.tsx @@ -454,6 +454,10 @@ export const SelectCaravanPanel = ({ } }, [realm]); + const canCarry = (caravan: CaravanInterface, resourceWeight: number) => { + return caravan.capacity ? divideByPrecision(caravan.capacity) >= resourceWeight : false; + }; + let myAvailableCaravans = useMemo( () => realmCaravans @@ -465,14 +469,13 @@ export const SelectCaravanPanel = ({ !caravan.blocked && (!caravan.arrivalTime || caravan.arrivalTime <= nextBlockTimestamp); // capacity in gr (1kg = 1000gr) - const canCarry = caravan.capacity ? caravan.capacity / 1000 >= resourceWeight : false; - if (isIdle && canCarry) { + if (isIdle && canCarry(caravan, resourceWeight)) { return caravan; } }) .filter(Boolean) as CaravanInterface[]) : [], - [realmCaravans], + [realmCaravans, resourceWeight], ); return ( @@ -549,7 +552,7 @@ export const SelectCaravanPanel = ({ />
-
{donkeysCount}
+
{donkeysLeft - donkeysCount}
Donkeys
@@ -567,12 +570,6 @@ export const SelectCaravanPanel = ({
Increase the amount of units
)} - {donkeysLeft && ( -
- Donkeys Left{" "} -
{donkeysLeft}
-
- )} )} {!isNewCaravan && ( diff --git a/client/src/components/worldmap/hyperstructures/FeedHyperstructure.tsx b/client/src/components/worldmap/hyperstructures/FeedHyperstructure.tsx index 7ccc8a2216..c6043efa87 100644 --- a/client/src/components/worldmap/hyperstructures/FeedHyperstructure.tsx +++ b/client/src/components/worldmap/hyperstructures/FeedHyperstructure.tsx @@ -28,6 +28,7 @@ import { useGetPositionCaravans } from "../../../hooks/helpers/useCaravans"; import { NumberInput } from "../../../elements/NumberInput"; import { ReactComponent as ArrowSeparator } from "../../../assets/icons/common/arrow-separator.svg"; import { WEIGHT_PER_DONKEY_KG } from "../../../constants/travel"; +import { ReactComponent as CloseIcon } from "../../../assets/icons/common/cross-circle.svg"; type FeedHyperstructurePopupProps = { onClose: () => void; @@ -63,7 +64,14 @@ export const FeedHyperstructurePopup = ({ onClose, order }: FeedHyperstructurePo ), - component: , + component: ( + setSelectedTab(1)} + onClose={onClose} + hyperstructureData={hyperstructureData} + /> + ), }, { key: "my", @@ -92,6 +100,7 @@ export const FeedHyperstructurePopup = ({ onClose, order }: FeedHyperstructurePo
Manage Hyperstructure:
+
@@ -157,7 +166,8 @@ const SelectableRealm = ({ realm, selected = false, initialized = false, onClick
24h:10m away
- {realm.resources && + {!initialized && + realm.resources && realm.resources.map((resource: any) => { return ( void; + onSendCaravan: () => void; hyperstructureData: HyperStructureInterface | undefined; }) => { const [selectedCaravan, setSelectedCaravan] = useState(0); @@ -265,7 +277,7 @@ const BuildHyperstructurePanel = ({ }); } } - onClose(); + onSendCaravan(); }; const { @@ -480,7 +492,7 @@ const BuildHyperstructurePanel = ({ <> {hyperstructureData?.initialized && ( <> -
+
You Give {Object.keys(resourcesLeftToComplete).map((_id) => { @@ -490,7 +502,7 @@ const BuildHyperstructurePanel = ({ getEntityIdFromKeys([BigInt(realmEntityId), BigInt(id)]), ); return ( -
+
{ setFeedResourcesGiveAmounts({ ...feedResourcesGiveAmounts, - [id]: resourcesLeftToComplete[id], + [id]: Math.min(divideByPrecision(resource?.balance || 0), resourcesLeftToComplete[id]), }); }} resourceId={id} @@ -520,7 +532,7 @@ const BuildHyperstructurePanel = ({ })}
- +
Structure needs diff --git a/client/src/components/worldmap/hyperstructures/HyperStructureCaravans/HyperStructureCaravan.tsx b/client/src/components/worldmap/hyperstructures/HyperStructureCaravans/HyperStructureCaravan.tsx index fa405ab07d..a36fd936ba 100644 --- a/client/src/components/worldmap/hyperstructures/HyperStructureCaravans/HyperStructureCaravan.tsx +++ b/client/src/components/worldmap/hyperstructures/HyperStructureCaravans/HyperStructureCaravan.tsx @@ -16,7 +16,8 @@ import { getComponentValue } from "@latticexyz/recs"; import { useDojo } from "../../../../DojoContext"; import Button from "../../../../elements/Button"; import { Resource } from "../../../../types"; -import { HyperStructureInterface } from "../../../../hooks/helpers/useHyperstructure"; +import { HyperStructureInterface, useHyperstructure } from "../../../../hooks/helpers/useHyperstructure"; +import useUIStore from "../../../../hooks/store/useUIStore"; type CaravanProps = { caravan: CaravanInterface; @@ -28,6 +29,9 @@ type CaravanProps = { export const HyperStructureCaravan = ({ caravan, hyperstructureData, ...props }: CaravanProps) => { const { isMine, owner, arrivalTime, capacity } = caravan; const nextBlockTimestamp = useBlockchainStore((state) => state.nextBlockTimestamp); + const hyperstructures = useUIStore((state) => state.hyperstructures); + const setHyperstructures = useUIStore((state) => state.setHyperstructures); + const { getHyperstructure } = useHyperstructure(); const [isLoading, setIsLoading] = useState(false); const hasArrived = arrivalTime !== undefined && nextBlockTimestamp !== undefined && arrivalTime <= nextBlockTimestamp; @@ -79,9 +83,16 @@ export const HyperStructureCaravan = ({ caravan, hyperstructureData, ...props }: }); }; + const updateHyperStructure = () => { + const newHyperstructure = getHyperstructure(hyperstructureData.orderId, hyperstructureData.uiPosition); + hyperstructures[hyperstructureData.orderId - 1] = newHyperstructure; + setHyperstructures([...hyperstructures]); + }; + const onClick = async () => { setIsLoading(true); await transferAndReturn(); + updateHyperStructure(); setIsLoading(false); }; diff --git a/client/src/components/worldmap/hyperstructures/HyperstructuresListComponent.tsx b/client/src/components/worldmap/hyperstructures/HyperstructuresListComponent.tsx index 9715b87d2b..46cc074655 100644 --- a/client/src/components/worldmap/hyperstructures/HyperstructuresListComponent.tsx +++ b/client/src/components/worldmap/hyperstructures/HyperstructuresListComponent.tsx @@ -34,7 +34,7 @@ export const HyperstructuresListComponent = ({}: HyperstructuresListComponentPro {chosenOrder && showFeedPopup && ( setShowFeedPopup(false)} order={chosenOrder} /> )} - {chosenOrder && ( + {chosenOrder && hyperstructures && (
Hyperstructure of your order:
- Progress: {props.hyperstructure?.progress}% + Progress: {props.hyperstructure?.progress.toFixed(2)}%
)} diff --git a/client/src/components/worldmap/hyperstructures/models/HyperstructureStarted.tsx b/client/src/components/worldmap/hyperstructures/models/HyperstructureStarted.tsx index 698ef4617a..91464ac891 100644 --- a/client/src/components/worldmap/hyperstructures/models/HyperstructureStarted.tsx +++ b/client/src/components/worldmap/hyperstructures/models/HyperstructureStarted.tsx @@ -54,7 +54,7 @@ export default function HyperstructureStarted( {hyperstructure?.initialized && (
- Progress: {hyperstructure?.progress}% + Progress: {hyperstructure?.progress.toFixed(2)}%
)} diff --git a/client/src/data/hyperstructures.json b/client/src/data/hyperstructures.json index 01b5af7d05..b7775a0bcb 100644 --- a/client/src/data/hyperstructures.json +++ b/client/src/data/hyperstructures.json @@ -1,563 +1,1842 @@ [ - { - "x": -105.95073562656883, - "y": 0.528415243525413, - "z": -35.36402704025532, - "resources": { + { + "x": -14.738945388790135, + "y": 0.528415243525413, + "z": 30.327674620452598, + "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": -90.60024070188028, - "y": 0.528415243525413, - "z": 7.335662077462935, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": -119.45899643774253, - "y": 0.528415243525413, - "z": 22.36329531857441, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": -70.25751302528872, - "y": 0.528415243525413, - "z": -32.37931467429666, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": -22.73312316195737, - "y": 0.528415243525413, - "z": -28.231658318595414, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": -14.97911593658031, - "y": 0.528415243525413, - "z": -3.5918721344570272, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": -38.79051261810327, - "y": 0.528415243525413, - "z": 19.345213249091845, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": -14.738945388790135, - "y": 0.528415243525413, - "z": 30.327674620452598, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": 15.411695237142771, - "y": 0.528415243525413, - "z": 37.15702249267392, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": 27.244358277941554, - "y": 0.528415243525413, - "z": -8.70354515951557, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": 10.681895243570205, - "y": 0.528415243525413, - "z": -39.09521854207338, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": 82.19099990211434, - "y": 0.528415243525413, - "z": -34.185218206690024, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": 104.40780672185382, - "y": 0.528415243525413, - "z": -10.210581383051249, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": 70.95170623206306, - "y": 0.528415243525413, - "z": 8.4363296832867, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": 111.91588278029236, - "y": 0.528415243525413, - "z": 32.71779102660024, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} - }, - { - "x": 64.51836447255958, - "y": 0.528415243525413, - "z": 47.55800814381176, - "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] } - ] - \ No newline at end of file + }, + { + "x": 82.19099990211434, + "y": 0.528415243525413, + "z": -34.185218206690024, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": -14.97911593658031, + "y": 0.528415243525413, + "z": -3.5918721344570272, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": 111.91588278029236, + "y": 0.528415243525413, + "z": 32.71779102660024, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": -105.95073562656883, + "y": 0.528415243525413, + "z": -35.36402704025532, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": 64.51836447255958, + "y": 0.528415243525413, + "z": 47.55800814381176, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": 15.411695237142771, + "y": 0.528415243525413, + "z": 37.15702249267392, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": -38.79051261810327, + "y": 0.528415243525413, + "z": 19.345213249091845, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": -90.60024070188028, + "y": 0.528415243525413, + "z": 7.335662077462935, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": 70.95170623206306, + "y": 0.528415243525413, + "z": 8.4363296832867, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": -70.25751302528872, + "y": 0.528415243525413, + "z": -32.37931467429666, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": -22.73312316195737, + "y": 0.528415243525413, + "z": -28.231658318595414, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": 10.681895243570205, + "y": 0.528415243525413, + "z": -39.09521854207338, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": 27.244358277941554, + "y": 0.528415243525413, + "z": -8.70354515951557, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": 104.40780672185382, + "y": 0.528415243525413, + "z": -10.210581383051249, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + }, + { + "x": -119.45899643774253, + "y": 0.528415243525413, + "z": 22.36329531857441, + "resources": { + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } + } +] diff --git a/client/src/data/realmids_by_order.json b/client/src/data/realmids_by_order.json index 88667d2cc1..14e3fbb278 100644 --- a/client/src/data/realmids_by_order.json +++ b/client/src/data/realmids_by_order.json @@ -1505,7 +1505,7 @@ 7965, 7973 ], - "the Fox": [ + "Fox": [ 4, 29, 32, @@ -2007,7 +2007,7 @@ 7985, 7997 ], - "the Twins": [ + "Twins": [ 5, 18, 87, diff --git a/client/src/hooks/helpers/useHyperstructure.tsx b/client/src/hooks/helpers/useHyperstructure.tsx index fe155deb95..1a17ed6a83 100644 --- a/client/src/hooks/helpers/useHyperstructure.tsx +++ b/client/src/hooks/helpers/useHyperstructure.tsx @@ -6,6 +6,7 @@ import { getContractPositionFromRealPosition, getEntityIdFromKeys } from "../../ export interface HyperStructureInterface { hyperstructureId: number; + orderId: number; progress: number; hyperstructureResources: { resourceId: number; @@ -62,6 +63,7 @@ export const useHyperstructure = () => { return { hyperstructureId, + orderId, progress, hyperstructureResources, initialzationResources: hyperstructureData[orderId - 1].resources.initialization.map((resource) => { diff --git a/client/src/layouts/World.tsx b/client/src/layouts/World.tsx index 044b18426d..092d936da6 100644 --- a/client/src/layouts/World.tsx +++ b/client/src/layouts/World.tsx @@ -23,7 +23,7 @@ import useSound from "use-sound"; import { NotificationsComponent } from "../components/NotificationsComponent"; import { useSyncWorld } from "../hooks/graphql/useGraphQLQueries"; import WorldMapMenuModule from "../modules/WorldMapMenuModule"; -import { HYPERSTRUCTURES_POSITIONS } from "../modules/scenes/WorldMapScene"; +import hyperStructures from "../data/hyperstructures.json"; import { useHyperstructure } from "../hooks/helpers/useHyperstructure"; export const World = () => { @@ -59,7 +59,9 @@ export const World = () => { useEffect(() => { if (!loading) { setHyperstructures( - HYPERSTRUCTURES_POSITIONS.map((hyperstructure, index) => getHyperstructure(index + 1, hyperstructure)), + hyperStructures.map((hyperstructure, index) => + getHyperstructure(index + 1, { x: hyperstructure.x, y: hyperstructure.y, z: hyperstructure.z }), + ), ); } }, [loading]); diff --git a/client/src/modules/scenes/WorldMapScene.tsx b/client/src/modules/scenes/WorldMapScene.tsx index 7e8c00bc20..ce5030261f 100644 --- a/client/src/modules/scenes/WorldMapScene.tsx +++ b/client/src/modules/scenes/WorldMapScene.tsx @@ -8,89 +8,6 @@ import HyperstructureFinished from "../../components/worldmap/hyperstructures/mo import useUIStore from "../../hooks/store/useUIStore.js"; // import { TransformControls } from "@react-three/drei"; -export const HYPERSTRUCTURES_POSITIONS = [ - { - x: -105.95073562656883, - y: 0.528415243525413, - z: -35.36402704025532, - }, - { - x: -90.60024070188028, - y: 0.528415243525413, - z: 7.335662077462935, - }, - { - x: -119.45899643774253, - y: 0.528415243525413, - z: 22.36329531857441, - }, - { - x: -70.25751302528872, - y: 0.528415243525413, - z: -32.37931467429666, - }, - { - x: -22.73312316195737, - y: 0.528415243525413, - z: -28.231658318595414, - }, - { - x: -14.97911593658031, - y: 0.528415243525413, - z: -3.5918721344570272, - }, - { - x: -38.79051261810327, - y: 0.528415243525413, - z: 19.345213249091845, - }, - { - x: -14.738945388790135, - y: 0.528415243525413, - z: 30.327674620452598, - }, - { - x: 15.411695237142771, - y: 0.528415243525413, - z: 37.15702249267392, - }, - { - x: 27.244358277941554, - y: 0.528415243525413, - z: -8.70354515951557, - }, - { - x: 10.681895243570205, - y: 0.528415243525413, - z: -39.09521854207338, - }, - { - x: 82.19099990211434, - y: 0.528415243525413, - z: -34.185218206690024, - }, - { - x: 104.40780672185382, - y: 0.528415243525413, - z: -10.210581383051249, - }, - { - x: 70.95170623206306, - y: 0.528415243525413, - z: 8.4363296832867, - }, - { - x: 111.91588278029236, - y: 0.528415243525413, - z: 32.71779102660024, - }, - { - x: 64.51836447255958, - y: 0.528415243525413, - z: 47.55800814381176, - }, -]; - export const WorldMapScene = () => { const hyperstructures = useUIStore((state) => state.hyperstructures); diff --git a/contracts/data/hyperstructures/generateCommands.js b/contracts/data/hyperstructures/generateCommands.js index 6234ae9ead..43ad6f80c5 100644 --- a/contracts/data/hyperstructures/generateCommands.js +++ b/contracts/data/hyperstructures/generateCommands.js @@ -10,13 +10,13 @@ structures.forEach((structure) => { // Extracting values for initialization const numInitializationResources = initialization.length; const initializationStrings = initialization - .map((res) => `${res.resourceType},${res.amount}`) + .map((res) => `${res.resourceType},${parseInt(res.amount)}`) .join(","); // Extracting values for completion const numCompletionResources = completion.length; const completionStrings = completion - .map((res) => `${res.resourceType},${res.amount}`) + .map((res) => `${res.resourceType},${parseInt(res.amount)}`) .join(","); // Formatting the coords diff --git a/contracts/data/hyperstructures/generateHyperstructureResources.js b/contracts/data/hyperstructures/generateHyperstructureResources.js new file mode 100644 index 0000000000..d413a23fbd --- /dev/null +++ b/contracts/data/hyperstructures/generateHyperstructureResources.js @@ -0,0 +1,35 @@ +import data from "./hyperstructures.json"; + +const initialResources = [ + 872.17, 685.39, 666.61, 459.65, 385.39, 302.78, 205.04, 166.43, 158.96, 103.3, + 52.17, 42.96, 41.57, 41.57, 29.91, 28.17, 24.17, 19.3, 16.17, 9.57, 6.43, 4, +]; + +// Function to update completion amounts +function updateCompletionAmounts(data, initialResources) { + data.forEach((item) => { + const completion = item.resources.completion; + completion.forEach((compItem) => { + const resourceType = compItem.resourceType; + if (resourceType >= 1 && resourceType <= initialResources.length) { + const index = resourceType - 1; + const newAmount = initialResources[index] * 50 * 1000; + compItem.amount = newAmount; + } + }); + const initialization = item.resources.initialization; + initialization.forEach((initItem) => { + const resourceType = initItem.resourceType; + if (resourceType >= 1 && resourceType <= initialResources.length) { + const index = resourceType - 1; + const newAmount = initialResources[index] * 2 * 1000; + initItem.amount = newAmount; + } + }); + }); +} + +// Update the completion amounts +updateCompletionAmounts(data, initialResources); + +console.log(JSON.stringify(data, null, 2)); // Output the updated data diff --git a/contracts/data/hyperstructures/hyperstructures.json b/contracts/data/hyperstructures/hyperstructures.json index ca3fdd37e8..b7775a0bcb 100644 --- a/contracts/data/hyperstructures/hyperstructures.json +++ b/contracts/data/hyperstructures/hyperstructures.json @@ -1,562 +1,1842 @@ [ { - "x": -105.95073562656883, + "x": -14.738945388790135, "y": 0.528415243525413, - "z": -35.36402704025532, + "z": 30.327674620452598, "resources": { - "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], - "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + "initialization": [ + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], + "completion": [ + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": -90.60024070188028, + "x": 82.19099990211434, "y": 0.528415243525413, - "z": 7.335662077462935, + "z": -34.185218206690024, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": -119.45899643774253, + "x": -14.97911593658031, "y": 0.528415243525413, - "z": 22.36329531857441, + "z": -3.5918721344570272, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": -70.25751302528872, + "x": 111.91588278029236, "y": 0.528415243525413, - "z": -32.37931467429666, + "z": 32.71779102660024, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": -22.73312316195737, + "x": -105.95073562656883, "y": 0.528415243525413, - "z": -28.231658318595414, + "z": -35.36402704025532, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": -14.97911593658031, + "x": 64.51836447255958, "y": 0.528415243525413, - "z": -3.5918721344570272, + "z": 47.55800814381176, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": -38.79051261810327, + "x": 15.411695237142771, "y": 0.528415243525413, - "z": 19.345213249091845, + "z": 37.15702249267392, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": -14.738945388790135, + "x": -38.79051261810327, "y": 0.528415243525413, - "z": 30.327674620452598, + "z": 19.345213249091845, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": 15.411695237142771, + "x": -90.60024070188028, "y": 0.528415243525413, - "z": 37.15702249267392, + "z": 7.335662077462935, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": 27.244358277941554, + "x": 70.95170623206306, "y": 0.528415243525413, - "z": -8.70354515951557, + "z": 8.4363296832867, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": 10.681895243570205, + "x": -70.25751302528872, "y": 0.528415243525413, - "z": -39.09521854207338, + "z": -32.37931467429666, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": 82.19099990211434, + "x": -22.73312316195737, "y": 0.528415243525413, - "z": -34.185218206690024, + "z": -28.231658318595414, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": 104.40780672185382, + "x": 10.681895243570205, "y": 0.528415243525413, - "z": -10.210581383051249, + "z": -39.09521854207338, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": 70.95170623206306, + "x": 27.244358277941554, "y": 0.528415243525413, - "z": 8.4363296832867, + "z": -8.70354515951557, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": 111.91588278029236, + "x": 104.40780672185382, "y": 0.528415243525413, - "z": 32.71779102660024, + "z": -10.210581383051249, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } }, { - "x": 64.51836447255958, + "x": -119.45899643774253, "y": 0.528415243525413, - "z": 47.55800814381176, + "z": 22.36329531857441, "resources": { "initialization": [ - {"resourceType": 1, "amount": 1000000}, - {"resourceType": 2, "amount": 1000000}, - {"resourceType": 3, "amount": 1000000}, - {"resourceType": 4, "amount": 1000000 }], + { + "resourceType": 1, + "amount": 1744340 + }, + { + "resourceType": 2, + "amount": 1370780 + }, + { + "resourceType": 3, + "amount": 1333220 + }, + { + "resourceType": 4, + "amount": 919300 + } + ], "completion": [ - { "resourceType": 1, "amount": 10000000 }, - { "resourceType": 2, "amount": 10000000 }, - { "resourceType": 3, "amount": 10000000 }, - { "resourceType": 4, "amount": 10000000 }, - { "resourceType": 5, "amount": 10000000 }, - { "resourceType": 6, "amount": 10000000 }, - { "resourceType": 7, "amount": 10000000 }, - { "resourceType": 8, "amount": 10000000 }, - { "resourceType": 9, "amount": 10000000 }, - { "resourceType": 10, "amount": 10000000 }, - { "resourceType": 11, "amount": 10000000 }, - { "resourceType": 12, "amount": 10000000 }, - { "resourceType": 13, "amount": 10000000 }, - { "resourceType": 14, "amount": 10000000 }, - { "resourceType": 15, "amount": 10000000 }, - { "resourceType": 16, "amount": 10000000 }, - { "resourceType": 17, "amount": 10000000 }, - { "resourceType": 18, "amount": 10000000 }, - { "resourceType": 19, "amount": 10000000 }, - { "resourceType": 20, "amount": 10000000 }, - { "resourceType": 21, "amount": 10000000 }, - { "resourceType": 22, "amount": 10000000 } - ]} + { + "resourceType": 1, + "amount": 43608500 + }, + { + "resourceType": 2, + "amount": 34269500 + }, + { + "resourceType": 3, + "amount": 33330500 + }, + { + "resourceType": 4, + "amount": 22982500 + }, + { + "resourceType": 5, + "amount": 19269500 + }, + { + "resourceType": 6, + "amount": 15138999.999999998 + }, + { + "resourceType": 7, + "amount": 10252000 + }, + { + "resourceType": 8, + "amount": 8321500 + }, + { + "resourceType": 9, + "amount": 7948000 + }, + { + "resourceType": 10, + "amount": 5165000 + }, + { + "resourceType": 11, + "amount": 2608500 + }, + { + "resourceType": 12, + "amount": 2148000 + }, + { + "resourceType": 13, + "amount": 2078500 + }, + { + "resourceType": 14, + "amount": 2078500 + }, + { + "resourceType": 15, + "amount": 1495500 + }, + { + "resourceType": 16, + "amount": 1408500 + }, + { + "resourceType": 17, + "amount": 1208500 + }, + { + "resourceType": 18, + "amount": 965000 + }, + { + "resourceType": 19, + "amount": 808500.0000000001 + }, + { + "resourceType": 20, + "amount": 478500 + }, + { + "resourceType": 21, + "amount": 321500 + }, + { + "resourceType": 22, + "amount": 200000 + } + ] + } } ] diff --git a/contracts/scripts/set_config.sh b/contracts/scripts/set_config.sh index 05978c4e03..5d939b49a1 100755 --- a/contracts/scripts/set_config.sh +++ b/contracts/scripts/set_config.sh @@ -169,22 +169,22 @@ commands+=( # Define hyperstructures # @dev generated using data/hyperstructures/generateCommands.js # data => ./contracts/data/hyperstructures/hyperstructures.json - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,740492,1446359" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,893997,1873356" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,605410,2023632" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,1097424,1476206" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,1572668,1517683" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,1650208,1764081" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,1412094,1993452" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,1652610,2103276" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,1954116,2171570" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,2072443,1712964" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,1906818,1409047" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,2621909,1458147" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,2844078,1697894" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,2509517,1884363" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,2919158,2127177" - "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1000000,2,1000000,3,1000000,4,1000000,22,1,10000000,2,10000000,3,10000000,4,10000000,5,10000000,6,10000000,7,10000000,8,10000000,9,10000000,10,10000000,11,10000000,12,10000000,13,10000000,14,10000000,15,10000000,16,10000000,17,10000000,18,10000000,19,10000000,20,10000000,21,10000000,22,10000000,2445183,2275580" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,1652610,2103276" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,2621909,1458147" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,1650208,1764081" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,2919158,2127177" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,740492,1446359" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,2445183,2275580" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,1954116,2171570" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,1412094,1993452" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,893997,1873356" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,2509517,1884363" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,1097424,1476206" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,1572668,1517683" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,1906818,1409047" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,2072443,1712964" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,2844078,1697894" + "sozo execute --world $world DefineHyperStructure --account-address $DOJO_ACCOUNT_ADDRESS --calldata 1,4,1,1744340,2,1370780,3,1333220,4,919300,22,1,43608500,2,34269500,3,33330500,4,22982500,5,19269500,6,15138999,7,10252000,8,8321500,9,7948000,10,5165000,11,2608500,12,2148000,13,2078500,14,2078500,15,1495500,16,1408500,17,1208500,18,965000,19,808500,20,478500,21,321500,22,200000,605410,2023632" ) commands+=(