Skip to content

Commit

Permalink
Half-Life: Opposing Force
Browse files Browse the repository at this point in the history
Gearboxing
  • Loading branch information
generic-name-guy authored Aug 18, 2024
2 parents a1792dd + b78cce0 commit 2dbd4da
Show file tree
Hide file tree
Showing 79 changed files with 8,597 additions and 11 deletions.
60 changes: 60 additions & 0 deletions CVARINFO
Original file line number Diff line number Diff line change
Expand Up @@ -520,3 +520,63 @@ server noarchive bool CanGive = false;
server noarchive int SMO = 0;
server int DynamicSpawnMonsters = 1;
server int levelsToPlay = 32;

//gearbox cvars
// When adding new options, don't forget to add them to:
// - zscript/zabor/event_handler.zs:printGearboxCvars().
// - keyconf.txt:Alias gb_reset.

// Options /////////////////////////////////////////////////////////////////////////////////////////

user int gb_scale = 1;
user color gb_color = "22 22 CC";
user color gb_dim_color = "99 99 99";
user bool gb_show_tags = true;

// 0 - blocky view
// 1 - wheel view
user int gb_view_type = 1;

user bool gb_enable_dim = true;
user bool gb_enable_blur = false;
user float gb_wheel_position = 1.0;
user float gb_wheel_scale = 1.0;
user bool gb_wheel_tint = true;
user int gb_multiwheel_limit = 12;

user float gb_blocks_position_x = 0.0;
user float gb_blocks_position_y = 0.0;

user int gb_text_scale = 1;
user float gb_text_position_x = 0.0;
user float gb_text_position_y = 0.0;
user float gb_text_position_y_max = 1.0;
user int gb_text_usual_color = 21; // cyan
user int gb_text_selected_color = 9; // white

user string gb_font = "NewSmallFont";

user bool gb_open_on_scroll = false;

user bool gb_open_on_slot = true;
user bool gb_reverse_slot_cycle_order = false;
user bool gb_select_first_slot_weapon = false;

user bool gb_mouse_in_wheel = true;
user bool gb_select_on_key_up = false;
user bool gb_no_menu_if_one = false;
user bool gb_on_automap = false;
user bool gb_lock_positions = false;
user bool gb_enable_sounds = true;
user bool gb_frozen_can_open = false;

user int gb_time_freeze = 0;

user float gb_mouse_sensitivity_x = 1.0;
user float gb_mouse_sensitivity_y = 1.0;

user bool gb_zabor_enabled = true;

// Custom weapon order storage /////////////////////////////////////////////////////////////////////

nosave string gb_custom_weapon_order = "";
7 changes: 7 additions & 0 deletions GLDEFS
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@
#include "models/nashgore/CorpseBlood/_materials.txt"
#include "models/nashgore/Footprint/_materials.txt"

HardwareShader postprocess scene
{
Name "gb_blur"
Shader "shaders/mfx_bss_blur.fp" 330
}


