Skip to content

Commit

Permalink
Merge pull request #47 from UndeadZeratul/main
Browse files Browse the repository at this point in the history 
Convert Spawn Configs from enums into sliders
  • Loading branch information
@UndeadZeratul
UndeadZeratul authored Aug 16, 2024
2 parents 28a9bb3 + 9d9b126 commit 55a7928
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 49 deletions.
6 changes: 6 additions & 0 deletions LANGUAGE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ MENU_PERSISTENCY = "Persistent Spawns: ";
MENU_WEPPERSISTENCY = "Persistent Weapon Spawns: ";
MENU_MAGPERSISTENCY = "Persistent Magazine Spawns: ";

// Menu Option Values
MENU_ENABLED = "Enabled";
MENU_DISABLED = "Disabled";
MENU_REPLACEALL = "Replace All";
MENU_WITHALL = "With All";

// Menu Command Text
MENU_RESETWEP = "Reset Weapon Options";
MENU_RESETMAG = "Reset Magazine Options";
Expand Down
82 changes: 33 additions & 49 deletions MENUDEF
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
// Spawn Bias (for items that do replace)
OptionValue "SpawnBias" {
-1, "Disabled"
0, "Replace All"
2, "1 in 3"
4, "1 in 5"
9, "1 in 10"
14, "1 in 15"
19, "1 in 20"
24, "1 in 25"
49, "1 in 50"
99, "1 in 100"
149, "1 in 150"
199, "1 in 200"
}

// Pistols

