More weapon fixes

This commit is contained in:
Xylemon 2024-09-01 02:12:11 -07:00
parent 8340ed9f79
commit 6929a15d0c
10 changed files with 55 additions and 33 deletions

View file

@ -43,3 +43,5 @@ set sk_item_smg1_large2 "225"
set sk_item_smg1_large3 "135"
set sk_item_smg1_grenade "1"
set sk_max_annebelle "12"

View file

@ -11,23 +11,25 @@
entityDef ammo_types {
"ammo_none" "0"
"ammo_357" "1"
"ammo_alyxgun" "2"
"ammo_ar2" "3"
"ammo_ar2_altfire" "4"
"ammo_buckshot" "5"
"ammo_crossbow" "6"
"ammo_grenade" "7"
"ammo_pistol" "8"
"ammo_slam" "9"
"ammo_smg1" "10"
"ammo_smg1_grenade" "11"
"ammo_annebelle" "2"
"ammo_alyxgun" "3"
"ammo_ar2" "4"
"ammo_ar2_altfire" "5"
"ammo_buckshot" "6"
"ammo_crossbow" "7"
"ammo_grenade" "8"
"ammo_pistol" "9"
"ammo_slam" "10"
"ammo_smg1" "11"
"ammo_smg1_grenade" "12"
"ammo_sniper" "13"
"ammo_rpg" "13"
"ammo_rpg" "14"
}
entityDef ammo_names {
"ammo_none" "None"
"ammo_357" ".357 Bullets"
"ammo_annebelle" "Annebelle Bullets"
"ammo_alyxgun" "Alyxgun Bullets"
"ammo_ar2" "AR2 Bullets"
"ammo_ar2_altfire" "AR2 Combine Balls"
@ -45,6 +47,7 @@ entityDef ammo_names {
entityDef ammo_max {
"ammo_none" "0"
"ammo_357" "skill:max_357"
"ammo_annebelle" "skill:max_annebelle"
"ammo_alyxgun" "skill:max_alyxgun"
"ammo_ar2" "skill:max_ar2"
"ammo_ar2_altfire" "skill:max_ar2_altfire"

View file

@ -13,14 +13,12 @@ entityDef weapon_annabelle
"snd_respawn" "item.respawn"
// weapon specific
"def_fireInfo" "fireInfo_shotgun"
"def_altFireInfo" "fireInfo_altShotgun"
"def_fireInfo" "fireInfo_annebelle"
"inv_name" "#HL2_Annabelle"
"clipSize" "2"
"ammoType" "ammo_buckshot"
"ammoType" "ammo_annabelle"
"ammoRequired" "1"
"actPump" "8"
"actHolster" "4"
"actReloadStart" "5"
"actReload" "6"
@ -36,4 +34,24 @@ entityDef weapon_annabelle
"hudSlot" "3"
"hudSlotPos" "1"
"weight" "4"
}
}
entityDef projectile_annebelle
{
"inherit" "projectile_bullet_base"
"damage" "skill:plr_dmg_buckshot"
"hitscans" "12"
"spread" "0.08716 0.08716"
}
entityDef fireInfo_annebelle
{
"def_onFire" "projectile_annebelle"
"ammoPerShot" "1"
"fireRate" "0.75"
"actFire" "1"
"actFireStop" "8"
"punchAngle" "-5 0 0"
"model_flash" "sprites/muzzleflash2.spr"
"snd_fire" "Weapon_Shotgun.Single"
}

View file

@ -43,8 +43,8 @@ entityDef fireInfo_ar2
"ammoType" "ammo_ar2"
"ammoRequired" "1"
"ammoPerShot" "1"
"fireRate" ".45"
"punchAngle" "-10 0 0"
"fireRate" "0.1"
"punchAngle" "-2 0 0"
"model_flash" "sprites/muzzleflash2.spr"
"actFire" "1,2,3,4"
"snd_fire" "Weapon_AR2.Single"

View file

@ -15,7 +15,8 @@ entityDef weapon_crossbow
// weapon specific
"def_fireInfo" "fireInfo_crossbow"
"inv_name" "#HL2_Crossbow"
"clipSize" "5"
"inv_ammo_crossbow" "4"
"clipSize" "1"
"actFire" "3"
"actFireLast" "6"
@ -26,7 +27,7 @@ entityDef weapon_crossbow
"actIdleEmpty" "1"
"snd_fire" "Weapon_Crossbow.Single"
"snd_reload" "Weapon_Crossbow.Reload"
// "snd_reload" "Weapon_Crossbow.Reload"
// HLWeapon specific
"hudSlot" "3"
@ -38,10 +39,9 @@ entityDef weapon_crossbow
entityDef fireInfo_crossbow
{
"def_onFire" "projectile_bolt"
"ammoType" "ammo_bolt"
"ammoType" "ammo_crossbow"
"ammoRequired" "1"
"ammoPerShot" "1"
"fireRate" "2.0"
"punchAngle" "-2 0 0"
}
@ -62,7 +62,7 @@ entityDef projectile_bolt
"bounce" "1"
"def_damage" "damage_boltDirect"
"model_detonate" "fx_spark.main"
"snd_explode" "Weapon_Crossbow.BoltElectrify"
"snd_explode" "Weapon_Crossbow.BoltFly"
"detonate_on_fuse" "0"
"detonate_on_death" "1"
"detonate_on_world" "1"

View file

@ -23,7 +23,7 @@ entityDef weapon_crowbar
"silent_fire" "1"
"meleeRateMiss" "0.5"
"meleeRateHit" "0.25"
"meleeRateHit" "0.45"
"actIdle" "0"
"actDraw" "1"

View file

@ -13,7 +13,7 @@ entityDef weapon_frag
"snd_respawn" "item.respawn"
"inv_name" "#HL2_Grenade"
"inv_weapon" "weapon_grenade"
"inv_weapon" "weapon_frag"
"inv_ammo_grenade" "5"
"def_onRelease" "projectile_grenade"
"def_explode_inhand" "env_grenade_explodeinhand"
@ -37,7 +37,7 @@ entityDef weapon_frag
"crosshair" "none"
}
entityDef projectile_frag
entityDef projectile_grenade
{
"spawnclass" "NSProjectile"
"model" "models/items/grenadeAmmo.mdl"

View file

@ -33,7 +33,7 @@ entityDef weapon_pistol
// HLWeapon specific
"hudSlot" "1"
"hudSlotPos" "0"
"weight" "2"
"weight" "2"
}
entityDef projectile_pistol
@ -48,7 +48,8 @@ entityDef fireInfo_pistol
"ammoType" "ammo_pistol"
"ammoRequired" "1"
"ammoPerShot" "1"
"fireRate" ".25"
"punchAngle" "-10 0 0"
"fireRate" "0.1"
"semiAuto" "1"
"punchAngle" "-1 0 0"
"model_flash" "sprites/muzzleflash2.spr"
}

View file

@ -30,8 +30,6 @@ entityDef weapon_shotgun
"snd_empty" "Weapon_Shotgun.Empty"
// "snd_reload" "Weapon_Shotgun.Reload"
// HLWeapon specific
"hudSlot" "3"
"hudSlotPos" "0"

View file

@ -76,8 +76,8 @@ entityDef fireInfo_smg1
"ammoType" "ammo_smg1"
"ammoRequired" "1"
"ammoPerShot" "1"
"fireRate" "0.1"
"punchAngle" "-10 0 0"
"fireRate" "0.085"
"punchAngle" "-2 0 0"
"model_flash" "sprites/muzzleflash2.spr"
"actFire" "1,2,3,4"
"snd_fire" "Weapon_SMG1.Single"