Skip to content

Enhanced custom weapons support #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Oct 25, 2023
Merged

Enhanced custom weapons support #183

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5a0c406
Added an entity factory manager for custom weapons
Petercov Apr 16, 2022
7877953
Fixes
Petercov Apr 16, 2022
749f9ff
Finished parser for vscript weapon
Petercov Apr 17, 2022
332856e
Added factory for melee weapons
Petercov Apr 18, 2022
f58b599
Fixed custom weapon scripts on client
Petercov Apr 18, 2022
e771805
Readiness activities for custom melee weapon
Petercov Apr 18, 2022
ee46bc4
Fixes
Petercov Apr 18, 2022
179b7a5
Added factory for bullet-firing guns
Petercov Apr 19, 2022
13f422f
Fix issues
Petercov Apr 19, 2022
0ae65a5
Fix weapon selection
Petercov Apr 19, 2022
d871c6f
Add Mapbase file headers
Petercov Apr 19, 2022
fa41a32
Added a data cache to the custom weapons system
Petercov Apr 20, 2022
31cd394
More features for custom melee weapon
Petercov Apr 20, 2022
3701914
Fix
Petercov Apr 20, 2022
d3978db
Fixed custom gun not reseting zoom when holstered
Petercov Apr 22, 2022
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
Prev Previous commit
Next Next commit
Fixes
  • Loading branch information
@Petercov
Petercov committed Apr 18, 2022
commit ee46bc4bd11ad6baffde36dc30de0e267df0d70b
2 changes: 1 addition & 1 deletion sp/src/game/server/mapbase/custom_weapon_factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CCustomWeaponSystem::CCustomWeaponSystem() : CAutoGameSystem("CustomWeaponFactor

void CCustomWeaponSystem::LevelInitPreEntity()
{
AddManifestFile(GLOBAL_WEAPONS_MANIFEST);
LoadCustomWeaponsManifest(GLOBAL_WEAPONS_MANIFEST);

// Check for a generic "mapname_manifest.txt" file and load it.
if (filesystem->FileExists(AUTOLOADED_MANIFEST_FILE, "GAME"))
Expand Down
28 changes: 22 additions & 6 deletions sp/src/game/server/mapbase/weapon_custom_hl2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,30 @@ acttable_t CHLCustomWeaponMelee::m_acttable[] =
{ ACT_DISARM, ACT_DISARM_MELEE, false },

// Readiness activities (not aiming)
{ ACT_IDLE_RELAXED, ACT_IDLE_MELEE, false },//never aims
{ ACT_IDLE_STIMULATED, ACT_IDLE_MELEE, false },
{ ACT_IDLE_AGITATED, ACT_IDLE_ANGRY_MELEE, false },//always aims
{ ACT_IDLE_RELAXED, ACT_IDLE_MELEE, false },//never aims
{ ACT_IDLE_STIMULATED, ACT_IDLE_MELEE, false },
{ ACT_IDLE_AGITATED, ACT_IDLE_ANGRY_MELEE, false },//always aims

{ ACT_WALK_RELAXED, ACT_WALK_MELEE, false },//never aims
{ ACT_WALK_STIMULATED, ACT_WALK_MELEE, false },
{ ACT_WALK_AGITATED, ACT_WALK_MELEE, false },//always aims

{ ACT_RUN_RELAXED, ACT_RUN_MELEE, false },//never aims
{ ACT_RUN_STIMULATED, ACT_RUN_MELEE, false },
{ ACT_RUN_AGITATED, ACT_RUN_MELEE, false },//always aims

// Readiness activities (aiming)
{ ACT_IDLE_AIM_RELAXED, ACT_IDLE_MELEE, false },//never aims
{ ACT_IDLE_AIM_STIMULATED, ACT_IDLE_ANGRY_MELEE, false },
{ ACT_IDLE_AIM_AGITATED, ACT_IDLE_ANGRY_MELEE, false },//always aims
{ ACT_IDLE_AIM_RELAXED, ACT_IDLE_MELEE, false },//never aims
{ ACT_IDLE_AIM_STIMULATED, ACT_IDLE_ANGRY_MELEE, false },
{ ACT_IDLE_AIM_AGITATED, ACT_IDLE_ANGRY_MELEE, false },//always aims

{ ACT_WALK_AIM_RELAXED, ACT_WALK_MELEE, false },//never aims
{ ACT_WALK_AIM_STIMULATED, ACT_WALK_MELEE, false },
{ ACT_WALK_AIM_AGITATED, ACT_WALK_MELEE, false },//always aims

{ ACT_RUN_AIM_RELAXED, ACT_RUN_MELEE, false },//never aims
{ ACT_RUN_AIM_STIMULATED, ACT_RUN_MELEE, false },
{ ACT_RUN_AIM_AGITATED, ACT_RUN_MELEE, false },//always aims
//End readiness activities
#else
{ ACT_IDLE, ACT_IDLE_ANGRY_MELEE, false },
Expand Down