Skip to content

Commit

Permalink
some npc shotgun stuff
Browse files Browse the repository at this point in the history
- add the higher quality model for npc mosconi from SH
- buff the npc ksg damage to base 180
- fix npc mosconi dealing like an actual thousand damage
- fix YET ANOTHER u240.3 crash involving female_biker tweaktable

Co-Authored-By: Sebastian Gabl (aka Hoppip) <[email protected]>
  • Loading branch information
nikitawastaken and segabl committed Jan 4, 2024
1 parent a65bf95 commit d09834d
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 23 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

2 changes: 2 additions & 0 deletions lua/charactertweakdata.lua
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ Hooks:PostHook(CharacterTweakData, "init", "eclipse_init", function(self)
self.cop.weapon = self.presets.weapon.base
self.gangster.weapon = self.presets.weapon.base
self.biker.weapon = self.presets.weapon.base
self.biker_female.weapon = self.presets.weapon.base
self.biker_escape.weapon = self.presets.weapon.base
self.triad.weapon = self.presets.weapon.base
self.mobster.weapon = self.presets.weapon.base
Expand Down Expand Up @@ -863,6 +864,7 @@ Hooks:PostHook(CharacterTweakData, "init", "eclipse_init", function(self)
-- Set chatter presets
self.mobster.chatter = self.presets.enemy_chatter.gangster
self.biker.chatter = self.presets.enemy_chatter.gangster
self.biker_female.chatter = self.presets.enemy_chatter.gangster
self.biker_escape.chatter = self.presets.enemy_chatter.gangster
self.bolivian.chatter = self.presets.enemy_chatter.gangster
self.bolivian_indoors.chatter = self.presets.enemy_chatter.gangster
Expand Down
5 changes: 2 additions & 3 deletions lua/weapontweakdata.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1729,6 +1729,7 @@ self.system.use_data.selection_index = SELECTION.UNDERBARREL_PRIMARY
self.benelli_npc.DAMAGE = 1
self.benelli_npc.CLIP_AMMO_MAX = 8
self.ksg_npc = deep_clone(self.r870_npc)
self.ksg_npc.DAMAGE = 1.2

-- dozer guns
self.m249_npc.DAMAGE = 1
Expand All @@ -1749,6 +1750,7 @@ self.system.use_data.selection_index = SELECTION.UNDERBARREL_PRIMARY
self.shepheard_npc = deep_clone(self.mp5_npc)

-- misc guns
self.mossberg_npc.DAMAGE = 1
self.raging_bull_npc.DAMAGE = 1
self.ak47_ass_npc.DAMAGE = 1
self.ak47_ass_npc.auto.fire_rate = 0.2
Expand All @@ -1769,9 +1771,6 @@ self.system.use_data.selection_index = SELECTION.UNDERBARREL_PRIMARY
self.ksg_npc.sounds.prefix = "keltec_npc"
self.beretta92_npc.has_suppressor = "suppressed_b"
self.mossberg_npc.anim_usage = "is_shotgun_pump"
self.mossberg_npc.CLIP_AMMO_MAX = 2
self.mossberg_npc.shell_ejection = "effects/payday2/particles/weapons/shells/shell_empty"
self.mossberg_npc.sounds.prefix = self.huntsman_crew.sounds.prefix
self.mossberg_npc.usage = "is_double_barrel"
self.m14_sniper_npc.trail = "effects/particles/weapons/sniper_trail"
self.svd_snp_npc.trail = "effects/particles/weapons/sniper_trail"
Expand Down
6 changes: 5 additions & 1 deletion supermod.xml
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,11 @@
<!-- new weapons -->
<group name="units/payday2/weapons/">

<!-- huntsman retexture/model -->
<file :name="wpn_npc_sawnoff_shotgun/sawnoff_df.texture"/>
<file :name="wpn_npc_sawnoff_shotgun/sawnoff_nm.texture"/>
<file :name="wpn_npc_sawnoff_shotgun/wpn_npc_sawnoff_shotgun.model"/>

<!-- ksg -->
<file :name="wpn_npc_ksg/ksg_df.texture"/>
<file :name="wpn_npc_ksg/ksg_nm.texture"/>
Expand All @@ -294,7 +299,6 @@

<!-- ump & huntsman sound -->
<file :name="wpn_npc_ump/wpn_npc_ump.unit" dyn_package="false"/>
<file :name="wpn_npc_sawnoff_shotgun/wpn_npc_sawnoff_shotgun.unit" dyn_package="false"/>
</group>

<!-- zeals -->
Expand Down

0 comments on commit d09834d

Please sign in to comment.