diff --git a/public/lang/en/buildings.json b/public/lang/en/buildings.json index 23a1a38..5eda387 100644 --- a/public/lang/en/buildings.json +++ b/public/lang/en/buildings.json @@ -5,6 +5,7 @@ "gold-mine": "Gold mine", "utilities": "Utilities", - "research-lab": "Research lab" + "research-lab": "Research lab", + "research-facility": "Research facility" } } \ No newline at end of file diff --git a/public/lang/en/research.json b/public/lang/en/research.json index 7509b12..7740864 100644 --- a/public/lang/en/research.json +++ b/public/lang/en/research.json @@ -26,6 +26,10 @@ "terraforming": { "name": "Terraforming", "description": "Allows for changing landscape of planets, making them habitable" + }, + "advanced-technologies": { + "name": "Advanced Technologies", + "description": "Various advanced technologies" } } } \ No newline at end of file diff --git a/src/lib/data/buildings.json b/src/lib/data/buildings.json index cadb3c4..b571033 100644 --- a/src/lib/data/buildings.json +++ b/src/lib/data/buildings.json @@ -74,6 +74,39 @@ }, "energy": 100, "multiplier": 3 + }, + { + "id": "research-facility", + "requirements": { + "buildings": [ + { + "id": "research-lab", + "level": 3 + } + ], + "research": [ + { + "id": "advanced-technologies", + "level": 2 + } + ], + "resources": [ + { + "name": "iron", + "amount": 1 + }, + { + "name": "gold", + "amount": 1 + }, + { + "name": "coal", + "amount": 1 + } + ] + }, + "energy": 100, + "multiplier": 2 } ] } diff --git a/src/lib/data/research.json b/src/lib/data/research.json index d741b12..9cf4083 100644 --- a/src/lib/data/research.json +++ b/src/lib/data/research.json @@ -106,5 +106,22 @@ }, "time": 500, "multiplier": 3 + }, { + "id": "advanced-technologies", + "requirements": { + "buildings": [ + { + "id": "research-lab", + "level": 6 + } + ], + "research": [], + "resources": { + "iron": 1000, + "gold": 500 + } + }, + "time": 1500, + "multiplier": 4 } ] \ No newline at end of file diff --git a/src/pages/game/buildings.astro b/src/pages/game/buildings.astro index 58b10cb..b267869 100644 --- a/src/pages/game/buildings.astro +++ b/src/pages/game/buildings.astro @@ -4,8 +4,6 @@ import NavBar from '../../components/NavBar.astro'; import { getUserByAccessToken } from '../../lib/db/users'; import { getHighestWeightedLanguage, getLocales } from '../../lib/utils/langDriver'; import ResourceBar from '../../components/ResourceBar.astro'; -// import { calculateCurrentAvailableResources } from '../../lib/utils/resourceManager'; -// import { getUserResources } from '../../lib/utils/resourceManager'; const buildingsList = (await import('../../lib/data/buildings.json')).default; @@ -16,14 +14,12 @@ if(loggedToken === null || username === "") return Astro.redirect('/logout'); const checkUser = await getUserByAccessToken(loggedToken); if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout'); -// const resources = await getUserResources(checkUser._id); - const locale = await getHighestWeightedLanguage(Astro.request.headers.get('accept-language')); const langResources = await getLocales(locale, 'resources'); const langGame = await getLocales(locale, 'game'); const langBuildings = await getLocales(locale, 'buildings'); -// console.log(await calculateCurrentAvailableResources(checkUser._id)); +const langResearch = await getLocales(locale, 'research'); --- @@ -38,6 +34,12 @@ const langBuildings = await getLocales(locale, 'buildings'); {building.requirements.resources.map(res => (
{langResources[`Label_${res.name}`]}: {res.amount}
))} + {building.requirements.buildings.map(b => ( +
{langBuildings[`Label_${b.id}`]}: {b.level}
+ ))} + {building.requirements.research.map(t => ( +
{langResearch[`Label_${t.id}`].name}: {t.level}
+ ))} {langGame['Link_build']} ))}