Skip to content
This repository was archived by the owner on Jul 14, 2020. It is now read-only.

Add more weapons/Ammo #5

Merged
merged 1 commit into from
May 22, 2020
Merged

Add more weapons/Ammo #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
276 changes: 263 additions & 13 deletions configs/config.weapons.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,78 @@
Config.AmmoTypes = {
UNUSABLE = { label = _U('ammo_unusable'), hash = 0 },
MOONSHINEJUG = {},
LASSO = { hash = 0xEAD00129 },
FISHINGROD = {},
THROWING_KNIVES = {},
TOMAHAWK = {},
TOMAHAWK_ANCIENT = {},
PISTOL = {},
REPEATER = {},
REVOLVER = {},
--PISTOLS
PISTOL = { hash = 0x743D4F54 },
PISTOL_EXPRESS = {},
PISTOL_EXPRESS_EXPLOSIVE = {},
PISTOL_HIGH_VELOCITY = {},
PISTOL_SPLIT_POINT = {},
--REPEATER
REPEATER = { hash = 0xB0B80B9A },
REPEATER_EXPRESS = {},
REPEATER_EXPRESS_EXPLOSIVE = {},
REPEATER_HIGH_VELOCITY = {},
--REVOLVER
REVOLVER = {hash = 0x64356159 },
REVOLVER_EXPRESS = {},
REVOLVER_EXPRESS_EXPLOSIVE = {},
REVOLVER_HIGH_VELOCITY = {},
REVOLVER_SPLIT_POINT = {},
--Riffle
RIFLE = {},
SHOTGUN = {},
ARROW = {},
DYNAMITE = {},
MOLOTOV = {},
RIFLE_EXPRESS = {},
RIFLE_EXPRESS_EXPLOSIVE = {},
RIFLE_HIGH_VELOCITY = {},
RIFLE_SPLIT_POINT = {},
RIFLE_VARMINT = { hash = 0x7DF4D025 },
--Shotgun
SHOTGUN = { hash = 0x90083D3B},
SHOTGUN_BUCKSHOT_INCENDIARY = {},
SHOTGUN_EXPRESS_EXPLOSIVE = {},
SHOTGUN_SLUG = {},
--SNIPER
SNIPER_RIFLE = { hash = 0xD05319F },
--BOW
ARROW = { hash = 0x38E6F55F },
ARROW_DYNAMITE = {},
ARROW_FIRE = {},
ARROW_IMPROVED = {},
ARROW_POISON = {},
ARROW_SMALL_GAME = {},
ARROW_CONFUSION = {},
ARROW_DISORIENT = {},
ARROW_DRAIN = {},
ARROW_TRAIL = {},
ARROW_WOUND = {},
--THROWABLES
DYNAMITE = { hash = 0x1C9D6E9D },
DYNAMITE_VOLATILE = {},
MOLOTOV = { hash = 0x5633F9D5 },
MOLOTOV_VOLATILE = {},
THROWING_KNIVES = { hash = 0x9E4AD291 },
THROWING_KNIVES_IMPROVED = {},
THROWING_KNIVES_POISON = {},
THROWING_KNIVES_JAVIER = { hash = 0xF51D1AC7},
THROWING_KNIVES_CONFUSE = {},
THROWING_KNIVES_DISORIENT = {},
THROWING_KNIVES_DRAIN = {},
THROWING_KNIVES_TRAIL = {},
THROWING_KNIVES_WOUND = {},
HATCHET = { hash = 0x194631D6 },
HATCHET_CLEAVER = { hash = 0xB925EC32 },
HATCHET_DOUBLE_BIT = { hash = 0x63A5047F },
HATCHET_DOUBLE_BIT_RUSTED = { hash = 0xCABE0C0F },
HATCHET_HEWING = { hash = 0x8507C1F7 },
HATCHET_ANCIENT = { hash = 0xA9708E57 },
HATCHET_HUNTER = { hash = 0x1AA32EB0 },
HATCHET_HUNTER_RUSTED = { hash = 0xBEDC8EB6 },
HATCHET_VIKING = { hash = 0xE501537B },
TOMAHAWK = { hash = 0x49A985D7 },
TOMAHAWK_HOMING = {},
TOMAHAWK_IMPROVED = {},
TOMAHAWK_ANCIENT = {hash = 0xF25D45BC }
}

