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

Fix.

Reduced npcs numbers :sailboat:, kept only not important and invisible npcs.
Risenio лет назад: 8
Родитель
Сommit
c16d8b6e4d
2 измененных файлов с 17 добавлено и 23 удалено
  1. 16 22
      lib/index.js
  2. 1 1
      manifest.json

+ 16 - 22
lib/index.js

@@ -10,19 +10,19 @@ module.exports = function FpsUtils(mod) {
 	const BronzeClr = '#BC8F8F', SilverClr = '#9A9A9A', GoldClr = '#DAA520', PinkClr = '#FFB7C5', HPinkClr = '#FF69B4', CPinkClr = '#ED5D92', RedClr = '#FE6F5E', GreenClr = '#4DE19C', LPurpleClr = '#E0B0FF', PurpleClr = '#9966CC', LBlueClr = '#4DDCE1', BlueClr = '#436EEE', DBlueClr = '#00575e', HBlueClr = '#08B3E5', GrayClr = '#778899', YellowClr = '#C0B94D', OrangeClr = '#FFBE5E';
 	const BronzeClr = '#BC8F8F', SilverClr = '#9A9A9A', GoldClr = '#DAA520', PinkClr = '#FFB7C5', HPinkClr = '#FF69B4', CPinkClr = '#ED5D92', RedClr = '#FE6F5E', GreenClr = '#4DE19C', LPurpleClr = '#E0B0FF', PurpleClr = '#9966CC', LBlueClr = '#4DDCE1', BlueClr = '#436EEE', DBlueClr = '#00575e', HBlueClr = '#08B3E5', GrayClr = '#778899', YellowClr = '#C0B94D', OrangeClr = '#FFBE5E';
 	const alphabet = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
 	const alphabet = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
 	const FishingNpcs = {
 	const FishingNpcs = {
-		8: [6011], //frog
-		12: [1, 2], //crab, bay kamara(not aggressive type)
-		23: [201, 202], //frog, bee
-		34: [8000], //goat
-		61: [9805, 9901, 9902, 9903, 9904, 9905, 9906, 9907, 9908], //Ostgarath - Vexatus Swamp
-		62: [1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1020, 1024, 1025, 1026, 1031, 1032, 1033, 1034, 1035, 1038, 1039, 1040, 1041, 1042, 1043, 1501, 1900, 1901, 1902, 1903, 8100, 9001, 9002, 9003, 9004, 9805, 9901, 9902, 9903, 9904, 9905], //Ostgarath - Cutthroat Harbor
-		83: [9805, 9901, 9902, 9903, 9904, 9905], //Westonia - Celsian Lake
-		99: [1180, 1181, 1182, 1183, 1184, 1185], //All invisible ?_? - unknown area.
-		207: [9805, 9901, 9902, 9903, 9904, 9905], //Arcadia - Muricai
-		212: [1034], //Cutthroat followup
-		223: [9805, 9901, 9902, 9903, 9904, 9905, 9906, 9907, 9915, 9925], //Poporia - Lake of Tears
-		230: [1041, 1042, 1043, 1044, 1045, 1046, 1084, 9805, 9901, 9902, 9903, 9904, 9905, 9906], //Veritas District - Seren's Lake
-		362: [1201, 1202, 1301, 1302] //Cutthroat followup
+		8: [6011],		//frog
+		12: [1, 2],		//crab, bay kamara
+		23: [201, 202],	//frog, bee
+		34: [8000],		//goat
+		61: [9901],		//Ostgarath - Vexatus Swamp
+		62: [1017, 1035, 1039, 1040, 1041, 1042, 1900, 1901, 1902, 1903, 9001, 9002, 9003, 9004, 9901], //Ostgarath - Cutthroat Harbor
+		83: [9901],									//Westonia - Celsian Lake
+		99: [1180, 1181, 1182, 1183, 1184, 1185],	//All invisible ?_? - unknown area.
+		207: [9901],								//Arcadia - Muricai
+		212: [1034],								//Cutthroat followup
+		223: [9901, 9906, 9907, 9915, 9925],		//Poporia - Lake of Tears
+		230: [9901],								//Veritas District - Seren's Lake
+		362: [1201, 1202, 1301, 1302]				//Cutthroat followup
 	}
 	}
 
 
 	let MyGameId,
 	let MyGameId,
@@ -31,7 +31,6 @@ module.exports = function FpsUtils(mod) {
 		ChangeOnCd,
 		ChangeOnCd,
 		LastState,
 		LastState,
 		LastVrange,
 		LastVrange,
-		Alerted,
 		TmpData = [],
 		TmpData = [],
 		PartyMembers = [],
 		PartyMembers = [],
 		HiddenNpcs = {},
 		HiddenNpcs = {},
@@ -823,7 +822,7 @@ module.exports = function FpsUtils(mod) {
 	}
 	}
 
 
 	function sAbnormalityFail(event) {
 	function sAbnormalityFail(event) {
-		if ([3000021, 99020000].includes(event.id)) return false;
+		if ([3000021, 99020000, 99020010].includes(event.id)) return false;
 	}
 	}
 
 
 	function sActionStage(event) {
 	function sActionStage(event) {
@@ -1373,13 +1372,8 @@ module.exports = function FpsUtils(mod) {
 			case "fishing":
 			case "fishing":
 				mod.settings.Fishing = !mod.settings.Fishing;
 				mod.settings.Fishing = !mod.settings.Fishing;
 				Msg(`Fishing mode is ${mod.settings.Fishing ? `<font color="${GreenClr}">Enabled</font>` : `<font color="${RedClr}">Disabled</font>`}.`);
 				Msg(`Fishing mode is ${mod.settings.Fishing ? `<font color="${GreenClr}">Enabled</font>` : `<font color="${RedClr}">Disabled</font>`}.`);
-				if (mod.settings.Fishing) {
-					HideFishingNpcs();
-					if (!Alerted) {
-						Msg(`<font color="${PinkClr}">Reminder: All fishing npcs won't spawn until you turn off fishing mode</font>.`);
-						Alerted = true;
-					}
-				} else ShowFishingNpcs();
+				if (mod.settings.Fishing) HideFishingNpcs();
+				else ShowFishingNpcs();
 				break;
 				break;
 			case "help":
 			case "help":
 				mod.command.exec(`fps gui help`)
 				mod.command.exec(`fps gui help`)

+ 1 - 1
manifest.json

@@ -3,7 +3,7 @@
         "README.md": "b9cbe53c8ea61dbb4b8cf889842f5344bf5b1fed0c12edc3c6004bede865ae00",
         "README.md": "b9cbe53c8ea61dbb4b8cf889842f5344bf5b1fed0c12edc3c6004bede865ae00",
         "lib/data/npcData.json": "df6ea18642a274017e173d9bf34884a44202c72b3e030085aa5bb64f7b2d6337",
         "lib/data/npcData.json": "df6ea18642a274017e173d9bf34884a44202c72b3e030085aa5bb64f7b2d6337",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "7cbdb7cdc33a5c2cb319af04b745736c4a58a6a937458ef41b013223605d1840",
+        "lib/index.js": "0d0d53f3a8191d24d303b0df9bd59d937e452b7964f037ee0dcefe0ca6396278",
         "lib/setting_migration.js": "15e78141c9b59b9aa563ec107048a1212523942a4ed23bea38803cdb8abe9df6",
         "lib/setting_migration.js": "15e78141c9b59b9aa563ec107048a1212523942a4ed23bea38803cdb8abe9df6",
         "module.json": "d4b5d23aecb16e1ae6ba64f6b71842b0b88dd5c686f54a7d9c328604a0f2570b",
         "module.json": "d4b5d23aecb16e1ae6ba64f6b71842b0b88dd5c686f54a7d9c328604a0f2570b",
         "package.json": "64239e69d6e4b0568f1dd8456edeb8585e7ba2bcab1ae9cf4625d7027de95ff3"
         "package.json": "64239e69d6e4b0568f1dd8456edeb8585e7ba2bcab1ae9cf4625d7027de95ff3"