pulselight M1HeatWave
{
color 0.0 0.1 1.0
Expand Down
Binary file added GRAPHICS/Gearbox/gb_ammo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GRAPHICS/Gearbox/gb_box.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GRAPHICS/Gearbox/gb_circ.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GRAPHICS/Gearbox/gb_cor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GRAPHICS/Gearbox/gb_desc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GRAPHICS/Gearbox/gb_hand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GRAPHICS/Gearbox/gb_hcir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GRAPHICS/Gearbox/gb_nope.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GRAPHICS/Gearbox/gb_pip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GRAPHICS/Gearbox/gb_pntr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GRAPHICS/Gearbox/gb_weap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GRAPHICS/Gearbox/gb_wpsel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 46 additions & 6 deletions KEYCONF.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,21 @@ addplayerclass PB_PlayerPawn

addkeysection "Project Brutality" PBAdvMoves

AddMenuKey "Weapon Special Wheel" "+PBWeaponSpecial"
alias "+PBWeaponSpecial" "netevent PBWeaponSpecialOn"
alias "-PBWeaponSpecial" "netevent PBWeaponSpecialOff"
Alias +pb_specialwheel "event pb_special_wheel"
Alias -pb_specialwheel "event pb_special_wheel_up"
Alias +pb_equipmenu "event pb_equip_wheel"
Alias -pb_equipmenu "event pb_equip_wheel_up"

AddMenuKey "Equipment Selection Wheel" "+PBEquipSpecial"
alias "+PBEquipSpecial" "netevent PBEquipSpecialOn"
alias "-PBEquipSpecial" "netevent PBEquipSpecialOff"
AddMenuKey "$PB_TOGGLE_SPECIALS_MENU" +pb_specialwheel
AddMenuKey "$PB_TOGGLE_EQUIP_MENU" +pb_equipmenu

//AddMenuKey "Weapon Special Wheel" "+PBWeaponSpecial"
//alias "+PBWeaponSpecial" "netevent PBWeaponSpecialOn"
//alias "-PBWeaponSpecial" "netevent PBWeaponSpecialOff"

//AddMenuKey "Equipment Selection Wheel" "+PBEquipSpecial"
//alias "+PBEquipSpecial" "netevent PBEquipSpecialOn"
//alias "-PBEquipSpecial" "netevent PBEquipSpecialOff"

addmenukey "Unload Gun" unreloader
alias unreloader "puke 363"
Expand Down Expand Up @@ -53,3 +61,35 @@ defaultbind L "netevent EV_ClearGore"
alias pb_minimal_hud_style "set pb_hudxmargin -9; set pb_hudymargin -9; set pb_hudalpha 0.2; set pb_hudboxalpha 0; set pb_hideunusedtypes true; set pb_curmaxammolist false; set pb_showlevelstats false; set pb_showhudvisor false; set pb_showhudvisorglass false; set pb_huddynamics false; set pb_showammolist false"

alias pb_full_hud_style "set pb_hudxmargin 0; set pb_hudymargin 0; set pb_hudalpha 1; set pb_hudboxalpha 1; set pb_hideunusedtypes true; set pb_curmaxammolist true; set pb_showlevelstats false; set pb_showhudvisor true; set pb_showhudvisorglass true; set pb_huddynamics true; set pb_showammolist true"

//gearbox
// Aliases /////////////////////////////////////////////////////////////////////////////////////////

Alias +gb_toggle_weapon_menu "event gb_toggle_weapon_menu"
Alias -gb_toggle_weapon_menu "event gb_toggle_weapon_menu_up"

Alias +gb_toggle_inventory_menu "event gb_toggle_inventory_menu"
Alias -gb_toggle_inventory_menu "event gb_toggle_inventory_menu_up"

Alias gb_prev_weapon "netevent gb_prev_weapon"

Alias gb_rotate_weapon_priority "event gb_rotate_weapon_priority"
Alias gb_rotate_weapon_slot "event gb_rotate_weapon_slot"
Alias gb_reset_custom_order "netevent gb_reset_custom_order"


Alias zabor "event zabor"

Alias gb_copy_player_color "gb_color $color"

Alias gb_reset "ResetCvar gb_scale; ResetCvar gb_color; ResetCvar gb_dim_color; ResetCvar gb_show_tags; ResetCvar gb_view_type; ResetCvar gb_enable_dim; ResetCvar gb_enable_blur; ResetCvar gb_wheel_position; ResetCvar gb_wheel_scale; ResetCvar gb_wheel_tint; ResetCvar gb_multiwheel_limit; ResetCvar gb_blocks_position_x; ResetCvar gb_blocks_position_y; ResetCvar gb_text_scale; ResetCvar gb_text_position_x; ResetCvar gb_text_position_y; ResetCvar gb_text_position_y_max; ResetCvar gb_text_usual_color; ResetCvar gb_text_selected_color; ResetCvar gb_open_on_scroll; ResetCvar gb_open_on_slot; ResetCvar gb_reverse_slot_cycle_order; ResetCvar gb_select_first_slot_weapon; ResetCvar gb_mouse_in_wheel; ResetCvar gb_select_on_key_up; ResetCvar gb_no_menu_if_one; ResetCvar gb_on_automap; ResetCvar gb_lock_positions; ResetCvar gb_enable_sounds; ResetCvar gb_frozen_can_open; ResetCvar gb_time_freeze; ResetCvar gb_mouse_sensitivity_x; ResetCvar gb_mouse_sensitivity_y; ResetCvar gb_zabor_enabled"

// Keys ////////////////////////////////////////////////////////////////////////////////////////////

AddKeySection "$GB_KEYSECTION" gb_Keys

AddMenuKey "$GB_TOGGLE_WEAPON_MENU" +gb_toggle_weapon_menu
AddMenuKey "$GB_TOGGLE_INVENTORY_MENU" +gb_toggle_inventory_menu
AddMenuKey "$GB_PREV_WEAPON" gb_prev_weapon
AddMenuKey "$GB_ROTATE_WEAPON_PRIORITY" gb_rotate_weapon_priority
AddMenuKey "$GB_ROTATE_WEAPON_SLOT" gb_rotate_weapon_slot
193 changes: 192 additions & 1 deletion MENUDEF.txt
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ OptionMenu "PBSettings"
Submenu "Visual Settings", "RenderingSettings"
StaticText " "
Submenu "HUD Settings", "PB_HUDOptions"
statictext ""
Submenu "$GB_OPTIONS","gb_Options"
StaticText " "
StaticText " "
StaticText " "
Expand Down Expand Up @@ -272,7 +274,7 @@ OptionMenu "GameplaySettings"
StaticText " "
StaticText " "

Option "Weapon Wheel Freezes Time", "py_weaponwheel_freeze", "OnOff"
//Option "Weapon Wheel Freezes Time", "py_weaponwheel_freeze", "OnOff"
Option "Weapon ADS Controls","pb_toggle_aim_hold", "AimingStyle" //Looks like we are using this newer line.
StaticText " "
StaticText "--------Grenade Bounce/Explosion Behavior"
Expand Down Expand Up @@ -890,3 +892,192 @@ OptionValue "NashGoreGibTypes"
1, "$NASHGOREMNU_GIB_TYPE_NOSTICKYGIBS"
2, "$NASHGOREMNU_VANILLA"
}

