Skip to content

Commit 453608d

Browse files
BitlBitl
committed
disable stun, fix pyro taunt icon bug, disable team glows
1 parent e6e191a commit 453608d

14 files changed

+89
-31
lines changed

‎game/quiver/info_changelog.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Quiver Private Alpha 1.1.0:
2+
- Disabled stun in most instances, except in MvM where it's crucial against robots.
3+
- Disabled player glows on spawn and spectator (except in MvM).
4+
- Fixed a bug where some kill feeds erroneously show the Pyro kill taunt kill icon.
5+
16
Quiver Private Alpha 1.0.1:
27
- Whitelisted the Back Scatter and Force-a-Nature.
38
- Removed the Force-a-Nature's stun.

‎game/quiver/info_highlights.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ Highlights:
1111
- Bots now equip items, will actively look out for armor (on higher difficulties) and have random difficulties, giving a more dynamic single-player experience.
1212
- Added Team Deathmatch. Maps without a specified gamemode (no gamemode logic or entities), or with dm_ or tdm_ prefixes will be considered Team Deathmatch maps. Disable qf_allow_tdm if you wish to disable Team Deathmatch on your server and restore the original "no gamemode" logic.
1313
- Maps include: 2Fort, Lumberyard, Ravine.
14-
- Disabled the Match Status HUD, and restored the original TF2 round timer.
14+
- Disabled the Match Status HUD, and restored the original TF2 round timer.
15+
- Disabled stun in most instances, except in MvM where it's crucial against robots.
16+
- Disabled player glows on spawn and spectator (except in MvM).
1517

1618
Class changes:
1719
- Run speeds have been increased across all 9 classes. However, one aspect remains: Heavies are the slowest, Scouts are the fastest.
@@ -57,7 +59,6 @@ Unlockable weapon balance changes:
5759
- The per-backstab health bonus you get with the Conniver's Kunai was decreased from 140 health to 85, reducing the maximum health per backstab kill from 210 to 155.
5860
- The Flare Gun now deploys 15% faster.
5961
- When using the Cloak and Dagger, the jumping/bunnyhopping cloak drain increases to 4x.
60-
- Removed the Force-a-Nature's stun.
6162

6263
MvM Changes:
6364
- Added armor-related upgrades to MvM (max armor, pierces damage resistances, and armor resistance).

‎game/quiver/steam.inf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
PatchVersion=2101
2-
ClientVersion=2101
3-
ServerVersion=2101
1+
PatchVersion=2110
2+
ClientVersion=2110
3+
ServerVersion=2110
44
ProductName=quiver
55
appID=243750
66
ServerAppID=244310

‎game/quiver/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=Private Alpha 1.0.1
1+
version=Private Alpha 1.1.0

‎src/game/client/client_quiver.vpc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ $Project "Client (Quiver)"
213213
{
214214
$File "quiver\qf_hud_tdmstatus.cpp"
215215
$File "quiver\qf_hud_tdmstatus.h"
216+
$File "$SRCDIR\game\shared\quiver\achievements_quiver.cpp"
216217
}
217218

218219
$Folder "TF"

‎src/game/client/tf/hud_basedeathnotice.cpp‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -511,12 +511,11 @@ void CHudBaseDeathNotice::FireGameEvent( IGameEvent *event )
511511
Q_strncpy( m_DeathNotices[iMsg].Killer.szName, killer_name, ARRAYSIZE( m_DeathNotices[iMsg].Killer.szName ) );
512512
Q_strncpy( m_DeathNotices[iMsg].Victim.szName, victim_name, ARRAYSIZE( m_DeathNotices[iMsg].Victim.szName ) );
513513

514-
#ifndef BDSBASE
515514
if (killedwith && *killedwith)
516515
{
517516
Q_snprintf(m_DeathNotices[iMsg].szIcon, sizeof(m_DeathNotices[iMsg].szIcon), "d_%s", killedwith);
518517
}
519-
#endif
518+
520519
if ( !killer || killer == victim )
521520
{
522521
m_DeathNotices[iMsg].bSelfInflicted = true;
@@ -550,15 +549,6 @@ void CHudBaseDeathNotice::FireGameEvent( IGameEvent *event )
550549
}
551550
}
552551
}
553-
#ifdef BDSBASE
554-
else
555-
{
556-
if (killedwith && *killedwith)
557-
{
558-
Q_snprintf(m_DeathNotices[iMsg].szIcon, sizeof(m_DeathNotices[iMsg].szIcon), "d_%s", killedwith);
559-
}
560-
}
561-
#endif
562552

563553
m_DeathNotices[iMsg].iWeaponID = event->GetInt( "weaponid" );
564554
m_DeathNotices[iMsg].iKillerID = event->GetInt( "attacker" );

‎src/game/client/tf/tf_hud_spectator_extras.cpp‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
using namespace vgui;
2424

25-
ConVar tf_spec_xray_disable( "tf_spec_xray_disable", "0", FCVAR_ARCHIVE, "Disable the spectator xray mode." );
25+
ConVar tf_spec_xray_disable( "tf_spec_xray_disable", "0", FCVAR_ARCHIVE, "Disable the spectator xray mode." );
2626
ConVar tf_enable_glows_after_respawn( "tf_enable_glows_after_respawn", "1", FCVAR_ARCHIVE, "Enable teammate glow effects after respawn." );
2727

