diff --git a/images/Time2wait.svg b/images/Time2wait.svg
new file mode 100644
index 0000000..790f701
--- /dev/null
+++ b/images/Time2wait.svg
@@ -0,0 +1,71 @@
+
+
diff --git a/js/Layers/study.js b/js/Layers/study.js
index 9d3a165..96889d0 100644
--- a/js/Layers/study.js
+++ b/js/Layers/study.js
@@ -1,3 +1,26 @@
+function createCard(title, description, onDraw) {
+ return { title, description, onDraw };
+}
+
+const nothingCard = () => createCard("His job is not to wield power but to draw attention away from it.", "Do nothing.", () => {});
+const gainPointsCard = () => createCard("Don't Panic.", "Successfully study some properties", () => addPoints("study", getResetGain("study")));
+
+const baseCards = () => {
+ return [ nothingCard(), nothingCard(), nothingCard(), nothingCard(), nothingCard(), nothingCard(), gainPointsCard(), gainPointsCard(), gainPointsCard() ];
+};
+
+const cardFormat = (card, id = "", width = "200px", height = "300px") => {
+ // TODO observe/science symbol
+ return ["display-text", `
+
+ ${card.title}
+
+
${card.description}
+
+
+
",
- display() {
- return `Each casting of this spell increases its cost, and makes collecting flowers 50% faster.
Currently: x${format(this.effect())}
Cost: ${format(this.cost())} flowers`;
- },
- cost(x) {
- return new Decimal(1000).times(new Decimal(3).pow(x || getBuyableAmount(this.layer, this.id)));
- },
- effect() {
- return new Decimal(1.5).pow(getBuyableAmount(this.layer, this.id));
- },
- canAfford() {
- return player[this.layer].points.gte(this.cost());
- },
- buy() {
- player[this.layer].points = player[this.layer].points.sub(this.cost());
- setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(1));
- },
- unlocked: () => hasMilestone("flowers", 1)
- },
- 12: {
- title: "Why should I trouble myself?
",
- display() {
- return `Each casting of this spell increases its cost, and doubles experience gain.
Currently: x${format(this.effect())}
Cost: ${format(this.cost())} flowers`;
- },
- cost(x) {
- return new Decimal(10000).times(new Decimal(4).pow(x || getBuyableAmount(this.layer, this.id)));
- },
- effect() {
- return new Decimal(2).pow(getBuyableAmount(this.layer, this.id));
- },
- canAfford() {
- return player[this.layer].points.gte(this.cost());
- },
- buy() {
- player[this.layer].points = player[this.layer].points.sub(this.cost());
- setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(1));
- },
- unlocked: () => hasMilestone("flowers", 2)
- },
- 13: {
- title: "And there was Weena dancing at my side!
",
- display() {
- return `Each casting of this spell increases its cost, and raises flower collection rate to an additive +.05 power.
Currently: ^${format(this.effect())}
Cost: ${format(this.cost())} flowers`;
- },
- cost(x) {
- return new Decimal(250000).times(new Decimal(10).pow(x || getBuyableAmount(this.layer, this.id)));
- },
- effect() {
- return new Decimal(.05).times(getBuyableAmount(this.layer, this.id)).add(1);
- },
- canAfford() {
- return player[this.layer].points.gte(this.cost());
- },
- buy() {
- player[this.layer].points = player[this.layer].points.sub(this.cost());
- setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(1));
- },
- unlocked: () => hasMilestone("flowers", 3)
- }
- },
- upgrades: {
- rows: 1,
- cols: 4,
- nextChapter: {
- title: "And those that carry us forward, are dreams.
",
- description: "Close the time loop.",
- unlocked: true,
- onPurchase() {
- showTab("none");
- player.chapter = 2;
- player.timeSlots = new Decimal(1);
- }
- },
- 11: {
- title: "A chain of beautiful flowers
",
- description: "Increase collection speed based on how many flowers you have
",
- cost: new Decimal(10),
- effect: () => player.flowers.points.clampMin(1).pow(0.1).add(1),
- unlocked: () => hasMilestone("flowers", 0),
- effectDisplay() {
- return `x${format(this.effect())}`;
- }
- },
- 12: {
- title: "A big garland of flowers
",
- description: "Increase collection speed based on your collecting flowers level",
- cost: new Decimal(100),
- effect: () => new Decimal(getJobLevel("flowers")).pow(2).div(10).add(1),
- unlocked: () => hasMilestone("flowers", 0),
- effectDisplay() {
- return `x${format(this.effect())}`;
- }
- },
- 13: {
- title: "Weena's Gift
",
- description: "Increase experience gain based on real time spent collecting flowers",
- cost: new Decimal(250),
- effect: () => new Decimal(player.flowers.realTime).div(100).add(1),
- unlocked: () => hasMilestone("flowers", 0),
- effectDisplay() {
- return `x${format(this.effect())}`;
- }
- },
- 14: {
- title: "White Sphinx
",
- description: "Increase flower collection based on the number of upgrades bought",
- cost: new Decimal(500),
- effect: () => Decimal.pow(1.5, player.flowers.upgrades.length),
- unlocked: () => hasMilestone("flowers", 0),
- effectDisplay() {
- return `x${format(this.effect())}`;
- }
- }
- }
});
diff --git a/js/mod.js b/js/mod.js
index 78affed..e455281 100644
--- a/js/mod.js
+++ b/js/mod.js
@@ -78,6 +78,6 @@ function maxTickLength() {
function fixOldSave(oldVersion){
if (oldVersion === "0.0") {
player.chapter = 1;
+ player.flowers.points = player.flowers.points.clampMax(1e9);
}
- console.log(oldVersion, player.chapter);
}
\ No newline at end of file
diff --git a/style.css b/style.css
index 6520468..55484bb 100644
--- a/style.css
+++ b/style.css
@@ -730,9 +730,59 @@ button > * {
}
}
-@media only screen and (max-width: 720px) {
+@media only screen and (max-width: 1200px) {
.col.right {
min-width: 100%;
background: var(--background);
}
}
+
+.card {
+ padding: 10px;
+ background: darkcyan;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-evenly;
+ box-shadow: black 4px 4px 8px 0px;
+ border-radius: 10px;
+ position: relative;
+ margin: 10px auto;
+}
+
+.card:hover {
+ transform: scale(1.1);
+}
+
+.card > span {
+ flex-basis: 30%;
+ display: flex;
+}
+
+.card > img {
+ max-width: 50%;
+ position: absolute;
+ bottom: 10px;
+ left: 50%;
+ transform: translateX(-50%);
+ opacity: .5;
+}
+
+.card h3 {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-height: 100%;
+}
+
+.flipCard {
+ animation: flip 1s;
+}
+
+@keyframes flip {
+ 0% {
+ transform: rotateY(90deg);
+ }
+
+ 100% {
+ transform: rotateY(0deg);
+ }
+}