Skip to content

Commit

Permalink
Continued work on Broken
Browse files Browse the repository at this point in the history
  • Loading branch information
spencers145 committed Nov 6, 2024
1 parent 1144ab1 commit 0034245
Show file tree
Hide file tree
Showing 5 changed files with 148 additions and 49 deletions.
5 changes: 2 additions & 3 deletions js/data/homeactions.js
Original file line number Diff line number Diff line change
Expand Up @@ -4726,7 +4726,7 @@ SharkGame.HomeActions = {
brokenCrab: 1,
},
},
cost: [{ resource: "will", costFunction: "linear", priceIncrease: 10 }],
cost: [{ resource: "will", costFunction: "linear", priceIncrease: 100 }],
max: "brokenCrab",
prereq: {
upgrade: ["crabRecall"],
Expand Down Expand Up @@ -4771,8 +4771,7 @@ SharkGame.HomeActions = {
},
},
cost: [
{ resource: "will", costFunction: "linear", priceIncrease: 20 },
{ resource: "determination", costFunction: "linear", priceIncrease: 1 },
{ resource: "will", costFunction: "linear", priceIncrease: 50 },
],
max: "brokenDolphin",
prereq: {
Expand Down
39 changes: 20 additions & 19 deletions js/data/homemessages.js
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ SharkGame.HomeMessages = {
broken: [
{
name: "broken-default",
message: "The ocean is filled with masses of...something, or perhaps nothing, that never move. There is no life here.",
message: "The ocean is filled with masses of...something, or perhaps nothing, that never move. Strange shapes move nearby.",
},
{
name: "broken-will",
Expand All @@ -537,35 +537,36 @@ SharkGame.HomeMessages = {
message: "The sharks bow down in the shadow of your divinity. They beg you to fix their world.",
},
{
name: "broken-rays",
unlock: { resource: { brokenRay: 12 } },
message: "The rays are distraught. They say their king has gone missing. They plead with you to find him.",
name: "broken-hope",
unlock: { resource: { hope: 200 } },
message: "The frenzy . They say they are filled with hope.",
},
{
name: "broken-crabs",
name: "broken-night",
unlock: { resource: { brokenCrab: 100 } },
message: "The crabs are grateful for their rescue, but so confused. They say they were lost to the void just seconds ago.",
message: "",
},
{
name: "broken-dolphins",
unlock: { resource: { brokenDolphin: 35 } },
message: "The dolphins always come out panicking. They keep asking where the king is.",
name: "broken-art",
unlock: { resource: { dolphinArtist: 35 } },
message: "The artists paint the ocean with silent, magical strokes. Wisps of a strange energy flow freely through the ocean currents.",
},
{
name: "broken-sculptors",
name: "broken-essence",
unlock: { resource: { liquidEssence: 5 } },
message: "The liquid essence balls up in beads on the ocean floor. It radiates divine power.",
},
{
name: "broken-sky",
unlock: { resource: { sharkSculptor: 5 } },
message: "The sculptors chisel away at rock, erecting crude, effective monuments to your power. Their creativity fuels your ability.",
message: "The astronomers carefully tune their instruments. Stars, glowing softly, slowly fill the sky as they work.",
},
{
name: "broken-memories",
unlock: { resource: { rescueTeam: 5 } },
message: "Each creature comes out of the void dazed and confused. The dolphins insist they've lost much of their memories.",
},
{
name: "broken-essence",
unlock: { resource: { liquidEssence: 5 } },
message: "The liquid essence balls up in pools on the floor. It radiates divine power.",
message: "",
},

// {
// name: "broken-machines",
// unlock: { resource: { rescueTeam: 5 } },
Expand All @@ -579,7 +580,7 @@ SharkGame.HomeMessages = {
{
name: "broken-out-of-reach",
unlock: { resource: { liquidEssence: 5 } },
message: "You have to keep going. You're almost there.",
message: "The sharks, rays, and crabs mourn their king.",
},
{
name: "broken-temple",
Expand All @@ -589,7 +590,7 @@ SharkGame.HomeMessages = {
{
name: "broken-temple",
unlock: { resource: { liquidEssence: 5 } },
message: "Who were you, before? Before you started this journey?</br>You can't remember.",
message: "Who were you, before? Before you started this journey?</br>You realize you can't remember.",
},
],
/*
Expand Down
91 changes: 76 additions & 15 deletions js/data/resourcetable.js
Original file line number Diff line number Diff line change
Expand Up @@ -1254,6 +1254,46 @@ SharkGame.ResourceTable = {

// STUFF FOR FINALE BEGINS HERE

remnant: {
name: "remnants",
singleName: "remnant",
desc: "Memories, or merely an echo.",
color: "#BBBBBB",
value: 1,
},

starflake: {
name: "starflakes",
singleName: "starflake",
desc: "Stars in the sand.",
color: "#FFD642",
value: 1,
},

dawnCrystal: {
name: "dawn crystals",
singleName: "dawn crystal",
desc: "The stolen sun.",
color: "#9E3FB5",
value: 1,
},

nighttide: {
name: "nighttide",
singleName: "nighttide",
desc: "Midnight, fallen from the sky.",
color: "#5C606B",
value: 5,
},

void: {
name: "void",
singleName: "void",
desc: "Pure unreality, commanded only by the highest beings.",
color: "#444444",
value: 5,
},

will: {
name: "will",
singleName: "will",
Expand All @@ -1265,14 +1305,14 @@ SharkGame.ResourceTable = {
inspiration: {
name: "inspiration",
singleName: "inspiration",
desc: "The power to create.",
desc: "The power to invent.",
color: "#E89EE3",
value: 1,
},

determination: {
name: "determination",
singleName: "determination",
hope: {
name: "hope",
singleName: "hope",
desc: "The power to overcome.",
color: "#E35B8F",
value: 1,
Expand All @@ -1281,24 +1321,24 @@ SharkGame.ResourceTable = {
imagination: {
name: "imagination",
singleName: "imagination",
desc: "The power to invent.",
color: "#FFD6FC",
desc: "The power to dream.",
color: "#4492C9",
value: 1,
},

power: {
name: "power",
singleName: "power",
desc: "A stream of divinity.",
color: "#FFD6FC",
color: "#44C9AA",
value: 1,
},

liquidEssence: {
name: "liquid essence",
singleName: "liquid essence",
desc: "The shape of imagination. More stable than its concentrated counterpart.",
color: "#FFD6FC",
color: "#95DECD",
value: 9999999999999,
},

Expand All @@ -1308,7 +1348,7 @@ SharkGame.ResourceTable = {
desc: "Fallen from the apex of everything.",
color: "#92C1E0",
income: {
will: 1,
remnant: 1,
},
jobs: ["scientist", "nurse", "diver"],
value: 1000,
Expand All @@ -1320,8 +1360,7 @@ SharkGame.ResourceTable = {
desc: "Forever loyal to the sharks.",
color: "#797CFC",
income: {
will: 1,
inspiration: 0.01,
starflake: 1,
},
jobs: ["laser", "maker", "scholar", "shoveler", "clamScavenger"],
value: 1000,
Expand All @@ -1333,8 +1372,7 @@ SharkGame.ResourceTable = {
desc: "Only ever helpful.",
color: "#C03030",
income: {
will: 1,
determination: 0.002,
dawnCrystal: 0.1,
},
value: 1000,
},
Expand All @@ -1349,13 +1387,36 @@ SharkGame.ResourceTable = {
},
jobs: ["treasurer", "biologist", "historian"],
value: 1000,
forceIncome: true,
},

voidDiver: {
name: "void divers",
singleName: "void diver",
desc: "Meddling with darkness.",
color: "#797CFC",
income: {
will: 1,
inspiration: 0.01,
},
value: 1000,
},

rayAstronomers: {
name: "ray astronomers",
singleName: "ray astronomer",
desc: "The sky speaks to them. What did it say?",
color: "#797CFC",
income: {
will: 1,
inspiration: 0.01,
},
value: 1000,
},

rescueTeam: {
name: "rescue teams",
singleName: "rescue team",
desc: "Find them.",
desc: ".",
color: "#C6BAC6",
income: {
brokenShark: 0.02,
Expand Down
60 changes: 49 additions & 11 deletions js/data/upgrades.js
Original file line number Diff line number Diff line change
Expand Up @@ -4529,29 +4529,67 @@ SharkGame.Upgrades = {
},

broken: {
strongWill: {
name: "Strong Will",
desc: "Tap into your inner strength. Focus.",
crystalFashioning: {
name: "Crystal Fashioning",
desc: ".",
researchedMessage:
"You find the will within yourself to push onward. You've only just begun.",
".",
effectDesc:
"If you will it so, you can use the crystals to blah blah something?.",
cost: {
remnant: 100,
},
},
remnantRecycling: {
name: "Remnant Recycling",
desc: "The sharks have been chasing around these bizarre-looking...things. Their appearence defies explanation.",
researchedMessage:
"If you focus, you can see the truth. There's a fish under all this garbage! With a little effort, you can set it free.",
effectDesc:
"Willpower generation is twice as efficient. Harness your mental prowess!",
"Separating the fish from the remnants, you can take the power for yourself.",
cost: {
remnant: 100,
},
},
volatileMixtures: {
name: "Volatile Mixtures",
desc: "The remnants, starflakes, nighttide, and crystals contain a strange power that we can't understand. Let's mix them together and see if they blow up!",
researchedMessage:
"We have confirmed that mixing these things, indeed, blows them up. With one exception.",
effectDesc:
"We have learned that nighttide and starflakes can safely mix. Does that mean anything?",
cost: {
inspiration: 10,
},
effect: {
resourceBoost: {
will: 2,
inspiration: 2,
},
},
},
strangePaints: {
name: "Strange Paints",
desc: "Putting nighttide and starflakes together makes a semi-solid sparkle paste. We NEED to know more. It's so pretty.",
researchedMessage:
"Reports of its shininess were greatly exaggerated, but it makes a great ",
effectDesc:
"Discovered But sparkles are not inherently useful. Noted.",
cost: {
inspiration: 10,
},
effect: {
resourceBoost: {
inspiration: 2,
},
},
},
powerfulInspiration: {
name: "Powerful Inspiration",
desc: "Remember the beauty of what you have seen. Focus.",
creativePursuits: {
name: "Creative Pursuits",
desc: "The dolphins have been requesting a supply of paint. Look, normally we'd detest this sort of time-wasting - but it's not like we have another use for it.",
researchedMessage:
"",
"The dolphins carefully explained to us the actual, physically important power of creativity. We're a bit doubtful, but, okay, sure.",
effectDesc:
"Inspiration generation is twice as efficient.",
"Dolphin artists can be equipped. Let's see if they have any idea what they're talking about.",
cost: {
inspiration: 10,
},
Expand Down
2 changes: 1 addition & 1 deletion js/tabs/lab.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ SharkGame.Lab = {
get message() {
switch (world.worldType) {
case "broken":
return "There may not be science in this world, but you still have aspirations.<br>Progress at all costs.";
return "You might not have science, but you still have goals.<br>The frenzy stands ready to help you achieve your aspirations.";
case "tempestuous":
if (res.getTotalResource("scientist") < 1) {
return "Sort of just off to the side, there's a cave.";
Expand Down

0 comments on commit 0034245

Please sign in to comment.