Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refine Spawning slots for various weapons #15

Merged
merged 8 commits into from
Oct 25, 2023
Merged

Refine Spawning slots for various weapons #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3084071
Refine Spawning slots for various weapons
UndeadZeratul Oct 7, 2023
79511c7
Update Spawn Handler to use checkReplaces
UndeadZeratul Oct 13, 2023
34faa9e
Ensure CVARs are loaded
UndeadZeratul Oct 14, 2023
7f88fbd
Use HDAutoPistol to fix broken weapon slot
UndeadZeratul Oct 17, 2023
bbbd450
Use more general PlasmaReplaces class instead of specifically the TB
UndeadZeratul Oct 18, 2023
4093ad9
Fix Gungnir & Redline MODELDEF paths
UndeadZeratul Oct 20, 2023
b3125d4
Update CVARs to match latest spawn slots
UndeadZeratul Oct 21, 2023
05e9d67
Update LANGUAGE lumps to match latest CVARs
UndeadZeratul Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions CVARINFO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ server bool blackhawk_persistent_spawning = false;
// Blackjack
server bool blackjack_allowBackpacks = true;
server int blackjack_clipbox_spawn_bias = 9;
server int blackjack_hunter_spawn_bias = 9;
server int blackjack_slayer_spawn_bias = 9;
server bool blackjack_persistent_spawning = false;

// Gungnir
Expand All @@ -31,12 +33,12 @@ server bool gungnir_persistent_spawning = false;
// Hammerhead
server bool hammerhead_allowBackpacks = true;
server int hammerhead_chaingun_spawn_bias = 14;
server int hammerhead_thunderbuster_spawn_bias = 9;
server int hammerhead_plasma_spawn_bias = 9;
server bool hammerhead_persistent_spawning = false;

// Jackdaw
server bool jackdaw_allowBackpacks = true;
server int jackdaw_vulcanette_spawn_bias = 49;
server int jackdaw_clipbox_spawn_bias = 49;
server bool jackdaw_persistent_spawning = false;

// Majestic
Expand All @@ -48,12 +50,12 @@ server bool majestic_persistent_spawning = false;

// Redline
server bool redline_allowBackpacks = true;
server int redline_thunderbuster_spawn_bias = 9;
server int redline_plasma_spawn_bias = 9;
server bool redline_persistent_spawning = false;

// Scorpion
server bool scorpion_allowBackpacks = true;
server int scorpion_bronto_spawn_bias = 9;
server int scorpion_bfg_spawn_bias = 9;
server bool scorpion_persistent_spawning = false;

// Viper
Expand All @@ -67,6 +69,7 @@ server bool viper_persistent_spawning = false;
server bool wyvern_allowBackpacks = true;
server int wyvern_hunter_spawn_bias = 99;
server int wyvern_slayer_spawn_bias = 49;
server int wyvern_plasma_spawn_bias = 24;
server bool wyvern_persistent_spawning = false;


Expand All @@ -81,7 +84,7 @@ server bool blackhawkBolts_persistent_spawning = false;

// Blackjack .355 Mag
server bool blackjack355mag_allowBackpacks = true;
server int blackjack355mag_clip_spawn_bias = 14;
server int blackjack355mag_clipmag_spawn_bias = 14;
server bool blackjack355mag_persistent_spawning = false;

// Blackjack Shell Mag
Expand Down
7 changes: 5 additions & 2 deletions LANGUAGE.en
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ MENU_BLACKHAWK_INVERT = "Invert Bolt Selection Order";
// Blackjack Options Text
MENU_BLACKJACK_TITLE = "------ 'Blackjack' .355 Rifle Options ------";
MENU_BLACKJACK_CLIPBOX_SPAWNTEXT = "Control the spawn rate of the blackjack on Clip Boxes:";
MENU_BLACKJACK_HUNTER_SPAWNTEXT = "Control the spawn rate of the blackjack on Hunter Shotguns:";
MENU_BLACKJACK_SLAYER_SPAWNTEXT = "Control the spawn rate of the blackjack on Slayer Shotguns:";
MENU_BLACKJACK_BACKPACKS = "Control whether the Blackjack spawns in Backpacks:";

