hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update from master (merge error)

Browse Source
This commit is contained in:
Vortrex
2023-02-07 15:11:56 -06:00
parent a5b9840729
commit 1e91698e05
63 changed files with 422 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
database.sql
View File

@@ -358,7 +358,7 @@ CREATE TABLE IF NOT EXISTS `biz_main` (
`biz_till` int(11) NOT NULL DEFAULT '0',
`biz_entrance_fee` int(11) NOT NULL DEFAULT '0',
`biz_deleted` tinyint(1) NOT NULL DEFAULT '0',
`biz_who_deleted` int(11) NOT NULL DEFAULT '479',
`biz_who_deleted` int(11) NOT NULL DEFAULT '1',
`biz_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`biz_has_interior` tinyint(1) NOT NULL DEFAULT '0',
`biz_interior_lights` tinyint(4) NOT NULL DEFAULT '1',
@@ -420,9 +420,9 @@ CREATE TABLE IF NOT EXISTS `clan_main` (
`clan_owner` int(11) NOT NULL DEFAULT '0',
`clan_created` int(11) NOT NULL DEFAULT '0',
`clan_deleted` tinyint(4) NOT NULL DEFAULT '0',
`clan_who_deleted` int(11) NOT NULL DEFAULT '479',
`clan_who_deleted` int(11) NOT NULL DEFAULT '1',
`clan_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`clan_who_added` int(11) NOT NULL DEFAULT '479',
`clan_who_added` int(11) NOT NULL DEFAULT '1',
`clan_when_added` bigint(20) NOT NULL DEFAULT '0',
`clan_motd` varchar(128) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
`clan_col_r` int(11) NOT NULL DEFAULT '255',
@@ -634,7 +634,7 @@ CREATE TABLE IF NOT EXISTS `house_main` (
`house_custom_interior` tinyint(4) NOT NULL DEFAULT '0',
`house_deleted` tinyint(4) NOT NULL DEFAULT '0',
`house_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`house_who_deleted` int(11) NOT NULL DEFAULT '479',
`house_who_deleted` int(11) NOT NULL DEFAULT '1',
`house_tax_exempt` tinyint(4) NOT NULL DEFAULT '0',
`house_radio_station` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`house_id`) USING BTREE,
@@ -793,9 +793,9 @@ CREATE TABLE IF NOT EXISTS `item_main` (
`item_value` int(11) NOT NULL DEFAULT '0',
`item_enabled` tinyint(4) NOT NULL DEFAULT '0',
`item_deleted` tinyint(4) NOT NULL DEFAULT '0',
`item_who_deleted` int(11) NOT NULL DEFAULT '479',
`item_who_deleted` int(11) NOT NULL DEFAULT '1',
`item_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`item_who_added` int(11) NOT NULL DEFAULT '479',
`item_who_added` int(11) NOT NULL DEFAULT '1',
`item_when_added` bigint(20) NOT NULL DEFAULT '0',
PRIMARY KEY (`item_id`),
KEY `item_server` (`item_server`),
@@ -855,9 +855,9 @@ CREATE TABLE IF NOT EXISTS `item_type` (
`item_type_anim_put` varchar(64) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'none',
`item_type_anim_pickup` varchar(64) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'none',
`item_type_deleted` tinyint(4) NOT NULL DEFAULT '0',
`item_type_who_deleted` int(11) NOT NULL DEFAULT '479',
`item_type_who_deleted` int(11) NOT NULL DEFAULT '1',
`item_type_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`item_type_who_added` int(11) NOT NULL DEFAULT '479',
`item_type_who_added` int(11) NOT NULL DEFAULT '1',
`item_type_when_added` bigint(20) NOT NULL DEFAULT '0',
PRIMARY KEY (`item_type_id`),
KEY `item_type_server` (`item_type_server`),
@@ -2307,9 +2307,9 @@ CREATE TABLE IF NOT EXISTS `job_equip` (
`job_equip_name` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
`job_equip_enabled` tinyint(1) NOT NULL DEFAULT '1',
`job_equip_deleted` tinyint(1) NOT NULL DEFAULT '1',
`job_equip_who_deleted` int(11) NOT NULL DEFAULT '479',
`job_equip_who_deleted` int(11) NOT NULL DEFAULT '1',
`job_equip_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`job_equip_who_added` int(11) NOT NULL DEFAULT '479',
`job_equip_who_added` int(11) NOT NULL DEFAULT '1',
`job_equip_when_added` bigint(20) NOT NULL DEFAULT '0',
PRIMARY KEY (`job_equip_id`),
KEY `job_equip_job` (`job_equip_job`),
@@ -2330,9 +2330,9 @@ CREATE TABLE IF NOT EXISTS `job_equip_item` (
`job_equip_item_value` int(11) NOT NULL DEFAULT '0',
`job_equip_item_enabled` tinyint(1) NOT NULL DEFAULT '1',
`job_equip_item_deleted` tinyint(1) NOT NULL DEFAULT '0',
`job_equip_item_who_deleted` int(11) NOT NULL DEFAULT '479',
`job_equip_item_who_deleted` int(11) NOT NULL DEFAULT '1',
`job_equip_item_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`job_equip_item_who_added` int(11) NOT NULL DEFAULT '479',
`job_equip_item_who_added` int(11) NOT NULL DEFAULT '1',
`job_equip_item_when_added` bigint(20) NOT NULL DEFAULT '0',
PRIMARY KEY (`job_equip_item_id`) USING BTREE,
KEY `job_equip_item_equip` (`job_equip_item_equip`),
@@ -2360,9 +2360,9 @@ CREATE TABLE IF NOT EXISTS `job_loc` (
`job_loc_vw` int(11) NOT NULL DEFAULT '0',
`job_loc_name` varchar(64) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
`job_loc_deleted` tinyint(4) NOT NULL DEFAULT '0',
`job_loc_who_deleted` int(11) NOT NULL DEFAULT '479',
`job_loc_who_deleted` int(11) NOT NULL DEFAULT '1',
`job_loc_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`job_loc_who_added` int(11) NOT NULL DEFAULT '479',
`job_loc_who_added` int(11) NOT NULL DEFAULT '1',
`job_loc_when_added` bigint(20) NOT NULL DEFAULT '0',
PRIMARY KEY (`job_loc_id`),
KEY `job_loc_job` (`job_loc_job`),
@@ -2394,9 +2394,9 @@ CREATE TABLE IF NOT EXISTS `job_main` (
`job_wl` tinyint(4) NOT NULL DEFAULT '0',
`job_bl` tinyint(4) NOT NULL DEFAULT '0',
`job_deleted` tinyint(4) NOT NULL DEFAULT '0',
`job_who_deleted` int(11) NOT NULL DEFAULT '479',
`job_who_deleted` int(11) NOT NULL DEFAULT '1',
`job_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`job_who_added` int(11) NOT NULL DEFAULT '479',
`job_who_added` int(11) NOT NULL DEFAULT '1',
`job_when_added` bigint(20) NOT NULL DEFAULT '0',
PRIMARY KEY (`job_id`),
KEY `job_server` (`job_server`),
@@ -2421,9 +2421,9 @@ CREATE TABLE IF NOT EXISTS `job_rank` (
`job_rank_flags` int(11) NOT NULL DEFAULT '0',
`job_rank_pay` int(11) NOT NULL DEFAULT '0',
`job_rank_deleted` int(11) NOT NULL DEFAULT '0',
`job_rank_who_deleted` int(11) NOT NULL DEFAULT '479',
`job_rank_who_deleted` int(11) NOT NULL DEFAULT '1',
`job_rank_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`job_rank_who_added` int(11) NOT NULL DEFAULT '479',
`job_rank_who_added` int(11) NOT NULL DEFAULT '1',
`job_rank_when_added` bigint(20) NOT NULL DEFAULT '0',
PRIMARY KEY (`job_rank_id`),
KEY `fk_job_rank_job` (`job_rank_job`),
@@ -2452,9 +2452,9 @@ CREATE TABLE IF NOT EXISTS `job_route` (
`job_route_pay` int(11) NOT NULL DEFAULT '0',
`job_route_enabled` tinyint(4) NOT NULL DEFAULT '1',
`job_route_deleted` tinyint(4) NOT NULL DEFAULT '0',
`job_route_who_deleted` int(11) NOT NULL DEFAULT '479',
`job_route_who_deleted` int(11) NOT NULL DEFAULT '1',
`job_route_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`job_route_who_added` int(11) NOT NULL DEFAULT '479',
`job_route_who_added` int(11) NOT NULL DEFAULT '1',
`job_route_when_added` bigint(20) NOT NULL DEFAULT '0',
PRIMARY KEY (`job_route_id`),
KEY `fk_job_route_job` (`job_route_job`),
@@ -2481,9 +2481,9 @@ CREATE TABLE IF NOT EXISTS `job_route_loc` (
`job_route_loc_delay` int(11) NOT NULL DEFAULT '0',
`job_route_loc_pay` int(11) NOT NULL DEFAULT '0',
`job_route_loc_deleted` tinyint(4) NOT NULL DEFAULT '0',
`job_route_loc_who_deleted` int(11) NOT NULL DEFAULT '479',
`job_route_loc_who_deleted` int(11) NOT NULL DEFAULT '1',
`job_route_loc_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`job_route_loc_who_added` int(11) NOT NULL DEFAULT '479',
`job_route_loc_who_added` int(11) NOT NULL DEFAULT '1',
`job_route_loc_when_added` bigint(20) NOT NULL DEFAULT '0',
`job_route_loc_goto_msg` varchar(128) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
`job_route_loc_arrive_msg` varchar(128) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
@@ -2507,9 +2507,9 @@ CREATE TABLE IF NOT EXISTS `job_uniform` (
`job_uniform_minrank` int(11) NOT NULL DEFAULT '0',
`job_uniform_name` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'Unnamed',
`job_uniform_deleted` tinyint(4) NOT NULL DEFAULT '0',
`job_uniform_who_deleted` int(11) NOT NULL DEFAULT '479',
`job_uniform_who_deleted` int(11) NOT NULL DEFAULT '1',
`job_uniform_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`job_uniform_who_added` int(11) NOT NULL DEFAULT '479',
`job_uniform_who_added` int(11) NOT NULL DEFAULT '1',
`job_uniform_when_added` bigint(20) NOT NULL DEFAULT '0',
PRIMARY KEY (`job_uniform_id`),
KEY `job_uniform_job` (`job_uniform_job`),
@@ -3119,7 +3119,7 @@ CREATE TABLE IF NOT EXISTS `veh_main` (
`veh_ins_acct` tinyint(1) NOT NULL DEFAULT '0',
`veh_price` int(11) NOT NULL DEFAULT '0',
`veh_deleted` tinyint(1) NOT NULL DEFAULT '0',
`veh_who_deleted` int(11) NOT NULL DEFAULT '479',
`veh_who_deleted` int(11) NOT NULL DEFAULT '1',
`veh_when_deleted` bigint(20) NOT NULL DEFAULT '0',
`veh_flags` int(11) NOT NULL DEFAULT '0',
`veh_spawn_lock` tinyint(1) NOT NULL DEFAULT '0',