diff --git a/KEYCONF b/KEYCONF index a06d0c9..0c40385 100644 --- a/KEYCONF +++ b/KEYCONF @@ -1,11 +1,11 @@ // Aliases for resetting the spawning cvars only, not technically necessary but helpful to have to reset all of the world spawning options to off for an ammo type. - [Ted] -alias hdb_enableammo_reset_cvars "resetcvar hdblib_enableammo_1; resetcvar hdblib_enableammo_3; resetcvar hdblib_enableammo_3;" +alias hdb_enableammo_reset_cvars "resetcvar hdblib_enableammo_1; resetcvar hdblib_enableammo_2; resetcvar hdblib_enableammo_3;" +alias hdb_ndm_reset_cvars "resetcvar hdb_ndm_box_spawn_bias; resetcvar hdb_ndm_casing_spawn_bias; resetcvar hdb_ndm_persistent_spawning" alias hdb_500sw_reset_cvars "resetcvar hdb_500sw_shellbox_spawn_bias; resetcvar hdb_500sw_rocket_spawn_bias; resetcvar hdb_500sw_casing_spawn_bias; resetcvar hdb_500sw_persistent_spawning" 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_ndm_reset_cvars "resetcvar hdb_ndm_box_spawn_bias; resetcvar hdb_ndm_casing_spawn_bias; resetcvar hdb_ndm_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 +28,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_ndm_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 diff --git a/MENUDEF b/MENUDEF index b4175d3..114eef3 100644 --- a/MENUDEF +++ b/MENUDEF @@ -209,7 +209,7 @@ OptionMenu 9mmNDM SafeCommand "Reset spawn options", "resetcvar hdb_ndm_casing_spawn_bias" StaticText "" StaticText "Enable/Disable NDM from spawning in Ammo Boxes and Backpacks.", "purple" - FlagOption "$TAG_NDM", "hdblib_enableammo_1", "OnOff", 18 + FlagOption "$TAG_NDM", "hdblib_enableammo_1", "OnOff", 0 StaticText "" StaticText "Control whether replacements happen after a mapload.", "white" Option "Persistent Spawns: ", "hdb_ndm_persistent_spawning", "OnOff" diff --git a/TEXTURES b/TEXTURES index efb932f..402ee6a 100644 --- a/TEXTURES +++ b/TEXTURES @@ -1039,6 +1039,7 @@ Sprite "G50YA0", 10, 7 } } +// .069 Bore & .420 Frei Sprite "42TEA0", 10, 6 { Offset 5, 6 @@ -1210,6 +1211,7 @@ Sprite "LLS4A0", 15, 7 } } +//fumbled shell sprites Sprite "ELLSA1", 3, 4 { Offset 1, 4 @@ -1270,6 +1272,7 @@ Sprite "ELLSE5", 3, 4 Patch "ELLSE5", 0, 0 } +//single flare shells Sprite "FLARA0", 3, 10 { XScale 0.500 @@ -1278,6 +1281,7 @@ Sprite "FLARA0", 3, 10 Patch "FLARA0", 0, 0 } +//four flare shells Sprite "FLA4A0", 15, 10 { XScale 0.500 @@ -1286,6 +1290,7 @@ Sprite "FLA4A0", 15, 10 Patch "FLA4A0", 0, 0 } +//flare shellbox Sprite "FLBXA0", 32, 12 { Offset 16, 12 @@ -1316,6 +1321,7 @@ Sprite "XLBXA0", 32, 12 Patch "XLBXA0", 0, 0 } +//fumbled shell sprites Sprite "XLLSA1", 3, 4 { Offset 1, 4 @@ -1480,6 +1486,11 @@ Sprite "T710A0", 40, 23 Patch "T710A0", 0, 0 } +// End of texture definitions + +//Belt Links + +//Large Sprite "HW0LA0", 14, 6 { Offset 7, 6 diff --git a/zscript/HDBulletLib/SpawnHandler.zsc b/zscript/HDBulletLib/SpawnHandler.zsc index cc7ab92..5daa935 100644 --- a/zscript/HDBulletLib/SpawnHandler.zsc +++ b/zscript/HDBulletLib/SpawnHandler.zsc @@ -1,8 +1,9 @@ const HDCONST_HDBLEVENT = HDCONST_BPSPAWNPOOLEVENT + 1; class HDBulletLibHandler : EventHandler { - // [Ace] Order here must match order in menu. And zscript files. - [Ted] + // [Ace] Order here must match bitshifting order in menudef and zscript files. - [Ted, UZ] static const class RemovedClasses[] = { + 'HDNDMLoose', 'HDSlugAmmo', 'HD500SWLightAmmo', 'HD500SWHeavyAmmo', @@ -21,7 +22,6 @@ class HDBulletLibHandler : EventHandler { 'HD50AM_Ammo', 'HDAurochsAmmo', 'HD069BoreAmmo', - 'HDNDMLoose', 'TenMilBrass', 'Wan_ThuRKTAmmo', 'Wan_TortRKTAmmo',