Merge pull request #549 from bitpredator/dev

chore: removed support for npwd_crypto
bitpredator · Oct 29, 2023 · 16628c1 · 16628c1
2 parents cb8320c + 6838a34
commit 16628c1
Show file tree

Hide file tree

Showing 39 changed files with 33 additions and 13,859 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -28,4 +28,5 @@
    [client/init/main.lua]: fix(radio): fix oversight with function call
    [workflows/dependency-review.yml]: chore(deps): bump actions/checkout from 3 to 4
    [voice-ui/pnpm-lock.yaml]: chore(deps-dev): bump follow-redirects in /voice-ui
-   [voice-ui/pnpm-lock.yaml]: chore(deps-dev): bump browserify-sign from 4.2.1 to 4.2.2 in /voice-ui
+   [voice-ui/pnpm-lock.yaml]: chore(deps-dev): bump browserify-sign from 4.2.1 to 4.2.2 in /voice-ui
+7. [npwd + es_extended]: chore: removed support for npwd_crypto @bitpredator
diff --git a/server-data/resources/[esx]/es_extended/config.lua b/server-data/resources/[esx]/es_extended/config.lua
@@ -14,19 +14,15 @@ Config.Accounts = {
 		label = _U('account_money'),
 		round = true
 	},
-	crypto = {
-		label = _('crypto_currency'),
-		round = false
-	}
 }
 
-Config.StartingAccountMoney 	= {bank = 50000}
-Config.EnableSocietyPayouts 	= true -- pay from the society account that the player is employed at? Requirement: esx_society
-Config.MaxWeight            	= 24   -- the max inventory weight without backpack
-Config.PaycheckInterval         = 7 * 60000 -- how often to recieve pay checks in milliseconds
-Config.EnableDebug              = false -- Use Debug options?
-Config.EnableWantedLevel    	= false -- Use Normal GTA wanted Level?
-Config.EnablePVP                = true -- Allow Player to player combat
+Config.StartingAccountMoney 	  = {bank = 50000}
+Config.EnableSocietyPayouts 	  = true -- pay from the society account that the player is employed at? Requirement: esx_society
+Config.MaxWeight            	  = 24   -- the max inventory weight without backpack
+Config.PaycheckInterval           = 7 * 60000 -- how often to recieve pay checks in milliseconds
+Config.EnableDebug                = false -- Use Debug options?
+Config.EnableWantedLevel    	  = false -- Use Normal GTA wanted Level?
+Config.EnablePVP                  = true -- Allow Player to player combat
 Config.Multichar                  = true -- Enable support for esx_multicharacter
 Config.Identity                   = true -- Select a characters identity data before they have loaded in (this happens by default with multichar)
 Config.DistanceGive 			  = 4.0 -- Max distance when giving items, weapons etc.
@@ -35,30 +31,30 @@ Config.DisableVehicleRewards      = false -- Disables Player Recieving weapons f
 Config.DisableNPCDrops            = true -- stops NPCs from dropping weapons on death
 Config.DisableWeaponWheel         = false -- Disables default weapon wheel
 Config.DisableAimAssist           = false -- disables AIM assist (mainly on controllers)
-Config.DisableDisplayAmmo  		 = false -- Disable ammunition display
+Config.DisableDisplayAmmo  		  = false -- Disable ammunition display
 Config.RemoveHudComponents = {
-	[1] = false, --WANTED_STARS,
-	[2] = false, --WEAPON_ICON
-	[3] = false, --CASH
-	[4] = false,  --MP_CASH
-	[5] = false, --MP_MESSAGE
-	[6] = false, --VEHICLE_NAME
-	[7] = false,-- AREA_NAME
-	[8] = false,-- VEHICLE_CLASS
-	[9] = false, --STREET_NAME
-	[10] = false, --HELP_TEXT
-	[11] = false, --FLOATING_HELP_TEXT_1
-	[12] = false, --FLOATING_HELP_TEXT_2
-	[13] = false, --CASH_CHANGE
-	[14] = false, --RETICLE
-	[15] = false, --SUBTITLE_TEXT
-	[16] = false, --RADIO_STATIONS
-	[17] = false, --SAVING_GAME,
-	[18] = false, --GAME_STREAM
-	[19] = false, --WEAPON_WHEEL
-	[20] = false, --WEAPON_WHEEL_STATS
-	[21] = false, --HUD_COMPONENTS
-	[22] = false, --HUD_WEAPONS
+	[1]  = false, -- WANTED_STARS,
+	[2]  = false, -- WEAPON_ICON
+	[3]  = false, -- CASH
+	[4]  = false, -- MP_CASH
+	[5]  = false, -- MP_MESSAGE
+	[6]  = false, -- VEHICLE_NAME
+	[7]  = false, -- AREA_NAME
+	[8]  = false, -- VEHICLE_CLASS
+	[9]  = false, -- STREET_NAME
+	[10] = false, -- HELP_TEXT
+	[11] = false, -- FLOATING_HELP_TEXT_1
+	[12] = false, -- FLOATING_HELP_TEXT_2
+	[13] = false, -- CASH_CHANGE
+	[14] = false, -- RETICLE
+	[15] = false, -- SUBTITLE_TEXT
+	[16] = false, -- RADIO_STATIONS
+	[17] = false, -- SAVING_GAME,
+	[18] = false, -- GAME_STREAM
+	[19] = false, -- WEAPON_WHEEL
+	[20] = false, -- WEAPON_WHEEL_STATS
+	[21] = false, -- HUD_COMPONENTS
+	[22] = false, -- HUD_WEAPONS
 }
 
 Config.MaxAdminVehicles = true -- admin vehicles spawn with max vehcle settings

diff --git a/server-data/resources/[phone]/npwd/config.json b/server-data/resources/[phone]/npwd/config.json
@@ -38,7 +38,7 @@
     "useWebhook": true
   },
   "apps": [
-    "npwd_services","npwd_crypto"
+    "npwd_services"
   ],
   "voiceMessage": {
     "enabled": false,