OptionMenu "majesticSpawning" {
Expand All @@ -27,13 +11,13 @@ OptionMenu "majesticSpawning" {

StaticText "$MENU_WEPSPAWNOPTIONS", "Yellow"
StaticText "$MENU_MAJESTIC_PISTOL_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "majestic_pistol_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "majestic_pistol_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar majestic_pistol_spawn_bias"
StaticText "$MENU_MAJESTIC_HUNTER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "majestic_hunter_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "majestic_hunter_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar majestic_hunter_spawn_bias"
StaticText "$MENU_MAJESTIC_SLAYER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "majestic_slayer_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "majestic_slayer_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar majestic_slayer_spawn_bias"
StaticText ""

Expand All @@ -43,7 +27,7 @@ OptionMenu "majesticSpawning" {

StaticText "$MENU_MAGSPAWNOPTIONS", "Yellow"
StaticText "$MENU_MAJESTICMAG_CLIPMAG_SPAWNTEXT", "White"
Option "$MENU_MAGSPAWNRATE", "majesticmag_clipmag_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_MAGSPAWNRATE", "majesticmag_clipmag_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETMAG", "resetcvar majesticmag_clipmag_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -74,13 +58,13 @@ OptionMenu "viperSpawning" {

StaticText "$MENU_WEPSPAWNOPTIONS", "Yellow"
StaticText "$MENU_VIPER_PISTOL_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "viper_pistol_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "viper_pistol_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar viper_pistol_spawn_bias"
StaticText "$MENU_VIPER_HUNTER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "viper_hunter_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "viper_hunter_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar viper_hunter_spawn_bias"
StaticText "$MENU_VIPER_SLAYER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "viper_slayer_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "viper_slayer_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar viper_slayer_spawn_bias"
StaticText ""

Expand All @@ -90,7 +74,7 @@ OptionMenu "viperSpawning" {

StaticText "$MENU_MAGSPAWNOPTIONS", "Yellow"
StaticText "$MENU_VIPERMAG_CLIPMAG_SPAWNTEXT", "White"
Option "$MENU_MAGSPAWNRATE", "vipermag_clipmag_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_MAGSPAWNRATE", "vipermag_clipmag_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETMAG", "resetcvar vipermag_clipmag_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -130,13 +114,13 @@ OptionMenu "blackjackSpawning" {

StaticText "$MENU_WEPSPAWNOPTIONS", "Green"
StaticText "$MENU_BLACKJACK_CLIPBOX_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "blackjack_clipbox_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "blackjack_clipbox_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar blackjack_clipbox_spawn_bias"
StaticText "$MENU_BLACKJACK_HUNTER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "blackjack_hunter_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "blackjack_hunter_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar blackjack_hunter_spawn_bias"
StaticText "$MENU_BLACKJACK_SLAYER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "blackjack_slayer_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "blackjack_slayer_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar blackjack_slayer_spawn_bias"
StaticText ""

Expand All @@ -146,7 +130,7 @@ OptionMenu "blackjackSpawning" {

StaticText "$MENU_MAGSPAWNOPTIONS", "Green"
StaticText "$MENU_BLACKJACKMAG_355_CLIPMAG_SPAWNTEXT", "White"
Option "$MENU_MAGSPAWNRATE", "blackjack355mag_clipmag_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_MAGSPAWNRATE", "blackjack355mag_clipmag_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETMAG", "resetcvar blackjack355mag_clipmag_spawn_bias"
StaticText ""

Expand All @@ -155,7 +139,7 @@ OptionMenu "blackjackSpawning" {
StaticText ""

StaticText "$MENU_BLACKJACKMAG_SHELL_SHELL_SPAWNTEXT", "White"
Option "$MENU_MAGSPAWNRATE", "blackjackshellmag_shell_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_MAGSPAWNRATE", "blackjackshellmag_shell_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETMAG", "resetcvar blackjackshellmag_shell_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -187,7 +171,7 @@ OptionMenu "jackdawSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "Green"
StaticText "$MENU_JACKDAW_CLIPBOX_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "jackdaw_clipbox_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "jackdaw_clipbox_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar jackdaw_clipbox_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -226,7 +210,7 @@ OptionMenu "blackhawkSpawning" {

StaticText "$MENU_WEPSPAWNOPTIONS", "Orange"
StaticText "$MENU_BLACKHAWK_LAUNCHER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "blackhawk_launcher_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "blackhawk_launcher_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar blackhawk_launcher_spawn_bias"
StaticText ""

Expand All @@ -236,7 +220,7 @@ OptionMenu "blackhawkSpawning" {

StaticText "$MENU_BOLTBUNDLE_SPAWNOPTIONS", "Orange"
StaticText "$MENU_BOLTBUNDLE_ROCKET_SPAWNTEXT", "White"
Option "$MENU_BOLTBUNDLE_SPAWNRATE", "blackhawkBolts_rocket_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_BOLTBUNDLE_SPAWNRATE", "blackhawkBolts_rocket_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETBOLTBUNDLE", "resetcvar blackhawkBolts_rocket_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -267,7 +251,7 @@ OptionMenu "scorpionSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "Orange"
StaticText "$MENU_SCORPION_BFG_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "scorpion_bfg_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "scorpion_bfg_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar scorpion_bfg_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -297,13 +281,13 @@ OptionMenu "wyvernSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "Orange"
StaticText "$MENU_WYVERN_HUNTER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "wyvern_hunter_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "wyvern_hunter_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar wyvern_hunter_spawn_bias"
StaticText "$MENU_WYVERN_SLAYER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "wyvern_slayer_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "wyvern_slayer_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar wyvern_slayer_spawn_bias"
StaticText "$MENU_WYVERN_PLASMA_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "wyvern_plasma_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "wyvern_plasma_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar wyvern_plasma_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -335,7 +319,7 @@ OptionMenu "gungnirSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "Cyan"
StaticText "$MENU_GUNGNIR_BFG_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "gungnir_bfg_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "gungnir_bfg_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar gungnir_bfg_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -365,10 +349,10 @@ OptionMenu "hammerheadSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "Cyan"
StaticText "$MENU_HAMMERHEAD_CHAINGUN_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "hammerhead_chaingun_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "hammerhead_chaingun_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar hammerhead_chaingun_spawn_bias"
StaticText "$MENU_HAMMERHEAD_PLASMA_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "hammerhead_plasma_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "hammerhead_plasma_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar hammerhead_plasma_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -398,7 +382,7 @@ OptionMenu "redlineSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "Cyan"
StaticText "$MENU_REDLINE_PLASMA_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "redline_plasma_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "redline_plasma_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar redline_plasma_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -428,11 +412,11 @@ OptionMenu "ladlauncherSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "FAK_Blue"
StaticText "$MENU_LADLAUNCHER_ROCKETBOX_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "ladderlauncher_rocketbox_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "ladderlauncher_rocketbox_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar ladderlauncher_rocketbox_spawn_bias"
StaticText ""
StaticText "$MENU_LADLAUNCHER_CELLPACK_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "ladderlauncher_cellpack_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "ladderlauncher_cellpack_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar ladderlauncher_cellpack_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -462,7 +446,7 @@ OptionMenu "psgSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "FAK_Blue"
StaticText "$MENU_PSG_BLUEARMOR_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "psg_bluearmour_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "psg_bluearmour_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar psg_bluearmour_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -492,7 +476,7 @@ OptionMenu "secretfinderSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "FAK_Blue"
StaticText "$MENU_SECRETFINDER_MAP_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "secretfinder_map_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "secretfinder_map_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar secretfinder_map_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -522,7 +506,7 @@ OptionMenu "superstimSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "FAK_Blue"
StaticText "$MENU_SUPERSTIM_STIMPACK_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "superstim_stimpack_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "superstim_stimpack_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar superstim_stimpack_spawn_bias"
StaticText ""

Expand Down Expand Up @@ -588,7 +572,7 @@ OptionMenu "dsdSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "FAK_Blue"
StaticText "$MENU_DSD_BACKPACK_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "dsd_backpack_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "dsd_backpack_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar dsd_backpack_spawn_bias"

StaticText "$MENU_DSD_BACKPACKS", "White"
Expand Down Expand Up @@ -685,7 +669,7 @@ OptionMenu "archerSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "FAK_Blue"
StaticText "$MENU_SOULCUBE_CHAINSAW_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "soulcube_chainsaw_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "soulcube_chainsaw_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar soulcube_chainsaw_spawn_bias"

StaticText "$MENU_SOULCUBE_BACKPACKS", "White"
Expand Down Expand Up @@ -714,7 +698,7 @@ OptionMenu "crateSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "FAK_Blue"
StaticText "$MENU_WEAPONCRATE_LAUNCHER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "weaponcrate_launcher_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "weaponcrate_launcher_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar weaponcrate_launcher_spawn_bias"
StaticText ""

Expand All @@ -740,7 +724,7 @@ OptionMenu "barricadeSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "FAK_Blue"
StaticText "$MENU_BARRICADE_LAUNCHER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "deployablebarricade_launcher_spawn_bias", "SpawnBias"
ScaleSlider "$MENU_WEPSPAWNRATE", "deployablebarricade_launcher_spawn_bias", -1, 999, 1, "$MENU_REPLACEALL", "$MENU_DISABLED"
SafeCommand "$MENU_RESETWEP", "resetcvar deployablebarricade_launcher_spawn_bias"
StaticText ""

Expand Down

0 comments on commit 55a7928

Please sign in to comment.