Skip to content

Chaotic Beta Merge - #50

Open
glowkate wants to merge 37 commits into
Toby222:devfrom
glowkate:chaotic
Open

glowkate wants to merge 37 commits into
Toby222:devfrom
glowkate:chaotic

Conversation

@glowkate

@glowkate glowkate commented Sep 3, 2026

Copy link
Copy Markdown

No description provided.

glowkate and others added 30 commits December 7, 2025 15:38
Turtle Harmoniser to put more emphesis on coral.
Pull sprites from head to branch
Comment thread Testfile.txt Outdated

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this

Comment thread js/gateway.js Outdated
],
chaotic: [
"Do you wonder why you remained corporeal?",
"Did you recognise any of the echos many faces?",

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"Did you recognise any of the echos many faces?",
"Did you recognise any of the echoes' many faces?",

Comment thread js/data/sprites.js
Comment on lines +80 to +87
"actions/fakeCatchFish": {
frame: {
x: 300,
y: 0,
w: 50,
h: 50,
},
},

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How did you even do this?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just told the game where fakeCatchFish's image was in the spritesheet. Just so happens that its image was the same as catchFish. Since this was on a different branch, git could pull in the added sprites without removing this code.

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, it's added as a child of actions/breakDownAncientPart
The actual sprite is at the bottom

Comment thread js/data/sprites.js
Comment on lines +802 to +818
"actions/echoShiftCrab": {
frame: {
x: 550,
y: 250,
w: 50,
h: 50,
},
},
"actions/shiftEchoRay": {
"actions/echoShiftRay": {
frame: {
x: 550,
y: 300,
w: 50,
h: 50,
},
},
"actions/shiftEchoShark": {
"actions/echoShiftShark": {

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You did not update the sprites

Comment thread js/data/sprites.js
Comment on lines +2018 to +2025
"actions/fakeCatchFish": {
frame: {
x: 300,
y: 50,
w: 50,
h: 50,
},
},

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sprite doesn't exist

Comment thread js/data/resourcetable.js Outdated
"clamScavenger",
"seabedStripper",
"calciniumConverter",
// "wispCumulator", Depricated

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just remove it then

Comment thread js/data/resourcetable.js Outdated
Comment on lines +1378 to +1391
/*
wispCumulator: {
name: "wisp cumulators",
singleName: "wisp cumulator",
color: "#3EBD6C", // change when art's done
desc: "Filters wisps from the ocean currents using sand.",
income: {
wisp: 50,
get sand() {
return -500 + 250 * SharkGame.Aspects.mechanicalManifestation.level;
},
},
value: 70000,
}, */

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove if no longer needed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants