UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backed out changeset: fe0e55c4d544

Browse Source
This commit is contained in:
Nicholas Hastings 2014-03-30 14:07:14 -04:00
parent e708cdf28c
commit fdae6cf1b0
7 changed files with 116 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
gamedata/funcommands.games.txt
View File

@ -1,74 +0,0 @@
"Games"
{
"#default"
{
"Keys"
{
"SpriteBeam" "sprites/laser.vmt"
"SpriteBeam2" "sprites/bluelight1.vmt"
"SpriteExplosion" "sprites/sprite_fire01.vmt"
"SpriteGlow" "sprites/blueglow2.vmt"
"SpriteHalo" "sprites/halo01.vmt"
"SoundBlip" "buttons/blip1.wav"
"SoundBeep" "buttons/button17.wav"
"SoundFinal" "weapons/cguard/charging.wav"
"SoundBoom" "weapons/explode3.wav"
"SoundFreeze" "physics/glass/glass_impact_bullet4.wav"
}
}
"csgo"
{
"Keys"
{
"SpriteBeam" "sprites/laserbeam.vmt"
"SpriteBeam2" "sprites/physbeam.vmt"
"SpriteExplosion" ""
"SpriteGlow" "sprites/blueflare1.vmt"
"SpriteHalo" "sprites/glow01.vmt"
}
}
"$INSURGENCY" // Standalone gasme
{
"Keys"
{
"SpriteBeam" "sprites/laserbeam.vmt"
"SpriteBeam2" ""
"SpriteExplosion" "sprites/sprite_fire01.vmt"
"SpriteGlow" ""
"SpriteHalo" "sprites/glow01.vmt"
}
}
"swarm"
{
"Keys"
{
"SpriteBeam" "sprites/laserbeam.vmt"
"SpriteBeam2" ""
"SpriteExplosion" "sprites/flamelet1.vmt"
"SpriteGlow" "sprites/blueflare1.vmt"
"SpriteHalo" "sprites/glow01.vmt"
}
}
"#default"
{
"#supported"
{
"game" "left4dead"
"game" "left4dead2"
}
"Keys"
{
"SpriteBeam" "sprites/laserbeam.vmt"
"SpriteBeam2" "sprites/physbeam.vmt"
"SpriteExplosion" "sprites/floorfire4_.vmt"
"SpriteGlow" "sprites/blueflare1.vmt"
"SpriteHalo" "sprites/glow01.vmt"
}
}
}

102
plugins/funcommands.sp
View File

