Skip to content

Commit

Permalink
Merge pull request #4 from UndeadZeratul/Ace-Items
Browse files Browse the repository at this point in the history 
Ace items
  • Loading branch information
@tedthedragon
tedthedragon authored Oct 25, 2023
2 parents ac3cf54 + 493c88f commit 90ed0e2
Show file tree
Hide file tree
Showing 18 changed files with 738 additions and 297 deletions.
23 changes: 13 additions & 10 deletions CVARINFO
View file
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 All @@ -103,27 +106,27 @@ server bool vipermag_persistent_spawning = false;
// Items
//------------

server int deployablebarricade_rl_spawn_bias = 24;
server int deployablebarricade_launcher_spawn_bias = 24;
server bool deployablebarricade_persistent_spawning = false;

server bool ladderlauncher_allowBackpacks = true;
server int ladderlauncher_rocketbox_spawn_bias = 24;
server int ladderlauncher_cellpack_spawn_bias = 24;
server int ladderlauncher_battery_spawn_bias = 24;
server bool ladderlauncher_persistent_spawning = false;

server bool psg_allowBackpacks = true;
server int psg_battlearmor_spawn_bias = 19;
server int psg_bluearmour_spawn_bias = 19;
server bool psg_persistent_spawning = false;

server bool secretfinder_allowBackpacks = true;
server int secretfinder_map_spawn_bias = 19;
server bool secretfinder_persistent_spawning = false;

server bool superstim_allowBackpacks = true;
server int superstim_medical_spawn_bias = 19;
server int superstim_stimpack_spawn_bias = 19;
server bool superstim_persistent_spawning = false;

server int weaponcrate_rl_spawn_bias = 19;
server int weaponcrate_launcher_spawn_bias = 19;
server bool weaponcrate_persistent_spawning = false;

server bool dsd_allowBackpacks = true;
Expand Down
20 changes: 9 additions & 11 deletions LANGUAGE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,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 @@ -91,7 +93,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 @@ -113,7 +115,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 @@ -130,6 +132,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:";

// Ladder Launcher Options Text
Expand All @@ -148,14 +151,9 @@ MENU_SECRETFINDER_TITLE = "------ Secret Finder Options ------";
MENU_SECRETFINDER_MAP_SPAWNTEXT = "Control the spawn rate of the Secret Finder on automaps:";
MENU_SECRETFINDER_BACKPACKS = "Control whether the Secret Finder spawns in Backpacks:";

// Secret Finder Options Text
MENU_SECRETFINDER_TITLE = "------ Secret Finder Options ------";
MENU_SECRETFINDER_MAP_SPAWNTEXT = "Control the spawn rate of the Secret Finder on automaps:";
MENU_SECRETFINDER_BACKPACKS = "Control whether the Secret Finder spawns in Backpacks:";

// Super Stim Options Text
MENU_SUPERSTIM_TITLE = "------ Super Stimpack Options ------";
MENU_SUPERSTIM_MEDICAL_SPAWNTEXT = "Control the spawn rate of the Super Stimpack on medical supplies:";
MENU_SUPERSTIM_STIMPACK_SPAWNTEXT = "Control the spawn rate of the Super Stimpack on Stimpacks:";
MENU_SUPERSTIM_BACKPACKS = "Control whether the Super Stimpack spawns in Backpacks:";

// Field Assembly Kit Options Text
Expand Down Expand Up @@ -194,11 +192,11 @@ MENU_SOULCUBE_BACKPACKS = "Control whether the Soul Cube spawns

// Weapon Crate Options Text
MENU_WEAPONCRATE_TITLE = "------ Weapon Crate Options ------";
MENU_WEAPONCRATE_RL_SPAWNTEXT = "Control the spawn rate of the Weapon Crate on Rocket Launchers:";
MENU_WEAPONCRATE_LAUNCHER_SPAWNTEXT = "Control the spawn rate of the Weapon Crate on Rocket Launchers:";