MENU_BLACKJACKMAG_355_CLIPMAG_SPAWNTEXT = "Control the spawn rate of the .355 Magazines on Clip Magazines:";
Expand All @@ -84,7 +86,7 @@ MENU_HAMMERHEAD_BACKPACKS = "Control whether the Hammerhead spawns

// Jackdaw Options Text
MENU_JACKDAW_TITLE = "------ 'Jackdaw' 9mm SMG Options ------";
MENU_JACKDAW_CHAINGUN_SPAWNTEXT = "Control the spawn rate of the jackdaw on Vulcanettes:";
MENU_JACKDAW_CLIPBOX_SPAWNTEXT = "Control the spawn rate of the jackdaw on Clip Boxes:";
MENU_JACKDAW_BACKPACKS = "Control whether the Jackdaw spawns in Backpacks:";

// Majestic Options Text
Expand All @@ -106,7 +108,7 @@ MENU_REDLINE_BACKPACKS = "Control whether the Redline spawns in

// Scorpion Options Text
MENU_SCORPION_TITLE = "------ 'Scorpion' 35mm Sniper Cannon Options ------";
MENU_SCORPION_BRONTORNIS_SPAWNTEXT = "Control the spawn rate of the Scorpion on the Brontornis Rifle:";
MENU_SCORPION_BFG_SPAWNTEXT = "Control the spawn rate of the Scorpion on BFG-9000s:";
MENU_SCORPION_BACKPACKS = "Control whether the Scorpion spawns in Backpacks:";

// Viper Options Text
Expand All @@ -123,6 +125,7 @@ MENU_VIPERMAG_BACKPACKS = "Control whether Viper Magazines spawn
MENU_WYVERN_TITLE = "------ 'Wyvern' .50 cal. Double-Barrel Rifle Options ------";
MENU_WYVERN_HUNTER_SPAWNTEXT = "Control the spawn rate of the Wyvern on Hunter Shotguns:";
MENU_WYVERN_SLAYER_SPAWNTEXT = "Control the spawn rate of the Wyvern on Slayer Shotguns:";
MENU_WYVERN_PLASMA_SPAWNTEXT = "Control the spawn rate of the Wyvern on Thunderbusters:";
MENU_WYVERN_BACKPACKS = "Control whether the Wyvern spawns in Backpacks:";

