Fixing GirlDictionaryCollector for the EpP draft two-step process

45026831 · Feb 9, 2023 · 24019da · 24019da
1 parent bc57755
commit 24019da
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,4 @@
+1.32.2: Fixing GirlDictionaryCollector for the EpP draft two-step process
 1.32.1: Fixing hiding "Claim All" button on CxH.
 1.32.0: Adding style tweak to hide the new "Claim All" button in seasons. Off by default.
 1.31.2: Updating patrons list for February

diff --git a/dist/hh-plus-plus.dev.user.js b/dist/hh-plus-plus.dev.user.js
diff --git a/dist/hh-plus-plus.meta.js b/dist/hh-plus-plus.meta.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name            Hentai Heroes++ BDSM version
 // @description     Adding things here and there in the Hentai Heroes game. Also supports HHCore-based games such as GH and CxH.
-// @version         1.32.1
+// @version         1.32.2
 // @match           https://*.hentaiheroes.com/*
 // @match           https://nutaku.haremheroes.com/*
 // @match           https://*.gayharem.com/*

diff --git a/dist/hh-plus-plus.user.js b/dist/hh-plus-plus.user.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hh-plus-plus",
-  "version": "1.32.1",
+  "version": "1.32.2",
   "description": "Adding things here and there in the Hentai Heroes game. Also supports HHCore-based games such as GH and CxH.",
   "private": "true",
   "scripts": {

diff --git a/src/collectors/GirlDictionaryCollector.js b/src/collectors/GirlDictionaryCollector.js
@@ -11,7 +11,7 @@ const upsert = (id, data) => {
 }
 
 const collectFromRewards = (rewards) => {
-    if (rewards && rewards.data && rewards.data.shards) {
+    if (rewards && rewards.data && !rewards.data.draft && rewards.data.shards) {
         girlDictionary = Helpers.getGirlDictionary()
         rewards.data.shards.forEach(({ id_girl, value }) => {
             const girlId = `${id_girl}`
@@ -141,6 +141,7 @@ class GirlDictionaryCollector {
 
     static collectFromPachinkoRewards() {
         Helpers.onAjaxResponse(/action=play/i, collectFromAjaxResponseSingular)
+        Helpers.onAjaxResponse(/action=claim/i, collectFromAjaxResponseSingular)
     }
 
     static collectFromContestRewards() {