alpha 1.1.2, finally

Mewtwo2387 · Nov 22, 2023 · a3cb29d · a3cb29d
1 parent 36af153
commit a3cb29d
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 19 deletions.
diff --git a/index.html b/index.html
@@ -343,20 +343,20 @@ <h2>Next Stamina in&nbsp;</h2><h1 class="h1s" id="nextstam">2</h1><h2>&nbsp;Achi
                         <button id="minebutton" class="locked" disabled="true" onclick="mine()">Cannot Mine (Nothing Selected)</button>
                         <canvas id="miningcanvas" width="320" height="640" style="width:320px;height:640px;margin:15px;" onclick="sel(event)"></canvas>
                     </div>
-                    <div class="miningtab" id="miningitems">
+                    <div class="miningtab" id="miningitemstab">
                         <div class="infobox" id="pickaxe">
                             <img class="img50px" src="assets/images/icons-alchemy/C000.png" style="margin: auto;display: block;">
                             <h2 style="width: 100%;text-align: center;" id="pickaxename">None</h2>
                         </div>
-                        <div class="infobox" id="furnace">
+                        <div class="infobox" id="furnace" onclick="navigateMining('furnacetab')">
                             <img class="img50px" src="assets/images/icons-alchemy/C000.png" style="margin: auto;display: block;">
                             <h2 style="width: 100%;text-align: center;" id="furnacename">None</h2>
                         </div>
-                        <div class="infobox" id="refinary">
+                        <div class="infobox" id="refinary" onclick="navigateMining('refinarytab')">
                             <img class="img50px" src="assets/images/icons-alchemy/C000.png" style="margin: auto;display: block;">
                             <h2 style="width: 100%;text-align: center;" id="refinaryname">None</h2>
                         </div>
-                        <div class="infobox" id="alloy">
+                        <div class="infobox" id="alloy" onclick="navigateMining('alloytab')">
                             <img class="img50px" src="assets/images/icons-alchemy/C000.png" style="margin: auto;display: block;">
                             <h2 style="width: 100%;text-align: center;" id="alloyname">None</h2>
                         </div>
@@ -446,13 +446,25 @@ <h2 style="width: 100%;text-align: center;" id="soulgemamount">0</h2>
                         </div>
                     </div>
                     <div class="miningtab" id="furnacetab">
-
+                        <button onclick="navigateMining('miningitemstab')">back</button>
+                        <h2>furnace goes here</h2>
+                        <button onclick="if(GD.haematite>0&&GD.coal>0){GD.haematite--;GD.coal--;GD.iron++}">test smelt iron</button>
                     </div>
                     <div class="miningtab" id="refinarytab">
-
+                        <button onclick="navigateMining('miningitemstab')">back</button>
+                        <h2>refinary goes here</h2>
+                        <button onclick="if(GD.stone>0&&GD.coal>0){GD.stone--;GD.coal--;GD.refinedstone++}">test refine stone</button>
+                        <button onclick="if(GD.darkstone>0&&GD.coal>0){GD.darkstone--;GD.coal--;GD.refineddarkstone++}">test refine darkstone</button>
+                        <button onclick="if(GD.iron>0&&GD.coal>1){GD.iron--;GD.coal-=2;GD.refinediron++}">test refine iron</button>
+                        <button onclick="if(GD.silver>0&&GD.coal>1){GD.silver--;GD.coal-=2;GD.refinedsilver++}">test refine silver</button>
+                        <button onclick="if(GD.gold>0&&GD.coal>1){GD.gold--;GD.coal-=2;GD.refinedgold++}">test refine gold</button>
+                        <button onclick="if(GD.diamond>0&&GD.coal>3){GD.diamond--;GD.coal-=4;GD.refineddiamond++}">test refine diamond</button>
+
                     </div>
                     <div class="miningtab" id="alloytab">
-
+                        <button onclick="navigateMining('miningitemstab')">back</button>
+                        <h2>alloy goes here</h2>
+                        <button onclick="if(GD.gold>0&&GD.silver>0&&GD.Catalyst>=10){GD.gold--;GD.silver--;GD.Catalyst-=10;GD.lumium++}">test alloy lumium</button>
                     </div>
                 </div>
                 <div class="tab" id="exploring">

diff --git a/js/mine.js b/js/mine.js
@@ -291,4 +291,12 @@ function loadmines(){
         showmine();
     }
     contload();
+}
+
+function navigateMining(tab){
+    document.getElementById('miningitemstab').style.display = "none"
+    document.getElementById('furnacetab').style.display = "none"
+    document.getElementById('alloytab').style.display = "none"
+    document.getElementById('refinarytab').style.display = "none"
+    document.getElementById(tab).style.display = "inline-block"
 }
