From 7ef1ff493db13a435bb36e6f6ec937ec24470adb Mon Sep 17 00:00:00 2001
From: ModragX <151087186+qazox@users.noreply.github.com>
Date: Wed, 20 Dec 2023 18:04:11 -0500
Subject: [PATCH 1/2] resarch clicker

---
 src/routes/+page.svelte                 | 171 ++++++++++++++++++------
 src/routes/researchclicker/+page.svelte | 138 -------------------
 src/routes/roguepotato/+page.svelte     |   2 -
 3 files changed, 132 insertions(+), 179 deletions(-)
 delete mode 100644 src/routes/researchclicker/+page.svelte
 delete mode 100644 src/routes/roguepotato/+page.svelte

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 5a72e87..f1a227e 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,45 +1,138 @@
 <script>
-    import Button from "$lib/Button.svelte";
+    let technologicalProgression = "Stone";
+
+    import { Currency, Factory } from "$lib/clicker.js";
+    import CurrencyItem from "$lib/CurrencyItem.svelte";
+    import FactoryItem from "$lib/FactoryItem.svelte";
+
+    let causeUpdate = () => {
+        currencies = { ...currencies };
+        upgrades = { ...upgrades };
+        technology.stoneTools.invis = !(upgrades.scientist.amount > 9);
+    };
+
+    let currencies = {
+        research: new Currency("TECH", causeUpdate, "research"),
+        land: new Currency("LAND", causeUpdate, "land"),
+        stone: new Currency("ROCK", causeUpdate, "stone"),
+        wood: new Currency("WOOD", causeUpdate, "wood"),
+        dirt: new Currency("DIRT", causeUpdate, "dirt"),
+    };
+
+    currencies.research.perClick = 1;
+    currencies.stone.delay = 3000;
+
+    let upgrades = {
+        scientist: new Factory(
+            "Scientist",
+            {
+                research: 15,
+            },
+            {
+                research: {
+                    perClick: 0,
+                    delay: 1,
+                    perDelay: 1,
+                },
+            },
+            1.1,
+            causeUpdate,
+            false,
+            "scientist"
+        ),
+        miner: new Factory(
+            "Miner",
+            {
+                stone: 10,
+            },
+            {
+                stone: {
+                    perClick: 0,
+                    delay: 1,
+                    perDelay: 1,
+                },
+            },
+            1.1,
+            causeUpdate,
+            false,
+            "miner"
+        ),
+    };
+    let technology = {
+        rockfinding: new Factory(
+            "Rock Finding",
+            {
+                research: 15,
+            },
+            {
+                stone: {
+                    perClick: 0.1,
+                    delay: 1,
+                    perDelay: 0,
+                },
+            },
+            1.1,
+            causeUpdate,
+            true,
+            "stone"
+        ),
+        stoneTools: new Factory(
+            "Stone Tools",
+            {
+                research: 100,
+                stone: 50,
+            },
+            {
+                stone: {
+                    perClick: 0.1,
+                    delay: 1,
+                    perDelay: 0,
+                },
+            },
+            1.1,
+            causeUpdate,
+            true,
+            "research"
+        ),
+    };
 </script>
 
-<section class="left">
-    <h1 class="row">
-        <img src="/potatoplusplus.svg" alt="icon" />
-        <p>Welcome to Potato++</p>
-    </h1>
-    <p>
-        Potato++ is a website where two brothers make games and put them here so
-        people can play them.
-    </p>
-    <section class="row">
-        <Button href="https://discord.gg/KnAU3Snc9g" content="Discord" />
-        <Button
-            href="https://github.com/potato-plus-plus/ppp"
-            content="Source Code"
-        />
-    </section>
-    <h1>Games</h1>
-    <h2>Early Access Games</h2>
-    <p>These games are games that are not finished yet, but are available to play.</p>
-    <section class="row">
-        <Button
-            href="researchclicker"
-            content="Research Clicker"
-            icon="/research.svg"
-        />
-        <Button
-            href="roguepotato"
-            content="Rogue Potato"
-            icon="/research.svg"
-        />
-    </section>
+<h1>{technologicalProgression} Age</h1>
+<a
+    on:click={() => {
+        for (let currency in currencies) {
+            currencies[currency].click();
+        }
+    }}><img src="/research.svg" /></a
+>
+<p>Click to <b>Research</b></p>
 
-    <h2>Finished Games</h2>
-    <p>These games are full games, and are no longer in the Early Access phase.</p>
+<h2>Raw Resources</h2>
 