@ -51,11 +51,11 @@ public Plugin:myinfo =
new Handle:hTopMenu = INVALID_HANDLE; new Handle:hTopMenu = INVALID_HANDLE;
// Sounds // Sounds
new String:g_BlipSound[PLATFORM_MAX_PATH]; #define SOUND_BLIP "buttons/blip1.wav"
new String:g_BeepSound[PLATFORM_MAX_PATH]; #define SOUND_BEEP "buttons/button17.wav"
new String:g_FinalSound[PLATFORM_MAX_PATH]; #define SOUND_FINAL "weapons/cguard/charging.wav"
new String:g_BoomSound[PLATFORM_MAX_PATH]; #define SOUND_BOOM "weapons/explode3.wav"
new String:g_FreezeSound[PLATFORM_MAX_PATH]; #define SOUND_FREEZE "physics/glass/glass_impact_bullet4.wav"
// Following are model indexes for temp entities // Following are model indexes for temp entities
new g_BeamSprite = -1; new g_BeamSprite = -1;
@ -179,65 +179,45 @@ HookEvents( )
public OnMapStart() public OnMapStart()
{ {
new Handle:gameConfig = LoadGameConfigFile("funcommands.games"); PrecacheSound(SOUND_BLIP, true);
if (gameConfig == INVALID_HANDLE) PrecacheSound(SOUND_BEEP, true);
PrecacheSound(SOUND_FINAL, true);
PrecacheSound(SOUND_BOOM, true);
PrecacheSound(SOUND_FREEZE, true);
new EngineVersion:sdkversion = GetEngineVersion();
if (sdkversion == Engine_Left4Dead || sdkversion == Engine_Left4Dead2
|| sdkversion == Engine_AlienSwarm || sdkversion == Engine_CSGO)
{ {
SetFailState("Unable to load game config funcommands.games"); g_BeamSprite = PrecacheModel("materials/sprites/laserbeam.vmt");
return; g_HaloSprite = PrecacheModel("materials/sprites/glow01.vmt");
// l4d, l4d2, and csgo have this. swarm does not.
if (sdkversion != Engine_AlienSwarm)
{
g_BeamSprite2 = PrecacheModel("materials/sprites/physbeam.vmt");
}
g_GlowSprite = PrecacheModel("materials/sprites/blueflare1.vmt");
if (sdkversion == Engine_Left4Dead || sdkversion == Engine_Left4Dead2)
{
g_ExplosionSprite = PrecacheModel("sprites/floorfire4_.vmt");
}
else if (sdkversion == Engine_AlienSwarm)
{
g_ExplosionSprite = PrecacheModel("sprites/flamelet1.vmt");
}
}
else
{
g_BeamSprite = PrecacheModel("materials/sprites/laser.vmt");
g_HaloSprite = PrecacheModel("materials/sprites/halo01.vmt");
g_BeamSprite2 = PrecacheModel("sprites/bluelight1.vmt");
g_GlowSprite = PrecacheModel("sprites/blueglow2.vmt");
g_ExplosionSprite = PrecacheModel("sprites/sprite_fire01.vmt");
} }
if (GameConfGetKeyValue(gameConfig, "SoundBlip", g_BlipSound, sizeof(g_BlipSound)) && g_BlipSound[0])
{
PrecacheSound(g_BlipSound, true);
}
if (GameConfGetKeyValue(gameConfig, "SoundBeep", g_BeepSound, sizeof(g_BeepSound)) && g_BeepSound[0])
{
PrecacheSound(g_BeepSound, true);
}
if (GameConfGetKeyValue(gameConfig, "SoundFinal", g_FinalSound, sizeof(g_FinalSound)) && g_FinalSound[0])
{
PrecacheSound(g_FinalSound, true);
}
if (GameConfGetKeyValue(gameConfig, "SoundBoom", g_BoomSound, sizeof(g_BoomSound)) && g_BoomSound[0])
{
PrecacheSound(g_BoomSound, true);
}
if (GameConfGetKeyValue(gameConfig, "SoundFreeze", g_FreezeSound, sizeof(g_FreezeSound)) && g_FreezeSound[0])
{
PrecacheSound(g_FreezeSound, true);
}
new String:buffer[PLATFORM_MAX_PATH];
if (GameConfGetKeyValue(gameConfig, "SpriteBeam", buffer, sizeof(buffer)) && buffer[0])
{
g_BeamSprite = PrecacheModel(buffer);
}
if (GameConfGetKeyValue(gameConfig, "SpriteBeam2", buffer, sizeof(buffer)) && buffer[0])
{
g_BeamSprite2 = PrecacheModel(buffer);
}
if (GameConfGetKeyValue(gameConfig, "SpriteExplosion", buffer, sizeof(buffer)) && buffer[0])
{
g_ExplosionSprite = PrecacheModel(buffer);
}
if (GameConfGetKeyValue(gameConfig, "SpriteGlow", buffer, sizeof(buffer)) && buffer[0])
{
g_GlowSprite = PrecacheModel(buffer);
}
if (GameConfGetKeyValue(gameConfig, "SpriteHalo", buffer, sizeof(buffer)) && buffer[0])
{
g_HaloSprite = PrecacheModel(buffer);
}
CloseHandle(gameConfig);
} }
public OnMapEnd() public OnMapEnd()

40
plugins/funcommands/beacon.sp
View File

