Skip to content

Commit

Permalink
more issues seen from streams of hl2 chaos
Browse files Browse the repository at this point in the history
longer archiving some useless things in config.cfg
Ran Out Of Glue can no longer happen on d1_trainstation_01
chaos_strike_max default is now 3 instead of 5
teleporting by Teleporter Bullets will now cause the shooter to be released from any barnacle tongues
if d1_canals_11 is entered with no airboat, the game will now give a new one
Give Random Weapon and Give All Weapons can now give bugbait
fixed Give Random Weapon and Give All Weapons putting weapon(s) at the map origin if the player was in a vehicle at the time
added chaos_unstuck_neweffect to control whether the game tries to get the player unstuck when a new effect starts. this may not be desired by players use clips.
barrels launched by Double Barrel Shotgun now offset more appropriately when the player is big or small
version number now included in mod title
Surprise Reforestation has been made to be less dense and less likely to block doorways. the effect has been given a larger "radius" to account for the smaller density of trees
the game now gives a gravity gun upon entering d3_citadel_03 if you don't have one so that the weapon destruction sequence can proceed properly
Wobbly can no longer reapply when loading a save which was made before it ended
Wobbly's strength has been halved and now scales with player size
Noriko, No! can no longer happen on any map where the magnet might touch a dissolving trigger, which will lead to a crash
fixed a crash related to manhack squads
Force In/Out Vehicle will no longer check the map list if forcing a player out of a vehicle, because there's no reason to
d3_breen_01 added to the map list for the Player Teleport context
removed the code for periodically checking if the player is stuck while Player Is Huge is active because it seems like the issues with it have been fixed
minor fixes related to crouching and player size
Suppression Field Hiccup can no longer happen on d3_breen_01
  • Loading branch information
Pinsplash committed Apr 28, 2023
1 parent 094eb33 commit e2c34c7
Show file tree
Hide file tree
Showing 23 changed files with 233 additions and 106 deletions.
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ client.dylib.dSYM/
server.dylib
server.dylib.dSYM/

# shader files
config.cfg

*.tmp
*.bsp
*.sav
Expand All @@ -59,4 +60,6 @@ server.dylib.dSYM/
*.dll
*.lib
*.vpc.sentinel
*.tga
*.tga