for name, _ in pairs(Config.AmmoTypes) do
Expand Down Expand Up @@ -171,8 +231,8 @@ Config.Weapons = {
name = 'WEAPON_RIFLE_VARMINT',
key = 'w_repeater_pumpaction01',
hash = GetHashKey('WEAPON_RIFLE_VARMINT'),
ammo = Config.AmmoTypes.REPEATER,
group = Config.WeaponGroups.REPEATER,
ammo = Config.AmmoTypes.RIFLE_VARMINT,
group = Config.WeaponGroups.RIFLE,
label = _U('weapon_rifle_varmint'),
components = {}
},
Expand Down Expand Up @@ -396,7 +456,15 @@ Config.Weapons = {
name = 'WEAPON_BOW',
key = 'w_sp_bowarrow',
hash = GetHashKey('WEAPON_BOW'),
ammo = Config.AmmoTypes.ARROW,
ammo =
{
Config.AmmoTypes.ARROW,
Config.AmmoTypes.ARROW_FIRE,
Config.AmmoTypes.ARROW_DYNAMITE,
Config.AmmoTypes.ARROW_SMALL_GAME,
Config.AmmoTypes.ARROW_IMPROVED,
Config.AmmoTypes.ARROW_POISON
},
group = Config.WeaponGroups.BOW,
label = _U('weapon_bow'),
components = {}
Expand All @@ -418,5 +486,187 @@ Config.Weapons = {
group = Config.WeaponGroups.MELEE_THROWABLE,
label = _U('weapon_thrown_molotov'),
components = {}
},
{
name = 'WEAPON_LASSO',
key = 'w_melee_lasso01',
hash = GetHashKey('WEAPON_LASSO'),
ammo = Config.AmmoTypes.LASSO,
group = Config.WeaponGroups.LASSO,
label = _U('weapon_lasso'),
components = {}
},
{
name = 'WEAPON_MELEE_LANTERN_ELECTRIC',
key = 's_interact_lantern03x_pickup',
hash = GetHashKey('WEAPON_MELEE_LANTERN_ELECTRIC'),
ammo = Config.AmmoTypes.UNUSABLE,
group = Config.WeaponGroups.MELEE,
label = _U('weapon_melee_lantern_electric'),
components = {}
},
{
name = 'WEAPON_MELEE_TORCH',
key = 's_interact_torch',
hash = GetHashKey(''),
ammo = Config.AmmoTypes.UNUSABLE,
group = Config.WeaponGroups.MELEE,
label = _U('weapon_melee_torch'),
components = {}
},
{
name = 'WEAPON_MELEE_BROKEN_SWORD',
key = 'w_melee_brokenSword01',
hash = GetHashKey('WEAPON_MELEE_BROKEN_SWORD'),
ammo = Config.AmmoTypes.UNUSABLE,
group = Config.WeaponGroups.MELEE,
label = _U('weapon_melee_broken_sword'),
components = {}
},
{
name = 'WEAPON_MELEE_HATCHET',
key = 'w_melee_hatchet01',
hash = GetHashKey('WEAPON_MELEE_HATCHET'),
ammo = Config.AmmoTypes.HATCHET,
group = Config.WeaponGroups.MELEE_THROWABLE,
label = _U('weapon_melee_hatchet'),
components = {}
},
{
name = 'WEAPON_MELEE_CLEAVER',
key = 'w_melee_hatchet02',
hash = GetHashKey('WEAPON_MELEE_CLEAVER'),
ammo = Config.AmmoTypes.HATCHET_CLEAVER,
group = Config.WeaponGroups.MELEE_THROWABLE,
label = _U('weapon_melee_cleaver'),
components = {}
},
{
name = 'WEAPON_MELEE_ANCIENT_HATCHET',
key = 'w_melee_hatchet03',
hash = GetHashKey('WEAPON_MELEE_ANCIENT_HATCHET'),
ammo = Config.AmmoTypes.HATCHET_ANCIENT,
group = Config.WeaponGroups.MELEE_THROWABLE,
label = _U('weapon_melee_ancient_hatchet'),
components = {}
},
{
name = 'WEAPON_MELEE_HATCHET_VIKING',
key = 'w_melee_hatchet04',
hash = GetHashKey('WEAPON_MELEE_HATCHET_VIKING'),
ammo = Config.AmmoTypes.HATCHET_VIKING,
group = Config.WeaponGroups.MELEE_THROWABLE,
label = _U('weapon_melee_hatchet_viking'),
components = {}
},
{
name = 'WEAPON_MELEE_HATCHET_HEWING',
key = 'w_melee_hatchet05',
hash = GetHashKey('WEAPON_MELEE_HATCHET_HEWING'),
ammo = Config.AmmoTypes.HATCHET_HEWING,
group = Config.WeaponGroups.MELEE_THROWABLE,
label = _U('weapon_melee_hatchet_hewing'),
components = {}
},
{
name = 'WEAPON_MELEE_HATCHET_DOUBLE_BIT',
key = 'w_melee_hatchet06',
hash = GetHashKey('WEAPON_MELEE_HATCHET_DOUBLE_BIT'),
ammo = Config.AmmoTypes.HATCHET_DOUBLE_BIT,
group = Config.WeaponGroups.MELEE_THROWABLE,
label = _U('weapon_melee_hatchet_double_bit'),
components = {}
},
{
name = 'WEAPON_MELEE_HATCHET_DOUBLE_BIT_RUSTED',
key = 'w_melee_hatchet06',
hash = GetHashKey('WEAPON_MELEE_HATCHET_DOUBLE_BIT_RUSTED'),
ammo = Config.AmmoTypes.HATCHET_DOUBLE_BIT_RUSTED,
group = Config.WeaponGroups.MELEE_THROWABLE,
label = _U('weapon_melee_hatchet_double_bit_rusted'),
components = {}
},
{
name = 'WEAPON_MELEE_HATCHET_HUNTER',
key = 'w_melee_hatchet07',
hash = GetHashKey('WEAPON_MELEE_HATCHET_HUNTER'),
ammo = Config.AmmoTypes.HATCHET_HUNTER,
group = Config.WeaponGroups.MELEE_THROWABLE,
label = _U('weapon_melee_hatchet_hunter'),
components = {}
},
{
name = 'WEAPON_MELEE_HATCHET_HUNTER_RUSTED',
key = 'w_melee_hatchet07',
hash = GetHashKey('WEAPON_MELEE_HATCHET_HUNTER_RUSTED'),
ammo = Config.AmmoTypes.HATCHET_HUNTER_RUSTED,
group = Config.WeaponGroups.MELEE_THROWABLE,
label = _U('weapon_melee_hatchet_hunter_rusted'),
components = {}
},
{
name = 'WEAPON_MELEE_KNIFE_JOHN',
key = 'w_melee_knife01',
hash = GetHashKey('WEAPON_MELEE_KNIFE_JOHN'),
group = Config.WeaponGroups.MELEE,
label = _U('weapon_melee_knife_john'),
components = {}
},
{
name = 'WEAPON_MELEE_KNIFE',
key = 'w_melee_knife02',
hash = GetHashKey('WEAPON_MELEE_KNIFE'),
group = Config.WeaponGroups.MELEE,
label = _U('weapon_melee_knife'),
components = {}
},
{
name = 'WEAPON_MELEE_KNIFE_JAWBONE',
key = 'w_melee_knife03',
hash = GetHashKey('WEAPON_MELEE_KNIFE_JAWBONE'),
group = Config.WeaponGroups.MELEE,
label = _U('weapon_melee_knife_jawbone'),
components = {}
},

{
name = 'WEAPON_MELEE_KNIFE_MINER',
key = 'w_melee_knife14',
hash = GetHashKey('WEAPON_MELEE_KNIFE_MINER'),
group = Config.WeaponGroups.MELEE,
label = _U('weapon_melee_knife_miner'),
components = {}
},
{
name = 'WEAPON_MELEE_KNIFE_CIVIL_WAR',
key = 'w_melee_knife16',
hash = GetHashKey('WEAPON_MELEE_KNIFE_CIVIL_WAR'),
group = Config.WeaponGroups.MELEE,
label = _U('weapon_melee_knife_civil_war'),
components = {}
},
{
name = 'WEAPON_MELEE_KNIFE_BEAR',
key = 'w_melee_knife17',
hash = GetHashKey('WEAPON_MELEE_KNIFE_BEAR'),
group = Config.WeaponGroups.MELEE,
label = _U('weapon_melee_knife_bear'),
components = {}
},
{
name = 'WEAPON_MELEE_KNIFE_VAMPIRE',
key = 'w_melee_knife18',
hash = GetHashKey('WEAPON_MELEE_KNIFE_VAMPIRE'),
group = Config.WeaponGroups.MELEE,
label = _U('weapon_melee_knife_vampire'),
components = {}
},
{
name = 'WEAPON_MELEE_MACHETE',
key = 'w_melee_machete01',
hash = GetHashKey('WEAPON_MELEE_MACHETE'),
group = Config.WeaponGroups.MELEE,
label = _U('weapon_melee_knife_machete'),
components = {}
}
}
22 changes: 22 additions & 0 deletions locales/en.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,28 @@ Locales['en'] = {
['weapon_bow'] = 'Bow',
['weapon_thrown_dynamite'] = 'Dynamite',
['weapon_thrown_molotov'] = 'Molotov',
['weapon_lasso'] = 'Lasso',
['weapon_melee_lantern'] = 'Electric Lantern',
['weapon_melee_torch'] = 'Torch',
['weapon_melee_broken_sword'] = 'Broken Sword',
['weapon_melee_hatchet'] = 'Hatchet',
['weapon_melee_cleaver'] = 'Cleaver',
['weapon_melee_ancient_hatchet'] = 'Ancient Hatchet',
['weapon_melee_hatchet_viking'] = 'Viking Hatchet',
['weapon_melee_hatchet_hewing'] = 'Hewing Hatchet',
['weapon_melee_hatchet_double_bit'] = 'Double-Bit Hatchet',
['weapon_melee_hatchet_double_bit_rusted'] = 'Rusted Double-Bit Hatchet',
['weapon_melee_hatchet_hunter'] = 'Hunter Hatchet',
['weapon_melee_hatchet_hunter_rusted'] = 'Rusted Hunter Hatchet',
['weapon_melee_knife_john'] = 'John\'s Knife',
['weapon_melee_knife'] = 'Knife',
['weapon_melee_knife_jawbone'] = 'Jawbone Knife',
['weapon_melee_knife_miner'] = 'Miner Knife',
['weapon_melee_knife_civil_war'] = 'Civil War Knife',
['weapon_melee_knife_bear'] = 'Antler Knife',
['weapon_melee_knife_vampire'] = 'Ornate Dagger',
['weapon_melee_knife_machete'] = 'Machete',


-- Weapon groups
['group_revolver'] = 'Revolvers',
Expand Down