Mirrors/halflife2chaos
1
0
Fork 0
mirror of https://github.com/Pinsplash/halflife2chaos.git synced 2024-10-29 23:32:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes made for ep1

Browse Source 
made clientscheme.res match with 2013 SDK except in specifically needed cases
fixed logo in first map showing "HALF-LIFE'"
fixed advisor screens not looking good with ep2 advisor model, new model is because the cables would not appear to move when viewed on the monitor only
fixed APC being unable to drive properly
made ep1 credits actually the ep1 credits, not hl2
This commit is contained in:
Pinsplash 2024-04-19 15:06:18 -05:00
parent 9e5286658e
commit 921e479c19
12 changed files with 163 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
sourcemods/ep1chaos/models/Advisor_nocables.dx80.vtx Normal file
View File

Binary file not shown.

BIN
sourcemods/ep1chaos/models/Advisor_nocables.dx90.vtx Normal file
View File

Binary file not shown.

BIN
sourcemods/ep1chaos/models/Advisor_nocables.sw.vtx Normal file
View File

Binary file not shown.

BIN
sourcemods/ep1chaos/models/advisor_nocables.mdl Normal file
View File

Binary file not shown.

BIN
sourcemods/ep1chaos/models/advisor_nocables.vvd Normal file
View File

Binary file not shown.

64
sourcemods/ep1chaos/resource/clientscheme.res
View File