//
// Gearbox
//

// Menus ///////////////////////////////////////////////////////////////////////////////////////////

OptionMenu gb_Options
{

Title "$GB_OPTIONS"

StaticText ""
Option "$GB_VIEW_TYPE", gb_view_type, gb_ViewTypeValues

StaticText ""
StaticText "$GB_KEYSECTION", 1
Control "$GB_TOGGLE_WEAPON_MENU" , "+gb_toggle_weapon_menu"
Control "$GB_TOGGLE_INVENTORY_MENU" , "+gb_toggle_inventory_menu"
Control "$GB_PREV_WEAPON" , "gb_prev_weapon"
Control "$GB_ROTATE_WEAPON_PRIORITY", "gb_rotate_weapon_priority"
Control "$GB_ROTATE_WEAPON_SLOT" , "gb_rotate_weapon_slot"

StaticText ""
Submenu "$GB_BEHAVIOR_OPTIONS" , gb_BehaviorOptions
Submenu "$GB_UI_OPTIONS" , gb_UiOptions
Submenu "$GB_WHEEL_OPTIONS" , gb_WheelOptions
Submenu "$GB_BLOCKS_OPTIONS" , gb_BlocksOptions
Submenu "$GB_TEXT_OPTIONS" , gb_TextOptions
Submenu "$GB_ADVANCED_OPTIONS" , gb_AdvancedOptions
Submenu "$GB_GZDOOM_OPTIONS" , gb_GZDoomOptions

StaticText ""
SafeCommand "$GB_RESET" , gb_reset , "$GB_RESET_PROMPT"
SafeCommand "$GB_RESET_CUSTOM_ORDER" , gb_reset_custom_order , "$GB_RESET_CUSTOM_ORDER_PROMPT"
StaticText "$GB_RESET_CUSTOM_ORDER_NOTE", black

}

OptionMenu gb_BehaviorOptions
{

Title "$GB_BEHAVIOR_OPTIONS_TITLE"

Option "$GB_OPEN_ON_PREV_NEXT" , gb_open_on_scroll , OnOff

StaticText ""
Option "$GB_OPEN_ON_SLOT" , gb_open_on_slot , OnOff
Option "$GB_REVERSE_SLOT_CYCLE_ORDER" , gb_reverse_slot_cycle_order , OnOff
Option "$GB_SELECT_FIRST_SLOT_WEAPON" , gb_select_first_slot_weapon , OnOff
Option "$GB_NO_MENU_IF_ONE" , gb_no_menu_if_one , OnOff

StaticText ""
Option "$GB_SELECT_ON_KEY_UP" , gb_select_on_key_up , OnOff
Option "$GB_FREEZE_TIME" , gb_time_freeze , gb_FreezeValues
Option "$GB_ENABLE_ON_AUTOMAP" , gb_on_automap , OnOff
Option "$GB_LOCK_POSITION" , gb_lock_positions , OnOff
Option "$GB_FROZEN_CAN_OPEN" , gb_frozen_can_open , OnOff

}

OptionMenu gb_GZDoomOptions
{

Title "$GB_GZDOOM_OPTIONS_TITLE"

StaticText ""
Option "$SCALEMNU_HUDASPECT", hud_AspectScale, OnOff
StaticText "$GB_ASPECT_SCALE_NOTE", black

}

