Skip to content

Freeday: Fixed the no damage bug and small improvements #401

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

Open
azalty wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Freeday: Fixed the no damage bug and small improvements #401

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbbb9ae
Freeday: Fixed #400 and small improvements
azalty Sep 18, 2022
5be2866
Fixed m_takedamage values
azalty Sep 21, 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
32 changes: 24 additions & 8 deletions addons/sourcemod/scripting/MyJailbreak/freeday.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@
#pragma semicolon 1
#pragma newdecls required

// m_takedamage values
#define DAMAGE_NO 0
#define DAMAGE_EVENTS_ONLY 1 // Call damage functions, but don't modify health
#define DAMAGE_YES 2
#define DAMAGE_AIM 3

// Booleans
bool g_bIsFreeday = false;
bool g_bStartFreeday = false;
Expand Down Expand Up @@ -704,9 +710,12 @@ void StartEventRound(bool thisround)
if (!IsClientInGame(i))
continue;

SetEntProp(i, Prop_Data, "m_takedamage", 0, 1);
if (IsPlayerAlive(i))
{
SetEntProp(i, Prop_Data, "m_takedamage", DAMAGE_NO, 1);

SetEntityMoveType(i, MOVETYPE_NONE);
SetEntityMoveType(i, MOVETYPE_NONE);
}
}

CreateTimer(3.0, Timer_PrepareEvent);
Expand Down Expand Up @@ -770,14 +779,21 @@ void PrepareDay()

CreateInfoPanel(i);

SetEntProp(i, Prop_Send, "m_CollisionGroup", 2); // 2 - none / 5 - 'default'

if (!gc_bdamage.BoolValue && IsValidClient(i))
if (IsPlayerAlive(i))
{
SetEntProp(i, Prop_Data, "m_takedamage", 0, 1);
}
SetEntProp(i, Prop_Send, "m_CollisionGroup", 2); // 2 - none / 5 - 'default'

SetEntityMoveType(i, MOVETYPE_WALK);
if (!gc_bdamage.BoolValue)
{
SetEntProp(i, Prop_Data, "m_takedamage", DAMAGE_NO, 1); // Disable damage received (godmode)
}
else
{
SetEntProp(i, Prop_Data, "m_takedamage", DAMAGE_YES, 1); // Allow damage receive (no godmode, normal)
}

SetEntityMoveType(i, MOVETYPE_WALK);
}
}

if (gp_bMyJailbreak)
Expand Down