@ -24,7 +24,6 @@ Scheme
BaseSettings
{
"FgColor" "255 220 0 100"
"FgColor_vrmode" "255 220 0 200"
"BgColor" "0 0 0 76"
"Panel.FgColor" "255 220 0 100"
@ -69,11 +68,6 @@ Scheme
// Blank space to leave beneath the menu on the main screen
"Main.BottomBorder" "32"
// Deck colors
"SteamDeckLoadingBar" "250 128 20 255"
"SteamDeckSpinner" "201 100 0 255"
"SteamDeckLoadingText" "181 179 175 255"
}
//////////////////////// BITMAP FONT FILES /////////////////////////////
@ -320,18 +314,6 @@ Scheme
"custom" "1"
}
}
FlashlightDeck
{
"1"
{
"name" "HalfLife2"
"tall" "46"
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
Crosshairs
{
"1"
@ -666,7 +648,20 @@ Scheme
"weight" "0"
"additive" "0"
"antialias" "1"
"custom" "1" [$OSX]
"custom" "1"
}
}
ClientTitleFont_og
{
"1"
{
"name" "HL2EP1"
"tall" "34"
"tall_hidef" "48"
"weight" "0"
"additive" "0"
"antialias" "1"
"custom" "1"
}
}
CreditsLogo
@ -690,30 +685,9 @@ Scheme
"weight" "900"
"antialias" "1"
"additive" "1"
"yres" "480 899"
}
"2"
{
"name" "Trebuchet MS"
"tall" "12"
"weight" "900"
"antialias" "1"
"additive" "1"
}
}
CreditsOutroLogos
{
"1"
{
"name" "HalfLife2"
"tall" "34"
"weight" "0"
"antialias" "1"
"additive" "1"
"custom" "1"
}
}
CreditsOutroValve
{
"1"
{
@ -833,15 +807,6 @@ Scheme
}
}
"SteamDeckLoadingText"
{
"7"
{
"name" "Alte DIN 1451 Mittelschrift"
"tall" "24"
"weight" "800"
}
}
}
@ -852,6 +817,7 @@ Scheme
{
"1" "resource/HALFLIFE2.ttf"
"2" "resource/HL2crosshairs.ttf"
"3" "resource/HL2EP1.ttf"
"4" "resource/linux_fonts/DejaVuSans.ttf"
"5" "resource/linux_fonts/DejaVuSans-Bold.ttf"
"6" "resource/linux_fonts/DejaVuSans-BoldOblique.ttf"

124
sourcemods/ep1chaos/scripts/credits.txt
View File

@ -99,6 +99,7 @@
"CreditsParams"
{
"logo" "HALF-LIFE'"
"logo2" "== episode one=="
"fadeintime" "2.5"
"fadeouttime" "1"
@ -111,8 +112,8 @@
"color" "255 255 255 128"
//Outro Parameters
"scrolltime" "158"
//Outro Parameters
"scrolltime" "60"
"separation" "10"
}
@ -121,95 +122,129 @@
//========================================================
"OutroCreditsNames"
{
"HALF-LIFE'" "CreditsOutroLogos"
"HALF-LIFE'" "ClientTitleFont_og"
"== episode one==" "ClientTitleFont_og"
" " "CreditsOutroText"
"V" "CreditsOutroValve"
"V" "CreditsOutroLogos"
" " "CreditsOutroText"
"Viktor Antonov" "CreditsOutroText"
"Mike Asquith" "CreditsOutroText"
"Gautam Babbar" "CreditsOutroText"
"Ted Backman" "CreditsOutroText"
"T.K. Backman" "CreditsOutroText"
"Kelly Bailey" "CreditsOutroText"
"Jeff Ballinger" "CreditsOutroText"
"Matt Bamberger" "CreditsOutroText"
"Jeff Ballinger" "CreditsOutroText"
"Matt Bamberger" "CreditsOutroText"
"Aaron Barber" "CreditsOutroText"
"Jeep Barnett" "CreditsOutroText"
"Josh Bentley" "CreditsOutroText"
"Yahn Bernier" "CreditsOutroText"
"Ken Birdwell" "CreditsOutroText"
"Derrick Birum" "CreditsOutroText"
"Chris Bokitch" "CreditsOutroText"
"Steve Bond" "CreditsOutroText"
"Matt Boone" "CreditsOutroText"
"Jason Brashill" "CreditsOutroText"
"Charlie Brown" "CreditsOutroText"
"Julie Caldwell" "CreditsOutroText"
"Charlie Burgin" "CreditsOutroText"
"Julie Caldwell" "CreditsOutroText"
"Dario Casali" "CreditsOutroText"
"Yvan Charpentier" "CreditsOutroText"
"Chris Chin" "CreditsOutroText"
"Jess Cliffe" "CreditsOutroText"
"John Cook" "CreditsOutroText"
"Phil Co" "CreditsOutroText"
"John Cook" "CreditsOutroText"
"Greg Coomer" "CreditsOutroText"
"Kellie Cosner" "CreditsOutroText"
"Scott Dalton" "CreditsOutroText"
"Kerry Davis" "CreditsOutroText"
"Jason Deakins" "CreditsOutroText"
"Joe Demers" "CreditsOutroText"
"Ariel Diaz" "CreditsOutroText"
"Quintin Doroquez" "CreditsOutroText"
"Quintin Doroquez" "CreditsOutroText"
"Jim Dose" "CreditsOutroText"
"Martha Draves" "CreditsOutroText"
"Laura Dubuk" "CreditsOutroText"
"Mike Dunkle" "CreditsOutroText"
"Mike Dussault" "CreditsOutroText"
"Rick Ellis" "CreditsOutroText"
"Dhabih Eng" "CreditsOutroText"
"Miles Estes" "CreditsOutroText"
"Katie Engel" "CreditsOutroText"
"Chet Faliszek" "CreditsOutroText"
"Tarn Faulkner" "CreditsOutroText"
"Adrian Finol" "CreditsOutroText"
"Bill Fletcher" "CreditsOutroText"
"Moby Francke" "CreditsOutroText"
"Stephane Gaudette" "CreditsOutroText"
"Kathy Gehrig" "CreditsOutroText"
"Pat Goodwin" "CreditsOutroText"
"Chris Green" "CreditsOutroText"
"Chris Grinstead" "CreditsOutroText"
"Paul Graham" "CreditsOutroText"
"Chris Green" "CreditsOutroText"
"Chris Grinstead" "CreditsOutroText"
"John Guthrie" "CreditsOutroText"
"Leslie Hall" "CreditsOutroText"
"Damarcus Holbrook" "CreditsOutroText"
"Tim Holt" "CreditsOutroText"
"Brian Jacobson" "CreditsOutroText"
"Jeff Hameluck" "CreditsOutroText"
"Jason Holtman" "CreditsOutroText"
"Keith Huggins" "CreditsOutroText"
"Jim Hughes" "CreditsOutroText"
"John Huisingh" "CreditsOutroText"
"Brian Jacobson" "CreditsOutroText"
"Cory Jarnagin" "CreditsOutroText"
"Lars Jensvold" "CreditsOutroText"
"Erik Johnson" "CreditsOutroText"
"Jakob Jungels" "CreditsOutroText"
"Rich Kaethler" "CreditsOutroText"
"Steve Kalning" "CreditsOutroText"
"Iikka Keranen" "CreditsOutroText"
"Eric Kirchmer" "CreditsOutroText"
"David Kircher" "CreditsOutroText"
"Erik Kirchmer" "CreditsOutroText"
"Scott Klintworth" "CreditsOutroText"
"Alden Kroll" "CreditsOutroText"
"Marc Laidlaw" "CreditsOutroText"
"Jeff Lane" "CreditsOutroText"
"Jeff Lane" "CreditsOutroText"
"Dan LeFree" "CreditsOutroText"
"Isabelle Lemay" "CreditsOutroText"
"Tom Leonard" "CreditsOutroText"
"Doug Lombardi" "CreditsOutroText"
"Bianca Loomis" "CreditsOutroText"
"Realm Lovejoy" "CreditsOutroText"
"Randy Lundeen" "CreditsOutroText"
"Scott Lynch" "CreditsOutroText"
"Ido Magal" "CreditsOutroText"
"Gary McTaggart" "CreditsOutroText"
"John Morello II" "CreditsOutroText"
"Ido Magal" "CreditsOutroText"
"Nick Maggiore" "CreditsOutroText"
"Patrick McClard" "CreditsOutroText"
"Gary McTaggart" "CreditsOutroText"
"Jason Mitchell" "CreditsOutroText"
"John Morello" "CreditsOutroText"
"Bryn Moslow" "CreditsOutroText"
"Arsenio Navarro" "CreditsOutroText"
"Gabe Newell" "CreditsOutroText"
"Tri Nguyen" "CreditsOutroText"
"Jake Nicholson" "CreditsOutroText"
"Jake Nicholson" "CreditsOutroText"
"Martin Otten" "CreditsOutroText"
"Kristen Perry" "CreditsOutroText"
"Bay Raitt" "CreditsOutroText"
"Alfred Reynolds" "CreditsOutroText"
"Nick Papineau" "CreditsOutroText"
"Bay Raitt" "CreditsOutroText"
"Alfred Reynolds" "CreditsOutroText"
"Garret Rickey" "CreditsOutroText"
"Dave Riller" "CreditsOutroText"
"Danika Rogers" "CreditsOutroText"
"Jason Ruymen" "CreditsOutroText"
"David Sawyer" "CreditsOutroText"
"Marc Scaparro" "CreditsOutroText"
"Wade Schin" "CreditsOutroText"
"Matthew Scott" "CreditsOutroText"
"Aaron Seeler" "CreditsOutroText"
"Nick Shaffner" "CreditsOutroText"
"Taylor Sherman" "CreditsOutroText"
"Taylor Sherman" "CreditsOutroText"
"Eric Smith" "CreditsOutroText"
"David Speyrer" "CreditsOutroText"
"Jay Stelly" "CreditsOutroText"
"Jeremy Stone" "CreditsOutroText"
"Mikel Thompson" "CreditsOutroText"
"Kelly Thornton" "CreditsOutroText"
"Jeremy Stone" "CreditsOutroText"
"Kim Swift" "CreditsOutroText"
"Kelly Thornton" "CreditsOutroText"
"Carl Uhlman" "CreditsOutroText"
"Bill Van Buren" "CreditsOutroText"
"KayLee Vogt" "CreditsOutroText"
"Jennifer Valente" "CreditsOutroText"
"Doug Valente" "CreditsOutroText"
"Bill Van Buren" "CreditsOutroText"
"Robin Walker" "CreditsOutroText"
"Josh Weier" "CreditsOutroText"
"Doug Wood" "CreditsOutroText"
"Erik Wolpaw" "CreditsOutroText"
"Doug Wood" "CreditsOutroText"
"Matt T. Wood" "CreditsOutroText"
"Matt Wright" "CreditsOutroText"
" " "CreditsOutroText"
"Danika Wright" "CreditsOutroText"
" " "CreditsOutroText"
" " "CreditsOutroText"
" " "CreditsOutroText"
@ -222,7 +257,6 @@
"Mike Shapiro - Barney Calhoun" "CreditsOutroText"
"Mike Shapiro - Gman" "CreditsOutroText"
"Harry S. Robins - Dr. Isaac Kleiner" "CreditsOutroText"
"Jim French - Father Grigori" "CreditsOutroText"
"John Patrick Lowrie - Citizens\Misc. characters" "CreditsOutroText"
"Mary Kae Irvin - Citizens\Misc. characters" "CreditsOutroText"
"Ellen McLain - Overwatch" "CreditsOutroText"
@ -231,7 +265,7 @@
" " "CreditsOutroText"
" " "CreditsOutroText"
"Voice Casting:" "CreditsOutroText"
"Shana Landsburg\Teri Fiddleman" "CreditsOutroText"
"Shana Landsburg and Teri Fiddleman" "CreditsOutroText"
" " "CreditsOutroText"
" " "CreditsOutroText"
" " "CreditsOutroText"
@ -256,7 +290,6 @@
" " "CreditsOutroText"
"Crack Legal Team:" "CreditsOutroText"
"Liam Lavery" "CreditsOutroText"
"Jason Holtman" "CreditsOutroText"
"Karl Quackenbush" "CreditsOutroText"
"Kristen Boraas" "CreditsOutroText"
"Kevin Rosenfield" "CreditsOutroText"
@ -267,13 +300,13 @@
" " "CreditsOutroText"
"Thanks to the following for the use of their faces:" "CreditsOutroText"
"Jamil Mullen" "CreditsOutroText"
"Art Min" "CreditsOutroText"
"Larry 'The Count' Heard" "CreditsOutroText"
"Ted Cohrt" "CreditsOutroText"
"Roger Guay" "CreditsOutroText"
"Frank Sheldon" "CreditsOutroText"
"Travis Dunlop" "CreditsOutroText"
"Daniel Dociu" "CreditsOutroText"
"Art Min" "CreditsOutroText"
"Van Crowder" "CreditsOutroText"
"Joey Paresa" "CreditsOutroText"
"Chau Luu" "CreditsOutroText"
@ -297,7 +330,6 @@
"Falcon Northwest" "CreditsOutroText"
"Havok" "CreditsOutroText"
"SOFTIMAGE" "CreditsOutroText"
"and Don Kemmis, SLK Technologies" "CreditsOutroText"
" " "CreditsOutroText"
" " "CreditsOutroText"
" " "CreditsOutroText"
@ -311,4 +343,4 @@
}
}

