Merge branch 'master' into patch-3

locales/br.lua

@@ -133,5 +133,18 @@
       ['weapon_flashlight'] = 'laterna',
       ['gadget_nightvision'] = 'visão noturna',
       ['gadget_parachute'] = 'paraquedas',
-    }
-
+      ['weapon_flare'] = 'Flare',
+      ['weapon_snspistol_mk2'] = 'Pistola SNS  Mk II',
+      ['weapon_revolver_mk2'] = 'Revolver Pesada Mk II',
+      ['weapon_doubleaction'] = 'Revolver Dupla-acao',
+      ['weapon_specialcarabine_mk2'] = 'Carabina Especial Mk II',
+      ['weapon_bullpruprifle_mk2'] = 'Bullpup Rifle Mk II',
+      ['weapon_pumpshotgun_mk2'] = 'Espingarda Mk II',
+      ['weapon_marksmanrifle_mk2'] = 'Rifle Marksman Mk II',  
+      ['weapon_assaultrifle_mk2'] = 'Rifle de assalto Mk II ',  
+      ['weapon_carbinerifle_mk2'] = 'Carabina Mk II ',  
+      ['weapon_combatmg_mk2'] = 'MG de Combate Mk II',  
+      ['weapon_heavysniper_mk2'] = 'Sniper pesada Mk II',  
+      ['weapon_pistol_mk2'] = 'Pistola Mk II',  
+      ['weapon_smg_mk2'] = 'SMG Mk II', 
+}

localization/br_es_extened.sql

@@ -0,0 +1,69 @@
+    USE `essentialmode`;
+
+    ALTER TABLE `users`
+      ADD COLUMN `name` VARCHAR(255) NULL DEFAULT '' AFTER `money`,
+      ADD COLUMN `skin` LONGTEXT NULL AFTER `name`,
+      ADD COLUMN `job` varchar(255) NULL DEFAULT 'unemployed' AFTER `skin`,
+      ADD COLUMN `job_grade` INT NULL DEFAULT 0 AFTER `job`,
+      ADD COLUMN `loadout` LONGTEXT NULL AFTER `job_grade`,
+      ADD COLUMN `position` VARCHAR(255) NULL AFTER `loadout`
+    ;
+
+    CREATE TABLE `items` (
+
+      `id` int(11) NOT NULL AUTO_INCREMENT,
+      `name` varchar(255) NOT NULL,
+      `label` varchar(255) NOT NULL,
+      `limit` int(11) NOT NULL DEFAULT '-1',
+      `rare` int(11) NOT NULL DEFAULT '0',
+      `can_remove` int(11) NOT NULL DEFAULT '1',
+
+      PRIMARY KEY (`id`)
+    );
+
+    CREATE TABLE `job_grades` (
+
+      `id` int(11) NOT NULL AUTO_INCREMENT,
+      `job_name` varchar(255) DEFAULT NULL,
+      `grade` int(11) NOT NULL,
+      `name` varchar(255) NOT NULL,
+      `label` varchar(255) NOT NULL,
+      `salary` int(11) NOT NULL,
+      `skin_male` longtext NOT NULL,
+      `skin_female` longtext NOT NULL,
+
+      PRIMARY KEY (`id`)
+    );
+
+    INSERT INTO `job_grades` VALUES (1,'unemployed',0,'rsa','Desempregado',200,'{}','{}');
+
+    CREATE TABLE `jobs` (
+
+      `id` int(11) NOT NULL AUTO_INCREMENT,
+      `name` varchar(255) NOT NULL,
+      `label` varchar(255) DEFAULT NULL,
+
+      PRIMARY KEY (`id`)
+    );
+
+    INSERT INTO `jobs` VALUES (1,'unemployed','Desempregado');
+
+    CREATE TABLE `user_accounts` (
+
+      `id` int(11) NOT NULL AUTO_INCREMENT,
+      `identifier` varchar(255) NOT NULL,
+      `name` varchar(255) NOT NULL,
+      `money` double NOT NULL DEFAULT '0',
+
+      PRIMARY KEY (`id`)
+    );
+
+    CREATE TABLE `user_inventory` (
+
+      `id` int(11) NOT NULL AUTO_INCREMENT,
+      `identifier` varchar(255) NOT NULL,
+      `item` varchar(255) NOT NULL,
+      `count` int(11) NOT NULL,
+
+      PRIMARY KEY (`id`)
+    );