diff --git a/pages/changelog.html b/pages/changelog.html
@@ -11,7 +11,6 @@
 -->
 <!-- TO BE COMPLETED IN 1.1.x
     MINING:
-    mining items tooltip
     remaining mining images
     stamina progression
     more mining achi
@@ -27,6 +26,9 @@
     alchemy achi
     utility items
     more smeltables and alloyables
+    furnace UI
+    furnace time requirement
+    furnace capacity
 
     MISSIONS:
     mission set 2
@@ -38,40 +40,59 @@
 
     OTHERS:
     buy max
-    changelog rewrite
     achi icon for no icon
     tab icons
+    tab icons
+    the 90 achi icons
+    main menu button icons
+    main menu save state 
+    tab icons 
     the 90 achi icons
     main menu button icons
     main menu save state 
     food div background
     more food achis and ups 
 
     BUGS:
-    next: 017
+    017 Snorlax Click popups sometimes at wrong place
+    next: 018
 -->
 
 <!-- TO BE COMPLETED IN FUTURE VERSIONS
+    1.2.x UI UPDATE:
+    achi tooltips
+    mining item tooltips
+    changelog revamp
+    the 90 achi icons
+    main menu button icons
+    main menu save state
+    food shop ui
+    consistent with ei's backyard
+
+    1.3 OR FURTHER:
     isekai portal
     ascension
     evo shop
     research
     daily reward
     offline income
     levels
-    new ui
+    snorlax planet
+    rebalancing
     storyline
     more settings
     export/import data
     achievement % (similar to cookie clicker milk)
+    online
 -->
 
 <h1 class="block">Alpha 1.1.2</h1>
-<p class="block">19/1/2023 - </p>
-<p class="ps block multiline changelog-quote">"Oh, hello there. Here I am back to this shit. The only difference is that I'm now doing it during work instead of during physics lessons. And the good thing is, I have done so little of 1.1.2 previously in January that there's no semi-finished stuff to pick up."
-"Like, the only thing I've done in January is writing a bunch of stuff in the changelog. No coding."
-"Another cool thing, I'm using github now."
-"Probably the biggest update. Bigger than 1.1.0. That's clearly why it took 8 months right?"</p>
+<p class="block">19/1/2023 - 21/11/2023</p>
+<p class="ps block multiline changelog-quote">"AUG: Oh, hello there. Here I am back to this shit. The only difference is that I'm now doing it during work instead of during physics lessons. And the good thing is, I have done so little of 1.1.2 previously in January that there's no semi-finished stuff to pick up."
+"AUG: Like, the only thing I've done in January is writing a bunch of stuff in the changelog. No coding."
+"AUG: Another cool thing, I'm using github now."
+"AUG: Probably the biggest update. Bigger than 1.1.0. That's clearly why it took 8 months right?"
+"NOV: hello again. I'm here again. This time in London. Finally finishing up 1.1.2. Well not really cause it's just some buttons with nothing but functionality. At least you can now progress."</p>
 <h2 class="h2s changelog-additions block">Additions</h2>
 <p class="ps block multiline"><b>Alchemy</b></p>
 <p class="ps block multiline changelog-quote">"And there goes our eventuallies from 1.1.0"</p>
@@ -110,15 +131,17 @@ <h2 class="h2s changelog-additions block">Additions</h2>
             - It doesn't work now  
     - Furnace can smelt certain stuff using some time and some coal
         - Haematite is the only smeltable item for now, costing 1 coal and 8 seconds, giving iron.
+        - However in this version there's no time required nor a UI, nor a furnace required.
         - I have no idea what else it should be able to smelt for now
     - Refinary can refine certain stuff using some time and some coal
         - Refining stone and darkstone cost 1 coal and 8 seconds
-        - Refining iron, silver, and gold cost 2 coal and 16 seconds
+        - Refining iron, silver, and gold cost 2 coal and 16 seconds, nor a refinary required.
         - Refining diamond cost 4 coal and 32 seconds
+        - However in this version there's no time required nor a UI.
     - Alloy furnace can mix certain stuff using some time and some catalyst
         - Lumium is the only mixable item for now, costing 10 catalyst, 10 seconds, 1 gold, 1 silver
-        - Maybe iron+coal for steel later
-    - Currently, you can only smelt, refine, or alloy one thing at a time. Capacity will be added later.</p>
+        - However in this version there's no time required nor a UI, nor a alloy furnace required.
+        - Maybe iron+coal for steel later</p>
 <h2 class="h2s changelog-changes block">Changes</h2>
 <p class="ps block multiline"><b>Mining</b>
 - A strong enough pickaxe is now required to mine. Pickaxe doesn't have durability for now.