Skip to content

Commit

Permalink
update various gamepadui files
Browse files Browse the repository at this point in the history
  • Loading branch information
Bitl committed Mar 10, 2023
1 parent 865b588 commit 172acd5
Show file tree
Hide file tree
Showing 34 changed files with 971 additions and 103 deletions.
2 changes: 2 additions & 0 deletions sp/game/firefightreloaded/batch/steam_copy.bat
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ XCOPY /E "%CD%\gamepadui" "%gamepaduidir%" /sy
XCOPY "%CD%\gameinfo.txt" "%basedir%" /y
XCOPY "%CD%\steam.inf" "%basedir%" /y
XCOPY "%CD%\version.txt" "%basedir%" /y
XCOPY "%CD%\firefightreloaded_pak_000.vpk" "%basedir%" /y
XCOPY "%CD%\firefightreloaded_pak_dir.vpk" "%basedir%" /y

echo.
echo Moving game data to release folder...
Expand Down
4 changes: 2 additions & 2 deletions sp/game/firefightreloaded/gameinfo.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"GameInfo"
{
game "FIREFIGHT RELOADED"
logo "FIREFIGHT RELOADED"
logo2 ""
title ""
title2 ""
gamepadui_title "FIREFIGHT RELOADED"
gamepadui_title2 ""
type singleplayer_only
supportsvr 0
developer "Bitl Development Studios"
Expand Down
34 changes: 29 additions & 5 deletions sp/game/firefightreloaded/gamepadui/mainmenu.res
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,62 @@
{
"text" "#GameUI_GameMenu_ResumeGame"
"command" "cmd gamemenucommand resumegame"
"priority" "7"
"priority" "10"
"family" "ingame"
}

"NewGame"
{
"text" "#GameUI_GameMenu_NewGame"
"command" "cmd gamepadui_opennewgamedialog"
"priority" "6"
"command" "cmd createnewgame"
"priority" "9"
"family" "all"
}

"SaveGame"
{
"text" "#GameUI_GameMenu_SaveGame"
"command" "cmd gamepadui_opensavegamedialog"
"priority" "5"
"priority" "8"
"family" "ingame"
}

"LoadGame"
{
"text" "#GameUI_GameMenu_LoadGame"
"command" "cmd gamepadui_openloadgamedialog"
"priority" "4"
"priority" "7"
"family" "all"
}

"Options"
{
"text" "#GameUI_GameMenu_Options"
"command" "cmd gamepadui_openoptionsdialog"
"priority" "6"
"family" "all"
}

"ModelOptions"
{
"text" "#FRMP_PlayerModel_Title"
"command" "cmd playermodeldialog"
"priority" "5"
"family" "all"
}

"SpawnlistOptions"
{
"text" "#FR_Spawnlist_Title"
"command" "cmd spawnlistdialog"
"priority" "4"
"family" "all"
}

"OpenWorkshop"
{
"text" "#FIREFIGHTRELOADED_ModMenu_Title"
"command" "cmd showworkshop"
"priority" "3"
"family" "all"
}
Expand Down
39 changes: 16 additions & 23 deletions sp/game/firefightreloaded/gamepadui/options.res
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"text" "#GameUI_VeryHard"
"description" "#GameUI_VeryHardDescription"
"type" "skillyskill"
"image" "gamepadui/hard"
"image" "gamepadui/veryhard"
"skill" "3"
}

Expand All @@ -48,7 +48,7 @@
"text" "#GameUI_Nightmare"
"description" "#GameUI_NightmareDescription"
"type" "skillyskill"
"image" "gamepadui/hard"
"image" "gamepadui/nightmare"
"skill" "4"
}
}
Expand Down Expand Up @@ -199,6 +199,20 @@
"advanced" "1"
}

"Console"
{
"text" "#GameUI_DeveloperConsoleCheck"
"type" "wheelywheel"
"advanced" "1"
"convar" "con_enable"

"options"
{
"0" "#gameui_disabled"
"1" "#gameui_enabled"
}
}

