Merge pull request #9 from Spelljinxer/dev

fixes
Spelljinxer · Sep 14, 2023 · 4e53967 · 4e53967
2 parents 2386b22 + fedc98c
commit 4e53967
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/anisBanner.html b/anisBanner.html
@@ -135,8 +135,6 @@ <h1> made by Spelljinxer </h1>
   <div class="gacha-container">
     <div class="gacha-window"></div>
     <div class="pull-container">
-      <!-- <button class="pull" onclick="pullCharacter('single')">1x <img src="../img/specialTicket.webp" alt="Single Pull" id="ordinaryTicket"></button>
-      <button class="pull" onclick="pullCharacter('multi')">10x <img src="../img/specialTicket.webp" alt="Multi Pull" id="ordinaryTicket"></button> -->
       <button class="pull pull-single">1x <img src="./img/specialTicket.webp" alt="Single Pull" id="ordinaryTicket"></button>
       <button class="pull pull-multi">10x <img src="./img/specialTicket.webp" alt="Multi Pull" id="ordinaryTicket"></button>
     </div> 

diff --git a/helmBanner.html b/helmBanner.html
@@ -77,7 +77,7 @@ <h1> made by Spelljinxer </h1>
         </a>
       </li>
 
-      <li class="nav-iteme">
+      <li class="nav-item">
         <a href="./anisBanner.html?activeBanner=AnisSS" class="nav-link">
           <img class="nav-img" src="./img/banners/anisBanner.png"></img>
           <span class="link-text">Anis</span>
@@ -135,13 +135,10 @@ <h1> made by Spelljinxer </h1>
   <div class="gacha-container">
     <div class="gacha-window"></div>
     <div class="pull-container">
-      <!-- <button class="pull" onclick="pullCharacter('single')">1x <img src="../img/specialTicket.webp" alt="Single Pull" id="ordinaryTicket"></button>
-      <button class="pull" onclick="pullCharacter('multi')">10x <img src="../img/specialTicket.webp" alt="Multi Pull" id="ordinaryTicket"></button> -->
       <button class="pull pull-single">1x <img src="./img/specialTicket.webp" alt="Single Pull" id="ordinaryTicket"></button>
       <button class="pull pull-multi">10x <img src="./img/specialTicket.webp" alt="Multi Pull" id="ordinaryTicket"></button>
     </div> 
   </div>
-
   <script src="./js/gacha.js"></script>
 </body>
 </html>
diff --git a/index.html b/index.html
@@ -133,8 +133,6 @@ <h1> made by Spelljinxer </h1>
   <div class="gacha-container">
     <div class="gacha-window"></div>
     <div class="pull-container">
-      <!-- <button class="pull" onclick="pullCharacter('single')">1x <img src="./img/ordinaryRecruit.webp" alt="Single Pull" id="ordinaryTicket"></button>
-      <button class="pull" onclick="pullCharacter('multi')">10x <img src="./img/ordinaryRecruit.webp" alt="Multi Pull" id="ordinaryTicket"></button> -->
       <button class="pull pull-single">1x <img src="./img/ordinaryRecruit.webp" alt="Single Pull" id="ordinaryTicket"></button>
       <button class="pull pull-multi">10x <img src="./img/ordinaryRecruit.webp" alt="Multi Pull" id="ordinaryTicket"></button>
     </div> 

diff --git a/js/gacha.js b/js/gacha.js
@@ -1,7 +1,7 @@
 /**
  * @author Reiden Rufin (Spelljinxer)
  * @version 0.7
- * @date 13/09/2023
+ * @date 14/09/2023
  * @credit I do not own the characterrs or images used in this project. All rights belong to SHIFTUP and the Level Infinite.
  * 
  */
@@ -104,14 +104,15 @@ function init(data) {
       var randomSSR = Math.random();
       console.log("randomSSR: " + randomSSR);
       if (randomSSR <= SSR_RATE) {
-          if (randomSSR <= LIMITED_RATE) {
+          rarity = 'SSR';
+          console.log("You pulled an SSR!");
+          if (randomSSR <= LIMITED_RATE && randomSSR >= PILGRIM_RATE) {
               rarity = 'Limited';
               console.log("You pulled the Limited SSR!");
-          } else if (randomSSR <= PILGRIM_RATE) {
+          }
+          if (randomSSR <= PILGRIM_RATE) {
               rarity = 'Pilgrim';
               console.log("You pulled a Pilgrim SSR!");
-          } else {
-              rarity = 'SSR';
           }
       } else if (randomSSR <= SR_RATE) {
           rarity = 'SR';

diff --git a/moderniaBanner.html b/moderniaBanner.html
@@ -135,8 +135,6 @@ <h1> made by Spelljinxer </h1>
   <div class="gacha-container">
     <div class="gacha-window"></div>
     <div class="pull-container">
-      <!-- <button class="pull" onclick="pullCharacter('single')">1x <img src="../img/specialTicket.webp" alt="Single Pull" id="ordinaryTicket"></button>
-      <button class="pull" onclick="pullCharacter('multi')">10x <img src="../img/specialTicket.webp" alt="Multi Pull" id="ordinaryTicket"></button> -->
       <button class="pull pull-single">1x <img src="./img/specialTicket.webp" alt="Single Pull" id="ordinaryTicket"></button>
       <button class="pull pull-multi">10x <img src="./img/specialTicket.webp" alt="Multi Pull" id="ordinaryTicket"></button>
     </div>