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

Removal of all mentions of 50AE #20

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Removal of all mentions of 50AE #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e84f0bd
Update ZSCRIPT.zsc
Cryomundus Oct 3, 2023
7fef8eb
Update README.md
Cryomundus Oct 3, 2023
36e99db
Update MENUDEF
Cryomundus Oct 3, 2023
8a32c68
Update LANGUAGE
Cryomundus Oct 3, 2023
88fe484
Update KEYCONF
Cryomundus Oct 3, 2023
dee9538
Update CVARINFO
Cryomundus Oct 3, 2023
bb35763
Update SpawnHandler.zsc
Cryomundus Oct 3, 2023
100a006
Update 50AE.zsc
Cryomundus Oct 3, 2023
a70f4e4
Merge branch 'HDest-Community:main' into main
Cryomundus Dec 28, 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
7 changes: 1 addition & 6 deletions CVARINFO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ server int hdb_069bore_box_spawn_bias = -1;
server int hdb_069bore_casing_spawn_bias = -1;
server bool hdb_069bore_persistent_spawning = false;

// .50 AE
server int hdb_50ae_box_spawn_bias = -1;
server int hdb_50ae_casing_spawn_bias = -1;
server bool hdb_50ae_persistent_spawning = false;

// .50 OMG
server int hdb_50omg_box_spawn_bias = -1;
server int hdb_50omg_casing_spawn_bias = -1;
Expand Down Expand Up @@ -138,4 +133,4 @@ server bool hdb_300savage_persistent_spawning = false;
// 7.62 Tokarev
server int hdb_7Tokarev_box_spawn_bias = -1;
server int hdb_7Tokarev_casing_spawn_bias = -1;
server bool hdb_7Tokarev_persistent_spawning = false;
server bool hdb_7Tokarev_persistent_spawning = false;
3 changes: 1 addition & 2 deletions KEYCONF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ alias hdb_500sw_reset_cvars "resetcvar hdb_500sw_shellbox_spawn_bias;
alias hdb_12gslug_reset_cvars "resetcvar hdb_12gslug_shellbox_spawn_bias; resetcvar hdb_12gslug_shell_spawn_bias; resetcvar hdb_12gslug_casing_spawn_bias; resetcvar hdb_12gslug_persistent_spawning"
alias hdb_420frei_reset_cvars "resetcvar hdb_420frei_box_spawn_bias; resetcvar hdb_420frei_casing_spawn_bias; resetcvar hdb_420frei_persistent_spawning"
alias hdb_069bore_reset_cvars "resetcvar hdb_069bore_box_spawn_bias; resetcvar hdb_069bore_casing_spawn_bias; resetcvar hdb_069bore_persistent_spawning"
alias hdb_50ae_reset_cvars "resetcvar hdb_50ae_box_spawn_bias; resetcvar hdb_50ae_casing_spawn_bias; resetcvar hdb_50ae_persistent_spawning"
alias hdb_50OMG_reset_cvars "resetcvar hdb_50omg_box_spawn_bias; resetcvar hdb_50omg_casing_spawn_bias; resetcvar hdb_50omg_persistent_spawning"
alias hdb_45ACP_reset_cvars "resetcvar hdb_45acp_box_spawn_bias; resetcvar hdb_45acp_casing_spawn_bias; resetcvar hdb_45acp_persistent_spawning"
alias hdb_10mmAuto_reset_cvars "resetcvar hdb_10mm_box_spawn_bias; resetcvar hdb_10mm_casing_spawn_bias; resetcvar hdb_10mm_persistent_spawning"
Expand All @@ -28,4 +27,4 @@ alias hdb_bird_reset_cvars "resetcvar hdb_bird_shellbox_spawn_bias;
alias hdb_300savage_reset_cvars "resetcvar hdb_300savage_shellbox_spawn_bias; resetcvar hdb_300savage_shell_spawn_bias; resetcvar hdb_300savage_casing_spawn_bias; resetcvar hdb_300savage_persistent_spawning"
alias hdb_762Tokarev_reset_cvars "resetcvar hdb_7Tokarev_box_spawn_bias; resetcvar hdb_7Tokarev_casing_spawn_bias; resetcvar hdb_7Tokarev_persistent_spawning"

