Risenio лет назад: 8
Родитель
Сommit
6947fd4563
2 измененных файлов с 9 добавлено и 70 удалено
  1. 8 69
      lib/index.js
  2. 1 1
      manifest.json

+ 8 - 69
lib/index.js

@@ -5,72 +5,11 @@ module.exports = function FpsUtils(mod) {
 	const NotCP = typeof global.TeraProxy === 'undefined'; //For niceName forced thing and broken settings auto-save For Caali's Proxy users.
 	const NpcData = require("./data/npcData.json"),
 		SkillData = require("./data/skillString.json"),
-		BnzC = '#BC8F8F', SlvC = '#9A9A9A', GldC = '#DAA520', PnkC = '#FFB7C5', HPkC = '#FF69B4', CPKC = '#ED5D92', RedC = '#FE6F5E', GrnC = '#4DE19C', LPrC = '#E0B0FF',
-		PrpC = '#9966CC', LBlC = '#4DDCE1', BluC = '#436EEE', DBlC = '#00575e', HBlC = '#08B3E5', GryC = '#778899', YlwC = '#C0B94D', OngC = '#FFBE5E';
-
-	/*const FishingNpcs = {
-		8: [6011], //Vexatus ~Frog
-		12: [1, 2], //Cutthroat ~Crab & Bay kamara
-		23: [201, 202], // Frog & Bee
-		34: [8000], //Muricai ~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
-		207: [9901], //Arcadia - Muricai
-		212: [1034], //Cutthroat ~Reg
-		223: [9901, 9906, 9907, 9915, 9925], //Poporia - Lake of Tears
-		230: [9901], //Veritas District - Seren's Lake
-		362: [1201, 1202, 1301, 1302] //Cutthroat ~Skl
-	};*/
-
-	const FishingNpcs = { // TODO; Delete this
-		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
-	};
-
-	const PvPProjs = [
-		30120, 30220, 30320, //Shock trap ----Sorcerer
-		90120, 90220, 90320, 90420, 90520, 90620, 90720, 90820, 90920, //Slow trap ----Archer
-		100120, 100220, 100320, 100420, 100520, //Stun trap ----Archer
-		120220, 120320, 120420, 120520, 120620, 120720, 120820, 120920, //Void ----Sorcerer
-		150120, 150220, 150320, 150420, 150520, 150620, 150720, //Explosion trap ----Archer
-		170120, 170220, 170320, 170420, 170520, 170620, 170720, 170820, 170920, //Pain-mark trap ----Sorcerer
-		230120, 230220, 230320, //Stun-range trap ----Archer
-		250120, 250220, 250320, 250420, 250520, 250620, 250720, 250820, 250920, 251020 //Explosion-range trap ----Archer
-	];
-
-	const UserSumNPCs = [
-		12345, //Tree DJ ----Ninja
-		1100100, 1100101, //Shadow SA ----Warrior
-		1023000, 1023001, 1023002, 1023003, 1023004, 1023005, 1023006, 1023007, 1023008, 1023009, 1023010, 1023011, 1023012, 1023013, 1023014, //ToP ----Mystic
-		1023200, 1023201, 1023202, 1023203, 1023204, 1023205, 1023206, 1023207, 1023208, 1023209, 1023210, 1023211, //ToL ----Mystic
-		1023300, 1023301, 1023302, 1023303, 1023304, 1023305, 1023306, 1023307, 1023308, 1023309, 1023310, 1023311, 1023312, //ToV ----Mystic
-		1023400, 1023401, 1023402, 1023403, 1023404, 1023405, //ToW ----Mystic
-		1024000, 1024001, //Warding Totem ----Mystic
-		1024100, //Numbing Totem ----Mystic
-		1024200, //Speed Totem ----Mystic
-		1024300, //Assailing Totem ----Mystic
-		2100100, 2100101, //Shadow SF ----Warrior
-		10235001, 10235002, 10235003, 10235004, 10235005, 10235006, 10235007, 10235008, 10235009, 10235010, 10235011, 10235012, 10235013, 10235014, 10235015, 10235016, 10235017, 10235100, //ToP II ----Mystic
-		10236001, 10236002, 10236003, 10236004, 10236005, 10236006, 10236007, 10236008, 10236009, 10236010, 10236011, 10236012, 10236013, 10236014, 10236015, 10236100, //ToL II ----Mystic
-		10237001, 10237002, 10237003, 10237004, 10237005, 10237006, 10237007, 10237008, 10237009, 10237010, 10237011, 10237012, 10237013, 10237014, 10237015, 10237100, //ToV II ----Mystic
-		10238001, 10238002, 10238003, 10238004, 10238005, 10238006, 10238007, 10238008, 10238100, //ToW II ----Mystic
-		10239003, //Blob ----Mystic
-		30301001, 30301002, 30301003, 30301004, 30301005, //ST ----Gunner
-		30302001, 30302002, 30302003, 30302004, 30302005, 30302006, 30302007, //HB ----Gunner
-		30303001, 30303002, 30303003, 30303004, 30303005, 30303006, 30303007, //HB-Keen ----Gunner
-	];
+		BnzC = '#BC8F8F', SlvC = '#9A9A9A', GldC = '#DAA520', PnkC = '#FFB7C5', HPkC = '#FF69B4', CPKC = '#ED5D92', RedC = '#FE6F5E', GrnC = '#4DE19C', LPrC = '#E0B0FF', PrpC = '#9966CC', LBlC = '#4DDCE1', BluC = '#436EEE', DBlC = '#00575e', HBlC = '#08B3E5', GryC = '#778899', YlwC = '#C0B94D', OngC = '#FFBE5E';
+
+	const FishingNpcs = { 8: [6011], 12: [1, 2], 23: [201, 202], 34: [8000], 61: [9901], 62: [1017, 1035, 1039, 1040, 1041, 1042, 1900, 1901, 1902, 1903, 9001, 9002, 9003, 9004, 9901], 83: [9901], 207: [9901], 212: [1034], 223: [9901, 9906, 9907, 9915, 9925], 230: [9901], 362: [1201, 1202, 1301, 1302] };
+	const PvPProjs = [30120, 30220, 30320, 90120, 90220, 90320, 90420, 90520, 90620, 90720, 90820, 90920, 100120, 100220, 100320, 100420, 100520, 120220, 120320, 120420, 120520, 120620, 120720, 120820, 120920, 150120, 150220, 150320, 150420, 150520, 150620, 150720, 170120, 170220, 170320, 170420, 170520, 170620, 170720, 170820, 170920, 230120, 230220, 230320, 250120, 250220, 250320, 250420, 250520, 250620, 250720, 250820, 250920, 251020];
+	const UserSumNPCs = [12345, 1100100, 1100101, 1023000, 1023001, 1023002, 1023003, 1023004, 1023005, 1023006, 1023007, 1023008, 1023009, 1023010, 1023011, 1023012, 1023013, 1023014, 1023200, 1023201, 1023202, 1023203, 1023204, 1023205, 1023206, 1023207, 1023208, 1023209, 1023210, 1023211, 1023300, 1023301, 1023302, 1023303, 1023304, 1023305, 1023306, 1023307, 1023308, 1023309, 1023310, 1023311, 1023312, 1023400, 1023401, 1023402, 1023403, 1023404, 1023405, 1024000, 1024001, 1024100, 1024200, 1024300, 2100100, 2100101, 10235001, 10235002, 10235003, 10235004, 10235005, 10235006, 10235007, 10235008, 10235009, 10235010, 10235011, 10235012, 10235013, 10235014, 10235015, 10235016, 10235017, 10235100, 10236001, 10236002, 10236003, 10236004, 10236005, 10236006, 10236007, 10236008, 10236009, 10236010, 10236011, 10236012, 10236013, 10236014, 10236015, 10236100, 10237001, 10237002, 10237003, 10237004, 10237005, 10237006, 10237007, 10237008, 10237009, 10237010, 10237011, 10237012, 10237013, 10237014, 10237015, 10237100, 10238001, 10238002, 10238003, 10238004, 10238005, 10238006, 10238007, 10238008, 10238100, 10239003, 30301001, 30301002, 30301003, 30301004, 30301005, 30302001, 30302002, 30302003, 30302004, 30302005, 30302006, 30302007, 30303001, 30303002, 30303003, 30303004, 30303005, 30303006, 30303007,];
 
 	let MyGameId,
 		MyName,
@@ -594,7 +533,7 @@ module.exports = function FpsUtils(mod) {
 		return modified;
 	}
 
-	function NpcBCheck(event) { // TODO; ₛₛₛₛₛₛₕₕₕₕₕₕₕₕ
+	function NpcBCheck(event) {
 		let blocked = false;
 
 		if (mod.settings.ShowStyle) event.repairable = false;
@@ -841,7 +780,7 @@ module.exports = function FpsUtils(mod) {
 				mod.command.exec("fps mode 2")
 			} else {
 				if (!LastState || mod.settings.Mode !== 2) {
-					LastState = null; // TODO; bm?
+					LastState = null;
 					return;
 				}
 				mod.command.exec(`fps mode ${LastState}`)
@@ -896,7 +835,7 @@ module.exports = function FpsUtils(mod) {
 		if (HNpcs[event.gameId]) {
 			HNpcs[event.gameId].loc = event.dest
 			HNpcs[event.gameId].w = event.w
-			return false; // TODO; make sure the destory is done properly so npcs don't freeze in their spot after spawn.
+			return false;
 		}
 	}
 

+ 1 - 1
manifest.json

@@ -3,7 +3,7 @@
         "ReadMe.md": "07bbfc71ac79f9154e3c6d121c21adcb91fa16a56aff9e50f49f791482fd1442",
         "lib/data/npcData.json": "737fd1ff6b53121fc2fa716bc7f1c5688a4db2353dedf9c024bb879cd0cfa5a0",
         "lib/data/skillString.json": "9d69876fea0be8e6ac5dd43b3fc74ea023f6b8a6145384f8f780dd977045d8ef",
-        "lib/index.js": "3f7fddc3f0de94990c6e5ce54a2059ffbc2d717387c9185639436d26bb904d71",
+        "lib/index.js": "7d8e6770ec8071512d4af46f60f0836394e7db9cf17c14dcf3b8b8bd4ce1153b",
         "lib/setting_migration.js": "ceab7591a1d4cfbc16f43019a78c515f1b8d9ef7d834ad5722e19a65b80ceef9",
         "module.json": "817f90bb235687a40044b2875128ae848928efc62b3d3ecbde72d528e1fc033d",
         "package.json": "c6c696814caec5c2994c9bf6c75f52ac65b6199e0f61b246da2ad73d406ce877"