Mascali
/
shapez
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tobspr/shapez.io

This commit is contained in:
tobspr 2020-06-10 11:49:55 +02:00
parent 8af0e36ca8 89f934024b
commit 95a437a8bb
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/css/ingame_hud/shop.scss
View File

@ -88,7 +88,7 @@
} }
.description { .description {
grid-column: 3 / 4; grid-column: 2 / 4;
grid-row: 1 / 2; grid-row: 1 / 2;
@include PlainText; @include PlainText;
color: #aaa; color: #aaa;
@ -289,13 +289,7 @@
display: none; display: none;
} }
.description { .description {
// grid-column: 2 / 4;
// grid-row: 2 / 3;
align-self: end;
justify-self: center;
color: $colorGreenBright; color: $colorGreenBright;
text-transform: uppercase;
@include S(margin-top, 20px);
} }
} }
} }

13
src/js/game/hud/parts/shop.js
View File

@ -63,6 +63,7 @@ export class HUDShop extends BaseHUDPart {
const { tiers } = UPGRADES[upgradeId]; const { tiers } = UPGRADES[upgradeId];
const currentTier = this.root.hubGoals.getUpgradeLevel(upgradeId); const currentTier = this.root.hubGoals.getUpgradeLevel(upgradeId);
const currentTierMultiplier = this.root.hubGoals.upgradeImprovements[upgradeId];
const tierHandle = tiers[currentTier]; const tierHandle = tiers[currentTier];
// Set tier // Set tier
@ -87,15 +88,17 @@ export class HUDShop extends BaseHUDPart {
if (!tierHandle) { if (!tierHandle) {
// Max level // Max level
handle.elemDescription.innerText = T.ingame.shop.maximumLevel; handle.elemDescription.innerText = T.ingame.shop.maximumLevel.replace(
"<currentMult>",
currentTierMultiplier.toString()
);
continue; continue;
} }
// Set description // Set description
handle.elemDescription.innerText = T.shopUpgrades[upgradeId].description.replace( handle.elemDescription.innerText = T.shopUpgrades[upgradeId].description
"<gain>", .replace("<currentMult>", currentTierMultiplier.toString())
Math.floor(tierHandle.improvement * 100.0) .replace("<newMult>", (currentTierMultiplier + tierHandle.improvement).toString());
);
tierHandle.required.forEach(({ shape, amount }) => { tierHandle.required.forEach(({ shape, amount }) => {
const container = makeDiv(handle.elemRequirements, null, ["requirement"]); const container = makeDiv(handle.elemRequirements, null, ["requirement"]);

10
translations/base-en.yaml
View File

@ -288,7 +288,7 @@ ingame:
# The roman number for each tier # The roman number for each tier
tierLabels: [I, II, III, IV, V, VI, VII, VIII, IX, X] tierLabels: [I, II, III, IV, V, VI, VII, VIII, IX, X]
maximumLevel: Maximum level maximumLevel: MAXIMUM LEVEL (Speed x<currentMult>)
# The "Statistics" window # The "Statistics" window
statistics: statistics:
@ -352,16 +352,16 @@ ingame:
shopUpgrades: shopUpgrades:
belt: belt:
name: Belts, Distributor & Tunnels name: Belts, Distributor & Tunnels
description: Speed +<gain>% description: Speed x<currentMult> → x<newMult>
miner: miner:
name: Extraction name: Extraction
description: Speed +<gain>% description: Speed x<currentMult> → x<newMult>
processors: processors:
name: Cutting, Rotating & Stacking name: Cutting, Rotating & Stacking
description: Speed +<gain>% description: Speed x<currentMult> → x<newMult>
painting: painting:
name: Mixing & Painting name: Mixing & Painting
description: Speed +<gain>% description: Speed x<currentMult> → x<newMult>
# Buildings and their name / description # Buildings and their name / description
buildings: buildings: