Skip to content

Adding Components of Chaotic Ocean #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
glowkate wants to merge 19 commits into
base: dev
Choose a base branch
from
Draft

Adding Components of Chaotic Ocean #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bcfbbf3
Added components for the Chaotic ocean.
glowkate Dec 7, 2025
98dd790
Changed stylistic issues
glowkate Dec 20, 2025
2aa9506
More style tab edits woo
glowkate Dec 20, 2025
dca43c7
this time for sure
glowkate Dec 20, 2025
4eadab4
Fixed syntax error
glowkate Dec 20, 2025
333d824
Adding spaces to comments and adding a missing trailing comma
glowkate Dec 20, 2025
0766b61
removed trailing spaces
glowkate Dec 20, 2025
7bf9577
removed more trailing spaces ;-;
glowkate Dec 20, 2025
7bf902c
Single ] removal, prob a better way to do this
glowkate Dec 20, 2025
a2c2e0d
more style fixes
glowkate Dec 20, 2025
f7b9080
More smol things
glowkate Dec 20, 2025
aebeeeb
please let this be the last one for now
glowkate Dec 20, 2025
27bd6c1
Progressed introducing core resources for Chaotic ocean into game.
glowkate Jan 15, 2026
bc614aa
Implimented chaotic world selection from gateway, and opening fake
glowkate Jan 17, 2026
e030db0
Progressed on tech for Chaotic Ocean
glowkate Jan 18, 2026
436ff2c
Fixed syntax error and added a new tech
glowkate Jan 19, 2026
68a8e8a
Changed turtle sweepers into turtle transporters, and made a bunch of
glowkate Jan 25, 2026
9c45a5b
Added buttons for toggling echo production. They don't work yet.
glowkate Jan 26, 2026
7f2fc2d
Shift Echo toggles now change Echo production.
glowkate Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 85 additions & 0 deletions js/data/events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,91 @@
SharkGame.flags.gotFarmsBeforeShrimpThreat = true;
}
},
},
chaoticEchoShiftShark: {

Check failure on line 297 in js/data/events.js

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 4 spaces but found 1 tab

Check failure on line 297 in js/data/events.js

View workflow job for this annotation

GitHub Actions / build 

Unexpected tab character
handlingTime: "beforeTick",
priority: 0,
getAction() {
return "remove";
},
trigger() {
const crystal = res.getResource("crystal");

Check failure on line 304 in js/data/events.js

View workflow job for this annotation

GitHub Actions / build 

'crystal' is assigned a value but never used. Allowed unused vars must match /^__.+$/u
const wisp = res.getResource("wisp");

Check failure on line 305 in js/data/events.js

View workflow job for this annotation

GitHub Actions / build 

'wisp' is assigned a value but never used. Allowed unused vars must match /^__.+$/u

Check failure on line 305 in js/data/events.js

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 12 spaces but found 3 tabs

Check failure on line 305 in js/data/events.js

View workflow job for this annotation

GitHub Actions / build 

Unexpected tab character
const coral = res.getResource("coral");

Check failure on line 306 in js/data/events.js

View workflow job for this annotation

GitHub Actions / build 

'coral' is assigned a value but never used. Allowed unused vars must match /^__.+$/u

Check failure on line 306 in js/data/events.js

View workflow job for this annotation

GitHub Actions / build 

Expected indentation of 12 spaces but found 3 tabs

Check failure on line 306 in js/data/events.js

View workflow job for this annotation

GitHub Actions / build 

Unexpected tab character
const sand = res.getResource("sand");

Check failure on line 307 in js/data/events.js

View workflow job for this annotation

GitHub Actions / build 

Unexpected tab character

const echo = SharkGame.ResourceMap.get("echo");

SharkGame.flags.echoShiftShark = true;
SharkGame.flags.echoShiftRay = false;
SharkGame.flags.echoShiftCrab = false;

echo.baseIncome = { wisp: 10, sand: 0, crystal: 0, coral: 0 };

res.reapplyModifiers("echo", "wisp");
res.reapplyModifiers("echo", "sand");
res.reapplyModifiers("echo", "crystal");
res.reapplyModifiers("echo", "coral");

return true;
},
},
chaoticEchoShiftRay: {
handlingTime: "beforeTick",
priority: 0,
getAction() {
return "remove";
},
trigger() {
const crystal = res.getResource("crystal");
const wisp = res.getResource("wisp");
const coral = res.getResource("coral");
const sand = res.getResource("sand");

const echo = SharkGame.ResourceMap.get("echo");

SharkGame.flags.echoShiftShark = false;
SharkGame.flags.echoShiftRay = true;
SharkGame.flags.echoShiftCrab = false;

echo.baseIncome = { wisp: 2, sand: 10, crystal: 0, coral: 0 };

res.reapplyModifiers("echo", "wisp");
res.reapplyModifiers("echo", "sand");
res.reapplyModifiers("echo", "crystal");
res.reapplyModifiers("echo", "coral");

return true;
},
},
chaoticEchoShiftCrab: {
handlingTime: "beforeTick",
priority: 0,
getAction() {
return "remove";
},
trigger() {
const crystal = res.getResource("crystal");
const wisp = res.getResource("wisp");
const coral = res.getResource("coral");
const sand = res.getResource("sand");

const echo = SharkGame.ResourceMap.get("echo");


SharkGame.flags.echoShiftShark = false;
SharkGame.flags.echoShiftRay = false;
SharkGame.flags.echoShiftCrab = true;

echo.baseIncome = { wisp: 0, sand: 0, crystal: 2, coral: 1 };

res.reapplyModifiers("echo", "wisp");
res.reapplyModifiers("echo", "sand");
res.reapplyModifiers("echo", "crystal");
res.reapplyModifiers("echo", "coral");

return true;
},
},
revealBuyButtons: {
handlingTime: "beforeTick",
Expand Down
Loading