"OldSpawner"
{
"text" "#FR_OldSpawner"
Expand Down Expand Up @@ -829,27 +843,6 @@
"advanced" "1"
"convar" "mat_force_bloom"

"options"
{
"0" "#gameui_disabled"
"1" "#gameui_enabled"
}
}
}
}
"Advanced"
{
"title" "#GameUI_AdvancedNoEllipsis"
"alternating" "1"
"items"
{
"Console"
{
"text" "#GameUI_DeveloperConsoleCheck"
"type" "wheelywheel"
"advanced" "1"
"convar" "con_enable"

"options"
{
"0" "#gameui_disabled"
Expand Down
7 changes: 4 additions & 3 deletions sp/game/firefightreloaded/gamepadui/schemeachievement.res
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"Button.Background.Out" "0 0 0 0"
"Button.Background.Over" "255 255 255 255"
"Button.Background.Pressed" "255 255 255 255"
"Button.Background.Progress" "255 152 46 255"
"Button.Background.Unprogress" "152 152 152 255"
"Button.Background.Progress" "19 119 230 255"
"Button.Background.Unprogress" "255 255 255 255"

"Button.Text.Out" "255 255 255 255"
"Button.Text.Over" "0 0 0 255"
Expand Down Expand Up @@ -94,7 +94,8 @@

"CustomFontFiles"
{
"file" "gamepadui/fonts/NotoSans-Regular.ttf"
"file" "resource/smodgui.ttf"
"file" "gamepadui/fonts/din1451alt.ttf"
"file" "gamepadui/fonts/NotoSans-Regular.ttf"
}
}
3 changes: 2 additions & 1 deletion sp/game/firefightreloaded/gamepadui/schemechapterbutton.res
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
{
"settings"
{
"name" "Alte DIN 1451 Mittelschrift"
"name" "SMODGUI"
"tall" "26"
"weight" "400"
"antialias" "1"
Expand All @@ -80,6 +80,7 @@

"CustomFontFiles"
{
"file" "resource/smodgui.ttf"
"file" "gamepadui/fonts/NotoSans-Regular.ttf"
"file" "gamepadui/fonts/din1451alt.ttf"
}
Expand Down
42 changes: 21 additions & 21 deletions sp/game/firefightreloaded/gamepadui/schememainmenu.res
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"BaseSettings"
{
"Logo.OffsetX" "85"
"Logo.OffsetY.MainMenu" "290"
"Logo.OffsetY.MainMenu" "340"
"Logo.OffsetY.InGame" "340"

"Buttons.OffsetX" "85"
"Buttons.OffsetY.MainMenu" "95"
"Buttons.OffsetY.MainMenu" "120"
"Buttons.OffsetY.InGame" "70"
"Buttons.Space" "6"

"Button.Width.Out" "260"
"Button.Width.Over" "260"
"Button.Width.Pressed" "260"

"Button.Height.Out" "30"
"Button.Height.Over" "36"
"Button.Height.Pressed" "36"
"Button.Height.Out" "20"
"Button.Height.Over" "26"
"Button.Height.Pressed" "26"

"FooterButtons.OffsetX" "64"
"FooterButtons.OffsetY" "48"
Expand All @@ -41,28 +41,28 @@
"Button.Description.Hide.Over" "1"
"Button.Description.Hide.Pressed" "1"

"Button.Text.OffsetX.Animation.Duration" "0.15"
"Button.Width.Animation.Duration" "0.15"
"Button.Height.Animation.Duration" "0.25"
"Button.Background.Animation.Duration" "0.2"
"Button.Text.Animation.Duration" "0.2"
"Button.Description.Animation.Duration" "0.5"
"Button.Text.OffsetX.Animation.Duration" "0.1"
"Button.Width.Animation.Duration" "0.1"
"Button.Height.Animation.Duration" "0.1"
"Button.Background.Animation.Duration" "0.1"
"Button.Text.Animation.Duration" "0.1"
"Button.Description.Animation.Duration" "0.1"
}

"Colors"
{
"Logo" "255 255 255 255"
"Logo" "19 119 230 255"

"Button.Background.Out" "0 0 0 0"
"Button.Background.Over" "25 13 5 120"
"Button.Background.Over" "15 25 40 110"
"Button.Background.Pressed" "255 255 255 255"

"Button.Background.LeftBorder.Out" "0 0 0 255"
"Button.Background.LeftBorder.Over" "255 134 44 255"
"Button.Background.LeftBorder.Over" "19 119 230 255"
"Button.Background.LeftBorder.Pressed" "255 255 255 255"

"Button.Text.Out" "227 224 224 255"
"Button.Text.Over" "255 134 44 255"
"Button.Text.Over" "19 119 230 255"
"Button.Text.Pressed" "0 0 0 255"

"Button.Description.Out" "0 0 0 0"
Expand All @@ -76,9 +76,9 @@
{
"settings"
{
"name" "HalfLife2"
"tall" "34"
"weight" "400"
"name" "SMODGUI"
"tall" "50"
"weight" "200"
"antialias" "1"
}
}
Expand All @@ -88,7 +88,7 @@
"settings"
{
"name" "Alte DIN 1451 Mittelschrift"
"tall" "25"
"tall" "20"
"weight" "400"
"antialias" "1"
}
Expand All @@ -99,7 +99,7 @@
"settings"
{
"name" "Alte DIN 1451 Mittelschrift"
"tall" "25"
"tall" "20"
"weight" "600"
"antialias" "1"
}
Expand All @@ -108,7 +108,7 @@

"CustomFontFiles"
{
"file" "resource/HALFLIFE2.ttf"
"file" "resource/smodgui.ttf"
"file" "gamepadui/fonts/din1451alt.ttf"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"Colors"
{
"Button.Background.Out" "0 0 0 0"
"Button.Background.Over" "255 255 255 255"
"Button.Background.Over" "255 255 255 180"
"Button.Background.Pressed" "255 255 255 255"

"Button.Text.Out" "255 255 255 150"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,31 +55,31 @@
//"Button.Title.Background.Over" "255 134 44 255"
//"Button.Title.Background.Pressed" "255 134 44 255"
"Button.Title.Background.Over" "0 0 0 0"
"Button.Title.Background.Pressed" "25 13 5 120"
"Button.Title.Background.Pressed" "15 25 40 110"

"Button.Description.Background.Out" "0 0 0 0"
"Button.Description.Background.Over" "0 0 0 0"
"Button.Description.Background.Pressed" "25 13 5 120"
"Button.Description.Background.Pressed" "15 25 40 110"

"Button.Background.BottomBorder.Out" "0 0 0 0"
//"Button.Background.BottomBorder.Over" "255 134 44 255"
//"Button.Background.BottomBorder.Pressed" "255 134 44 255"

"Button.Background.BottomBorder.Over" "0 0 0 0"
"Button.Background.BottomBorder.Pressed" "255 152 46 255"
"Button.Background.BottomBorder.Pressed" "19 119 230 255"

"Button.Text.Out" "255 255 255 150"
//"Button.Text.Over" "255 255 255 255"
//"Button.Text.Pressed" "255 255 255 255"
"Button.Text.Over" "255 255 255 255"
"Button.Text.Pressed" "255 134 44 255"
"Button.Text.Pressed" "19 119 230 255"

"Button.Description.Out" "0 0 0 0"
"Button.Description.Over" "0 0 0 0"
"Button.Description.Pressed" "255 255 255 255"

"Button.Image.Out" "50 50 50 220"
"Button.Image.Over" "110 110 110 200"
"Button.Image.Out" "100 100 100 220"
"Button.Image.Over" "150 150 150 220"
"Button.Image.Pressed" "255 255 255 255"
}

Expand All @@ -101,7 +101,7 @@
"settings"
{
"name" "Noto Sans"
"tall" "17"
"tall" "15"
"weight" "400"
"antialias" "1"
}
Expand All @@ -110,7 +110,8 @@

"CustomFontFiles"
{
"file" "gamepadui/fonts/NotoSans-Regular.ttf"
"file" "resource/smodgui.ttf"
"file" "gamepadui/fonts/din1451alt.ttf"
"file" "gamepadui/fonts/NotoSans-Regular.ttf"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"Colors"
{
"Button.Background.Out" "0 0 0 0"
"Button.Background.Over" "255 255 255 255"
"Button.Background.Over" "255 255 255 180"
"Button.Background.Pressed" "255 255 255 255"

"Button.Text.Out" "255 255 255 150"
Expand All @@ -34,7 +34,7 @@
"Slider.Backing.Pressed" "0 0 0 140"

"Slider.Fill.Out" "255 255 255 255"
"Slider.Fill.Over" "0 0 0 255"
"Slider.Fill.Over" "255 255 255 255"
"Slider.Fill.Pressed" "0 0 0 255"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"Colors"
{
"Button.Background.Out" "0 0 0 0"
"Button.Background.Over" "255 255 255 255"
"Button.Background.Over" "255 255 255 180"
"Button.Background.Pressed" "255 255 255 255"

"Button.Binding" "0 0 0 255"
Expand Down
Loading

1 comment on commit 172acd5

@Bitl
Copy link
Member Author

@Bitl Bitl commented on 172acd5 Mar 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

colisionutils fix from ValveSoftware/source-sdk-2013#552

Please sign in to comment.