Skip to content

Commit

Permalink
Merge pull request #11 from JusCampin/General-Update
Browse files Browse the repository at this point in the history 
General update
  • Loading branch information
@JusCampin
JusCampin authored Sep 15, 2024
2 parents b816500 + 3591d55 commit 8c86ea9
Show file tree
Hide file tree
Showing 13 changed files with 902 additions and 616 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ combining AIMedic and Medical Script for VORP.

This script allows the choosing of NPC model, command, price, and multijob restriction for the
spawning of an AI Medic to pick you up. This has been improved upon from the original legacy_aimedic and legacy_medic.
It now includes an injury checking system. As a regular player you can check your last injury and the closest persons injury.
As a doctor you can check all of these and the patients pulse too!
It now includes an injury checking system. As a regular player you can check your pulse and last injury.
As a doctor you can check all of these and the patients stats too!

Also included, an injury and bleeding system set in the Config file. Stitches item will stop bleeding forever while bandage items stop the bleeding temporarily and saves to the database.
You will bleed from knife and gunshot injuries.
Expand Down
148 changes: 73 additions & 75 deletions client/Weapons.lua
View file
Original file line number Diff line number Diff line change
@@ -1,85 +1,83 @@
Knives = {
[tostring(GetHashKey('WEAPON_MELEE_KNIFE'))] = 'KNIFE',
[tostring(GetHashKey('WEAPON_MELEE_KNIFE_BEAR'))] = 'KNIFE BEAR',
[tostring(GetHashKey('WEAPON_MELEE_KNIFE_RUSTIC'))] = 'Knife Rustic',
[tostring(GetHashKey('WEAPON_MELEE_KNIFE_HORROR'))] = 'Knife Horror',
[tostring(GetHashKey('WEAPON_MELEE_KNIFE_CIVIL_WAR'))] = 'KNIFE CIVIL WAR',
[tostring(GetHashKey('WEAPON_MELEE_KNIFE_JAWBONE'))] = 'KNIFE JAWBONE',
[tostring(GetHashKey('WEAPON_MELEE_KNIFE_JOHN'))] = 'KNIFE JOHN',
[tostring(GetHashKey('WEAPON_MELEE_KNIFE_MINER'))] = 'KNIFE MINER',
[tostring(GetHashKey('WEAPON_MELEE_KNIFE_VAMPIRE'))] = 'KNIFE VAMPIRE',
[tostring(GetHashKey('WEAPON_MELEE_MACHETE'))] = 'MACHETE',
[tostring(GetHashKey('WEAPON_THROWN_THROWING_KNIVES'))] = 'THROWING KNIVES',
[tostring(GetHashKey('WEAPON_THROWN_TOMAHAWK'))] = 'TOMAHAWK',
[tostring(GetHashKey('WEAPON_THROWN_TOMAHAWK_ANCIENT'))] = 'TOMAHAWK ANCIENT',
[tostring(GetHashKey('WEAPON_MELEE_HATCHET_VIKING'))] = 'HATCHET VIKING',
[tostring(GetHashKey('WEAPON_MELEE_HATCHET_HUNTER_RUSTED'))] = 'HATCHET HUNTER RUSTED',
[tostring(GetHashKey('WEAPON_MELEE_HATCHET_HUNTER'))] = 'HATCHET HUNTER',
[tostring(GetHashKey('WEAPON_MELEE_HATCHET_HEWING'))] = 'HATCHET HEWING',
[tostring(GetHashKey('WEAPON_MELEE_HATCHET_DOUBLE_BIT_RUSTED'))] = 'HATCHET DOUBLE BIT RUSTED',
[tostring(GetHashKey('WEAPON_MELEE_HATCHET_DOUBLE_BIT'))] = 'HATCHET DOUBLE BIT',
[tostring(GetHashKey('WEAPON_MELEE_HATCHET'))] = 'HATCHET',
[tostring(GetHashKey('WEAPON_MELEE_CLEAVER'))] = 'CLEAVER',
[tostring(GetHashKey('WEAPON_MELEE_BROKEN_SWORD'))] = 'BROKEN SWORD',
[tostring(GetHashKey('WEAPON_MELEE_KNIFE_TRADER'))] = 'Knife Trader',
[tostring(GetHashKey('WEAPON_MELEE_ANCIENT_HATCHET'))] = 'ANCIENT HATCHET',
[tostring(GetHashKey('WEAPON_MACHETE_HORROR'))] = 'Machete Horror',
[tostring(GetHashKey('WEAPON_MELEE_MACHETE_COLLECTOR'))] = 'Machete Horror',


[`WEAPON_MELEE_KNIFE`] = 'KNIFE',
[`WEAPON_MELEE_KNIFE_BEAR`] = 'KNIFE BEAR',
[`WEAPON_MELEE_KNIFE_RUSTIC`] = 'Knife Rustic',
[`WEAPON_MELEE_KNIFE_HORROR`] = 'Knife Horror',
[`WEAPON_MELEE_KNIFE_CIVIL_WAR`] = 'KNIFE CIVIL WAR',
[`WEAPON_MELEE_KNIFE_JAWBONE`] = 'KNIFE JAWBONE',
[`WEAPON_MELEE_KNIFE_JOHN`] = 'KNIFE JOHN',
[`WEAPON_MELEE_KNIFE_MINER`] = 'KNIFE MINER',
[`WEAPON_MELEE_KNIFE_VAMPIRE`] = 'KNIFE VAMPIRE',
[`WEAPON_MELEE_MACHETE`] = 'MACHETE',
[`WEAPON_THROWN_THROWING_KNIVES`] = 'THROWING KNIVES',
[`WEAPON_THROWN_TOMAHAWK`] = 'TOMAHAWK',
[`WEAPON_THROWN_TOMAHAWK_ANCIENT`] = 'TOMAHAWK ANCIENT',
[`WEAPON_MELEE_HATCHET_VIKING`] = 'HATCHET VIKING',
[`WEAPON_MELEE_HATCHET_HUNTER_RUSTED`] = 'HATCHET HUNTER RUSTED',
[`WEAPON_MELEE_HATCHET_HUNTER`] = 'HATCHET HUNTER',
[`WEAPON_MELEE_HATCHET_HEWING`] = 'HATCHET HEWING',
[`WEAPON_MELEE_HATCHET_DOUBLE_BIT_RUSTED`] = 'HATCHET DOUBLE BIT RUSTED',
[`WEAPON_MELEE_HATCHET_DOUBLE_BIT`] = 'HATCHET DOUBLE BIT',
[`WEAPON_MELEE_HATCHET`] = 'HATCHET',
[`WEAPON_MELEE_CLEAVER`] = 'CLEAVER',
[`WEAPON_MELEE_BROKEN_SWORD`] = 'BROKEN SWORD',
[`WEAPON_MELEE_KNIFE_TRADER`] = 'Knife Trader',
[`WEAPON_MELEE_ANCIENT_HATCHET`] = 'ANCIENT HATCHET',
[`WEAPON_MACHETE_HORROR`] = 'Machete Horror',
[`WEAPON_MELEE_MACHETE_COLLECTOR`] = 'Machete Horror',
}

