From 808da5f7c26114e057efc4800b07254f15df3c90 Mon Sep 17 00:00:00 2001
From: vvo <>
Date: Sun, 23 Oct 2022 19:47:29 +0800
Subject: [PATCH] pregene stamp unlock fix

---
 sdvx@asphyxia/utils.ts                    | 23 +++++++++++++++++------
 sdvx@asphyxia/webui/asset/js/generator.js |  4 ++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/sdvx@asphyxia/utils.ts b/sdvx@asphyxia/utils.ts
index 0ce891c..5b4e1a9 100644
--- a/sdvx@asphyxia/utils.ts
+++ b/sdvx@asphyxia/utils.ts
@@ -373,12 +373,23 @@ export const preGeneRoll = async (data: {
       if(unobtainedItems.length > 0) {
         let randomItemIndex = Math.floor(Math.random() * unobtainedItems.length);
         console.log("Rolled item id: " + unobtainedItems[randomItemIndex] + " | item type: " + itemId[Object.keys(preGeneSet.items)[rollWhat]])
-        DB.Insert(data.refid, {
-          "collection": "item", 
-          "type": itemId[Object.keys(preGeneSet.items)[rollWhat]], 
-          "id": unobtainedItems[randomItemIndex], 
-          "param": 1 
-        })
+        if(itemId[Object.keys(preGeneSet.items)[rollWhat]] == 17) {
+          for(let stampID = (unobtainedItems[randomItemIndex] * 4) - 3; stampID <= (unobtainedItems[randomItemIndex] * 4); stampID++) {
+            DB.Insert(data.refid, {
+              "collection": "item", 
+              "type": itemId[Object.keys(preGeneSet.items)[rollWhat]], 
+              "id": stampID, 
+              "param": 1 
+            })
+          }
+        } else {
+          DB.Insert(data.refid, {
+            "collection": "item", 
+            "type": itemId[Object.keys(preGeneSet.items)[rollWhat]], 
+            "id": unobtainedItems[randomItemIndex], 
+            "param": 1 
+          })
+        }
         let finalItemType = (Object.keys(preGeneSet.items)[rollWhat] === 'subbg') ? 'bg' : Object.keys(preGeneSet.items)[rollWhat]
         await IO.WriteFile('webui/asset/logs/preGeneRollResult.json', JSON.stringify({'id': unobtainedItems[randomItemIndex], 'type': finalItemType}))
         finishedRolling = true
diff --git a/sdvx@asphyxia/webui/asset/js/generator.js b/sdvx@asphyxia/webui/asset/js/generator.js
index f7997da..2efbaa3 100644
--- a/sdvx@asphyxia/webui/asset/js/generator.js
+++ b/sdvx@asphyxia/webui/asset/js/generator.js
@@ -5,7 +5,7 @@ function countGeneItems(geneItems, items_crew, items_stamp, items_subbg, items_b
         total += geneItems.items['crew'].length
     }
     if('stamp' in geneItems.items) {
-        obtained += items_stamp.filter(stamp => geneItems.items.stamp.includes(stamp['id'])).length
+        obtained += items_stamp.filter(stamp => geneItems.items.stamp.includes(stamp['id'] / 4)).length
         total += geneItems.items['stamp'].length
     }
     if('subbg' in geneItems.items) {
@@ -26,7 +26,7 @@ function countGeneItems(geneItems, items_crew, items_stamp, items_subbg, items_b
 
 function loadImages(itemList, itemType, userItems) {
     itemList.forEach(item => {
-        let itemBrightness = userItems.find(userItem => userItem.id == item) != undefined ? 1 : 0.25
+        let itemBrightness = userItems.find(userItem => userItem.id == ((itemType !== 'stamp') ? item : (item * 4))) != undefined ? 1 : 0.25
         let imageUrl = 'static/asset/valgene_item/item_' + itemType + '_' + item + '.png'
         $.get(imageUrl, function(data, textStatus) {
             if (textStatus == "success") {