Skip to content

Commit 5f068cc

Browse files
authored
Merge pull request #1 from tobspr/master
Updating my fork from original repo
2 parents 053a160 + 35f7741 commit 5f068cc

32 files changed

+1931
-1325
lines changed

src/js/core/config.local.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export default {
33
/* dev:start */
44
// -----------------------------------------------------------------------------------
55
// Quickly enters the game and skips the main menu - good for fast iterating
6-
// fastGameEnter: true,
6+
fastGameEnter: true,
77
// -----------------------------------------------------------------------------------
88
// Skips any delays like transitions between states and such
99
// noArtificialDelays: true,
@@ -33,13 +33,13 @@ export default {
3333
// rewardsInstant: true,
3434
// -----------------------------------------------------------------------------------
3535
// Unlocks all buildings
36-
// allBuildingsUnlocked: true,
36+
allBuildingsUnlocked: true,
3737
// -----------------------------------------------------------------------------------
3838
// Disables cost of blueprints
39-
// blueprintsNoCost: true,
39+
blueprintsNoCost: true,
4040
// -----------------------------------------------------------------------------------
4141
// Disables cost of upgrades
42-
// upgradesNoCost: true,
42+
upgradesNoCost: true,
4343
// -----------------------------------------------------------------------------------
4444
// Disables the dialog when completing a level
4545
// disableUnlockDialog: true,
@@ -78,7 +78,7 @@ export default {
7878
// instantMiners: true,
7979
// -----------------------------------------------------------------------------------
8080
// When using fastGameEnter, controls whether a new game is started or the last one is resumed
81-
// resumeGameOnFastEnter: true,
81+
resumeGameOnFastEnter: true,
8282
// -----------------------------------------------------------------------------------
8383
// Special option used to render the trailer
8484
// renderForTrailer: true,

src/js/game/colors.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,10 @@ export const enumColorMixingResults = {
153153
for (const color in enumColors) {
154154
enumColorMixingResults[color][color] = color;
155155

156-
// Anything with white is white again
157-
enumColorMixingResults[color][c.white] = c.white;
156+
// Anything with white is white again, except for black which creates gray
157+
if (color !== enumColors.black) {
158+
enumColorMixingResults[color][c.white] = c.white;
159+
}
158160

159161
// Black mixed with white is gray
160162
enumColorMixingResults[c.black][c.white] = c.uncolored;

sync-translations.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const originalContents = fs
1717

1818
const original = YAML.parse(originalContents);
1919

20-
const placeholderRegexp = /<([a-zA-Z_0-9]+)>/gi;
20+
const placeholderRegexp = /[[<]([a-zA-Z_0-9]+)[\]<]/gi;
2121

2222
function match(originalObj, translatedObj, path = "/") {
2323
for (const key in originalObj) {

translations/base-ar.yaml

Lines changed: 76 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -30,42 +30,59 @@ steamPage:
3030
longText: >-
3131
[img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
3232
33-
shapez.io is a game about building factories to automate the creation and combination of shapes. Deliver the requested, increasingly complex shapes to progress within the game and unlock upgrades to speed up your factory.
33+
shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
34+
Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
3435
35-
Since the demand raises you will have to scale up your factory to fit the needs - Don't forget about resources though, you will have to expand in the [b]infinite map[/b]!
36+
As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
3637
37-
Since shapes can get boring soon you need to mix colors and paint your shapes with it - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
38+
Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
3839
39-
This game features 18 levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
40+
This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
4041
42+
Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
4143
4244
[b]Standalone Advantages[/b]
4345
4446
[list]
45-
[*] Waypoints
46-
[*] Unlimited Savegames
4747
[*] Dark Mode
48-
[*] More settings
49-
[*] Allow me to further develop shapez.io ❤️
50-
[*] More features in the future!
48+
[*] Unlimited Waypoints
49+
[*] Unlimited Savegames
50+
[*] Additional settings
51+
[*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
52+
[*] Coming soon: More Levels
53+
[*] Allows me to further develop shapez.io ❤️
5154
[/list]
5255
53-
[b]Planned features & Community suggestions[/b]
56+
[b]Future Updates[/b]
5457
55-
This game is open source - Anybody can contribute! Besides of that, I listen [b]a lot[/b] to the community! I try to read all suggestions and take as much feedback into account as possible.
58+
I am updating the game very often and trying to push an update at least every week!
5659
5760
[list]
58-
[*] Story mode where buildings cost shapes
59-
[*] More levels & buildings (standalone exclusive)
60-
[*] Different maps, and maybe map obstacles
61-
[*] Configurable map creation (Edit number and size of patches, seed, and more)
62-
[*] More types of shapes
63-
[*] More performance improvements (Although the game already runs pretty good!)
64-
[*] Color blind mode
61+
[*] Different maps and challenges (e.g. maps with obstacles)
62+
[*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
63+
[*] A story mode where buildings have a cost
64+
[*] Configurable map generator (Configure resource/shape size/density, seed and more)
65+
[*] Additional types of shapes
66+
[*] Performance improvements (The game already runs pretty well!)
6567
[*] And much more!
6668
[/list]
6769
68-
Be sure to check out my trello board for the full roadmap! https://trello.com/b/ISQncpJP/shapezio
70+
[b]This game is open source![/b]
71+
72+
Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
73+
Be sure to check out my trello board for the full roadmap!
74+
75+
[b]Links[/b]
76+
77+
[list]
78+
[*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
79+
[*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
80+
[*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
81+
[*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
82+
[*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
83+
[/list]
84+
85+
discordLink: Official Discord - Chat with me!
6986

7087
global:
7188
loading: Loading
@@ -131,28 +148,7 @@ mainMenu:
131148
savegameLevel: Level <x>
132149
savegameLevelUnknown: Unknown Level
133150

134-
contests:
135-
contest_01_03062020:
136-
title: "Contest #01"
137-
desc: Win <strong>$25</strong> for the coolest base!
138-
longDesc: >-
139-
To give something back to you, I thought it would be cool to make weekly contests!
140-
<br><br>
141-
<strong>This weeks topic:</strong> Build the coolest base!
142-
<br><br>
143-
Here's the deal:<br>
144-
<ul class="bucketList">
145-
<li>Submit a screenshot of your base to <strong>[email protected]</strong></li>
146-
<li>Bonus points if you share it on social media!</li>
147-
<li>I will choose 5 screenshots and propose it to the <strong>discord</strong> community to vote.</li>
148-
<li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
149-
<li>Deadline: 07.06.2020 12:00 AM CEST</li>
150-
</ul>
151-
<br>
152-
I'm looking forward to seeing your awesome creations!
153-
154-
showInfo: View
155-
contestOver: This contest has ended - Join the discord to get noticed about new contests!
151+
156152
continue: Continue
157153
newGame: New Game
158154
madeBy: Made by <author-link>
@@ -255,6 +251,7 @@ dialogs:
255251
createMarker:
256252
title: New Marker
257253
desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
254+
titleEdit: Edit Marker
258255

259256
markerDemoLimit:
260257
desc: You can only create two custom markers in the demo. Get the standalone for unlimited markers!
@@ -270,6 +267,10 @@ dialogs:
270267
You requested to export your base as a screenshot. Please note that this can
271268
be quite slow for a big base and even crash your game!
272269
270+
massCutInsufficientConfirm:
271+
title: Confirm cut
272+
desc: You can not afford to paste this area! Are you sure you want to cut it?
273+
273274
ingame:
274275
# This is shown in the top left corner and displays useful keybindings in
275276
# every situation
@@ -292,6 +293,7 @@ ingame:
292293
copySelection: Copy
293294
clearSelection: Clear Selection
294295
pipette: Pipette
296+
switchLayers: Switch layers
295297

296298
# Everything related to placing buildings (I.e. as soon as you selected a building
297299
# from the toolbar)
@@ -407,9 +409,11 @@ ingame:
407409
cyan: Cyan
408410
white: White
409411
uncolored: No color
412+
black: Black
410413
shapeViewer:
411414
title: Layers
412415
empty: Empty
416+
copyKey: Copy Key
413417

414418
# All shop upgrades
415419
shopUpgrades:
@@ -517,6 +521,27 @@ buildings:
517521
storage:
518522
name: Storage
519523
description: Stores excess items, up to a given capacity. Can be used as an overflow gate.
524+
wire:
525+
default:
526+
name: Energy Wire
527+
description: Allows you to transport energy.
528+
advanced_processor:
529+
default:
530+
name: Color Inverter
531+
description: Accepts a color or shape and inverts it.
532+
energy_generator:
533+
deliver: Deliver
534+
toGenerateEnergy: For
535+
default:
536+
name: Energy Generator
537+
description: Generates energy by consuming shapes.
538+
wire_crossings:
539+
default:
540+
name: Wire Splitter
541+
description: Splits a energy wire into two.
542+
merger:
543+
name: Wire Merger
544+
description: Merges two energy wires into one.
520545

521546
storyRewards:
522547
# Those are the rewards gained from completing the store
@@ -729,11 +754,11 @@ settings:
729754
title: Color Blind Mode
730755
description: Enables various tools which allow to play the game if you are color blind.
731756
rotationByBuilding:
732-
title: Rotation by building type
733-
description: >-
734-
Each building type remembers the rotation you last set it to individually.
735-
This may be more comfortable if you frequently switch between placing
736-
different building types.
757+
title: Rotation by building type
758+
description: >-
759+
Each building type remembers the rotation you last set it to individually.
760+
This may be more comfortable if you frequently switch between placing
761+
different building types.
737762
738763
keybindings:
739764
title: Keybindings
@@ -801,6 +826,11 @@ keybindings:
801826
lockBeltDirection: Enable belt planner
802827
switchDirectionLockSide: "Planner: Switch side"
803828
pipette: Pipette
829+
menuClose: Close Menu
830+
switchLayers: Switch layers
831+
advanced_processor: Color Inverter
832+
energy_generator: Energy Generator
833+
wire: Energy Wire
804834

805835
about:
806836
title: About this Game

0 commit comments

Comments
 (0)