Blunt = {
[tostring(GetHashKey('WEAPON_UNARMED'))] = 'Unarmed',
[`WEAPON_UNARMED`] = 'Unarmed',
}

Guns = {
[tostring(GetHashKey('WEAPON_PISTOL_M1899'))] = 'PISTOL M1899',
[tostring(GetHashKey('WEAPON_PISTOL_MAUSER'))] = 'PISTOL MAUSER',
[tostring(GetHashKey('WEAPON_PISTOL_MAUSER_DRUNK'))] = 'PISTOL MAUSER DRUNK',
[tostring(GetHashKey('WEAPON_PISTOL_SEMIAUTO'))] = 'PISTOL SEMIAUTO',
[tostring(GetHashKey('WEAPON_PISTOL_VOLCANIC'))] = 'PISTOL VOLCANIC',
[tostring(GetHashKey('WEAPON_REPEATER_CARBINE'))] = 'REPEATER CARBINE',
[tostring(GetHashKey('WEAPON_REPEATER_EVANS'))] = 'REPEATER EVANS',
[tostring(GetHashKey('WEAPON_REPEATER_HENRY'))] = 'REPEATER HENR',
[tostring(GetHashKey('WEAPON_REVOLVER_NAVY'))] = 'Revolver Navy',
[tostring(GetHashKey('WEAPON_REVOLVER_NAVY_CROSSOVER'))] = 'Revolver Navy Crossover',
[tostring(GetHashKey('WEAPON_REPEATER_WINCHESTER'))] = 'REPEATER WINCHESTER',
[tostring(GetHashKey('WEAPON_REVOLVER_CATTLEMAN'))] = 'REVOLVER CATTLEMAN',
[tostring(GetHashKey('WEAPON_REVOLVER_CATTLEMAN_JOHN'))] = 'REVOLVER CATTLEMAN JOHN',
[tostring(GetHashKey('WEAPON_REVOLVER_CATTLEMAN_MEXICAN'))] = 'REVOLVER CATTLEMAN MEXICAN',
[tostring(GetHashKey('WEAPON_REVOLVER_CATTLEMAN_PIG'))] = 'REVOLVER CATTLEMAN PIG',
[tostring(GetHashKey('WEAPON_REVOLVER_DOUBLEACTION'))] = 'REVOLVER DOUBLEACTION',
[tostring(GetHashKey('WEAPON_REVOLVER_DOUBLEACTION_EXOTIC'))] = 'REVOLVER DOUBLEACTION EXOTIC',
[tostring(GetHashKey('WEAPON_REVOLVER_DOUBLEACTION_GAMBLER'))] = 'REVOLVER DOUBLEACTION GAMBLER',
[tostring(GetHashKey('WEAPON_REVOLVER_DOUBLEACTION_MICAH'))] = 'REVOLVER DOUBLEACTION MICAH',
[tostring(GetHashKey('WEAPON_REVOLVER_LEMAT'))] = 'REVOLVER LEMAT',
[tostring(GetHashKey('WEAPON_REVOLVER_SCHOFIELD'))] = 'REVOLVER SCHOFIELD',
[tostring(GetHashKey('WEAPON_REVOLVER_SCHOFIELD_CALLOWAY'))] = 'REVOLVER SCHOFIELD CALLOWAY',
[tostring(GetHashKey('WEAPON_REVOLVER_SCHOFIELD_GOLDEN'))] = 'REVOLVER SCHOFIELD GOLDEN',
[tostring(GetHashKey('WEAPON_RIFLE_BOLTACTION'))] = 'RIFLE BOLTACTION',
[tostring(GetHashKey('WEAPON_RIFLE_SPRINGFIELD'))] = 'RIFLE SPRINGFIELD',
[tostring(GetHashKey('WEAPON_RIFLE_VARMINT'))] = 'RIFLE VARMINT',
[tostring(GetHashKey('WEAPON_RIFLE_ELEPHANT'))] = 'Elephant Rifle',
[tostring(GetHashKey('WEAPON_SHOTGUN_DOUBLEBARREL'))] = 'SHOTGUN DOUBLEBARREL',
[tostring(GetHashKey('WEAPON_SHOTGUN_DOUBLEBARREL_EXOTIC'))] = 'SHOTGUN DOUBLEBARREL EXOTIC',
[tostring(GetHashKey('WEAPON_SHOTGUN_PUMP'))] = 'SHOTGUN PUMP',
[tostring(GetHashKey('WEAPON_SHOTGUN_REPEATING'))] = 'SHOTGUN REPEATING',
[tostring(GetHashKey('WEAPON_SHOTGUN_SAWEDOFF'))] = 'SHOTGUN SAWEDOFF',
[tostring(GetHashKey('WEAPON_SHOTGUN_SEMIAUTO'))] = 'SHOTGUN SEMIAUTO',
[tostring(GetHashKey('WEAPON_SNIPERRIFLE_CARCANO'))] = 'SNIPERRIFLE CARCANO',
[tostring(GetHashKey('WEAPON_SNIPERRIFLE_ROLLINGBLOCK'))] = 'SNIPERRIFLE ROLLINGBLOCK',
[tostring(GetHashKey('WEAPON_SNIPERRIFLE_ROLLINGBLOCK_EXOTIC'))] = 'SNIPERRIFLE ROLLINGBLOCK EXOTIC',
[tostring(GetHashKey('WEAPON_BOW_IMPROVED'))] = 'Improved Bow',
[tostring(GetHashKey('WEAPON_BOW'))] = 'BOW'
[`WEAPON_PISTOL_M1899`] = 'PISTOL M1899',
[`WEAPON_PISTOL_MAUSER`] = 'PISTOL MAUSER',
[`WEAPON_PISTOL_MAUSER_DRUNK`] = 'PISTOL MAUSER DRUNK',
[`WEAPON_PISTOL_SEMIAUTO`] = 'PISTOL SEMIAUTO',
[`WEAPON_PISTOL_VOLCANIC`] = 'PISTOL VOLCANIC',
[`WEAPON_REPEATER_CARBINE`] = 'REPEATER CARBINE',
[`WEAPON_REPEATER_EVANS`] = 'REPEATER EVANS',
[`WEAPON_REPEATER_HENRY`] = 'REPEATER HENR',
[`WEAPON_REVOLVER_NAVY`] = 'Revolver Navy',
[`WEAPON_REVOLVER_NAVY_CROSSOVER`] = 'Revolver Navy Crossover',
[`WEAPON_REPEATER_WINCHESTER`] = 'REPEATER WINCHESTER',
[`WEAPON_REVOLVER_CATTLEMAN`] = 'REVOLVER CATTLEMAN',
[`WEAPON_REVOLVER_CATTLEMAN_JOHN`] = 'REVOLVER CATTLEMAN JOHN',
[`WEAPON_REVOLVER_CATTLEMAN_MEXICAN`] = 'REVOLVER CATTLEMAN MEXICAN',
[`WEAPON_REVOLVER_CATTLEMAN_PIG`] = 'REVOLVER CATTLEMAN PIG',
[`WEAPON_REVOLVER_DOUBLEACTION`] = 'REVOLVER DOUBLEACTION',
[`WEAPON_REVOLVER_DOUBLEACTION_EXOTIC`] = 'REVOLVER DOUBLEACTION EXOTIC',
[`WEAPON_REVOLVER_DOUBLEACTION_GAMBLER`] = 'REVOLVER DOUBLEACTION GAMBLER',
[`WEAPON_REVOLVER_DOUBLEACTION_MICAH`] = 'REVOLVER DOUBLEACTION MICAH',
[`WEAPON_REVOLVER_LEMAT`] = 'REVOLVER LEMAT',
[`WEAPON_REVOLVER_SCHOFIELD`] = 'REVOLVER SCHOFIELD',
[`WEAPON_REVOLVER_SCHOFIELD_CALLOWAY`] = 'REVOLVER SCHOFIELD CALLOWAY',
[`WEAPON_REVOLVER_SCHOFIELD_GOLDEN`] = 'REVOLVER SCHOFIELD GOLDEN',
[`WEAPON_RIFLE_BOLTACTION`] = 'RIFLE BOLTACTION',
[`WEAPON_RIFLE_SPRINGFIELD`] = 'RIFLE SPRINGFIELD',
[`WEAPON_RIFLE_VARMINT`] = 'RIFLE VARMINT',
[`WEAPON_RIFLE_ELEPHANT`] = 'Elephant Rifle',
[`WEAPON_SHOTGUN_DOUBLEBARREL`] = 'SHOTGUN DOUBLEBARREL',
[`WEAPON_SHOTGUN_DOUBLEBARREL_EXOTIC`] = 'SHOTGUN DOUBLEBARREL EXOTIC',
[`WEAPON_SHOTGUN_PUMP`] = 'SHOTGUN PUMP',
[`WEAPON_SHOTGUN_REPEATING`] = 'SHOTGUN REPEATING',
[`WEAPON_SHOTGUN_SAWEDOFF`] = 'SHOTGUN SAWEDOFF',
[`WEAPON_SHOTGUN_SEMIAUTO`] = 'SHOTGUN SEMIAUTO',
[`WEAPON_SNIPERRIFLE_CARCANO`] = 'SNIPERRIFLE CARCANO',
[`WEAPON_SNIPERRIFLE_ROLLINGBLOCK`] = 'SNIPERRIFLE ROLLINGBLOCK',
[`WEAPON_SNIPERRIFLE_ROLLINGBLOCK_EXOTIC`] = 'SNIPERRIFLE ROLLINGBLOCK EXOTIC',
[`WEAPON_BOW_IMPROVED`] = 'Improved Bow',
[`WEAPON_BOW`] = 'BOW'
}

