sm-plugins/bhoptimer
1
0
Fork 0
mirror of https://github.com/shavitush/bhoptimer.git synced 2025-12-07 10:28:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow setstart outside of start-zone and add shavit_zones_extra_spawn_height

Browse Source
This commit is contained in:
rtldg 2021-10-16 15:24:36 +00:00
parent f724863bc7
commit b88367d079
3 changed files with 70 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/sourcemod/configs/shavit-mapfixes.cfg
View File

@ -43,6 +43,10 @@
{
"shavit_misc_resettargetname" "0"
}
"bhop_strafecontrol"
{
"shavit_zones_extra_spawn_height" "1.0"
}
"bhop_symbiotic"
{
"shavit_misc_resettargetname_main" "filter_main"

42
addons/sourcemod/scripting/include/shavit/zones.inc
View File

@ -0,0 +1,42 @@
enum
{
ZF_ForceRender = (1 << 0),
ZF_Prebuilt = (1 << 1), // comes from mod_zone_* entities
};
#if 0
enum struct zone_cache_t
{
bool bZoneInitialized;
int iType;
int iTrack; // 0 - main, 1 - bonus1 etc
int iEntity;
int iDatabaseID; // when ZF_Prebuilt, this is the entity's m_iHammerID
int iFlags;
int iData;
float fCorner1[3];
float fCorner2[3];
float fDestination[3];
}
#else
enum struct zone_cache_t
{
bool bZoneInitialized;
bool bPrebuilt; // comes from mod_zone_* entities
int iZoneType;
int iZoneTrack; // 0 - main, 1 - bonus etc
int iEntityID;
int iDatabaseID;
int iZoneFlags;
int iZoneData;
}
#endif
native void Shavit_RemoveAllZones();
native int Shavit_GetZoneCount();
native void Shavit_GetZone(int index, any[] zonecache, int size = sizeof(zone_cache_t));
native int Shavit_AddZone(any[] zonecache, int size = sizeof(zone_cache_t));

54
addons/sourcemod/scripting/shavit-zones.sp
View File

@ -28,6 +28,8 @@
#include <shavit>
#include <adminmenu>
#include <shavit/zones>
#undef REQUIRE_EXTENSIONS
#include <cstrike>
#include <tf2>
@ -65,18 +67,6 @@ char gS_ZoneNames[][] =
"Stage Zone" // shows time when entering zone
};
enum struct zone_cache_t
{
bool bZoneInitialized;
bool bPrebuilt; // comes from mod_zone_* entities
int iZoneType;
int iZoneTrack; // 0 - main, 1 - bonus etc
int iEntityID;
int iDatabaseID;
int iZoneFlags;
int iZoneData;
}
enum struct zone_settings_t
{
bool bVisible;
@ -93,11 +83,6 @@ enum struct zone_settings_t
char sBeam[PLATFORM_MAX_PATH];
}
enum
{
ZF_ForceRender = (1 << 0)
};
// 0 - nothing
// 1 - wait for E tap to setup first coord
// 2 - wait for E tap to setup second coord
@ -161,6 +146,7 @@ Convar gCV_Height = null;
Convar gCV_Offset = null;
Convar gCV_EnforceTracks = null;
Convar gCV_BoxOffset = null;
Convar gCV_ExtraSpawnHeight = null;
Convar gCV_PrebuiltVisualOffset = null;
// handles
@ -296,6 +282,7 @@ public void OnPluginStart()
gCV_Offset = new Convar("shavit_zones_offset", "1.0", "When calculating a zone's *VISUAL* box, by how many units, should we scale it to the center?\n0.0 - no downscaling. Values above 0 will scale it inward and negative numbers will scale it outwards.\nAdjust this value if the zones clip into walls.");
gCV_EnforceTracks = new Convar("shavit_zones_enforcetracks", "1", "Enforce zone tracks upon entry?\n0 - allow every zone except for start/end to affect users on every zone.\n1 - require the user's track to match the zone's track.", 0, true, 0.0, true, 1.0);
gCV_BoxOffset = new Convar("shavit_zones_box_offset", "16", "Offset zone trigger boxes by this many unit\n0 - matches players bounding box\n16 - matches players center");
gCV_ExtraSpawnHeight = new Convar("shavit_zones_extra_spawn_height", "0.0", "YOU DONT NEED TO TOUCH THIS USUALLY. FIX YOUR ACTUAL ZONES.\nUsed to fix some shit prebuilt zones that are in the ground like bhop_strafecontrol");
gCV_PrebuiltVisualOffset = new Convar("shavit_zones_prebuilt_visual_offset", "0", "YOU DONT NEED TO TOUCH THIS USUALLY.\nUsed to fix the VISUAL beam offset for prebuilt zones on a map.\nExample maps you'd want to use 16 on: bhop_tranquility and bhop_amaranthglow");
gCV_Interval.AddChangeHook(OnConVarChanged);
@ -1337,13 +1324,15 @@ public Action Command_SetStart(int client, int args)
int track = Shavit_GetClientTrack(client);
#if 0
if(!InsideZone(client, Zone_Start, track))
{
Shavit_PrintToChat(client, "%T", "SetStartNotInStartZone", client, gS_ChatStrings.sWarning, gS_ChatStrings.sText, gS_ChatStrings.sVariable2, gS_ChatStrings.sText);
return Plugin_Handled;
}
#endif
Shavit_PrintToChat(client, "%T", "SetStart", client, gS_ChatStrings.sVariable2, gS_ChatStrings.sText);
SetStart(client, track, GetEntPropEnt(client, Prop_Send, "m_hGroundEntity") == -1);
@ -3231,26 +3220,31 @@ public void Shavit_OnRestart(int client, int track)
// standard zoning
else if((iIndex = GetZoneIndex(Zone_Start, track)) != -1)
{
float fCenter[3], fCustomStart[3];
fCenter[0] = gV_ZoneCenter[iIndex][0];
fCenter[1] = gV_ZoneCenter[iIndex][1];
fCenter[2] = gV_MapZones[iIndex][0][2] + 1.0; // no stuck in floor please
float bmin[3], bmax[3];
bool bCustomStart = false;
if(gB_HasSetStart[client][track] && !gB_StartAnglesOnly[client][track])
float fCenter[3];
fCenter[0] = gV_ZoneCenter[iIndex][0];
fCenter[1] = gV_ZoneCenter[iIndex][1];
fCenter[2] = gV_MapZones[iIndex][0][2];
if (gB_HasSetStart[client][track] && !gB_StartAnglesOnly[client][track])
{
float bmin[3], bmax[3];
FillBoxMinMax(gV_MapZones[iIndex][0], gV_MapZones[iIndex][1], bmin, bmax);
bmin[2] -= 0.01; // help fix some slight float accuracy loss for things like bhop_pisjapahnetribkoj
fCustomStart = gF_StartPos[client][track];
fCustomStart[2] += 1.0;
bCustomStart = PointInBox(fCustomStart, bmin, bmax);
fCenter = gF_StartPos[client][track];
bCustomStart = true;
}
TeleportEntity(client, bCustomStart ? fCustomStart : fCenter, gB_HasSetStart[client][track] ? gF_StartAng[client][track] : NULL_VECTOR, view_as<float>({0.0, 0.0, 0.0}));
fCenter[2] += 1.0 + gCV_ExtraSpawnHeight.FloatValue;
if (bCustomStart && !PointInBox(fCenter, bmin, bmax))
{
Shavit_StopTimer(client);
}
TeleportEntity(client, fCenter, gB_HasSetStart[client][track] ? gF_StartAng[client][track] : NULL_VECTOR, view_as<float>({0.0, 0.0, 0.0}));
}
// kz buttons