Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

fix iw4x, integration. improve scripts overall (#287)

Browse Source 
* fix(scripts): correct usage of notifyOnPlayerCommand

* fix(scripts): correct iw4x usage of is bot

* fix(scripts): correct iw4x usage of is bot

* fix(scripts): fix noclip on iw4x

* fix(scripts): ident

* iw5 too
This commit is contained in:
Edo 2023-04-08 03:42:18 +02:00 committed by GitHub
parent a434420951
commit c348283c94
8 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GameFiles/AntiCheat/IW4x/userraw/scripts/_customcallbacks.gsc
View File

@ -41,11 +41,11 @@ waitForAttack()
{
self endon( "disconnect" );
self notifyOnPlayerCommand( "player_shot", "+attack" );
self.lastAttackTime = 0;
for( ;; )
{
self notifyOnPlayerCommand( "player_shot", "+attack" );
self waittill( "player_shot" );
self.lastAttackTime = getTime();

2
GameFiles/AntiCheat/IW5/storage/iw5/scripts/_customcallbacks.gsc
View File

@ -40,11 +40,11 @@ waitForAttack()
{
self endon( "disconnect" );
self notifyOnPlayerCommand( "player_shot", "+attack" );
self.lastAttackTime = 0;
for( ;; )
{
self notifyOnPlayerCommand( "player_shot", "+attack" );
self waittill( "player_shot" );
self.lastAttackTime = getTime();

3
GameFiles/AntiCheat/PT6/storage/t6/scripts/mp/_customcallbacks.gsc.src
View File

@ -41,17 +41,16 @@ onPlayerConnect( player )
}
}
//Got added to T6 on April 2020
waitForAttack()
{
self endon( "disconnect" );
self notifyOnPlayerCommand( "player_shot", "+attack" );
self.lastAttackTime = 0;
for( ;; )
{
self notifyOnPlayerCommand( "player_shot", "+attack" );
self waittill( "player_shot" );
self.lastAttackTime = getTime();

5
GameFiles/GameInterface/_integration_base.gsc
View File

@ -4,7 +4,7 @@
Init()
{
level thread Setup();
thread Setup();
}
Setup()
@ -21,7 +21,8 @@ Setup()
level.commonFunctions = spawnstruct();
level.commonFunctions.setDvar = "SetDvarIfUninitialized";
level.commonFunctions.isBot = "IsBot";
level.commonKeys = spawnstruct();
level.notifyTypes = spawnstruct();

13
GameFiles/GameInterface/_integration_iw4x.gsc
View File

@ -4,7 +4,7 @@ Init()
{
level.eventBus.gamename = "IW4";
level thread Setup();
thread Setup();
}
Setup()
@ -18,6 +18,7 @@ Setup()
level.overrideMethods["GetTotalShotsFired"] = ::GetTotalShotsFired;
level.overrideMethods[level.commonFunctions.setDvar] = ::_SetDvarIfUninitialized;
level.overrideMethods[level.commonFunctions.isBot] = ::IsTestClient;
level.overrideMethods["waittill_notify_or_timeout"] = ::_waittill_notify_or_timeout;
level.overrideMethods[level.commonFunctions.changeTeam] = ::ChangeTeam;
level.overrideMethods[level.commonFunctions.getTeamCounts] = ::CountPlayers;
@ -48,7 +49,7 @@ OnPlayerConnect()
{
level waittill( "connected", player );
if ( scripts\_integration_base::_IsBot( player ) )
if ( player call [[ level.overrideMethods[ level.commonFunctions.isBot ] ]]() )
{
// we don't want to track bots
continue;
@ -441,7 +442,9 @@ NoClipImpl()
self SetClientDvar( "sv_cheats", 0 );
self God();
self Noclip();
self.clientflags |= 1; // IW4x specific
self Hide();
self.isNoClipped = true;
@ -455,7 +458,9 @@ NoClipImpl()
self SetClientDvar( "sv_cheats", 0 );
self God();
self Noclip();
self.clientflags &= ~1; // IW4x specific
self Show();
self.isNoClipped = false;

5
GameFiles/GameInterface/_integration_iw5.gsc
View File

@ -4,7 +4,7 @@ Init()
{
level.eventBus.gamename = "IW5";
level thread Setup();
thread Setup();
}
Setup()
@ -19,6 +19,7 @@ Setup()
level.overrideMethods["GetTotalShotsFired"] = ::GetTotalShotsFired;
level.overrideMethods["SetDvarIfUninitialized"] = ::_SetDvarIfUninitialized;
level.overrideMethods["waittill_notify_or_timeout"] = ::_waittill_notify_or_timeout;
level.overrideMethods[level.commonFunctions.isBot] = ::IsTestClient;
RegisterClientCommands();
@ -40,7 +41,7 @@ OnPlayerConnect()
{
level waittill( "connected", player );
if ( scripts\mp\_integration_base::_IsBot( player ) )
if ( player call [[ level.overrideMethods[ level.commonFunctions.isBot ] ]]() )
{
// we don't want to track bots
continue;

2
GameFiles/GameInterface/_integration_shared.gsc
View File

@ -1,7 +1,7 @@
Init()
{
level thread Setup();
thread Setup();
}
Setup()

2
GameFiles/GameInterface/_integration_t5.gsc
View File

@ -4,7 +4,7 @@ Init()
{
level.eventBus.gamename = "T5";
level thread Setup();
thread Setup();
}
Setup()