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

Small fix.

• Refactored some parts including formatting, naming & data.
• Fixed issue where people forget to spawn their own pet before enabling the hide own pet option; preventing them from using bound skills. [Now it works regardless].
• Updated NpcData to P105.
Risenio лет назад: 5
Родитель
Сommit
f6b915725a
7 измененных файлов с 19 добавлено и 22 удалено
  1. 7 7
      README.md
  2. 0 0
      lib/data/abnormalities.json
  3. 1 0
      lib/data/miscData.json
  4. 0 0
      lib/data/npcData.json
  5. 1 0
      lib/data/userSpawns.json
  6. 0 9
      lib/index.js
  7. 10 6
      manifest.json

+ 7 - 7
README.md

@@ -4,10 +4,10 @@
 ## How to use.
 ## How to use.
   * Put the script folder "fps-utils" into the `mods` folder.
   * Put the script folder "fps-utils" into the `mods` folder.
   * Log the game using the proxy.
   * Log the game using the proxy.
-  * To get access to the built-in GUI type `!fps g` into the chat.
+  * To get access to the built-in GUI type `/!fps g` into the chat.
 
 
 ## Capability.
 ## Capability.
-  * Should work on any proxy.
+  * Should work on any proxy. (Tera-Proxy & Tera-Toolbox, *as long as they're up-to-date*)
   * No dependencies.
   * No dependencies.
 
 
 ## List of commands can be found in [this Wiki](https://github.com/Risenio/fps-utils/wiki/Commands).
 ## List of commands can be found in [this Wiki](https://github.com/Risenio/fps-utils/wiki/Commands).
@@ -17,18 +17,18 @@
 
 
 ## Credits
 ## Credits
 Direct Contributers:
 Direct Contributers:
-  - [Saegusae](https://github.com/Saegusae)         - Original developer (No longer maintained).
-  - [HugeDong69](https://github.com/codeagon)       - Current maintained fork of Fps-utils.
+  - [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).
   - [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)
+  - [SaltyMonkey](https://github.com/SaltyMonkey)    - Tera-Toolbox (Tera-proxy's fork) developer.
   - [Leyki](https://github.com/Leyki)
   - [Leyki](https://github.com/Leyki)
 
 
 ---
 ---
 
 
-In-direct Contributers: 
+In-direct Contributers:
   - [Kasea](https://github.com/Kaseaa)
   - [Kasea](https://github.com/Kaseaa)
-  - [Caali](https://github.com/caali-hackerman)     - Toolbox (Tera-proxy's fork) developer.
+  - [Caali](https://github.com/caali-hackerman)     - Tera-Toolbox (Tera-proxy's fork) developer.
   - [Bernkastel](https://github.com/Bernkastel-0)   - Original idea/ZFPS alternative script.
   - [Bernkastel](https://github.com/Bernkastel-0)   - Original idea/ZFPS alternative script.
   - [Pinkie Pie](https://github.com/pinkipi)        - Original idea/Current maintained fork of Tera-proxy developer.
   - [Pinkie Pie](https://github.com/pinkipi)        - Original idea/Current maintained fork of Tera-proxy developer.
   - [Meishu](https://github.com/meishuu)            - Original developer of Tera-proxy (No longer maintained).
   - [Meishu](https://github.com/meishuu)            - Original developer of Tera-proxy (No longer maintained).

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
lib/data/abnormalities.json


+ 1 - 0
lib/data/miscData.json

@@ -0,0 +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"}}

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
lib/data/npcData.json


+ 1 - 0
lib/data/userSpawns.json

@@ -0,0 +1 @@
+{"FireWorks":[60016000,80037000],"MoteIds":[8008,8009,8010,8011,8012,8013,8014,8015,8016,8017,8018,8019,8020,8021,8022,8023],"SmokeBombId":90120,"TrapsIds":[30120,30220,30320,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],"UserNpcsHzId":1023,"UserNpcs":[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]}

Разница между файлами не показана из-за своего большого размера
+ 0 - 9
lib/index.js


+ 10 - 6
manifest.json

@@ -1,9 +1,12 @@
 {
 {
     "files": {
     "files": {
-        "README.md": "8c89fbefc91e4e75ee5981cf2f59834ae9f231c5179e150aaa0c2bedeaf79e37",
-        "lib/data/npcData.json": "57c6e0ca4d6e996eb295868cf964c61322182c8df68c9787528a20c617bf356a",
+        "README.md": "2761a747402655df9b944347b93257e219d3d7d34dba5cff320bc4872f99ce3a",
+        "lib/data/abnormalities.json": "54727de2123584eb0ff38ffca5e86601e3faf05e8dc3379c9a0fd6e5ede1ca0c",
+        "lib/data/miscData.json": "18e4ddbbdaeabf0c025cb06ffcf13f81b9b6eeed1c3d785c3238981639c4a01b",
+        "lib/data/npcData.json": "bcd1876e4266f71299a298221b2594e45bf87f143f276a62c60dd8a35b75acd7",
         "lib/data/skillString.json": "90f7cf9e29f0c143ffe4650bebe85c097371507a23c9fd2a0ab6c877d5451e58",
         "lib/data/skillString.json": "90f7cf9e29f0c143ffe4650bebe85c097371507a23c9fd2a0ab6c877d5451e58",
-        "lib/index.js": "1cd62cf1d0bdcff37b39bd12ca0240506cdcde8362cb63362caef26261be1df0",
+        "lib/data/userSpawns.json": "50fa11179c14e3d5ff0f92d73f62f968331258e85e534102cde03dd6ad977463",
+        "lib/index.js": "b82cfe62bfa8431de57db658d83bccdcfbaddefe5712cd2951495ff39e180534",
         "lib/setting_migration.js": "1821fbb5ed37672bd9a8daa54f8ab392e35aa6c38b1602c560865b3bf6a7c6a2",
         "lib/setting_migration.js": "1821fbb5ed37672bd9a8daa54f8ab392e35aa6c38b1602c560865b3bf6a7c6a2",
         "module.json": "11fae284a4b493d9e4c9b14e86710cf63449c582dfa4142c91e387b12ff63d1b",
         "module.json": "11fae284a4b493d9e4c9b14e86710cf63449c582dfa4142c91e387b12ff63d1b",
         "package.json": "cfce7f8421833b9d63eef6f93ca3efb48ec5f4c8dc82345c77708e596ff9aa1c"
         "package.json": "cfce7f8421833b9d63eef6f93ca3efb48ec5f4c8dc82345c77708e596ff9aa1c"
@@ -20,6 +23,7 @@
         "S_ABNORMALITY_BEGIN": 3,
         "S_ABNORMALITY_BEGIN": 3,
         "S_ABNORMALITY_END": 1,
         "S_ABNORMALITY_END": 1,
         "S_ABNORMALITY_REFRESH": 1,
         "S_ABNORMALITY_REFRESH": 1,
+        "S_ABNORMALITY_SCALE_UP": 2,
         "S_ACTION_END": 5,
         "S_ACTION_END": 5,
         "S_ACTION_STAGE": 9,
         "S_ACTION_STAGE": 9,
         "S_ANNOUNCE_UPDATE_NOTIFICATION": 1,
         "S_ANNOUNCE_UPDATE_NOTIFICATION": 1,
@@ -59,9 +63,9 @@
         "S_SOCIAL": 1,
         "S_SOCIAL": 1,
         "S_SPAWN_DROPITEM": 9,
         "S_SPAWN_DROPITEM": 9,
         "S_SPAWN_EVENT_SEED": 2,
         "S_SPAWN_EVENT_SEED": 2,
-        "S_SPAWN_NPC": [11, 12],
+        "S_SPAWN_NPC": 12,
         "S_SPAWN_PROJECTILE": 5,
         "S_SPAWN_PROJECTILE": 5,
-        "S_SPAWN_USER": 16,
+        "S_SPAWN_USER": 17,
         "S_START_ACTION_SCRIPT": 3,
         "S_START_ACTION_SCRIPT": 3,
         "S_START_COOLTIME_ITEM": 1,
         "S_START_COOLTIME_ITEM": 1,
         "S_START_USER_PROJECTILE": 9,
         "S_START_USER_PROJECTILE": 9,
@@ -72,7 +76,7 @@
         "S_USER_APPEARANCE_CHANGE": 1,
         "S_USER_APPEARANCE_CHANGE": 1,
         "S_USER_CHANGE_FACE_CUSTOM": 2,
         "S_USER_CHANGE_FACE_CUSTOM": 2,
         "S_USER_EXTERNAL_CHANGE": 7,
         "S_USER_EXTERNAL_CHANGE": 7,
-        "S_USER_LOCATION": 5,
+        "S_USER_LOCATION": 6,
         "S_USER_MOVETYPE": 1,
         "S_USER_MOVETYPE": 1,
         "S_USER_STATUS": 3
         "S_USER_STATUS": 3
     }
     }

Некоторые файлы не были показаны из-за большого количества измененных файлов