ep1_gamestats.dat
2 changes: 1 addition & 1 deletion sourcemods/ep1chaos/cfg/autoexec.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ chaos_effect_interval 20 //Time between each effect
chaos_effect_time 80 //Standard effect length
gl_clear 1 //Some effects like "Where Are The Objects?" can cause rapid flashing if both gl_clear and VSync are off. If you don't suffer from photosensitivity issues, or you have VSync on, you can turn this off for a performance boost and to get the classic "hall of mirrors" void effect.
chaos_instant_off 0 //1 instantly removes effects when chaos is 0
chaos_strike_max 5 //If an effect causes the player to die too many times, it will be aborted.
chaos_strike_max 3 //If an effect causes the player to die too many times, it will be aborted.
//All below are multipliers of length for individual effects. For example if chaos_effect_time is 90 and a multiplier is 0.666, the length of an effect will be 60 seconds.
//The desired number for a multiplier is the desired time divided by chaos_effect_time.
Expand Down
10 changes: 5 additions & 5 deletions sourcemods/ep1chaos/cfg/config.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
unbindall
bind "0" "vr_toggle"
bind "1" "slot1"
bind "2" "slot2"
bind "3" "slot3"
Expand All @@ -12,6 +13,7 @@ bind "d" "+moveright"
bind "e" "+use"
bind "f" "impulse 100"
bind "g" "phys_swap"
bind "p" "headtrack_reset_home_pos"
bind "q" "lastinv"
bind "r" "+reload"
bind "s" "+back"
Expand All @@ -24,6 +26,7 @@ bind "PAUSE" "pause"
bind "SHIFT" "+speed"
bind "ALT" "+walk"
bind "CTRL" "+duck"
bind "F3" "askconnect_accept"
bind "F5" "jpeg"
bind "F6" "save quick"
bind "F9" "load quick"
Expand Down Expand Up @@ -79,8 +82,6 @@ c_maxyaw "135"
c_minyaw "-135"
c_maxdistance "200"
c_mindistance "30"
c_orthowidth "160"
c_orthoheight "90"
joy_name "joystick"
joy_advanced "1"
joy_advaxisx "4"
Expand Down Expand Up @@ -203,7 +204,6 @@ sv_specaccelerate "5"
sv_specspeed "3"
sv_specnoclip "1"
sv_backspeed "0.6"
sv_skyname "sky_ep01_00_hdr"
sv_stickysprint "0"
xc_crouch_range "0.85"
xc_use_crouch_limiter "0"
Expand All @@ -214,8 +214,8 @@ npc_citizen_medic_throw_style "1"
windows_speaker_config "4"
snd_legacy_surround "0"
snd_pitchquality "1"
volume ".4"
snd_musicvolume "0.000000"
volume "1.000000"
snd_musicvolume "1.000000"
snd_mixahead "0.1"
adsp_debug "0"
snd_ducktovolume "0.55"
Expand Down
Binary file modified sourcemods/ep1chaos/ep1_gamestats.dat
Binary file not shown.
4 changes: 2 additions & 2 deletions sourcemods/ep1chaos/gameinfo.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"GameInfo"
{
game "HL2:EP1 Chaos"
title "HL2:EP1 Chaos"
game "HL2:EP1 Chaos v0.2.1"
title "HL2:EP1 Chaos v0.2.1"
type singleplayer_only

FileSystem
Expand Down
2 changes: 1 addition & 1 deletion sourcemods/ep2chaos/cfg/autoexec.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ chaos_effect_interval 20 //Time between each effect
chaos_effect_time 80 //Standard effect length
gl_clear 1 //Some effects like "Where Are The Objects?" can cause rapid flashing if both gl_clear and VSync are off. If you don't suffer from photosensitivity issues, or you have VSync on, you can turn this off for a performance boost and to get the classic "hall of mirrors" void effect.
chaos_instant_off 0 //1 instantly removes effects when chaos is 0
chaos_strike_max 5 //If an effect causes the player to die too many times, it will be aborted.
chaos_strike_max 3 //If an effect causes the player to die too many times, it will be aborted.
//All below are multipliers of length for individual effects. For example if chaos_effect_time is 90 and a multiplier is 0.666, the length of an effect will be 60 seconds.
//The desired number for a multiplier is the desired time divided by chaos_effect_time.
Expand Down
10 changes: 5 additions & 5 deletions sourcemods/ep2chaos/cfg/config.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
unbindall
bind "0" "vr_toggle"
bind "1" "slot1"
bind "2" "slot2"
bind "3" "slot3"
Expand All @@ -12,6 +13,7 @@ bind "d" "+moveright"
bind "e" "+use"
bind "f" "impulse 100"
bind "g" "phys_swap"
bind "p" "headtrack_reset_home_pos"
bind "q" "lastinv"
bind "r" "+reload"
bind "s" "+back"
Expand All @@ -24,6 +26,7 @@ bind "PAUSE" "pause"
bind "SHIFT" "+speed"
bind "ALT" "+walk"
bind "CTRL" "+duck"
bind "F3" "askconnect_accept"
bind "F5" "jpeg"
bind "F6" "save quick"
bind "F9" "load quick"
Expand Down Expand Up @@ -79,8 +82,6 @@ c_maxyaw "135"
c_minyaw "-135"
c_maxdistance "200"
c_mindistance "30"
c_orthowidth "160"
c_orthoheight "90"
joy_name "joystick"
joy_advanced "1"
joy_advaxisx "4"
Expand Down Expand Up @@ -203,7 +204,6 @@ sv_specaccelerate "5"
sv_specspeed "3"
sv_specnoclip "1"
sv_backspeed "0.6"
sv_skyname "sky_ep02_05_hdr"
sv_stickysprint "0"
xc_crouch_range "0.85"
xc_use_crouch_limiter "0"
Expand All @@ -214,8 +214,8 @@ npc_citizen_medic_throw_style "1"
windows_speaker_config "4"
snd_legacy_surround "0"
snd_pitchquality "1"
volume ".4"
snd_musicvolume "0.000000"
volume "1.000000"
snd_musicvolume "1.000000"
snd_mixahead "0.1"
adsp_debug "0"
snd_ducktovolume "0.55"
Expand Down
4 changes: 2 additions & 2 deletions sourcemods/ep2chaos/gameinfo.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"GameInfo"
{
game "HL2:EP2 Chaos"
title "HL2:EP2 Chaos"
game "HL2:EP2 Chaos v0.2.1"
title "HL2:EP2 Chaos v0.2.1"
type singleplayer_only

FileSystem
Expand Down
2 changes: 1 addition & 1 deletion sourcemods/hl2chaos/cfg/autoexec.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ chaos_effect_interval 20 //Time between each effect
chaos_effect_time 80 //Standard effect length
gl_clear 1 //Some effects like "Where Are The Objects?" can cause rapid flashing if both gl_clear and VSync are off. If you don't suffer from photosensitivity issues, or you have VSync on, you can turn this off for a performance boost and to get the classic "hall of mirrors" void effect.
chaos_instant_off 0 //1 instantly removes effects when chaos is 0
chaos_strike_max 5 //If an effect causes the player to die too many times, it will be aborted.
chaos_strike_max 3 //If an effect causes the player to die too many times, it will be aborted.
//All below are multipliers of length for individual effects. For example if chaos_effect_time is 90 and a multiplier is 0.666, the length of an effect will be 60 seconds.
//The desired number for a multiplier is the desired time divided by chaos_effect_time.
Expand Down
7 changes: 2 additions & 5 deletions sourcemods/hl2chaos/cfg/config.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ c_maxyaw "135"
c_minyaw "-135"
c_maxdistance "200"
c_mindistance "30"
c_orthowidth "240"
c_orthoheight "135"
joy_name "joystick"
joy_advanced "1"
joy_advaxisx "4"
Expand Down Expand Up @@ -206,7 +204,6 @@ sv_specaccelerate "5"
sv_specspeed "3"
sv_specnoclip "1"
sv_backspeed "0.6"
sv_skyname "sky_day01_09"
sv_stickysprint "0"
xc_crouch_range "0.85"
xc_use_crouch_limiter "0"
Expand All @@ -215,8 +212,8 @@ g_antlion_cascade_push "1"
windows_speaker_config "4"
snd_legacy_surround "0"
snd_pitchquality "1"
volume ".5"
snd_musicvolume "0.000000"
volume "1.000000"
snd_musicvolume "1.000000"
snd_mixahead "0.1"
adsp_debug "0"
snd_ducktovolume "0.55"
Expand Down
4 changes: 2 additions & 2 deletions sourcemods/hl2chaos/gameinfo.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"GameInfo"
{
game "HL2 Chaos"
title "HL2 Chaos"
game "HL2 Chaos v0.2.1"
title "HL2 Chaos v0.2.1"
type singleplayer_only

FileSystem
Expand Down
4 changes: 2 additions & 2 deletions sp/src/game/client/in_camera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ static ConVar c_maxyaw( "c_maxyaw", "135", FCVAR_ARCHIVE);
static ConVar c_minyaw( "c_minyaw", "-135", FCVAR_ARCHIVE );
static ConVar c_maxdistance( "c_maxdistance", "200", FCVAR_ARCHIVE );
static ConVar c_mindistance( "c_mindistance", "30", FCVAR_ARCHIVE );
static ConVar c_orthowidth( "c_orthowidth", "100", FCVAR_ARCHIVE );
static ConVar c_orthoheight( "c_orthoheight", "100", FCVAR_ARCHIVE );
static ConVar c_orthowidth("c_orthowidth", "100", FCVAR_NONE);
static ConVar c_orthoheight("c_orthoheight", "100", FCVAR_NONE);

static kbutton_t cam_pitchup, cam_pitchdown, cam_yawleft, cam_yawright;
static kbutton_t cam_in, cam_out; // -- "cam_move" is unused
Expand Down
6 changes: 4 additions & 2 deletions sp/src/game/client/view_effects.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ void CViewEffects::Restore( IRestore *pRestore, bool fCreatePlayers )
if( !pSaveData->levelInfo.fUseLandmark )
{
ClearAllFades();
ClearAllShakes();
//ClearAllShakes();

// Read in the view fades
int iCount = pRestore->ReadInt();
Expand All @@ -690,7 +690,8 @@ void CViewEffects::Restore( IRestore *pRestore, bool fCreatePlayers )

m_FadeList.AddToTail( pNewFade );
}

//Don't want this in chaos. if a save is made when wobbly is on, but laoded once it's off, the shake from wobbly could still apply
/*
// Read in the view shakes
iCount = pRestore->ReadInt();
for ( int i = 0; i < iCount; i++ )
Expand All @@ -703,6 +704,7 @@ void CViewEffects::Restore( IRestore *pRestore, bool fCreatePlayers )
m_ShakeList.AddToTail( pNewShake );
}
*/
}
}

Expand Down
Loading

0 comments on commit e2c34c7

Please sign in to comment.