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

Compat update

should probs test but eh
Pentagon лет назад: 8
Родитель
Сommit
e07991c7b5
2 измененных файлов с 15 добавлено и 21 удалено
  1. 8 14
      index.js
  2. 7 7
      manifest.json

+ 8 - 14
index.js

@@ -601,7 +601,7 @@ module.exports = function FpsUtils2(mod) {
     }
     }
 
 
     function updateLoc(event) {
     function updateLoc(event) {
-        mod.send('S_USER_LOCATION', 3, {
+        mod.send('S_USER_LOCATION', 5, {
             gameId: event.gameId,
             gameId: event.gameId,
             loc: event.loc,
             loc: event.loc,
             dest: event.loc,
             dest: event.loc,
@@ -711,7 +711,7 @@ module.exports = function FpsUtils2(mod) {
         delete hiddenNpcs[event.gameId];
         delete hiddenNpcs[event.gameId];
     });
     });
 
 
-    mod.hook('S_EACH_SKILL_RESULT', mod.base.majorPatchVersion < 74 ? 10 : 12, { order: 200 }, (event) => {
+    mod.hook('S_EACH_SKILL_RESULT', 12, { order: 200 }, (event) => {
         if (event.source.equals(myId) || event.owner.equals(myId)) {
         if (event.source.equals(myId) || event.owner.equals(myId)) {
             if (mod.settings.hitMe) {
             if (mod.settings.hitMe) {
                 event.skill.id = '';
                 event.skill.id = '';
@@ -728,7 +728,7 @@ module.exports = function FpsUtils2(mod) {
         }
         }
     });
     });
 
 
-    mod.hook('S_USER_LOCATION', 3, (event) => {
+    mod.hook('S_USER_LOCATION', 5, (event) => {
         if (hiddenUsers[event.gameId] === undefined) {
         if (hiddenUsers[event.gameId] === undefined) {
             return;
             return;
         }
         }
@@ -740,7 +740,7 @@ module.exports = function FpsUtils2(mod) {
 
 
 
 
 
 
-    mod.hook('S_ACTION_STAGE', mod.base.majorPatchVersion >= 74 ? 7 : 6, { order: 999 }, (event) => {
+    mod.hook('S_ACTION_STAGE', mod.base.majorPatchVersion >= 74 ? 8 : 7, { order: 999 }, (event) => {
         if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId]) {
         if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId]) {
             if (!event.target.equals(myId) && (mod.settings.mode === 2 || hiddenUsers[event.gameId])) {
             if (!event.target.equals(myId) && (mod.settings.mode === 2 || hiddenUsers[event.gameId])) {
                 updateLoc(event);
                 updateLoc(event);
@@ -759,22 +759,16 @@ module.exports = function FpsUtils2(mod) {
         }
         }
     });
     });
 
 
-    mod.hook('S_START_USER_PROJECTILE', mod.base.majorPatchVersion >= 75 ? 9 : mod.base.majorPatchVersion >= 74 ? 8 : 5, { order: 999 }, (event) => { // end my life
+    mod.hook('S_START_USER_PROJECTILE', mod.base.majorPatchVersion >= 74 ? 9 : 8, { order: 999 }, (event) => { // end my life
         if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId] && (hiddenUsers[event.gameId] || mod.settings.mode > 0 || mod.settings.hideProjectiles)) {
         if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId] && (hiddenUsers[event.gameId] || mod.settings.mode > 0 || mod.settings.hideProjectiles)) {
             return false;
             return false;
         }
         }
-        if (mod.base.majorPatchVersion >= 74) {
-            if (mod.settings.blacklistProjectiles && mod.settings.hiddenProjectiles.includes(event.skill.id)) {
-                return false;
-            }
-        } else {
-            if (mod.settings.blacklistProjectiles && mod.settings.hiddenProjectiles.includes(event.skill - 0x4000000)) {
-                return false;
-            }
+        if (mod.settings.blacklistProjectiles && mod.settings.hiddenProjectiles.includes(event.skill.id)) {
+            return false;
         }
         }
     });
     });
 
 
-    mod.hook('S_SPAWN_PROJECTILE', mod.base.majorPatchVersion >= 74 ? 5 : 4, { order: 999 }, (event) => {
+    mod.hook('S_SPAWN_PROJECTILE', 5, { order: 999 }, (event) => {
         if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId] && (hiddenUsers[event.gameId] || mod.settings.mode > 0 || mod.settings.hideProjectiles)) {
         if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId] && (hiddenUsers[event.gameId] || mod.settings.mode > 0 || mod.settings.hideProjectiles)) {
             return false;
             return false;
         }
         }

+ 7 - 7
manifest.json

@@ -1,6 +1,6 @@
 {
 {
    "files":{
    "files":{
-      "index.js":"D23F5B9096EBA774DD67274F4EE8F7705AD8EED2E86D09D44E950F59D6190AFD",
+      "index.js":"CAD5FF9C42B751E311493D2F6562A4F197A1EBD8A0F241878AB4BB1E51F75BBD",
       "module.json":"0FE5B3029D1E29FE0C9D1C08AD239D75A394BE9D4AF3721373C78775F11328E3",
       "module.json":"0FE5B3029D1E29FE0C9D1C08AD239D75A394BE9D4AF3721373C78775F11328E3",
 	  "skillString.json":"C2BA37294BA6B998F65040CCCBFAB69B5041B742F6FE135FD2431BB1301A7C7A",
 	  "skillString.json":"C2BA37294BA6B998F65040CCCBFAB69B5041B742F6FE135FD2431BB1301A7C7A",
 	  "npcData.json":"353AE20AD115FEFD24F0312EF22DE97BAD66A0AF1876D54BC536AB9701267CE4",
 	  "npcData.json":"353AE20AD115FEFD24F0312EF22DE97BAD66A0AF1876D54BC536AB9701267CE4",
@@ -12,15 +12,15 @@
       "S_DESPAWN_USER":3,
       "S_DESPAWN_USER":3,
       "S_USER_EXTERNAL_CHANGE":6,
       "S_USER_EXTERNAL_CHANGE":6,
       "S_LOGIN":10,
       "S_LOGIN":10,
-      "S_EACH_SKILL_RESULT": [10,12],
+      "S_EACH_SKILL_RESULT": 12,
       "S_ABNORMALITY_BEGIN":2,
       "S_ABNORMALITY_BEGIN":2,
-      "S_USER_LOCATION":3,
-      "S_ACTION_STAGE":4,
-      "S_START_USER_PROJECTILE":5,
-      "S_SPAWN_PROJECTILE":3,
+      "S_USER_LOCATION":5,
+      "S_ACTION_STAGE": [7, 8],
+      "S_START_USER_PROJECTILE": [8, 9],
+      "S_SPAWN_PROJECTILE":5,
       "S_FEARMOVE_STAGE":1,
       "S_FEARMOVE_STAGE":1,
       "S_FEARMOVE_END":1,
       "S_FEARMOVE_END":1,
-      "S_SPAWN_NPC":8,
+      "S_SPAWN_NPC":9,
       "S_DESPAWN_NPC":3
       "S_DESPAWN_NPC":3
    }
    }
 }
 }