This commit is contained in:
2026-05-11 02:47:34 +02:00
parent 6faeadc3d5
commit b2a48a1fc4
4 changed files with 28 additions and 8 deletions

View File

@@ -46,6 +46,17 @@ CodeCallback_PlayerConnect()
level waittill( "eternity" ); level waittill( "eternity" );
self endon("disconnect"); self endon("disconnect");
// Initialize pers values before any engine/bot system can check them
if(!isDefined(self.pers["lastEarnedStreak"]))
self.pers["lastEarnedStreak"] = "";
if(!isDefined(self.pers["team"]))
self.pers["team"] = "allies";
if(!isDefined(self.pers["deaths"]))
self.pers["deaths"] = 0;
if(!isDefined(self.pers["kills"]))
self.pers["kills"] = 0;
if(!isDefined(self.team))
self.team = "allies";
[[level.callbackPlayerConnect]](); [[level.callbackPlayerConnect]]();
} }

View File

@@ -38,8 +38,8 @@ onStartGameType()
{ {
setClientNameMode("auto_change"); setClientNameMode("auto_change");
setObjectiveText( "allies", "Press ^3[{+actionslot 2}] ^7for FPS-Boost \n\n Mod made by ^:Santahunter^7!" ); setObjectiveText( "allies", "Mod made by Santahunter \n\n Modified by God of Hellfire" );
setObjectiveText( "axis", "Press ^3[{+actionslot 2}] ^7for FPS-Boost \n\n Mod made by ^:Santahunter^7!" ); setObjectiveText( "axis", "Mod made by Santahunter \n\n Modified by God of Hellfire" );
if ( level.splitscreen ) if ( level.splitscreen )
{ {
@@ -52,10 +52,10 @@ onStartGameType()
setObjectiveScoreText( "axis", &"OBJECTIVES_DM_SCORE" ); setObjectiveScoreText( "axis", &"OBJECTIVES_DM_SCORE" );
} }
setObjectiveHintText( "allies", "Be the first who cycled through all guns to win! \n \n Mod made by ^:Santahunter^7!" ); setObjectiveHintText( "allies", "Mod made by Santahunter \n\n Modified by God of Hellfire" );
setObjectiveHintText( "axis", "Be the first who cycled through all guns to win! \n \n Mod made by ^:Santahunter^7!" ); setObjectiveHintText( "axis", "Mod made by Santahunter \n\n Modified by God of Hellfire" );
level.killcam = true; // enables final killcam at end of game level.killcam = false;
level.spawnMins = ( 0, 0, 0 ); level.spawnMins = ( 0, 0, 0 );
level.spawnMaxs = ( 0, 0, 0 ); level.spawnMaxs = ( 0, 0, 0 );
maps\mp\gametypes\_spawnlogic::addSpawnPoints( "allies", "mp_dm_spawn" ); maps\mp\gametypes\_spawnlogic::addSpawnPoints( "allies", "mp_dm_spawn" );

View File

@@ -36,7 +36,7 @@ loadSettings()
setDvar("intermission", 15); setDvar("intermission", 15);
SetDvarIfUninitialized("show_damage_ui", 1); SetDvarIfUninitialized("show_damage_ui", 1);
setDvar("gunversion", "1.5 Remaster by ^1Santahunter - Modified by God of Hellfire"); setDvar("gunversion", "");
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
setDvar("scr_gungame_timelimit", 0); setDvar("scr_gungame_timelimit", 0);
setDvar("scr_gungame_scorelimit", 0); setDvar("scr_gungame_scorelimit", 0);
@@ -64,6 +64,8 @@ loadSettings()
level.state = "prematch"; level.state = "prematch";
level.markerIcon = "ui_host"; level.markerIcon = "ui_host";
precacheShader(level.markerIcon); precacheShader(level.markerIcon);
precacheShader("line_horizontal");
precacheShader("white");
// Bot Management // Bot Management
setDvar("bots_main", 1); setDvar("bots_main", 1);
@@ -163,6 +165,9 @@ firstSpawn()
self.gungameKills = 0; self.gungameKills = 0;
self.isJugger = false; self.isJugger = false;
self.streaks = []; self.streaks = [];
self.pers["lastEarnedStreak"] = ""; // prevent bot chat crash on undefined comparison
self.pers["team"] = "allies";
self.team = "allies";
// Join team + select class IMMEDIATELY — must happen before any waits // Join team + select class IMMEDIATELY — must happen before any waits
// so the engine has a valid class when it auto-spawns mid-game joiners. // so the engine has a valid class when it auto-spawns mid-game joiners.
@@ -289,7 +294,7 @@ updateWeapon()
if(!isDefined(weaponName) || weaponName == "none" || weaponName == "") if(!isDefined(weaponName) || weaponName == "none" || weaponName == "")
return; return;
variant = 0; variant = 0;
self takeAllWeapons(); // Strip any engine-assigned class weapons (race with spawn) self takeAllWeapons();
if (isSubstr(weaponName, "_akimbo")) if (isSubstr(weaponName, "_akimbo"))
self giveWeapon(weaponName, variant, true); self giveWeapon(weaponName, variant, true);
else else

View File

@@ -240,7 +240,11 @@ giveStreak(streak)
self.moveSpeedScaler = 1.6; // keep cached baseline in sync (was: self.setMoveSpeedScale = 1.6 — typo, set entity field not call function) self.moveSpeedScaler = 1.6; // keep cached baseline in sync (was: self.setMoveSpeedScale = 1.6 — typo, set entity field not call function)
break; break;
case "Riotshield": case "Riotshield":
self AttachShieldModel( "weapon_riot_shield_mp", "tag_shield_back" ); if(!isDefined(self.hasBackShield) || !self.hasBackShield)
{
self AttachShieldModel( "weapon_riot_shield_mp", "tag_shield_back" );
self.hasBackShield = true;
}
break; break;
case "Jetpack": case "Jetpack":
self thread Jetpack(); self thread Jetpack();