alias hdb_reset_cvars "hdb_enableammo_reset_cvars; hdb_500sw_reset_cvars; hdb_12gslug_reset_cvars; hdb_420frei_reset_cvars; hdb_069bore_reset_cvars; hdb_50ae_reset_cvars; hdb_50OMG_reset_cvars; hdb_45ACP_reset_cvars; hdb_10mmAuto_reset_cvars; hdb_45lc_reset_cvars; hdb_g45lc_reset_cvars; hdb_lesslethalshells_reset_cvars; hdb_explosiveslugs_reset_cvars; hdb_fshells_reset_cvars; hdb_mball_reset_cvars; hdb_4GSS_reset_cvars; hdb_5mm_reset_cvars; hdb_50am_reset_cvars; hdb_6mm_reset_cvars; hdb_20mm_reset_cvars; hdb_ThuRKT_reset_cvars; hdb_TortRKT_reset_cvars; hdb_3006_reset_cvars; hdb_4GBS_reset_cvars; hdb_bird_reset_cvars; hdb_300savage_reset_cvars; hdb_762Tokarev_reset_cvars"
alias hdb_reset_cvars "hdb_enableammo_reset_cvars; hdb_500sw_reset_cvars; hdb_12gslug_reset_cvars; hdb_420frei_reset_cvars; hdb_069bore_reset_cvars; hdb_50OMG_reset_cvars; hdb_45ACP_reset_cvars; hdb_10mmAuto_reset_cvars; hdb_45lc_reset_cvars; hdb_g45lc_reset_cvars; hdb_lesslethalshells_reset_cvars; hdb_explosiveslugs_reset_cvars; hdb_fshells_reset_cvars; hdb_mball_reset_cvars; hdb_4GSS_reset_cvars; hdb_5mm_reset_cvars; hdb_50am_reset_cvars; hdb_6mm_reset_cvars; hdb_20mm_reset_cvars; hdb_ThuRKT_reset_cvars; hdb_TortRKT_reset_cvars; hdb_3006_reset_cvars; hdb_4GBS_reset_cvars; hdb_bird_reset_cvars; hdb_300savage_reset_cvars; hdb_762Tokarev_reset_cvars"
3 changes: 1 addition & 2 deletions LANGUAGE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ TAG_EXPLSHL = "Explosive Shotgun Slugs";
TAG_FLARESHELL = "Flare Shells";
TAG_G45LC = "Golden .45 LC round";
TAG_45LC = ".45 LC Round";
TAG_50AE = ".50 AE round";
TAG_50AM = ".50 Action Mega";
TAG_50OMG = ".50 OMG round";
TAG_MUSKETBALL = "Lead Ball";
Expand Down Expand Up @@ -100,4 +99,4 @@ PICKUP_069BORE="Picked up a .066 bore shell.";
PICKUP_069BOREBOX="Picked up some .066 bore shells.";

OB_20MM="%o was fragged by %k.";
OB_WANROCKET="%o was fragged by %k.";
OB_WANROCKET="%o was fragged by %k.";
3 changes: 0 additions & 3 deletions MENUDEF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ OptionMenu "HDBulletLibMenu"
StaticText ""
SafeCommand "Reset all options", "hdb_reset_cvars"
StaticText ""
StaticText "Created by Accensus", "cyan"
Submenu "$TAG_50AE", "50AE", 0, 1
StaticText ""
StaticText "Created by Sledge & prettyFist", "purple"
Submenu "$TAG_12SLUG", "12GaugeSlugs", 0, 1
Submenu "$TAG_500SW", "500SW", 0, 1
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ It's better to opt-in than it is to opt-out in this case. Check out the menu.

Currently Includes:

- .50 AE by Accensus
- 12 Gauge Slugs, .500 S&W Lights and Heavies, .420 Frei and .069 Bore by the Peppergrinder team
- .50 OMG by Bogus
- .45 ACP and 4-Gauge Buckshot by Popguy
Expand Down
1 change: 0 additions & 1 deletion ZSCRIPT.zsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ version "4.10"

#include "zscript/HDBulletLib/SpawnHandler.zsc"

#include "zscript/HDBulletLib/Ammunition/50AE.zsc"
#include "zscript/HDBulletLib/Ammunition/Slugs.zsc"
#include "zscript/HDBulletLib/Ammunition/500S&W.zsc"
#include "zscript/HDBulletLib/Ammunition/50OMG.zsc"
Expand Down
4 changes: 3 additions & 1 deletion zscript/HDBulletLib/Ammunition/50AE.zsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// NO LONGER USED, TO BE DELETED.

// ------------------------------
// CREATED BY ACCENSUS
// ------------------------------
Expand Down Expand Up @@ -92,4 +94,4 @@ class HD50AEBoxPickup : HDUPK
50AE X -1;
Stop;
}
}
}
1 change: 0 additions & 1 deletion zscript/HDBulletLib/SpawnHandler.zsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ const HDCONST_HDBLEVENT = HDCONST_BPSPAWNPOOLEVENT + 1;
class HDBulletLibHandler : EventHandler {
// [Ace] Order here must match order in menu. And zscript files. - [Ted]
static const class<HDAmmo> RemovedClasses[] = {
'HD50AEAmmo',
'HDSlugAmmo',
'HD500SWLightAmmo',
'HD500SWHeavyAmmo',
Expand Down