-    <h1>Credits</h1>
-    <section class="row">
-        <Button href="https://github.com/thepotatoplus" content="Potato" />
-        <Button href="https://github.com/nanodev-x" content="NDX" />
-    </section>
+<section class="row">
+    {#each Object.values(currencies) as currency}
+        {#if !currency.invis}
+            <CurrencyItem {currency} />
+        {/if}
+    {/each}
+</section>
+
+<h2>Generators</h2>
+
+<section class="row">
+    {#each Object.values(upgrades) as upgrade}
+        {#if !upgrade.invis}
+            <FactoryItem factory={upgrade} {currencies} />
+        {/if}
+    {/each}
+</section>
+
+<h2>Research</h2>
+
+<section class="row">
+    {#each Object.values(technology) as upgrade}
+        {#if !upgrade.invis}
+            <FactoryItem factory={upgrade} {currencies} />
+        {/if}
+    {/each}
 </section>
diff --git a/src/routes/researchclicker/+page.svelte b/src/routes/researchclicker/+page.svelte
deleted file mode 100644
index f1a227e..0000000
--- a/src/routes/researchclicker/+page.svelte
+++ /dev/null
@@ -1,138 +0,0 @@
-<script>
-    let technologicalProgression = "Stone";
-
-    import { Currency, Factory } from "$lib/clicker.js";
-    import CurrencyItem from "$lib/CurrencyItem.svelte";
-    import FactoryItem from "$lib/FactoryItem.svelte";
-
-    let causeUpdate = () => {
-        currencies = { ...currencies };
-        upgrades = { ...upgrades };
-        technology.stoneTools.invis = !(upgrades.scientist.amount > 9);
-    };
-
-    let currencies = {
-        research: new Currency("TECH", causeUpdate, "research"),
-        land: new Currency("LAND", causeUpdate, "land"),
-        stone: new Currency("ROCK", causeUpdate, "stone"),
-        wood: new Currency("WOOD", causeUpdate, "wood"),
-        dirt: new Currency("DIRT", causeUpdate, "dirt"),
-    };
-
-    currencies.research.perClick = 1;
-    currencies.stone.delay = 3000;
-
-    let upgrades = {
-        scientist: new Factory(
-            "Scientist",
-            {
-                research: 15,
-            },
-            {
-                research: {
-                    perClick: 0,
-                    delay: 1,
-                    perDelay: 1,
-                },
-            },
-            1.1,
-            causeUpdate,
-            false,
-            "scientist"
-        ),
-        miner: new Factory(
-            "Miner",
-            {
-                stone: 10,
-            },
-            {
-                stone: {
-                    perClick: 0,
-                    delay: 1,
-                    perDelay: 1,
-                },
-            },
-            1.1,
-            causeUpdate,
-            false,
-            "miner"
-        ),
-    };
-    let technology = {
-        rockfinding: new Factory(
-            "Rock Finding",
-            {
-                research: 15,
-            },
-            {
-                stone: {
-                    perClick: 0.1,
-                    delay: 1,
-                    perDelay: 0,
-                },
-            },
-            1.1,
-            causeUpdate,
-            true,
-            "stone"
-        ),
-        stoneTools: new Factory(
-            "Stone Tools",
-            {
-                research: 100,
-                stone: 50,
-            },
-            {
-                stone: {
-                    perClick: 0.1,
-                    delay: 1,
-                    perDelay: 0,
-                },
-            },
-            1.1,
-            causeUpdate,
-            true,
-            "research"
-        ),
-    };
-</script>
-
-<h1>{technologicalProgression} Age</h1>
-<a
-    on:click={() => {
-        for (let currency in currencies) {
-            currencies[currency].click();
-        }
-    }}><img src="/research.svg" /></a
->
-<p>Click to <b>Research</b></p>
-
-<h2>Raw Resources</h2>
-
-<section class="row">
-    {#each Object.values(currencies) as currency}
-        {#if !currency.invis}
-            <CurrencyItem {currency} />
-        {/if}
-    {/each}
-</section>
-
-<h2>Generators</h2>
-
-<section class="row">
-    {#each Object.values(upgrades) as upgrade}
-        {#if !upgrade.invis}
-            <FactoryItem factory={upgrade} {currencies} />
-        {/if}
-    {/each}
-</section>
-
-<h2>Research</h2>
-
-<section class="row">
-    {#each Object.values(technology) as upgrade}
-        {#if !upgrade.invis}
-            <FactoryItem factory={upgrade} {currencies} />
-        {/if}
-    {/each}
-</section>
diff --git a/src/routes/roguepotato/+page.svelte b/src/routes/roguepotato/+page.svelte
deleted file mode 100644
index 0872dfa..0000000
--- a/src/routes/roguepotato/+page.svelte
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1> test</h1>
-<p> hi guys</p>
\ No newline at end of file

From 9410ac7c7670e39ab90655deeab5239f20827671 Mon Sep 17 00:00:00 2001
From: ModragX <151087186+qazox@users.noreply.github.com>
Date: Wed, 20 Dec 2023 18:06:45 -0500
Subject: [PATCH 2/2] old links; fix

---
 src/routes/+layout.svelte | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 0b03d7d..9deefa6 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,6 +1,5 @@
 <h2>
-    <a href='https://potatoplusplus.com/'>Potato++</a> |
-    <a href="https://discord.gg/KnAU3Snc9g">Discord</a>
+    <a href="https://discord.gg/53DkvQnn9M">Discord</a>
 </h2>
 
 <slot />