Browse Source

p100 support

Dmitry S 4 years ago
parent
commit
c1fce9c0b5
2 changed files with 70 additions and 29 deletions
  1. 69 28
      index.js
  2. 1 1
      manifest.json

+ 69 - 28
index.js

@@ -7,6 +7,7 @@ module.exports = function boxOpener(dispatch) {
 		enabled = false,
 		boxEvent = null,
 		gacha_detected = false,
+		gacha_contract = 0,
 		isLooting = false,
 		location = null,
 		timer = null,
@@ -53,6 +54,7 @@ module.exports = function boxOpener(dispatch) {
 
 	function load() {
 		hook("C_USE_ITEM", 3, event => {
+			if (gacha_detected) return false;
 			if (!scanning) return;
 
 			if (scanning) {
@@ -64,15 +66,13 @@ module.exports = function boxOpener(dispatch) {
 				const d = new Date();
 				statStarted = d.getTime();
 				enabled = true;
-				timer = setTimeout(openBox, delay);
-				return true; // for consistency of sent data
+				timer = dispatch.setTimeout(openBox, delay);
 			}
 		});
 
-		hook("S_SYSTEM_MESSAGE_LOOT_ITEM", 1, event => {
+		hook("S_SYSTEM_MESSAGE_LOOT_ITEM", "raw", () => {
 			if (!gacha_detected && !isLooting && boxEvent) {
 				isLooting = true;
-				statOpened++;
 				if (!useDelay) {
 					dispatch.clearTimeout(timer);
 					openBox();
@@ -80,41 +80,81 @@ module.exports = function boxOpener(dispatch) {
 			}
 		});
 
-		hook("S_GACHA_END", 1, () => {
-			if (boxEvent) {
-				statOpened++;
-				if (!useDelay) {
-					clearTimeout(timer);
-					openBox();
-				}
+		hook("S_GACHA_END", "raw", () => {
+			if (boxEvent && gacha_detected) {
+				dispatch.clearTimeout(timer);
+				if (useDelay) timer = dispatch.setTimeout(openBox, delay);
+				else process.nextTick(openBox);
 			}
 		});
 
 		hook("S_SYSTEM_MESSAGE", 1, event => {
-			const msg = dispatch.parseSystemMessage(event.message);
-			if (msg.id === "SMT_ITEM_MIX_NEED_METERIAL" || msg.id === "SMT_CANT_CONVERT_NOW") {
+			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"].includes(msg)) {
 				command.message("Box can not be opened anymore, stopping");
 				stop();
 			}
 		});
 
-		hook("S_GACHA_START", 1, event => {
-			gacha_detected = true;
-			dispatch.send("C_GACHA_TRY", 1, {
-				"id": event.id
+		if (dispatch.majorPatchVersion >= 93) {
+			hook("S_REQUEST_CONTRACT", dispatch.majorPatchVersion > 107 ? 2 : 1, event => {
+				if (event.type !== 53) return;
+				dispatch.hookOnce("S_GACHA_START", "raw", () => {
+					gacha_detected = true;
+					gacha_contract = event.id;
+					openBox();
+					return false;
+				});
+				return false;
 			});
-		});
+
+			hook("S_CANCEL_CONTRACT", 1, event => {
+				if (!gacha_detected || event.type !== 53) return;
+				gacha_contract = 0;
+				stop();
+			});
+		} else {
+			hook("S_GACHA_START", 1, event => {
+				gacha_detected = true;
+				dispatch.send("C_GACHA_TRY", 1, {
+					"id": event.id
+				});
+			});
+		}
 	}
 
 	function openBox() {
 		if (dispatch.game.inventory.getTotalAmount(boxEvent.id) > 0) {
-			boxEvent.loc = location.loc;
-			boxEvent.w = location.w;
-			dispatch.send("C_USE_ITEM", 3, boxEvent);
-			if (useDelay) {
-				statUsed++;	// counter for used items other than boxes
+			if (dispatch.majorPatchVersion >= 93) {
+				if (gacha_detected) {
+					if (dispatch.majorPatchVersion >= 99) {
+						dispatch.toServer("C_GACHA_TRY", 2, {
+							id: gacha_contract,
+							amount: 1
+						});
+					} else {
+						dispatch.toServer("C_GACHA_TRY", 1, {
+							id: gacha_contract
+						});
+					}
+				} else {
+					boxEvent.loc = location.loc;
+					boxEvent.w = location.w;
+					dispatch.toServer("C_USE_ITEM", 3, boxEvent);
+					if (useDelay) {
+						statUsed++;	// counter for used items other than boxes
+					}
+					timer = dispatch.setTimeout(openBox, delay);
+				}
+			} else {
+				boxEvent.loc = location.loc;
+				boxEvent.w = location.w;
+				dispatch.send("C_USE_ITEM", 3, boxEvent);
+				if (useDelay) {
+					statUsed++;	// counter for used items other than boxes
+				}
 			}
-			timer = setTimeout(openBox, delay);
+			statOpened++;
 		} else {
 			command.message("You ran out of boxes, stopping");
 			stop();
@@ -134,13 +174,14 @@ module.exports = function boxOpener(dispatch) {
 			scanning = false;
 			command.message("Scanning for a box is aborted");
 		} else {
-			clearTimeout(timer);
+			if (gacha_detected && gacha_contract) dispatch.toServer("C_GACHA_CANCEL", 1, { id: gacha_contract });
+			if (useDelay && statOpened === 0) statOpened = statUsed;
+			if (!gacha_detected) statOpened += 1; // Add the box we used at start if not gacha.
+			dispatch.clearTimeout(timer);
 			enabled = false;
 			gacha_detected = false;
+			gacha_contract = 0;
 			boxEvent = null;
-			if (useDelay && statOpened == 0) {
-				statOpened = statUsed;
-			}
 			let d = new Date();
 			const t = d.getTime();
 			const timeElapsedMSec = t - statStarted;

+ 1 - 1
manifest.json

@@ -1,7 +1,7 @@
 {
     "files": {
         "README.md": "11ea6f81fe4e3cf47009ec6393b26d0366fb2c9d6c46b5ab7e9fe0e3a9620532",
-        "index.js": "bff411909d72da9d1d712904d864f8db5966db02926c20c63f4a7b79439bfdf1",
+        "index.js": "f22c443399bcbe642dec9d4700a46b1919083d5ac360b1226c853dce6bb4372d",
         "module.json": "fd1686b8e0640fdc1a415358f2f8330f7e2af658d9a9322d0ac701f099d0f897"
     }
 }