2828
DECLARE_HUDELEMENT( CTFHudSpectatorExtras );
@@ -100,6 +100,14 @@ void CTFHudSpectatorExtras::OnTick()
100100
if ( !g_PR )
101101
return;
102102

103+
#if defined(QUIVER_CLIENT_DLL)
104+
if (TFGameRules() && !TFGameRules()->IsMannVsMachineMode())
105+
{
106+
Reset();
107+
return;
108+
}
109+
#endif
110+
103111
if ( TFGameRules() && TFGameRules()->ShowMatchSummary() )
104112
{
105113
Reset();

‎src/game/server/server_quiver.vpc‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,19 @@ $Project "Server (Quiver)"
112112
$File "$SRCDIR\game\server\tf\workshop\maps_workshop.h"
113113
$File "$SRCDIR\game\server\tf\workshop\maps_workshop.cpp"
114114
}
115+
116+
$Folder "Quiver"
117+
{
118+
$File "$SRCDIR\game\shared\quiver\achievements_quiver.cpp"
119+
$Folder "Bot"
120+
{
121+
$Folder "Behavior"
122+
{
123+
$File "quiver\bot\behavior\tf_bot_get_armor.cpp"
124+
$File "quiver\bot\behavior\tf_bot_get_armor.h"
125+
}
126+
}
127+
}
115128

116129
$Folder "TF"
117130
{
@@ -709,12 +722,6 @@ $Project "Server (Quiver)"
709722
$File "tf\bot\behavior\squad\tf_bot_escort_squad_leader.cpp"
710723
$File "tf\bot\behavior\squad\tf_bot_escort_squad_leader.h"
711724
}
712-
713-
$Folder "Quiver"
714-
{
715-
$File "quiver\bot\behavior\tf_bot_get_armor.cpp"
716-
$File "quiver\bot\behavior\tf_bot_get_armor.h"
717-
}
718725
}
719726

720727
$Folder "MapEntities"

‎src/game/server/tf/tf_player.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3854,8 +3854,16 @@ void CTFPlayer::Spawn()
38543854
m_bRespawning = false;
38553855
m_Shared.RemoveAllCond(); // Remove conc'd, burning, rotting, hallucinating, etc.
38563856

3857+
#if defined(QUIVER_DLL)
3858+
if (TFGameRules() && TFGameRules()->IsMannVsMachineMode())
3859+
{
3860+
// add team glows for a period of time after we respawn
3861+
m_Shared.AddCond(TF_COND_TEAM_GLOWS, tf_spawn_glows_duration.GetInt());
3862+
}
3863+
#else
38573864
// add team glows for a period of time after we respawn
38583865
m_Shared.AddCond( TF_COND_TEAM_GLOWS, tf_spawn_glows_duration.GetInt() );
3866+
#endif
38593867

38603868
UpdateSkin( GetTeamNumber() );
38613869

@@ -11012,11 +11020,7 @@ void CTFPlayer::CommitSuicide( bool bExplode /* = false */, bool bForce /*= fals
1101211020
return;
1101311021

1101411022
m_bSuicideExplode = bExplode;
11015-
#ifdef BDSBASE
11016-
m_iSuicideCustomKillFlags = (EPlayerSuicideFlag_LockScore | TF_DMG_CUSTOM_SUICIDE);
11017-
#else
1101811023
m_iSuicideCustomKillFlags = TF_DMG_CUSTOM_SUICIDE;
11019-
#endif
1102011024

1102111025
BaseClass::CommitSuicide( bExplode, bForce );
1102211026
}

‎src/game/shared/multiplay_gamerules.cpp‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,10 +778,14 @@ ConVarRef suitcharger( "sk_suitcharger" );
778778
CBasePlayer *pScorer = GetDeathScorer( pKiller, pInflictor, pVictim );
779779

780780
#ifdef BDSBASE
781+
#ifdef HL2MP
781782
if (pVictim != pScorer || !FBitSet(pVictim->m_iSuicideCustomKillFlags, EPlayerSuicideFlag_LockScore))
782783
{
783784
pVictim->IncrementDeathCount(1);
784-
}
785+
}
786+
#else
787+
pVictim->IncrementDeathCount(1);
788+
#endif
785789
#else
786790
pVictim->IncrementDeathCount(1);
787791
#endif
@@ -795,7 +799,11 @@ ConVarRef suitcharger( "sk_suitcharger" );
795799
if ( pVictim == pScorer )
796800
{
797801
#ifdef BDSBASE
802+
#ifdef HL2MP
798803
if (!FBitSet(pVictim->m_iSuicideCustomKillFlags, EPlayerSuicideFlag_LockScore) && UseSuicidePenalty())
804+
#else
805+
if (UseSuicidePenalty())
806+
#endif
799807
#else
800808
if (UseSuicidePenalty())
801809
#endif

0 commit comments

Comments
 (0)