OptionMenu gb_UiOptions
{

Title "$GB_UI_OPTIONS_TITLE"

StaticText ""
ColorPicker "$GB_COLOR" , gb_color
Command "$GB_PLAYER_COLOR", gb_copy_player_color

StaticText ""
Option "$GB_SHOW_TAGS" , gb_show_tags , OnOff

StaticText ""
Option "$GB_DIM" , gb_enable_dim , OnOff
ColorPicker "$GB_DIM_COLOR" , gb_dim_color
Option "$GB_BLUR" , gb_enable_blur , OnOff

StaticText ""
Option "$GB_SOUND" , gb_enable_sounds , OnOff

StaticText ""
Option "$GB_FONT" , gb_font , gb_FontValues
TextField "$GB_FONT_CUSTOM" , gb_font
}

OptionMenu gb_WheelOptions
{

Title "$GB_WHEEL_OPTIONS_TITLE"

StaticText ""
Slider "$GB_WHEEL_X" , gb_wheel_position , -1.5, 1.5, 0.1, 1
Slider "$GB_WHEEL_SCALE" , gb_wheel_scale , 0.1, 2, 0.1, 1
Option "$GB_WHEEL_TINT" , gb_wheel_tint , OnOff

StaticText ""
Option "$GB_MOUSE_IN_WHEEL" , gb_mouse_in_wheel , OnOff
Slider "$GB_MULTIWHEEL_LIMIT" , gb_multiwheel_limit , 3, 100, 1, 0

StaticText ""
StaticText "$GB_MOUSE_SENSITIVITY", 1
Slider "$GB_X", gb_mouse_sensitivity_x, 0.1, 5, 0.1, 1
Slider "$GB_Y", gb_mouse_sensitivity_y, 0.1, 5, 0.1, 1

}

OptionMenu gb_BlocksOptions
{

Title "$GB_BLOCKS_OPTIONS_TITLE"

StaticText ""
Slider "$GB_SCALE" , gb_scale, 1, 8, 1, 0

StaticText ""
StaticText "$GB_POSITION", 1
Slider "$GB_X" , gb_blocks_position_x, 0.0, 1.0, 0.01, 2
Slider "$GB_Y" , gb_blocks_position_y, 0.0, 1.0, 0.01, 2

}

OptionMenu gb_TextOptions
{

Title "$GB_TEXT_OPTIONS_TITLE"

StaticText ""
Slider "$GB_SCALE" , gb_text_scale, 1, 8, 1, 0

StaticText ""
StaticText "$GB_POSITION", 1
Slider "$GB_X" , gb_text_position_x , 0.0, 1.0, 0.01, 2
Slider "$GB_Y" , gb_text_position_y , 0.0, 1.0, 0.01, 2
Slider "$GB_Y_BOUNDARY" , gb_text_position_y_max , 0.0, 1.0, 0.01, 2

StaticText ""
Option "$GB_TEXT_USUAL_COLOR" , gb_text_usual_color , TextColors
Option "$GB_TEXT_SELECTED_COLOR" , gb_text_selected_color , TextColors

}

OptionMenu gb_AdvancedOptions
{

Title "$GB_ADVANCED_OPTIONS_TITLE"

StaticText ""
Option "$GB_VM_ABORT_INFO_ENABLED", gb_zabor_enabled, OnOff

}

// Option Values ///////////////////////////////////////////////////////////////////////////////////

OptionValue gb_ViewTypeValues
{
0, "$GB_BLOCKY_VIEW"
1, "$GB_WHEEL_VIEW"
2, "$GB_TEXT_VIEW"
}

OptionValue gb_FreezeValues
{
0, "$OPTVAL_OFF"
1, "$GB_LEVEL_AND_PLAYER"
2, "$GB_PLAYER"
}

OptionString gb_FontValues
{
"NewSmallFont" , "$GB_NEW_SMALL_FONT"
"SmallFont" , "$GB_OLD_SMALL_FONT"
"ConsoleFont" , "$GB_CONSOLE_FONT"
"BigFont" , "$GB_BIG_FONT"
"PBFONT" , "$PB_FONT"
"PBBOLD" , "$PB_BOLDFONT"
"LOWQFONT" , "$PB_LOWQFONT"
}
Binary file added SOUNDS/gb_nope.ogg
Binary file not shown.
Binary file added SOUNDS/gb_tick.ogg
Binary file not shown.
Binary file added SOUNDS/gb_toggle.ogg
Binary file not shown.
Loading

0 comments on commit 2dbd4da

Please sign in to comment.