From e84f0bdba78f88af674b74da34974e3edd5d6e69 Mon Sep 17 00:00:00 2001 From: Cryomundus <70421214+Cryomundus@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:47:35 -0400 Subject: [PATCH 1/8] Update ZSCRIPT.zsc begin removing 50AE --- ZSCRIPT.zsc | 1 - 1 file changed, 1 deletion(-) diff --git a/ZSCRIPT.zsc b/ZSCRIPT.zsc index 1868e58..4e34eb2 100644 --- a/ZSCRIPT.zsc +++ b/ZSCRIPT.zsc @@ -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" From 7fef8eb8720bed73144aa9905dc77b09c1d0fa4b Mon Sep 17 00:00:00 2001 From: Cryomundus <70421214+Cryomundus@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:48:57 -0400 Subject: [PATCH 2/8] Update README.md remove mentions and credits for 50AE --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 49f92e6..361eda7 100644 --- a/README.md +++ b/README.md @@ -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 From 36e99db341940d4137b020ac897c74e16baa96df Mon Sep 17 00:00:00 2001 From: Cryomundus <70421214+Cryomundus@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:49:54 -0400 Subject: [PATCH 3/8] Update MENUDEF Remove spawn options for 50AE --- MENUDEF | 3 --- 1 file changed, 3 deletions(-) diff --git a/MENUDEF b/MENUDEF index 787a8e2..98777ff 100644 --- a/MENUDEF +++ b/MENUDEF @@ -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 From 8a32c68e5088634c86c4ffaaa54dd31e9aff6cce Mon Sep 17 00:00:00 2001 From: Cryomundus <70421214+Cryomundus@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:50:32 -0400 Subject: [PATCH 4/8] Update LANGUAGE remove tag definition for 50AE --- LANGUAGE | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/LANGUAGE b/LANGUAGE index b6f2d14..3505a2e 100644 --- a/LANGUAGE +++ b/LANGUAGE @@ -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"; @@ -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."; \ No newline at end of file +OB_WANROCKET="%o was fragged by %k."; From 88fe4848ca6d6c04bf33230204ed2dfd3f1f287a Mon Sep 17 00:00:00 2001 From: Cryomundus <70421214+Cryomundus@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:52:23 -0400 Subject: [PATCH 5/8] Update KEYCONF remove resetcvar and defaults for 50AE --- KEYCONF | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/KEYCONF b/KEYCONF index fa62058..641cf21 100644 --- a/KEYCONF +++ b/KEYCONF @@ -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" @@ -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" \ No newline at end of file +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" From dee9538b8df5c0ece988d3ce30167d113c1ad339 Mon Sep 17 00:00:00 2001 From: Cryomundus <70421214+Cryomundus@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:53:13 -0400 Subject: [PATCH 6/8] Update CVARINFO remove cvars for 50AE --- CVARINFO | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CVARINFO b/CVARINFO index 233405c..be9467f 100644 --- a/CVARINFO +++ b/CVARINFO @@ -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; @@ -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; \ No newline at end of file +server bool hdb_7Tokarev_persistent_spawning = false; From bb3576383e1100c5cf09774223261630427e1fa0 Mon Sep 17 00:00:00 2001 From: Cryomundus <70421214+Cryomundus@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:54:12 -0400 Subject: [PATCH 7/8] Update SpawnHandler.zsc remove 50AE from spawn handler --- zscript/HDBulletLib/SpawnHandler.zsc | 1 - 1 file changed, 1 deletion(-) diff --git a/zscript/HDBulletLib/SpawnHandler.zsc b/zscript/HDBulletLib/SpawnHandler.zsc index d1bb4d9..34bb321 100644 --- a/zscript/HDBulletLib/SpawnHandler.zsc +++ b/zscript/HDBulletLib/SpawnHandler.zsc @@ -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 RemovedClasses[] = { - 'HD50AEAmmo', 'HDSlugAmmo', 'HD500SWLightAmmo', 'HD500SWHeavyAmmo', From 100a00680d68d3622643157d71c7b46f4af64cb0 Mon Sep 17 00:00:00 2001 From: Cryomundus <70421214+Cryomundus@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:56:56 -0400 Subject: [PATCH 8/8] Update 50AE.zsc --- zscript/HDBulletLib/Ammunition/50AE.zsc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zscript/HDBulletLib/Ammunition/50AE.zsc b/zscript/HDBulletLib/Ammunition/50AE.zsc index bab029e..513c9ce 100644 --- a/zscript/HDBulletLib/Ammunition/50AE.zsc +++ b/zscript/HDBulletLib/Ammunition/50AE.zsc @@ -1,3 +1,5 @@ +// NO LONGER USED, TO BE DELETED. + // ------------------------------ // CREATED BY ACCENSUS // ------------------------------ @@ -92,4 +94,4 @@ class HD50AEBoxPickup : HDUPK 50AE X -1; Stop; } -} \ No newline at end of file +}