@ -91,33 +91,27 @@ public Action:Timer_Beacon(Handle:timer, any:value)
new Float:vec[3]; new Float:vec[3];
GetClientAbsOrigin(client, vec); GetClientAbsOrigin(client, vec);
vec[2] += 10; vec[2] += 10;
TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_BeaconRadius), g_BeamSprite, g_HaloSprite, 0, 15, 0.5, 5.0, 0.0, greyColor, 10, 0);
TE_SendToAll();
if (g_BeamSprite > -1 && g_HaloSprite > -1) if (team == 2)
{ {
TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_BeaconRadius), g_BeamSprite, g_HaloSprite, 0, 15, 0.5, 5.0, 0.0, greyColor, 10, 0); TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_BeaconRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 10.0, 0.5, redColor, 10, 0);
TE_SendToAll(); }
else if (team == 3)
if (team == 2) {
{ TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_BeaconRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 10.0, 0.5, blueColor, 10, 0);
TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_BeaconRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 10.0, 0.5, redColor, 10, 0); }
} else
else if (team == 3) {
{ TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_BeaconRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 10.0, 0.5, greenColor, 10, 0);
TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_BeaconRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 10.0, 0.5, blueColor, 10, 0);
}
else
{
TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_BeaconRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 10.0, 0.5, greenColor, 10, 0);
}
TE_SendToAll();
} }
if (g_BlipSound[0]) TE_SendToAll();
{
GetClientEyePosition(client, vec); GetClientEyePosition(client, vec);
EmitAmbientSound(g_BlipSound, vec, client, SNDLEVEL_RAIDSIREN); EmitAmbientSound(SOUND_BLIP, vec, client, SNDLEVEL_RAIDSIREN);
}
return Plugin_Continue; return Plugin_Continue;
} }

59
plugins/funcommands/fire.sp
View File

