Skip to content
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

Jump to bottom

Tachi and Milso can no longer shoot underwater, water now protects from bullets #676

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Tachi and Milso can no longer shoot underwater, water now protects from bullets #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4ddae9
give knife attack force
AdamTadeusz Oct 3, 2024
f66d84e
undo that knife pr
AdamTadeusz Oct 3, 2024
bfec27b
milso and tachi can't fire underwater, water now protects from bullets
AdamTadeusz Oct 3, 2024
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
2 changes: 1 addition & 1 deletion mp/src/game/shared/neo/weapons/weapon_milso.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CWeaponMilso::CWeaponMilso()
m_flSoonestAttack = gpGlobals->curtime;
m_flAccuracyPenalty = 0.0f;

m_bFiresUnderwater = true;
m_bFiresUnderwater = false;

m_weaponSeeds = {
"milsopx",
Expand Down
2 changes: 1 addition & 1 deletion mp/src/game/shared/neo/weapons/weapon_tachi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ CWeaponTachi::CWeaponTachi()
m_fMinRange2 = 24;
m_fMaxRange2 = 200;

m_bFiresUnderwater = true;
m_bFiresUnderwater = false;
m_bIsPrimaryFireMode = true;

m_weaponSeeds = {
Expand Down
6 changes: 6 additions & 0 deletions mp/src/public/bspflags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,15 @@
// everything that blocks line of sight for players, but with monsters added.
#define MASK_VISIBLE_AND_NPCS (MASK_OPAQUE_AND_NPCS|CONTENTS_IGNORE_NODRAW_OPAQUE)
// bullets see these as solid
#ifdef NEO
#define MASK_SHOT (CONTENTS_WATER|CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_MONSTER|CONTENTS_WINDOW|CONTENTS_DEBRIS|CONTENTS_HITBOX)
// non-raycasted weapons see this as solid (includes grates)
#define MASK_SHOT_HULL (CONTENTS_WATER|CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_MONSTER|CONTENTS_WINDOW|CONTENTS_DEBRIS|CONTENTS_GRATE)
#else
#define MASK_SHOT (CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_MONSTER|CONTENTS_WINDOW|CONTENTS_DEBRIS|CONTENTS_HITBOX)
// non-raycasted weapons see this as solid (includes grates)
#define MASK_SHOT_HULL (CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_MONSTER|CONTENTS_WINDOW|CONTENTS_DEBRIS|CONTENTS_GRATE)
#endif
// hits solids (not grates) and passes through everything else
#define MASK_SHOT_PORTAL (CONTENTS_SOLID|CONTENTS_MOVEABLE|CONTENTS_WINDOW|CONTENTS_MONSTER)
// everything normally solid, except monsters (world+brush only)
Expand Down