2
sp/src/game/client/hl2/hud_credits.cpp
View File

@ -424,7 +424,7 @@ void CHudCredits::DrawLogo( void )
}
else if ( hl2_episodic.GetBool() )
{
Q_snprintf( szLogoFont, sizeof( szLogoFont ), "ClientTitleFont" );
Q_snprintf( szLogoFont, sizeof( szLogoFont ), "ClientTitleFont_og" );
}
else
{

63
sp/src/game/server/hl2/hl2_player.cpp
View File

@ -2312,6 +2312,69 @@ void CHL2_Player::StartGame()
}
}
}
//advisor model, same as breen 01
else if (!Q_strcmp(pMapName, "ep1_citadel_01"))
{
CBaseEntity *pEnt = gEntList.FindEntityByName(NULL, "camera_advisor");
pEnt->SetAbsOrigin(Vector(-96, -103, 96));
pEnt->SetAbsAngles(QAngle(-10.74, 90, 0));
CBaseEntity *pCycle = gEntList.FindEntityByClassname(NULL, "cycler");
if (pCycle)
{
CBaseEntity *pAdv = (CBaseEntity *)CreateEntityByName("npc_advisor");
if (pAdv)
{
pAdv->SetAbsOrigin(pCycle->GetAbsOrigin());
pAdv->SetAbsAngles(pCycle->GetAbsAngles());
pAdv->KeyValue("model", "models/advisor_nocables.mdl");
pAdv->Spawn();
pAdv->Activate();
UTIL_Remove(pCycle);
}
}
}
//advisor model, same as breen 01
else if (!Q_strcmp(pMapName, "ep1_c17_02"))
{
CBaseEntity *pEnt = gEntList.FindEntityByName(NULL, "cam_advisor_1");
pEnt->SetAbsOrigin(Vector(2304, 693, -396));
pEnt->SetAbsAngles(QAngle(-10.74, 90, 0));
CBaseEntity *pCycle = gEntList.FindEntityByClassname(NULL, "cycler");
if (pCycle)
{
CBaseEntity *pAdv = (CBaseEntity *)CreateEntityByName("npc_advisor");
if (pAdv)
{
pAdv->SetAbsOrigin(pCycle->GetAbsOrigin());
pAdv->SetAbsAngles(pCycle->GetAbsAngles());
pAdv->KeyValue("model", "models/advisor_nocables.mdl");
pAdv->Spawn();
pAdv->Activate();
UTIL_Remove(pCycle);
}
}
}
//advisor model, same as breen 01
else if (!Q_strcmp(pMapName, "ep1_c17_05"))
{
CBaseEntity *pEnt = gEntList.FindEntityByName(NULL, "cam_advisor");
pEnt->SetAbsOrigin(Vector(10212, 10489, -1368));
pEnt->SetAbsAngles(QAngle(-10.74, 90, 0));
CBaseEntity *pCycle = gEntList.FindEntityByClassname(NULL, "cycler");
if (pCycle)
{
CBaseEntity *pAdv = (CBaseEntity *)CreateEntityByName("npc_advisor");
if (pAdv)
{
pAdv->SetAbsOrigin(pCycle->GetAbsOrigin());
pAdv->SetAbsAngles(pCycle->GetAbsAngles());
pAdv->KeyValue("model", "models/advisor_nocables.mdl");
pAdv->Spawn();
pAdv->Activate();
UTIL_Remove(pCycle);
}
}
}
}
//-----------------------------------------------------------------------------
//Purpose: Sets HL2 specific defaults.

