TeraProxy 8 years ago
parent
commit
b61699c19e
3 changed files with 23 additions and 12 deletions
  1. 9 5
      README.md
  2. 12 1
      index.js
  3. 2 6
      manifest.json

+ 9 - 5
README.md

@@ -1,18 +1,20 @@
 ##### :heavy_exclamation_mark: Status :heavy_exclamation_mark:
-Should work on all regions as long as the opcodes are mapped. Works on Caali's tera-proxy.  
+Should work on all regions as long as the opcodes are mapped. Works on Caali's and Pinkie Pie's tera-proxy.
 
-##### :heavy_exclamation_mark: Installation for Caali's tera-proxy :heavy_exclamation_mark:
+##### :heavy_exclamation_mark: Installation :heavy_exclamation_mark:
 1) Download Essentials: https://github.com/TeraProxy/Essentials/archive/master.zip
 2) Extract the contents of the zip file into "\tera-proxy\bin\node_modules\"
-3) Done! (the module will auto-update when a new version is released)
+3) Done! (the module will auto-update on Caali's proxy when a new version is released)
+  
+Users of Pinkie's proxy also need to install tera-game-state: https://github.com/caali-hackerman/tera-game-state/archive/master.zip  
   
 If you enjoy my work and wish to support future development, feel free to drop me a small donation: [![Donate](https://www.paypalobjects.com/webstatic/en_US/i/buttons/PP_logo_h_100x26.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=A3KBZUCSEQ5RJ&lc=US&item_name=TeraProxy&curency_code=USD&no_note=1&no_shipping=1&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted)
 
 # Essentials
-A tera-proxy module that automatically uses "Nostrum"/"Battle Solution" and "Complete Crystalbind" items whenever needed.  
+A tera-proxy module that automatically uses "Nostrum"/"Battle Solution" and "Complete Crystalbind" items whenever needed.
 
 ## Usage
-There are several options you can change in the "config.json" file:  
+There are several options you can change in the "\tera-proxy\settings\Essentials.json" file:  
   
 * "useNostrum" - Change this to "false" if you do not want the module to use any Nostrums
 * "useCCB" - Change this to "false" if you do not want the module to use any CCBs
@@ -37,6 +39,8 @@ Based on true-everful-nostrum by Caali https://github.com/caali-hackerman
 ## Changelog
 <details>
 
+### 2.0.3
+* [~] Cross compatibility for Caali's and Pinkie's proxy (no more branch)
 ### 2.0.2
 * [~] Tracking of whether you are Elite/Tera-Club or not is now automated (no more configuration needed)
 * [+] Running out of an Essentials item will now send you a notification and disable the module

+ 12 - 1
index.js

@@ -1,4 +1,4 @@
-// Version 2.0.2
+// Version 2.0.3
 // Based on true-everful-nostrum by Pinkie Pie https://github.com/pinkipi
 // Based on true-everful-nostrum by Caali https://github.com/caali-hackerman
 
@@ -11,6 +11,17 @@ const ITEMS_NOSTRUM = [152898, 184659, 201005, 201006, 201007, 201008, 201022, 8
 
 module.exports = function Essentials(mod) {
 
+	if(mod.proxyAuthor !== 'caali') {
+		const options = require('./module').options
+		if(options) {
+			const settingsVersion = options.settingsVersion
+			if(settingsVersion) {
+				mod.settings = require('./' + (options.settingsMigrator || 'module_settings_migrator.js'))(mod.settings._version, settingsVersion, mod.settings)
+				mod.settings._version = settingsVersion
+			}
+		}
+	}
+
 	mod.game.initialize("contract")
 
 	let slot = null,

+ 2 - 6
manifest.json

@@ -1,12 +1,8 @@
 {
 	"files": {
 		"LICENSE": "589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2",
-		"README.md": "a2c6bd3c02c206b1e6e795f55f79b0f83d6d4c173b4ccce0dd8452becb35b07d",
-		"config.json": {
-			"overwrite": false,
-			"hash": "a74387d37fd9a2823c4d0bad54ede9279a51595eb59db4e5abfb3b0c0f695628"
-		},
-		"index.js": "9582629ba5f3cf0a7523c87ee286dcbac9f25666675550ede349d5304f8a3dd7",
+		"README.md": "8285e865979ac7fc700a6fd165a2a73e9664a67dadaa4fead0020dfdd179b971",
+		"index.js": "a0b5875343210860afc620624df37a9504997b87e8a1dd41abf5210941104afa",
 		"module.json": "ff65da8b58525c2468a904b0c5cda7490b98d395dd352dcc12bf58ca67faf3cb",
 		"settings_migrator.js": "1e910f071a6542ea586144b5b8b57e2be8cc5cd196244b0ef294eca578c8eca5"
 	},