@ -109,18 +109,12 @@ public Action:Timer_FireBomb(Handle:timer, any:value)
if (g_FireBombTime[client] > 1) if (g_FireBombTime[client] > 1)
{ {
color = RoundToFloor(g_FireBombTime[client] * (255.0 / GetConVarFloat(g_Cvar_FireBombTicks))); color = RoundToFloor(g_FireBombTime[client] * (255.0 / GetConVarFloat(g_Cvar_FireBombTicks)));
if (g_BeepSound[0]) EmitAmbientSound(SOUND_BEEP, vec, client, SNDLEVEL_RAIDSIREN);
{
EmitAmbientSound(g_BeepSound, vec, client, SNDLEVEL_RAIDSIREN);
}
} }
else else
{ {
color = 0; color = 0;
if (g_FinalSound[0]) EmitAmbientSound(SOUND_FINAL, vec, client, SNDLEVEL_RAIDSIREN);
{
EmitAmbientSound(g_FinalSound, vec, client, SNDLEVEL_RAIDSIREN);
}
} }
SetEntityRenderColor(client, 255, color, color, 255); SetEntityRenderColor(client, 255, color, color, 255);
@ -129,16 +123,13 @@ public Action:Timer_FireBomb(Handle:timer, any:value)
GetClientName(client, name, sizeof(name)); GetClientName(client, name, sizeof(name));
PrintCenterTextAll("%t", "Till Explodes", name, g_FireBombTime[client]); PrintCenterTextAll("%t", "Till Explodes", name, g_FireBombTime[client]);
if (g_BeamSprite > -1 && g_HaloSprite > -1) GetClientAbsOrigin(client, vec);
{ vec[2] += 10;
GetClientAbsOrigin(client, vec);
vec[2] += 10;
TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_FireBombRadius) / 3.0, g_BeamSprite, g_HaloSprite, 0, 15, 0.5, 5.0, 0.0, greyColor, 10, 0); TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_FireBombRadius) / 3.0, g_BeamSprite, g_HaloSprite, 0, 15, 0.5, 5.0, 0.0, greyColor, 10, 0);
TE_SendToAll(); TE_SendToAll();
TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_FireBombRadius) / 3.0, g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 10.0, 0.5, whiteColor, 10, 0); TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_FireBombRadius) / 3.0, g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 10.0, 0.5, whiteColor, 10, 0);
TE_SendToAll(); TE_SendToAll();
}
return Plugin_Continue; return Plugin_Continue;
} }
else else
@ -149,27 +140,21 @@ public Action:Timer_FireBomb(Handle:timer, any:value)
TE_SendToAll(); TE_SendToAll();
} }
if (g_BeamSprite > -1 && g_HaloSprite > -1) GetClientAbsOrigin(client, vec);
{ vec[2] += 10;
GetClientAbsOrigin(client, vec); TE_SetupBeamRingPoint(vec, 50.0, GetConVarFloat(g_Cvar_FireBombRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.5, 30.0, 1.5, orangeColor, 5, 0);
vec[2] += 10; TE_SendToAll();
TE_SetupBeamRingPoint(vec, 50.0, GetConVarFloat(g_Cvar_FireBombRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.5, 30.0, 1.5, orangeColor, 5, 0); vec[2] += 15;
TE_SendToAll(); TE_SetupBeamRingPoint(vec, 40.0, GetConVarFloat(g_Cvar_FireBombRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 30.0, 1.5, orangeColor, 5, 0);
vec[2] += 15; TE_SendToAll();
TE_SetupBeamRingPoint(vec, 40.0, GetConVarFloat(g_Cvar_FireBombRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 30.0, 1.5, orangeColor, 5, 0); vec[2] += 15;
TE_SendToAll(); TE_SetupBeamRingPoint(vec, 30.0, GetConVarFloat(g_Cvar_FireBombRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.7, 30.0, 1.5, orangeColor, 5, 0);
vec[2] += 15; TE_SendToAll();
TE_SetupBeamRingPoint(vec, 30.0, GetConVarFloat(g_Cvar_FireBombRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.7, 30.0, 1.5, orangeColor, 5, 0); vec[2] += 15;
TE_SendToAll(); TE_SetupBeamRingPoint(vec, 20.0, GetConVarFloat(g_Cvar_FireBombRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.8, 30.0, 1.5, orangeColor, 5, 0);
vec[2] += 15; TE_SendToAll();
TE_SetupBeamRingPoint(vec, 20.0, GetConVarFloat(g_Cvar_FireBombRadius), g_BeamSprite, g_HaloSprite, 0, 10, 0.8, 30.0, 1.5, orangeColor, 5, 0);
TE_SendToAll();
}
if (g_BoomSound[0]) EmitAmbientSound(SOUND_BOOM, vec, client, SNDLEVEL_RAIDSIREN);
{
EmitAmbientSound(g_BoomSound, vec, client, SNDLEVEL_RAIDSIREN);
}
IgniteEntity(client, GetConVarFloat(g_Cvar_BurnDuration)); IgniteEntity(client, GetConVarFloat(g_Cvar_BurnDuration));
KillFireBomb(client); KillFireBomb(client);

73
plugins/funcommands/ice.sp
View File

@ -51,12 +51,9 @@ FreezeClient(client, time)
SetEntityMoveType(client, MOVETYPE_NONE); SetEntityMoveType(client, MOVETYPE_NONE);
SetEntityRenderColor(client, 0, 128, 255, 192); SetEntityRenderColor(client, 0, 128, 255, 192);
if (g_FreezeSound[0]) new Float:vec[3];
{ GetClientEyePosition(client, vec);
new Float:vec[3]; EmitAmbientSound(SOUND_FREEZE, vec, client, SNDLEVEL_RAIDSIREN);
GetClientEyePosition(client, vec);
EmitAmbientSound(g_FreezeSound, vec, client, SNDLEVEL_RAIDSIREN);
}
g_FreezeTime[client] = time; g_FreezeTime[client] = time;
g_FreezeSerial[client] = ++ g_Serial_Gen; g_FreezeSerial[client] = ++ g_Serial_Gen;
@ -70,15 +67,12 @@ UnfreezeClient(client)
if (IsClientInGame(client)) if (IsClientInGame(client))
{ {
if (g_FreezeSound[0]) new Float:vec[3];
{ GetClientAbsOrigin(client, vec);
new Float:vec[3]; vec[2] += 10;
GetClientAbsOrigin(client, vec);
vec[2] += 10; GetClientEyePosition(client, vec);
EmitAmbientSound(SOUND_FREEZE, vec, client, SNDLEVEL_RAIDSIREN);
GetClientEyePosition(client, vec);
EmitAmbientSound(g_FreezeSound, vec, client, SNDLEVEL_RAIDSIREN);
}
SetEntityMoveType(client, MOVETYPE_WALK); SetEntityMoveType(client, MOVETYPE_WALK);
@ -196,7 +190,7 @@ public Action:Timer_Freeze(Handle:timer, any:value)
{ {
TE_SetupGlowSprite(vec, g_GlowSprite, 0.95, 1.5, 50); TE_SetupGlowSprite(vec, g_GlowSprite, 0.95, 1.5, 50);
} }
else if (g_HaloSprite > -1) else
{ {
TE_SetupGlowSprite(vec, g_HaloSprite, 0.95, 1.5, 50); TE_SetupGlowSprite(vec, g_HaloSprite, 0.95, 1.5, 50);
} }
@ -230,18 +224,12 @@ public Action:Timer_FreezeBomb(Handle:timer, any:value)
if (g_FreezeBombTime[client] > 1) if (g_FreezeBombTime[client] > 1)
{ {
color = RoundToFloor(g_FreezeBombTime[client] * (255.0 / GetConVarFloat(g_Cvar_FreezeBombTicks))); color = RoundToFloor(g_FreezeBombTime[client] * (255.0 / GetConVarFloat(g_Cvar_FreezeBombTicks)));
if (g_BeepSound[0]) EmitAmbientSound(SOUND_BEEP, vec, client, SNDLEVEL_RAIDSIREN);
{
EmitAmbientSound(g_BeepSound, vec, client, SNDLEVEL_RAIDSIREN);
}
} }
else else
{ {
color = 0; color = 0;
if (g_FinalSound[0]) EmitAmbientSound(SOUND_FINAL, vec, client, SNDLEVEL_RAIDSIREN);
{
EmitAmbientSound(g_FinalSound, vec, client, SNDLEVEL_RAIDSIREN);
}
} }
SetEntityRenderColor(client, color, color, 255, 255); SetEntityRenderColor(client, color, color, 255, 255);
@ -250,16 +238,13 @@ public Action:Timer_FreezeBomb(Handle:timer, any:value)
GetClientName(client, name, sizeof(name)); GetClientName(client, name, sizeof(name));
PrintCenterTextAll("%t", "Till Explodes", name, g_FreezeBombTime[client]); PrintCenterTextAll("%t", "Till Explodes", name, g_FreezeBombTime[client]);
if (g_BeamSprite > -1 && g_HaloSprite > -1) GetClientAbsOrigin(client, vec);
{ vec[2] += 10;
GetClientAbsOrigin(client, vec);
vec[2] += 10;
TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_FreezeBombRadius) / 3.0, g_BeamSprite, g_HaloSprite, 0, 15, 0.5, 5.0, 0.0, greyColor, 10, 0); TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_FreezeBombRadius) / 3.0, g_BeamSprite, g_HaloSprite, 0, 15, 0.5, 5.0, 0.0, greyColor, 10, 0);
TE_SendToAll(); TE_SendToAll();
TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_FreezeBombRadius) / 3.0, g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 10.0, 0.5, whiteColor, 10, 0); TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_FreezeBombRadius) / 3.0, g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 10.0, 0.5, whiteColor, 10, 0);
TE_SendToAll(); TE_SendToAll();
}
return Plugin_Continue; return Plugin_Continue;
} }
else else
@ -270,10 +255,7 @@ public Action:Timer_FreezeBomb(Handle:timer, any:value)
TE_SendToAll(); TE_SendToAll();
} }
if (g_BoomSound[0]) EmitAmbientSound(SOUND_BOOM, vec, client, SNDLEVEL_RAIDSIREN);
{
EmitAmbientSound(g_BoomSound, vec, client, SNDLEVEL_RAIDSIREN);
}
KillFreezeBomb(client); KillFreezeBomb(client);
FreezeClient(client, GetConVarInt(g_Cvar_FreezeDuration)); FreezeClient(client, GetConVarInt(g_Cvar_FreezeDuration));
@ -304,18 +286,15 @@ public Action:Timer_FreezeBomb(Handle:timer, any:value)
continue; continue;
} }
if (g_HaloSprite > -1) if (g_BeamSprite2 > -1)
{ {
if (g_BeamSprite2 > -1) TE_SetupBeamPoints(vec, pos, g_BeamSprite2, g_HaloSprite, 0, 1, 0.7, 20.0, 50.0, 1, 1.5, blueColor, 10);
{
TE_SetupBeamPoints(vec, pos, g_BeamSprite2, g_HaloSprite, 0, 1, 0.7, 20.0, 50.0, 1, 1.5, blueColor, 10);
}
else if (g_BeamSprite > -1)
{
TE_SetupBeamPoints(vec, pos, g_BeamSprite, g_HaloSprite, 0, 1, 0.7, 20.0, 50.0, 1, 1.5, blueColor, 10);
}
TE_SendToAll();
} }
else
{
TE_SetupBeamPoints(vec, pos, g_BeamSprite, g_HaloSprite, 0, 1, 0.7, 20.0, 50.0, 1, 1.5, blueColor, 10);
}
TE_SendToAll();
FreezeClient(i, GetConVarInt(g_Cvar_FreezeDuration)); FreezeClient(i, GetConVarInt(g_Cvar_FreezeDuration));
} }