WeaponNames = {
[tostring(GetHashKey('WEAPON_MOONSHINEJUG'))] = 'MOONSHINEJUG',
[tostring(GetHashKey('OBJECT'))] = 'Object',
[tostring(GetHashKey('WEAPON_THROWN_DYNAMITE'))] = 'DYNAMITE',
[tostring(GetHashKey('WEAPON_THROWN_MOLOTOV'))] = 'MOLOTOV',
[tostring(GetHashKey('WEAPON_LASSO'))] = 'LASSO',
[tostring(GetHashKey('WEAPON_LASSO_REINFORCED'))] = 'Reinforced Lasso',
[tostring(GetHashKey('WEAPON_FISHINGROD'))] = 'FISHINGROD',
}
[`WEAPON_MOONSHINEJUG`] = 'MOONSHINEJUG',
[`OBJECT`] = 'Object',
[`WEAPON_THROWN_DYNAMITE`] = 'DYNAMITE',
[`WEAPON_THROWN_MOLOTOV`] = 'MOLOTOV',
[`WEAPON_LASSO`] = 'LASSO',
[`WEAPON_LASSO_REINFORCED`] = 'Reinforced Lasso',
[`WEAPON_FISHINGROD`] = 'FISHINGROD',
}
Loading

0 comments on commit 8c86ea9

Please sign in to comment.