// Deployable Barricade Options Text
MENU_DEPLOYABLEBARRICADE_TITLE = "------ Deployable Barricade Options ------";
MENU_DEPLOYABLEBARRICADE_RL_SPAWNTEXT = "Control the spawn rate of the Deployable Barricade on Rocket Launchers:";
MENU_BARRICADE_TITLE = "------ Deployable Barricade Options ------";
MENU_BARRICADE_LAUNCHER_SPAWNTEXT = "Control the spawn rate of the Deployable Barricade on Rocket Launchers:";

// Magazine Reloader Options Text
MENU_MAGRELOADER_TITLE = "------ Magazine Reloader Options ------";
Expand Down
57 changes: 33 additions & 24 deletions MENUDEF
View file
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 Expand Up @@ -453,8 +462,8 @@ OptionMenu "psgSpawning" {

StaticText "$MENU_SPAWNOPTIONS", "FAK_Blue"
StaticText "$MENU_PSG_BLUEARMOR_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "psg_battlearmor_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar psg_battlearmor_spawn_bias"
Option "$MENU_WEPSPAWNRATE", "psg_bluearmour_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar psg_bluearmour_spawn_bias"
StaticText ""

StaticText "$MENU_PSG_BACKPACKS", "White"
Expand Down Expand Up @@ -512,9 +521,9 @@ OptionMenu "superstimSpawning" {
StaticText ""

StaticText "$MENU_SPAWNOPTIONS", "FAK_Blue"
StaticText "$MENU_SUPERSTIM_MEDICAL_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "superstim_medical_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar superstim_medical_spawn_bias"
StaticText "$MENU_SUPERSTIM_STIMPACK_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "superstim_stimpack_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar superstim_stimpack_spawn_bias"
StaticText ""

StaticText "$MENU_SUPERSTIM_BACKPACKS", "White"
Expand Down Expand Up @@ -704,9 +713,9 @@ OptionMenu "crateSpawning" {
StaticText ""

StaticText "$MENU_SPAWNOPTIONS", "FAK_Blue"
StaticText "$MENU_WEAPONCRATE_RL_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "weaponcrate_rl_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar weaponcrate_rl_spawn_bias"
StaticText "$MENU_WEAPONCRATE_LAUNCHER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "weaponcrate_launcher_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar weaponcrate_launcher_spawn_bias"
StaticText ""

StaticText "$MENU_PERSISTENCYOPTIONS", "FAK_Blue"
Expand All @@ -721,7 +730,7 @@ OptionMenu "crateSpawning" {
}

OptionMenu "barricadeSpawning" {
Title "$MENU_DEPLOYABLEBARRICADE_TITLE"
Title "$MENU_BARRICADE_TITLE"
StaticText ""

StaticText "$MENU_NOTICE", "FAK_Blue"
Expand All @@ -730,9 +739,9 @@ OptionMenu "barricadeSpawning" {
StaticText ""

StaticText "$MENU_SPAWNOPTIONS", "FAK_Blue"
StaticText "$MENU_DEPLOYABLEBARRICADE_RL_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "deployablebarricade_rl_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar deployablebarricade_rl_spawn_bias"
StaticText "$MENU_BARRICADE_LAUNCHER_SPAWNTEXT", "White"
Option "$MENU_WEPSPAWNRATE", "deployablebarricade_launcher_spawn_bias", "SpawnBias"
SafeCommand "$MENU_RESETWEP", "resetcvar deployablebarricade_launcher_spawn_bias"
StaticText ""

StaticText "$MENU_PERSISTENCYOPTIONS", "FAK_Blue"
Expand Down
3 changes: 2 additions & 1 deletion zscript.zsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,5 @@ const HDLD_WYVERN = "wyv";
#include "zscript/accensus/items/FAK Upgrades/FAK Icarus.zsc"
#include "zscript/accensus/items/FAK Upgrades/FAK Potetobloke.zsc"
#include "zscript/accensus/items/FAK Upgrades/FAK Mohl.zsc"
#include "zscript/accensus/items/FAK Upgrades/FAK Peppergrinder.zsc"
#include "zscript/accensus/items/FAK Upgrades/FAK Peppergrinder.zsc"
#include "zscript/accensus/items/FAK Upgrades/FAK Radtech.zsc"
Loading

0 comments on commit 90ed0e2

Please sign in to comment.