3
sp/src/game/server/hl2/npc_apcdriver.cpp
View File

@ -78,7 +78,8 @@ void CNPC_APCDriver::Spawn( void )
m_flTimeLastSeenEnemy = -NPC_APCDRIVER_REMEMBER_TIME;
CapabilitiesClear();
CapabilitiesAdd(bits_CAP_INNATE_RANGE_ATTACK1 | bits_CAP_INNATE_RANGE_ATTACK2);
CapabilitiesAdd(bits_CAP_MOVE_GROUND);
if (m_bChaosSpawned)
CapabilitiesAdd(bits_CAP_MOVE_GROUND);
m_bFiringDisabled = false;
}

3
sp/src/game/server/npc_vehicledriver.cpp
View File

@ -129,7 +129,8 @@ void CNPC_VehicleDriver::Spawn( void )
m_flDistanceAlongSpline = 0.2;
m_pCurrentWaypoint = m_pNextWaypoint = NULL;
//GetNavigator()->SetPathcornerPathfinding( false );
if (!m_bChaosSpawned)
GetNavigator()->SetPathcornerPathfinding( false );
NPCInit();

4
sp/src/game/shared/beam_shared.cpp
View File

@ -66,8 +66,8 @@ bool IsStaticPointEntity( CBaseEntity *pEnt )
{
if ( pEnt->GetMoveParent() )
return false;
if ( !pEnt->GetModelIndex() )
//found some ambient_generics being used as targets with a model index of -1 in ep1_c17_02
if (pEnt->GetModelIndex() == 0 || pEnt->GetModelIndex() == -1)
return 1;
if ( FClassnameIs( pEnt, "info_target" ) || FClassnameIs( pEnt, "info_landmark" ) ||