Browse Source

projectile fix

woops
Pentagon 8 years ago
parent
commit
005fce0c0f
3 changed files with 183 additions and 185 deletions
  1. 1 1
      index.js
  2. 2 2
      manifest.json
  3. 180 182
      setting_migration.js

+ 1 - 1
index.js

@@ -787,7 +787,7 @@ module.exports = function FpsUtils2(mod) {
         if (!event.gameId.equals(myId) && spawnedPlayers[event.gameId] && (hiddenUsers[event.gameId] || mod.settings.mode > 0 || mod.settings.hideProjectiles)) {
             return false;
         }
-        if (mod.settings.blacklistProjectiles && mod.settings.hiddenProjectiles.includes(event.skill)) {
+        if (mod.settings.blacklistProjectiles && mod.settings.hiddenProjectiles.includes(event.skill.id)) {
             return false;
         }
     });

+ 2 - 2
manifest.json

@@ -1,10 +1,10 @@
 {
 	"files": {
 		"README.md": "793081FCA0CFDB727FD763258F079D69FD4DE472AF52920DFE289DA5D0966060",
-		"index.js": "677243DC54D053E6AC5EBE7F9D08D3F708E262A2A35ABF5E9EB0D4D3EB4029B8",
+		"index.js": "17441D7A77D8BB2ED968EF1012C58B5C184A0C06E615D89C01A1D7A892F75FB8",
 		"module.json": "0FE5B3029D1E29FE0C9D1C08AD239D75A394BE9D4AF3721373C78775F11328E3",
 		"npcData.json": "AC5CC26675716568FC7A88772A8C260304EC737221FF4B334EBB20783BCC6440",
-		"setting_migration.js": "83A9DF0586281933F797984464F5A75F4E10277DFC02719391FBA2003F841BDE",
+		"setting_migration.js": "6A2C1C665C6891E4C6DDD3E986617A38B17690119BD310AB25135EF503D41E1C",
 		"skillString.json": "C2BA37294BA6B998F65040CCCBFAB69B5041B742F6FE135FD2431BB1301A7C7A"
 	},
 	"defs": {

+ 180 - 182
setting_migration.js

@@ -1,193 +1,191 @@
 "use strict"
 
 const DefaultSettings = {
-        "mode": 0,
-		"party": false,
-        "hideFireworks": false,
-        "hideAllAbnormies": true,
-        "hideAllSummons": false,
-		"keepMySummons" : true,
-        "blacklistNpcs": false,
-        "blacklistSkills": false,
-        "blacklistAbnormies": false,
-        "hideProjectiles": false,
-        "hiddenAbnormies": [],
-        "blacklistProjectiles": false,
-        "hiddenProjectiles": [
-            67379784
-        ],
-        "hitMe": false,
-        "hitOther": true,
-        "hitDamage": false,
-        "showStyle": false,
-        "blacklistedNames": [
-            "hugedong"
-        ],
-        "hiddenNpcs": [],
-        "classNames": [
-            "warrior",
-            "lancer",
-            "slayer",
-            "berserker",
-            "sorcerer",
-            "archer",
-            "priest",
-            "mystic",
-            "reaper",
-            "gunner",
-            "brawler",
-            "ninja",
-            "valkyrie"
-        ],
-        "roleNames": [
-            "dps",
-            "healer",
-            "tank",
-            "ranged"
-        ],
-        "hiddenClasses": [],
-        "hiddenRoles": [],
-        "classes": {
-            "1": {
-                "name": "warrior",
-                "model": 1,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "dps"
-                ],
-                "isHidden": false
-            },
-            "2": {
-                "name": "lancer",
-                "model": 2,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "tank"
-                ],
-                "isHidden": false
-            },
-            "3": {
-                "name": "slayer",
-                "model": 3,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "dps"
-                ],
-                "isHidden": false
-            },
-            "4": {
-                "name": "berserker",
-                "model": 4,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "dps"
-                ],
-                "isHidden": false
-            },
-            "5": {
-                "name": "sorcerer",
-                "model": 5,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "dps",
-                    "ranged"
-                ],
-                "isHidden": false
-            },
-            "6": {
-                "name": "archer",
-                "model": 6,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "dps",
-                    "ranged"
-                ],
-                "isHidden": false
-            },
-            "7": {
-                "name": "priest",
-                "model": 7,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "healer"
-                ],
-                "isHidden": false
-            },
-            "8": {
-                "name": "mystic",
-                "model": 8,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "healer"
-                ],
-                "isHidden": false
-            },
-            "9": {
-                "name": "reaper",
-                "model": 9,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "dps"
-                ],
-                "isHidden": false
-            },
-            "10": {
-                "name": "gunner",
-                "model": 10,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "dps",
-                    "ranged"
-                ],
-                "isHidden": false
-            },
-            "11": {
-                "name": "brawler",
-                "model": 11,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "tank"
-                ],
-                "isHidden": false
-            },
-            "12": {
-                "name": "ninja",
-                "model": 12,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "dps"
-                ],
-                "isHidden": false
-            },
-            "13": {
-                "name": "valkyrie",
-                "model": 13,
-                "blockedSkills": [],
-                "blockingSkills": false,
-                "role": [
-                    "dps"
-                ],
-                "isHidden": false
-            }
+    "mode": 0,
+    "party": false,
+    "hideFireworks": false,
+    "hideAllAbnormies": true,
+    "hideAllSummons": false,
+    "keepMySummons": true,
+    "blacklistNpcs": false,
+    "blacklistSkills": false,
+    "blacklistAbnormies": false,
+    "hideProjectiles": false,
+    "hiddenAbnormies": [],
+    "blacklistProjectiles": false,
+    "hiddenProjectiles": [270120, 270220, 270320, 270420, 270520, 270620, 270720, 270820, 270920, 271020],
+    "hitMe": false,
+    "hitOther": true,
+    "hitDamage": false,
+    "showStyle": false,
+    "blacklistedNames": [
+        "hugedong"
+    ],
+    "hiddenNpcs": [],
+    "classNames": [
+        "warrior",
+        "lancer",
+        "slayer",
+        "berserker",
+        "sorcerer",
+        "archer",
+        "priest",
+        "mystic",
+        "reaper",
+        "gunner",
+        "brawler",
+        "ninja",
+        "valkyrie"
+    ],
+    "roleNames": [
+        "dps",
+        "healer",
+        "tank",
+        "ranged"
+    ],
+    "hiddenClasses": [],
+    "hiddenRoles": [],
+    "classes": {
+        "1": {
+            "name": "warrior",
+            "model": 1,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps"
+            ],
+            "isHidden": false
+        },
+        "2": {
+            "name": "lancer",
+            "model": 2,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "tank"
+            ],
+            "isHidden": false
+        },
+        "3": {
+            "name": "slayer",
+            "model": 3,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps"
+            ],
+            "isHidden": false
+        },
+        "4": {
+            "name": "berserker",
+            "model": 4,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps"
+            ],
+            "isHidden": false
+        },
+        "5": {
+            "name": "sorcerer",
+            "model": 5,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps",
+                "ranged"
+            ],
+            "isHidden": false
+        },
+        "6": {
+            "name": "archer",
+            "model": 6,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps",
+                "ranged"
+            ],
+            "isHidden": false
+        },
+        "7": {
+            "name": "priest",
+            "model": 7,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "healer"
+            ],
+            "isHidden": false
+        },
+        "8": {
+            "name": "mystic",
+            "model": 8,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "healer"
+            ],
+            "isHidden": false
+        },
+        "9": {
+            "name": "reaper",
+            "model": 9,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps"
+            ],
+            "isHidden": false
+        },
+        "10": {
+            "name": "gunner",
+            "model": 10,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps",
+                "ranged"
+            ],
+            "isHidden": false
+        },
+        "11": {
+            "name": "brawler",
+            "model": 11,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "tank"
+            ],
+            "isHidden": false
+        },
+        "12": {
+            "name": "ninja",
+            "model": 12,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps"
+            ],
+            "isHidden": false
+        },
+        "13": {
+            "name": "valkyrie",
+            "model": 13,
+            "blockedSkills": [],
+            "blockingSkills": false,
+            "role": [
+                "dps"
+            ],
+            "isHidden": false
         }
     }
+}
 
 function MigrateSettings(from_ver, to_ver, settings) {
     if (from_ver === undefined) {
         // Migrate legacy config file
-		console.log(`FPS-UTILS - FPSUTILS has been updated, please check the readme for more info`)
+        console.log(`FPS-UTILS - FPSUTILS has been updated, please check the readme for more info`)
         return Object.assign(Object.assign({}, DefaultSettings), settings);
     } else if (from_ver === null) {
         // No config file exists, use default settings
@@ -196,7 +194,7 @@ function MigrateSettings(from_ver, to_ver, settings) {
         // Migrate from older version (using the new system) to latest one
         if (from_ver + 1 < to_ver) {
             // Recursively upgrade in one-version steps
-			console.log(`FPS-UTILS - FPSUTILS has been updated, please check the readme for more info`)
+            console.log(`FPS-UTILS - FPSUTILS has been updated, please check the readme for more info`)
             settings = MigrateSettings(from_ver, from_ver + 1, settings);
             return MigrateSettings(from_ver + 1, to_ver, settings);
         }