Просмотр исходного кода

Merge pull request #7 from Risenio/master

Yet another fix for gacha-type boxes (rare issue).
Owyn лет назад: 6
Родитель
Сommit
d2f48a0034
2 измененных файлов с 11 добавлено и 4 удалено
  1. 9 3
      index.js
  2. 2 1
      manifest.json

+ 9 - 3
index.js

@@ -125,7 +125,7 @@ module.exports = function boxOpener(dispatch){
 		});
 		});
 		
 		
 		hook('S_GACHA_END', 'raw', () => {
 		hook('S_GACHA_END', 'raw', () => {
-			if(boxEvent)
+			if(boxEvent && gacha_detected)
 			{
 			{
 				dispatch.clearTimeout(timer);
 				dispatch.clearTimeout(timer);
 				if(useDelay) timer = dispatch.setTimeout(openBox,delay);
 				if(useDelay) timer = dispatch.setTimeout(openBox,delay);
@@ -135,7 +135,7 @@ module.exports = function boxOpener(dispatch){
 		
 		
 		hook('S_SYSTEM_MESSAGE', 1, event => {
 		hook('S_SYSTEM_MESSAGE', 1, event => {
 			const msg = dispatch.parseSystemMessage(event.message).id;
 			const msg = dispatch.parseSystemMessage(event.message).id;
-			if(['SMT_ITEM_MIX_NEED_METERIAL', 'SMT_CANT_CONVERT_NOW', 'SMT_GACHA_NO_MORE_ITEM_SHORT', 'SMT_NOTI_LEFT_LIMITED_GACHA_ITEM', 'SMT_GACHA_CANCEL', 'SMT_COMMON_NO_MORE_ITEM_TO_USE', 'SMT_CANNOT_CONTINUE_CONTRACT'].includes(msg))
+			if(['SMT_ITEM_MIX_NEED_METERIAL', 'SMT_CANT_CONVERT_NOW', 'SMT_GACHA_NO_MORE_ITEM_SHORT', 'SMT_NOTI_LEFT_LIMITED_GACHA_ITEM', 'SMT_GACHA_CANCEL', 'SMT_COMMON_NO_MORE_ITEM_TO_USE'].includes(msg))
 			{
 			{
 				command.message("Box can not be opened anymore, stopping");
 				command.message("Box can not be opened anymore, stopping");
 				stop();
 				stop();
@@ -152,6 +152,12 @@ module.exports = function boxOpener(dispatch){
 			})
 			})
 			return false;
 			return false;
 		});
 		});
+
+		hook('S_CANCEL_CONTRACT', 1, event => {
+			if (!gacha_detected || event.type !== 53) return;
+			gacha_contract = 0;
+			stop();
+		});
 	}
 	}
 	
 	
 	function openBox() 
 	function openBox() 
@@ -196,7 +202,7 @@ module.exports = function boxOpener(dispatch){
 		}
 		}
 		else
 		else
 		{
 		{
-			if(gacha_detected) dispatch.toServer('C_GACHA_CANCEL', 1, { id: gacha_contract });
+			if(gacha_detected && gacha_contract) dispatch.toServer('C_GACHA_CANCEL', 1, { id: gacha_contract });
 			if(useDelay && statOpened === 0) statOpened = statUsed;
 			if(useDelay && statOpened === 0) statOpened = statUsed;
 			if(!gacha_detected) statOpened += 1; // Add the box we used at start if not gacha.
 			if(!gacha_detected) statOpened += 1; // Add the box we used at start if not gacha.
 			dispatch.clearTimeout(timer);
 			dispatch.clearTimeout(timer);

+ 2 - 1
manifest.json

@@ -1,7 +1,7 @@
 {
 {
     "files": {
     "files": {
         "README.md": "8b1704eff4c6f1989542d77d59666e28bfda029392946c5688d88af94cced028",
         "README.md": "8b1704eff4c6f1989542d77d59666e28bfda029392946c5688d88af94cced028",
-        "index.js": "cec9e229bb7e653413001570ad6f276c8ab186f08485d32a2726f3c655710444",
+        "index.js": "c08d63bf5d400bef0f91e9dd249460654f285d1e7a3aca22534b2b791cd845d7",
         "module.json": "e760be348e9e9758c29a714b0950bdebb3fe773c0f4b3c02013bb833bb315ae6"
         "module.json": "e760be348e9e9758c29a714b0950bdebb3fe773c0f4b3c02013bb833bb315ae6"
     },
     },
     "defs": {
     "defs": {
@@ -9,6 +9,7 @@
         "C_GACHA_TRY": 1,
         "C_GACHA_TRY": 1,
         "C_PLAYER_LOCATION": 5,
         "C_PLAYER_LOCATION": 5,
         "C_USE_ITEM": 3,
         "C_USE_ITEM": 3,
+        "S_CANCEL_CONTRACT": 1,
         "S_GACHA_END": "raw",
         "S_GACHA_END": "raw",
         "S_GACHA_START": "raw",
         "S_GACHA_START": "raw",
         "S_REQUEST_CONTRACT": 1,
         "S_REQUEST_CONTRACT": 1,