Dmitry S лет назад: 4
Родитель
Сommit
252e062a69
6 измененных файлов с 16 добавлено и 41 удалено
  1. 3 0
      .gitignore
  2. 0 13
      config.json
  3. 5 6
      index.js
  4. 3 12
      manifest.json
  5. 1 6
      module.json
  6. 4 4
      settings_migrator.js

+ 3 - 0
.gitignore

@@ -0,0 +1,3 @@
+.eslintrc.json
+manifest-generator.bat
+manifest-generator.js

+ 0 - 13
config.json

@@ -1,13 +0,0 @@
-{
-    "version": 5,
-    "data": {
-        "useNostrum": true,
-        "useCCB": true,
-        "nostrumTime": 2,
-        "CCBTime": 5,
-        "dungeonOnly": false,
-        "log": false,
-        "nostrum": 200999,
-        "ccb": 70000
-    }
-}

+ 5 - 6
index.js

@@ -13,8 +13,7 @@ module.exports = function Essentials(mod) {
 		interval = null,
 		enabled = true,
 		counter = 0,
-		resetcount = null,
-		niceName = mod.proxyAuthor !== 'caali' ? '[Essentials] ' : ''
+		resetcount = null
 
 	// ############# //
 	// ### Hooks ### //
@@ -42,7 +41,7 @@ module.exports = function Essentials(mod) {
 
 	if(mod.settings.log) {
 		mod.hook('C_USE_ITEM', 3, event => {
-			mod.command.message(niceName + 'Used item ID: ' + event.id)
+			mod.command.message('Used item ID: ' + event.id)
 		})
 	}
 
@@ -91,7 +90,7 @@ module.exports = function Essentials(mod) {
 		if(counter > 5) {
 			let missing = (item == mod.settings.nostrum) ? 'Nostrums' : 'Crystalbinds'
 			enabled = false
-			mod.command.message(niceName + 'You ran out of ' + missing + ' (ID: ' + item + '). Essentials has been disabled. Please restock and enable the module again by typing "ess" in this chat.')
+			mod.command.message('You ran out of ' + missing + ' (ID: ' + item + '). Essentials has been disabled. Please restock and enable the module again by typing "ess" in this chat.')
 			console.log('[Essentials] You ran out of ' + missing + ' (ID: ' + item + '). Essentials has been disabled. Please restock and enable the module again by typing "ess" in proxy chat.')
 			return
 		}
@@ -131,12 +130,12 @@ module.exports = function Essentials(mod) {
 	mod.command.add(['essentials', 'ess'], (cmd) => {
 		if(cmd == null) {
 			enabled = !enabled
-			mod.command.message(niceName + 'Essentials ' + (enabled ? '<font color="#56B4E9">enabled</font>' : '<font color="#E69F00">disabled</font>'))
+			mod.command.message('Essentials ' + (enabled ? '<font color="#56B4E9">enabled</font>' : '<font color="#E69F00">disabled</font>'))
 			console.log('Essentials ' + (enabled ? 'enabled' : 'disabled'))
 		}
 		else if(cmd == "dungeon" || cmd == "dungeons" || cmd == "dung") {
 			mod.settings.dungeonOnly = !mod.settings.dungeonOnly
-			mod.command.message(niceName + 'Items will be used ' + (mod.settings.dungeonOnly ? 'everywhere' : 'in dungeons only'))
+			mod.command.message('Items will be used ' + (mod.settings.dungeonOnly ? 'everywhere' : 'in dungeons only'))
 		}
 		else mod.command.message('Commands:\n'
 			+ ' "ess" (enable/disable Essentials),\n'

+ 3 - 12
manifest.json

@@ -2,17 +2,8 @@
     "files": {
         "LICENSE": "589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2",
         "README.md": "bd77af365824f17b12821ff888640a4c34d8a2781516df76a4bb0635da3f9250",
-        "config.json": {
-            "overwrite": false,
-            "hash": "f37583b51ed6c475cc38f812a13ae52b784f5f319be8560f94cbf0c7f7a80db2"
-        },
-        "index.js": "97f0351532e8ce264ba26a0f1532d2f7426cedadb776b07fb2d2a51db85bc955",
-        "module.json": "6c1da3208bfd117b94de7acb78a0fd728ef33605c89e5dc4215f4b8d8ea2e641",
-        "settings_migrator.js": "0da6c1e6f7d14d980db286eb577e2e181cfcba44d9bc7dc0601db6c0020a2a03"
-    },
-    "defs": {
-        "C_USE_ITEM": 3,
-        "C_USE_PREMIUM_SLOT": 1,
-        "S_PREMIUM_SLOT_DATALIST": 2
+        "index.js": "e38eda3f5fd7da9c9be5cdf31615453cc6edbf9eb6153f545673087a0796f82d",
+        "module.json": "e96786616432aef36cd3f2dba57136deb485a2e5f6b2af9142fcfcf83d603294",
+        "settings_migrator.js": "aa0d939060340fc592629246ce848f7292b90d3dab26c0dc23074d374ca46b87"
     }
 }

+ 1 - 6
module.json

@@ -4,7 +4,6 @@
     "author": "TeraProxy / Caali / Pinkie Pie",
     "description": "A tera-proxy module that automatically uses Nostrum/Battle Solution and Complete Crystalbind items whenever needed.",
     "version": "2.3.1",
-    "donationUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=A3KBZUCSEQ5RJ",
     "options": {
         "niceName": "Essentials",
         "guiName": "Essentials",
@@ -12,9 +11,5 @@
         "settingsFile": "config.json",
         "settingsMigrator": "settings_migrator.js"
     },
-    "servers": ["https://raw.githubusercontent.com/TeraProxy/Essentials/master/"],
-    "supportUrl": "https://github.com/TeraProxy/Essentials/issues",
-    "dependencies": {
-        "tera-game-state": "https://raw.githubusercontent.com/caali-hackerman/tera-game-state/master/module.json"
-    }
+    "servers": ["https://raw.githubusercontent.com/tera-private-mods/essentials/master/"]
 }

+ 4 - 4
settings_migrator.js

@@ -2,10 +2,10 @@
 
 const DefaultSettings = {
 	"useNostrum": true,
-	"useCCB": true,
-	"nostrumTime": 5,
-	"CCBTime": 10,
-	"dungeonOnly": false,
+	"useCCB": false,
+	"nostrumTime": 2,
+	"CCBTime": 5,
+	"dungeonOnly": true,
 	"log": false,
 	"nostrum": 200999,
 	"ccb": 70000