30
plugins/funcommands/timebomb.sp
View File

@ -102,18 +102,12 @@ public Action:Timer_TimeBomb(Handle:timer, any:value)
if (g_TimeBombTime[client] > 1) if (g_TimeBombTime[client] > 1)
{ {
color = RoundToFloor(g_TimeBombTime[client] * (128.0 / GetConVarFloat(g_Cvar_TimeBombTicks))); color = RoundToFloor(g_TimeBombTime[client] * (128.0 / GetConVarFloat(g_Cvar_TimeBombTicks)));
if (g_BeepSound[0]) EmitAmbientSound(SOUND_BEEP, vec, client, SNDLEVEL_RAIDSIREN);
{
EmitAmbientSound(g_BeepSound, vec, client, SNDLEVEL_RAIDSIREN);
}
} }
else else
{ {
color = 0; color = 0;
if (g_FinalSound[0]) EmitAmbientSound(SOUND_FINAL, vec, client, SNDLEVEL_RAIDSIREN);
{
EmitAmbientSound(g_FinalSound, vec, client, SNDLEVEL_RAIDSIREN);
}
} }
SetEntityRenderColor(client, 255, 128, color, 255); SetEntityRenderColor(client, 255, 128, color, 255);
@ -122,16 +116,13 @@ public Action:Timer_TimeBomb(Handle:timer, any:value)
GetClientName(client, name, sizeof(name)); GetClientName(client, name, sizeof(name));
PrintCenterTextAll("%t", "Till Explodes", name, g_TimeBombTime[client]); PrintCenterTextAll("%t", "Till Explodes", name, g_TimeBombTime[client]);
if (g_BeamSprite > -1 && g_HaloSprite > -1) GetClientAbsOrigin(client, vec);
{ vec[2] += 10;
GetClientAbsOrigin(client, vec);
vec[2] += 10;
TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_TimeBombRadius) / 3.0, g_BeamSprite, g_HaloSprite, 0, 15, 0.5, 5.0, 0.0, greyColor, 10, 0); TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_TimeBombRadius) / 3.0, g_BeamSprite, g_HaloSprite, 0, 15, 0.5, 5.0, 0.0, greyColor, 10, 0);
TE_SendToAll(); TE_SendToAll();
TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_TimeBombRadius) / 3.0, g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 10.0, 0.5, whiteColor, 10, 0); TE_SetupBeamRingPoint(vec, 10.0, GetConVarFloat(g_Cvar_TimeBombRadius) / 3.0, g_BeamSprite, g_HaloSprite, 0, 10, 0.6, 10.0, 0.5, whiteColor, 10, 0);
TE_SendToAll(); TE_SendToAll();
}
return Plugin_Continue; return Plugin_Continue;
} }
else else
@ -142,10 +133,7 @@ public Action:Timer_TimeBomb(Handle:timer, any:value)
TE_SendToAll(); TE_SendToAll();
} }
if (g_BoomSound[0]) EmitAmbientSound(SOUND_BOOM, vec, client, SNDLEVEL_RAIDSIREN);
{
EmitAmbientSound(g_BoomSound, vec, client, SNDLEVEL_RAIDSIREN);
}
ForcePlayerSuicide(client); ForcePlayerSuicide(client);
KillTimeBomb(client); KillTimeBomb(client);

6
tools/buildbot/PackageScript
View File

@ -137,11 +137,7 @@ CopyFiles('configs/sql-init-scripts/sqlite', 'addons/sourcemod/configs/sql-init-
'update_admins-r1409.sql', 'update_admins-r1409.sql',
] ]
) )
CopyFiles('gamedata', 'addons/sourcemod/gamedata', CopyFiles('gamedata', 'addons/sourcemod/gamedata', ['sm-tf2.games.txt'])
[ 'funcommands.games.txt',
'sm-tf2.games.txt',
]
)
CopyFiles('gamedata/sdkhooks.games', 'addons/sourcemod/gamedata/sdkhooks.games', CopyFiles('gamedata/sdkhooks.games', 'addons/sourcemod/gamedata/sdkhooks.games',
[ 'common.games.txt', [ 'common.games.txt',
'engine.blade.txt', 'engine.blade.txt',