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

Patch 106.02

• `sPartyMemberList` to v9.
• Some spacing fixes.
Risenio лет назад: 5
Родитель
Сommit
46b323326c
5 измененных файлов с 18 добавлено и 18 удалено
  1. 1 1
      README.md
  2. 1 1
      lib/data/miscData.json
  3. 9 9
      lib/index.js
  4. 5 5
      manifest.json
  5. 2 2
      package.json

+ 1 - 1
README.md

@@ -18,7 +18,7 @@
 ## Credits
 ## Credits
 Direct Contributers:
 Direct Contributers:
   - [Saegusae](https://github.com/Saegusae)         - [Original developer](https://github.com/Saegusae/fps-utils) (No longer maintained).
   - [Saegusae](https://github.com/Saegusae)         - [Original developer](https://github.com/Saegusae/fps-utils) (No longer maintained).
-  - [HugeDong69](https://github.com/codeagon)       - ~~Most current maintained~~ [fork of Fps-utils](https://github.com/codeagon/fps-utils) (No longer maintained).
+  - [Pentagon](https://github.com/codeagon)         - ~~Most current maintained~~ [fork of Fps-utils](https://github.com/codeagon/fps-utils) (No longer maintained).
   - [SerenTera](https://github.com/SerenTera)
   - [SerenTera](https://github.com/SerenTera)
   - [Kyoukaya](https://github.com/kyoukaya)
   - [Kyoukaya](https://github.com/kyoukaya)
   - [SaltyMonkey](https://github.com/SaltyMonkey)   - Current Tera-Toolbox (Tera-proxy's fork) developer.
   - [SaltyMonkey](https://github.com/SaltyMonkey)   - Current Tera-Toolbox (Tera-proxy's fork) developer.

+ 1 - 1
lib/data/miscData.json

@@ -1 +1 @@
-{"Alphabet":"ABCDEFGHIJKLMNOPQRSTUVWXYZ","PClasses":["warrior","lancer","slayer","berserker","sorcerer","archer","priest","mystic","reaper","gunner","brawler","ninja","valkyrie"],"PRoles":["dps","healer","tank","ranged"],"InvalidVoiceId":249,"InvisibleNpcs":{"8":[6011],"12":[1],"23":[201,202],"34":[8000],"61":[9901],"62":[9001,9002,9003,9004,9901],"83":[9901],"207":[9901],"223":[9901],"230":[9901],"2010":[9901],"2011":[9901],"2012":[9901],"2013":[9901],"2014":[9901],"2015":[9901]},"ImportantActionScripts":[40000,40001,40002,426002],"MountToReplaceId":16,"SpamAchIds":[6,14,15,17,18,51,377,391,466,467,468,469,470,471,472,473,476,611,1002,1003,1004,1005,1308,1309,1310,1311,1312,1313,1314,1315,1408,1420,1744,1745,1769,1770,1771,1942,1943,1952,1992,2032,2033,2036,2037,2038,2057,2062,2071,2078,2081,2082,2083,2084,2088,2089,2095,6005,9817,20605,20607,20608,28723,28724,28725,28726,28727,28728,28729,28730,28731,28732,28733,28734,28735,28736,510005,510012,510019,510026,510027,510033,510034,510035,510036,510037,510038,510039,510040,510041,520029,520030,520032,520033,520034,520035,520048,520049,520050,520051,525000,525001,525002,525003,525004,525005,525006,525007,525008,525009,525010,525011,525012,525013,525014,525015,525016,525017,525018,525019,525020,525021,525022,525023,525024,525025,5010000],"StarterWeaponIds":[10001,10002,10003,10004,10005,10006,10007,10008,80396,55005,82005,58171,59053],"HexColors":{"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":"#5BC0BE","HBlC":"#08B3E5","GryC":"#778899","YlwC":"#C0B94D"}}
+{"Alphabet":"ABCDEFGHIJKLMNOPQRSTUVWXYZ","PClasses":["warrior","lancer","slayer","berserker","sorcerer","archer","priest","mystic","reaper","gunner","brawler","ninja","valkyrie"],"PRoles":["dps","healer","tank","ranged"],"InvalidVoiceId":249,"InvisibleNpcs":{"8":[6011],"12":[1],"23":[201,202],"34":[8000],"61":[9901],"62":[9001,9002,9003,9004,9901],"83":[9901],"207":[9901],"223":[9901],"230":[9901],"2010":[9901],"2011":[9901],"2012":[9901],"2013":[9901],"2014":[9901],"2015":[9901]},"ImportantActionScripts":[40000,40001,40002,426002],"MountToReplaceId":16,"SpamAchIds":[6,14,15,17,18,51,377,391,466,467,468,469,470,471,472,473,476,611,1002,1003,1004,1005,1308,1309,1310,1311,1312,1313,1314,1315,1408,1420,1744,1745,1769,1770,1771,1942,1943,1952,1992,2032,2033,2036,2037,2038,2057,2062,2071,2078,2081,2082,2083,2084,2088,2089,2095,6005,9817,20605,20607,20608,28723,28724,28725,28726,28727,28728,28729,28730,28731,28732,28733,28734,28735,28736,510005,510012,510019,510026,510027,510033,510034,510035,510036,510037,510038,510039,510040,510041,520029,520030,520032,520033,520034,520035,520048,520049,520050,520051,525000,525001,525002,525003,525004,525005,525006,525007,525008,525009,525010,525011,525012,525013,525014,525015,525016,525017,525018,525019,525020,525021,525022,525023,525024,525025,5010000],"StarterWeaponIds":[10001,10002,10003,10004,10005,10006,10007,10008,80396,55005,82005,58171,59053],"HexColors":{"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":"#5BC0BE","HBlC":"#08B3E5","GryC":"#778899","YlwC":"#C0B94D"}}

+ 9 - 9
lib/index.js

@@ -7,7 +7,7 @@ const NpcData = require('./data/npcData.json'),
 	{ ImportantAbns, BlockedAbns, ReplaceAbnIds, AbnNoEffectInvisibleNpcSpamId } = require('./data/abnormalities.json'),
 	{ ImportantAbns, BlockedAbns, ReplaceAbnIds, AbnNoEffectInvisibleNpcSpamId } = require('./data/abnormalities.json'),
 	{ UserNpcs, TrapsIds, FireWorks, UserNpcsHzId, SmokeBombId, MoteIds } = require('./data/userSpawns.json'),
 	{ UserNpcs, TrapsIds, FireWorks, UserNpcsHzId, SmokeBombId, MoteIds } = require('./data/userSpawns.json'),
 	{ InvisibleNpcs, SpamAchIds, PClasses, PRoles, HexColors, Alphabet, StarterWeaponIds, InvalidVoiceId, MountToReplaceId, ImportantActionScripts } = require('./data/miscData.json'),
 	{ InvisibleNpcs, SpamAchIds, PClasses, PRoles, HexColors, Alphabet, StarterWeaponIds, InvalidVoiceId, MountToReplaceId, ImportantActionScripts } = require('./data/miscData.json'),
-	{ BnzC, SlvC, GldC, PnkC, HPkC, CPKC, RedC, GrnC, LPrC, PrpC, LBlC, BluC, DBlC, HBlC, GryC, YlwC } = HexColors;
+	{ BnzC, SlvC, GldC, PnkC, HPkC, CPkC, RedC, GrnC, LPrC, PrpC, LBlC, BluC, DBlC, HBlC, GryC, YlwC } = HexColors;
 
 
 const LastHook = { order: 100010 },
 const LastHook = { order: 100010 },
 	LastHookfn = { order: 100010, filter: { fake: null, silenced: false, modified: null } };
 	LastHookfn = { order: 100010, filter: { fake: null, silenced: false, modified: null } };
@@ -198,7 +198,7 @@ module.exports = function FpsUtils(mod) {
 			case "help":
 			case "help":
 				gui.parse([
 				gui.parse([
 					{ text: `<font color="${PrpC}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: "fps gui" },
 					{ text: `<font color="${PrpC}" size="+24"><p align="right">MAIN MENU</p></font><br>`, command: "fps gui" },
-					{ text: `<font size="20"><font color="${LBlC}">Command</font>            <font color="${SlvC}">Arg(s)</font>                 <font color="${CPKC}">Example</font><br>` },
+					{ text: `<font size="20"><font color="${LBlC}">Command</font>            <font color="${SlvC}">Arg(s)</font>                 <font color="${CPkC}">Example</font><br>` },
 					{ text: `<font color="${HBlC}">gui ^ g</font>                      <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!fps gui</font><br>` },
 					{ text: `<font color="${HBlC}">gui ^ g</font>                      <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!fps gui</font><br>` },
 					{ text: `<font color="${HBlC}"> N/A </font>                         <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!fps-util</font><br>` },
 					{ text: `<font color="${HBlC}"> N/A </font>                         <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!fps-util</font><br>` },
 					{ text: `<font color="${HBlC}">0 ^ 1 ^ 2 ^ 3</font>              <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!0 ^ !1 ^ !2 ^ !3</font><br>` },
 					{ text: `<font color="${HBlC}">0 ^ 1 ^ 2 ^ 3</font>              <font color="${DBlC}">N/A</font>                    <font color="${HPkC}">!0 ^ !1 ^ !2 ^ !3</font><br>` },
@@ -291,12 +291,12 @@ module.exports = function FpsUtils(mod) {
 					{ text: `<font color="${PrpC}" size="+17">[Dress]</font>`, command: "fps quicklink dressingroom" }, { text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${PrpC}" size="+17">[Dress]</font>`, command: "fps quicklink dressingroom" }, { text: "&nbsp;&nbsp;&nbsp;" },
 					{ text: `<font color="${PrpC}" size="+17">[Hat Style]</font><br>`, command: "fps quicklink hatrestyle" },
 					{ text: `<font color="${PrpC}" size="+17">[Hat Style]</font><br>`, command: "fps quicklink hatrestyle" },
 					{ text: `<font color="${YlwC}" size="+20">Party:</font>` }, { text: "&#09;" },
 					{ text: `<font color="${YlwC}" size="+20">Party:</font>` }, { text: "&#09;" },
-					{ text: `<font color="${CPKC}" size="+18">[Reset]</font>`, command: "fps quicklink reset" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${CPKC}" size="+18">[Leave]</font>`, command: "fps quicklink drop" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
-					{ text: `<font color="${CPKC}" size="+18">[Disband]</font><br>`, command: "fps quicklink disband" },
+					{ text: `<font color="${CPkC}" size="+18">[Reset]</font>`, command: "fps quicklink reset" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${CPkC}" size="+18">[Leave]</font>`, command: "fps quicklink drop" }, { text: "&nbsp;&nbsp;&nbsp;&nbsp;" },
+					{ text: `<font color="${CPkC}" size="+18">[Disband]</font><br>`, command: "fps quicklink disband" },
 					{ text: `<font color="${YlwC}" size="+20">System:</font>` }, { text: "&#09;" },
 					{ text: `<font color="${YlwC}" size="+20">System:</font>` }, { text: "&#09;" },
-					{ text: `<font color="${CPKC}" size="+18">[Character Selection]</font>`, command: "fps quicklink lobby" }, { text: "&#09;&#09;&#09;&#09;&#09;" },
-					{ text: `<font color="${CPKC}" size="+18">[! Instant Exit !]</font><br>`, command: "fps quicklink instantexit" }
+					{ text: `<font color="${CPkC}" size="+18">[Character Selection]</font>`, command: "fps quicklink lobby" }, { text: "&#09;&#09;&#09;&#09;&#09;" },
+					{ text: `<font color="${CPkC}" size="+18">[! Instant Exit !]</font><br>`, command: "fps quicklink instantexit" }
 				], `<font color="${LPrC}">[FPS] Options</font> | <font color="${RedC}" size="+16">Red</font><font color="${LPrC}" size="+16"> = disabled, <font color="${GrnC}" size="+16">Green</font><font color="${LPrC}" size="+16"> = enabled</font>`);
 				], `<font color="${LPrC}">[FPS] Options</font> | <font color="${RedC}" size="+16">Red</font><font color="${LPrC}" size="+16"> = disabled, <font color="${GrnC}" size="+16">Green</font><font color="${LPrC}" size="+16"> = enabled</font>`);
 				break;
 				break;
 		}
 		}
@@ -348,7 +348,7 @@ module.exports = function FpsUtils(mod) {
 		return arr;
 		return arr;
 	}
 	}
 
 
-	function ScaleUpEntity(gameId, scale) { //Debug
+	function ScaleUpEntity(gameId, scale) {
 		mod.toClient('S_ABNORMALITY_SCALE_UP', 2, { gameId, scale, duration: 0 });
 		mod.toClient('S_ABNORMALITY_SCALE_UP', 2, { gameId, scale, duration: 0 });
 	}
 	}
 
 
@@ -1143,7 +1143,7 @@ module.exports = function FpsUtils(mod) {
 	mod.hook('S_USER_STATUS', 3, LastHook, sUserStatus)
 	mod.hook('S_USER_STATUS', 3, LastHook, sUserStatus)
 	mod.hook('S_DEAD_LOCATION', 2, sDeadLocation)
 	mod.hook('S_DEAD_LOCATION', 2, sDeadLocation)
 	mod.hook('S_USER_MOVETYPE', 1, LastHook, sUserMovetype)
 	mod.hook('S_USER_MOVETYPE', 1, LastHook, sUserMovetype)
-	mod.hook('S_PARTY_MEMBER_LIST', 8, sPartyMemberList)
+	mod.hook('S_PARTY_MEMBER_LIST', 9, sPartyMemberList)
 	mod.hook('S_USER_APPEARANCE_CHANGE', 1, LastHook, sUserAppearanceChange)
 	mod.hook('S_USER_APPEARANCE_CHANGE', 1, LastHook, sUserAppearanceChange)
 	mod.hook('S_USER_CHANGE_FACE_CUSTOM', 2, LastHook, sUserChangeFaceCustom)
 	mod.hook('S_USER_CHANGE_FACE_CUSTOM', 2, LastHook, sUserChangeFaceCustom)
 	mod.hook('S_USER_EXTERNAL_CHANGE', 7, LastHook, sUserExternalChange)
 	mod.hook('S_USER_EXTERNAL_CHANGE', 7, LastHook, sUserExternalChange)

+ 5 - 5
manifest.json

@@ -1,15 +1,15 @@
 {
 {
     "files": {
     "files": {
-        "README.md": "cd3520efc57698fe4911c325eaf625afa7fc187d4d0a92ace17bc4076fce2d98",
+        "README.md": "2d76c64d0955d36bac7d529543fd3d932cdee23f8c768b104d4c6544b1bf5a86",
         "lib/data/abnormalities.json": "54727de2123584eb0ff38ffca5e86601e3faf05e8dc3379c9a0fd6e5ede1ca0c",
         "lib/data/abnormalities.json": "54727de2123584eb0ff38ffca5e86601e3faf05e8dc3379c9a0fd6e5ede1ca0c",
-        "lib/data/miscData.json": "18e4ddbbdaeabf0c025cb06ffcf13f81b9b6eeed1c3d785c3238981639c4a01b",
+        "lib/data/miscData.json": "4f36b0f6c847ddde5a1a35acf944f700f3e47e39ca23e58cbf06233af67ad251",
         "lib/data/npcData.json": "bcd1876e4266f71299a298221b2594e45bf87f143f276a62c60dd8a35b75acd7",
         "lib/data/npcData.json": "bcd1876e4266f71299a298221b2594e45bf87f143f276a62c60dd8a35b75acd7",
         "lib/data/skillString.json": "90f7cf9e29f0c143ffe4650bebe85c097371507a23c9fd2a0ab6c877d5451e58",
         "lib/data/skillString.json": "90f7cf9e29f0c143ffe4650bebe85c097371507a23c9fd2a0ab6c877d5451e58",
         "lib/data/userSpawns.json": "50fa11179c14e3d5ff0f92d73f62f968331258e85e534102cde03dd6ad977463",
         "lib/data/userSpawns.json": "50fa11179c14e3d5ff0f92d73f62f968331258e85e534102cde03dd6ad977463",
-        "lib/index.js": "363234495d86592781ad05febeaa0da0260b310e551d28f13183bd7012966c64",
+        "lib/index.js": "0505fb6e658fba802e9a99ba6e9f6e9d4b962aa761aad466743c84b50da37d60",
         "lib/setting_migration.js": "1821fbb5ed37672bd9a8daa54f8ab392e35aa6c38b1602c560865b3bf6a7c6a2",
         "lib/setting_migration.js": "1821fbb5ed37672bd9a8daa54f8ab392e35aa6c38b1602c560865b3bf6a7c6a2",
         "module.json": "c23d04a44a1ccdca2b8fc03f547a9b44fa08527f8ad73bc81c8dec042f9b4dcf",
         "module.json": "c23d04a44a1ccdca2b8fc03f547a9b44fa08527f8ad73bc81c8dec042f9b4dcf",
-        "package.json": "c42b019c3287d31caab85ab6ed13f31fa6f4c7e346da44f51200c63ff4ed1005"
+        "package.json": "dd0e950e7b5b537ff09d5f7772373d2b1d7a13840868d4b5981e46d8ba25d1b9"
     },
     },
     "defs": {
     "defs": {
         "C_ADMIN": 1,
         "C_ADMIN": 1,
@@ -54,7 +54,7 @@
         "S_MOUNT_VEHICLE": 2,
         "S_MOUNT_VEHICLE": 2,
         "S_NPC_LOCATION": 3,
         "S_NPC_LOCATION": 3,
         "S_NPC_MENU_SELECT": 1,
         "S_NPC_MENU_SELECT": 1,
-        "S_PARTY_MEMBER_LIST": 8,
+        "S_PARTY_MEMBER_LIST": 9,
         "S_PLAYER_CHANGE_MP": 1,
         "S_PLAYER_CHANGE_MP": 1,
         "S_QUEST_BALLOON": 1,
         "S_QUEST_BALLOON": 1,
         "S_REQUEST_DESPAWN_SERVANT": 1,
         "S_REQUEST_DESPAWN_SERVANT": 1,

+ 2 - 2
package.json

@@ -6,6 +6,6 @@
 	"version": "19",
 	"version": "19",
 	"homepage": "https://github.com/Risenio/fps-utils/wiki",
 	"homepage": "https://github.com/Risenio/fps-utils/wiki",
 	"keywords": ["tera", "fps", "tera-fps", "tera-proxy", "tera-toolbox", "tera-online", "fps-utils", "optimization"],
 	"keywords": ["tera", "fps", "tera-fps", "tera-proxy", "tera-toolbox", "tera-online", "fps-utils", "optimization"],
-    "contributors": ["Saegusae", "codeagon", "SerenTera", "Kyoukaya", "SaltyMonkey", "Leyki"],
-	"repository": { "type":	"git", "url": "git+https://github.com/Risenio/fps-utils.git" }
+	"contributors": ["Saegusae", "codeagon", "SerenTera", "Kyoukaya", "SaltyMonkey", "Leyki"],
+	"repository": { "type": "git", "url": "git+https://github.com/Risenio/fps-utils.git" }
 }
 }