// Item Tags
Expand Down
33 changes: 21 additions & 12 deletions MENUDEF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,12 @@ OptionMenu "blackjackSpawning" {
StaticText "$MENU_BLACKJACK_CLIPBOX_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "blackjack_clipbox_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar blackjack_clipbox_spawn_bias"
StaticText "$MENU_BLACKJACK_HUNTER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "blackjack_hunter_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar blackjack_hunter_spawn_bias"
StaticText "$MENU_BLACKJACK_SLAYER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "blackjack_slayer_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar blackjack_slayer_spawn_bias"
StaticText ""

StaticText "$MENU_BLACKJACK_BACKPACKS", "White"
Expand All @@ -140,8 +146,8 @@ OptionMenu "blackjackSpawning" {

StaticText "$MENU_MAGSPAWNOPTIONS", "Green"
StaticText "$MENU_BLACKJACKMAG_355_CLIPMAG_SPAWNTEXT", "White"
Option "$MENU_MAGSPAWNRATE", "blackjack355mag_clip_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETMAG", "resetcvar blackjack355mag_clip_spawn_bias"
Option "$MENU_MAGSPAWNRATE", "blackjack355mag_clipmag_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETMAG", "resetcvar blackjack355mag_clipmag_spawn_bias"
StaticText ""

StaticText "$MENU_BLACKJACKMAG_355_BACKPACKS", "White"
Expand Down Expand Up @@ -180,9 +186,9 @@ OptionMenu "jackdawSpawning" {
StaticText ""

StaticText "$MENU_SPAWNOPTIONS", "Green"
StaticText "$MENU_JACKDAW_CHAINGUN_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "jackdaw_vulcanette_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar jackdaw_vulcanette_spawn_bias"
StaticText "$MENU_JACKDAW_CLIPBOX_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "jackdaw_clipbox_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar jackdaw_clipbox_spawn_bias"
StaticText ""

StaticText "$MENU_JACKDAW_BACKPACKS", "Green"
Expand Down Expand Up @@ -260,9 +266,9 @@ OptionMenu "scorpionSpawning" {
StaticText ""

StaticText "$MENU_SPAWNOPTIONS", "Orange"
StaticText "$MENU_SCORPION_BRONTORNIS_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "scorpion_bronto_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar scorpion_bronto_spawn_bias"
StaticText "$MENU_SCORPION_BFG_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "scorpion_bfg_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar scorpion_bfg_spawn_bias"
StaticText ""

StaticText "$MENU_SCORPION_BACKPACKS", "Orange"
Expand Down Expand Up @@ -296,6 +302,9 @@ OptionMenu "wyvernSpawning" {
StaticText "$MENU_WYVERN_SLAYER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "wyvern_slayer_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar wyvern_slayer_spawn_bias"
StaticText "$MENU_WYVERN_PLASMA_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "wyvern_plasma_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar wyvern_plasma_spawn_bias"
StaticText ""

StaticText "$MENU_WYVERN_BACKPACKS", "Orange"
Expand Down Expand Up @@ -359,8 +368,8 @@ OptionMenu "hammerheadSpawning" {
Option "$MENU_WEPSPAWNRATE", "hammerhead_chaingun_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar hammerhead_chaingun_spawn_bias"
StaticText "$MENU_HAMMERHEAD_PLASMA_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "hammerhead_thunderbuster_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar hammerhead_thunderbuster_spawn_bias"
Option "$MENU_WEPSPAWNRATE", "hammerhead_plasma_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar hammerhead_plasma_spawn_bias"
StaticText ""

StaticText "$MENU_HAMMERHEAD_BACKPACKS", "White"
Expand Down Expand Up @@ -389,8 +398,8 @@ OptionMenu "redlineSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "Cyan"
StaticText "$MENU_REDLINE_PLASMA_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "redline_thunderbuster_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar redline_thunderbuster_spawn_bias"
Option "$MENU_WEPSPAWNRATE", "redline_plasma_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar redline_plasma_spawn_bias"
StaticText ""

StaticText "$MENU_REDLINE_BACKPACKS", "White"
Expand Down
2 changes: 1 addition & 1 deletion MODELDEF.gungnir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Model GungnirRaySegment
{
USEACTORPITCH
DONTCULLBACKFACES
Path "Models" DONTCULLBACKFACES Scale 3.333333 6.0 6.0
Path "Models/Gungnir" DONTCULLBACKFACES Scale 3.333333 6.0 6.0
Model 0 "GungnirRaySegment.obj" FrameIndex GNGY A 0 0
}
4 changes: 2 additions & 2 deletions MODELDEF.redline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ Model RedlineRaySegment
{
USEACTORPITCH
DONTCULLBACKFACES
Path "Models" DONTCULLBACKFACES Scale 3.333333 1.0 1.0
Path "Models/Redline" DONTCULLBACKFACES Scale 3.333333 1.0 1.0
Model 0 "RedlineRaySegment.obj" FrameIndex RDLR A 0 0
}

Model RedlineRaySegmentOverheated
{
USEACTORPITCH
DONTCULLBACKFACES
Path "Models" DONTCULLBACKFACES Scale 3.333333 2.0 2.0
Path "Models/Redline" DONTCULLBACKFACES Scale 3.333333 2.0 2.0
Model 0 "RedlineRaySegment.obj" FrameIndex RDLR A 0 0
}
Loading