diff --git a/cvarinfo.base b/cvarinfo.base index 4e4e96f28..41214ec02 100644 --- a/cvarinfo.base +++ b/cvarinfo.base @@ -41,7 +41,7 @@ nosave int swwm_precisecrosshair = 1; // use mod's own, more precise crosshair nosave bool swwm_ldspoil = false; // [LD] always shows "Legendary" prefix on Legendary monsters, otherwise only when they've transformed server bool swwm_uncapalert = false; // all noise alerts have infinite range server int swwm_strictuntouchable = 0; // untouchable bonus ends... (1 - even if your armor absorbed all the damage, 2 - if you get hit by anything PERIOD) -server bool swwm_swapweapons = true; // [DLC1] allows carrying only one weapon in each slot (excluding starter melee) +server bool swwm_swapweapons = true; // [DLC] allows carrying only one weapon in each slot (excluding starter melee) nosave int swwm_forcestats = 1; // always shows level stats on the HUD, not just when the automap is open (2 - also show map name, otherwise only stats) user int swwm_funtrails = 0; // recolors trails of eviscerator chunks and sheen bullets server int swwm_ps_fullreset = 0; // full reset of inventory, including score if enabled (0: no, 1: all maps excluding hubs, 2: between clusters) diff --git a/gldefs.txt b/gldefs.txt index 0924763d3..2a5be2ea3 100644 --- a/gldefs.txt +++ b/gldefs.txt @@ -21,9 +21,9 @@ #include "gldefs/weapons/candygun.txt" #include "gldefs/weapons/ynykron.txt" // dlc weaponset -#include "gldefs/dlc1/dlcammo.txt" -#include "gldefs/dlc1/hammer.txt" -//#include "gldefs/dlc1/plasmablast.txt" -#include "gldefs/dlc1/sheenhmg.txt" -#include "gldefs/dlc1/quadravol.txt" -#include "gldefs/dlc1/mortalrifle.txt" +#include "gldefs/dlc/dlcammo.txt" +#include "gldefs/dlc/hammer.txt" +//#include "gldefs/dlc/plasmablast.txt" +#include "gldefs/dlc/sheenhmg.txt" +#include "gldefs/dlc/quadravol.txt" +#include "gldefs/dlc/mortalrifle.txt" diff --git a/gldefs/dlc1/dlcammo.txt b/gldefs/dlc/dlcammo.txt similarity index 100% rename from gldefs/dlc1/dlcammo.txt rename to gldefs/dlc/dlcammo.txt diff --git a/gldefs/dlc1/hammer.txt b/gldefs/dlc/hammer.txt similarity index 100% rename from gldefs/dlc1/hammer.txt rename to gldefs/dlc/hammer.txt diff --git a/gldefs/dlc1/mortalrifle.txt b/gldefs/dlc/mortalrifle.txt similarity index 100% rename from gldefs/dlc1/mortalrifle.txt rename to gldefs/dlc/mortalrifle.txt diff --git a/gldefs/dlc1/plasmablast.txt b/gldefs/dlc/plasmablast.txt similarity index 100% rename from gldefs/dlc1/plasmablast.txt rename to gldefs/dlc/plasmablast.txt diff --git a/gldefs/dlc1/quadravol.txt b/gldefs/dlc/quadravol.txt similarity index 100% rename from gldefs/dlc1/quadravol.txt rename to gldefs/dlc/quadravol.txt diff --git a/gldefs/dlc1/sheenhmg.txt b/gldefs/dlc/sheenhmg.txt similarity index 100% rename from gldefs/dlc1/sheenhmg.txt rename to gldefs/dlc/sheenhmg.txt diff --git a/language.def_menu b/language.def_menu index aea8358ad..8b7b50eec 100644 --- a/language.def_menu +++ b/language.def_menu @@ -518,9 +518,6 @@ SWWM_HELPTXT = "\cfArrow Keys:\c- Navigate\n" "\cfEnter, Left Click:\c- Sell\n" "\cfBackspace, Right Click:\c- Switch to buying"; -SWWM_GAMETAB = "Games"; -SWWM_PICKGAME = "Choose a game"; -SWWM_GAMETITLE_MADCATGAME = "Boot Test"; // Help menu SWWM_HELP_STORY = "The Story So Far"; SWWM_HELP_STORYDOOM = diff --git a/language.es_menu b/language.es_menu index 79fe0f03d..5b53dfee7 100644 --- a/language.es_menu +++ b/language.es_menu @@ -474,9 +474,6 @@ SWWM_HELPTXT = "\cfFlechas:\c- Navegar\n" "\cfEnter/Click Izdo.:\c- Vender\n" "\cfRetroceso/Click Dcho.:\c- Cambiar a compra"; -SWWM_GAMETAB = "Juegos"; -SWWM_PICKGAME = "Elige un juego"; -SWWM_GAMETITLE_MADCATGAME = "Test de Arranque"; // Help menu SWWM_HELP_STORY = "La Historia Hasta Ahora"; SWWM_HELP_STORYDOOM = diff --git a/language.version b/language.version index 0d581c32e..f1ed7b489 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1120 \cu(Wed Apr 3 21:31:44 CEST 2024)\c-"; -SWWM_SHORTVER="\cw1.3pre r1120 \cu(2024-04-03 21:31:44)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1121 \cu(Wed Apr 3 21:45:12 CEST 2024)\c-"; +SWWM_SHORTVER="\cw1.3pre r1121 \cu(2024-04-03 21:45:12)\c-"; diff --git a/modeldef.txt b/modeldef.txt index e18d374fb..7b3415884 100644 --- a/modeldef.txt +++ b/modeldef.txt @@ -21,14 +21,14 @@ #include "modeldef/weapons/candygun.txt" #include "modeldef/weapons/ynykron.txt" // dlc weaponset -#include "modeldef/dlc1/dlcammo.txt" -#include "modeldef/dlc1/hammer.txt" -//#include "modeldef/dlc1/plasmablast.txt" -//#include "modeldef/dlc1/puntzerbeta.txt" -//#include "modeldef/dlc1/puntzergamma.txt" -#include "modeldef/dlc1/sheenhmg.txt" -#include "modeldef/dlc1/quadravol.txt" -//#include "modeldef/dlc1/newsparkster.txt" -//#include "modeldef/dlc1/raykhom.txt" -#include "modeldef/dlc1/mortalrifle.txt" -//#include "modeldef/dlc1/rafankos.txt" +#include "modeldef/dlc/dlcammo.txt" +#include "modeldef/dlc/hammer.txt" +//#include "modeldef/dlc/plasmablast.txt" +//#include "modeldef/dlc/puntzerbeta.txt" +//#include "modeldef/dlc/puntzergamma.txt" +#include "modeldef/dlc/sheenhmg.txt" +#include "modeldef/dlc/quadravol.txt" +//#include "modeldef/dlc/newsparkster.txt" +//#include "modeldef/dlc/raykhom.txt" +#include "modeldef/dlc/mortalrifle.txt" +//#include "modeldef/dlc/rafankos.txt" diff --git a/modeldef/dlc1/dlcammo.txt b/modeldef/dlc/dlcammo.txt similarity index 100% rename from modeldef/dlc1/dlcammo.txt rename to modeldef/dlc/dlcammo.txt diff --git a/modeldef/dlc1/hammer.txt b/modeldef/dlc/hammer.txt similarity index 100% rename from modeldef/dlc1/hammer.txt rename to modeldef/dlc/hammer.txt diff --git a/modeldef/dlc1/mortalrifle.txt b/modeldef/dlc/mortalrifle.txt similarity index 100% rename from modeldef/dlc1/mortalrifle.txt rename to modeldef/dlc/mortalrifle.txt diff --git a/modeldef/dlc1/newsparkster.txt b/modeldef/dlc/newsparkster.txt similarity index 100% rename from modeldef/dlc1/newsparkster.txt rename to modeldef/dlc/newsparkster.txt diff --git a/modeldef/dlc1/plasmablast.txt b/modeldef/dlc/plasmablast.txt similarity index 100% rename from modeldef/dlc1/plasmablast.txt rename to modeldef/dlc/plasmablast.txt diff --git a/modeldef/dlc1/puntzerbeta.txt b/modeldef/dlc/puntzerbeta.txt similarity index 100% rename from modeldef/dlc1/puntzerbeta.txt rename to modeldef/dlc/puntzerbeta.txt diff --git a/modeldef/dlc1/puntzergamma.txt b/modeldef/dlc/puntzergamma.txt similarity index 100% rename from modeldef/dlc1/puntzergamma.txt rename to modeldef/dlc/puntzergamma.txt diff --git a/modeldef/dlc1/quadravol.txt b/modeldef/dlc/quadravol.txt similarity index 100% rename from modeldef/dlc1/quadravol.txt rename to modeldef/dlc/quadravol.txt diff --git a/modeldef/dlc1/rafankos.txt b/modeldef/dlc/rafankos.txt similarity index 100% rename from modeldef/dlc1/rafankos.txt rename to modeldef/dlc/rafankos.txt diff --git a/modeldef/dlc1/raykhom.txt b/modeldef/dlc/raykhom.txt similarity index 100% rename from modeldef/dlc1/raykhom.txt rename to modeldef/dlc/raykhom.txt diff --git a/modeldef/dlc1/sheenhmg.txt b/modeldef/dlc/sheenhmg.txt similarity index 100% rename from modeldef/dlc1/sheenhmg.txt rename to modeldef/dlc/sheenhmg.txt diff --git a/sndinfo.dlcweapons b/sndinfo.dlcweapons index aba2d6e2c..b94cfa2b6 100644 --- a/sndinfo.dlcweapons +++ b/sndinfo.dlcweapons @@ -1,137 +1,137 @@ $pitchshiftrange 0 -itamex/select = "sounds/dlc1/hammer/itamex_select.ogg" -itamex/deselect = "sounds/dlc1/hammer/itamex_deselect.ogg" -itamex/meleestart = "sounds/dlc1/hammer/itamex_meleestart.ogg" -itamex/meleeend = "sounds/dlc1/hammer/itamex_meleeend.ogg" -itamex/swing1 = "sounds/dlc1/hammer/itamex_swing1.ogg" -itamex/swing2 = "sounds/dlc1/hammer/itamex_swing2.ogg" -itamex/swing3 = "sounds/dlc1/hammer/itamex_swing3.ogg" +itamex/select = "sounds/dlc/hammer/itamex_select.ogg" +itamex/deselect = "sounds/dlc/hammer/itamex_deselect.ogg" +itamex/meleestart = "sounds/dlc/hammer/itamex_meleestart.ogg" +itamex/meleeend = "sounds/dlc/hammer/itamex_meleeend.ogg" +itamex/swing1 = "sounds/dlc/hammer/itamex_swing1.ogg" +itamex/swing2 = "sounds/dlc/hammer/itamex_swing2.ogg" +itamex/swing3 = "sounds/dlc/hammer/itamex_swing3.ogg" $random itamex/swing { itamex/swing1 itamex/swing2 itamex/swing3 } -itamex/hit1 = "sounds/dlc1/hammer/itamex_hit1.ogg" -itamex/hit2 = "sounds/dlc1/hammer/itamex_hit2.ogg" -itamex/hit3 = "sounds/dlc1/hammer/itamex_hit3.ogg" +itamex/hit1 = "sounds/dlc/hammer/itamex_hit1.ogg" +itamex/hit2 = "sounds/dlc/hammer/itamex_hit2.ogg" +itamex/hit3 = "sounds/dlc/hammer/itamex_hit3.ogg" $random itamex/hit { itamex/hit1 itamex/hit2 itamex/hit3 } -itamex/hitf1 = "sounds/dlc1/hammer/itamex_hitf1.ogg" -itamex/hitf2 = "sounds/dlc1/hammer/itamex_hitf2.ogg" -itamex/hitf3 = "sounds/dlc1/hammer/itamex_hitf3.ogg" +itamex/hitf1 = "sounds/dlc/hammer/itamex_hitf1.ogg" +itamex/hitf2 = "sounds/dlc/hammer/itamex_hitf2.ogg" +itamex/hitf3 = "sounds/dlc/hammer/itamex_hitf3.ogg" $random itamex/hitf { itamex/hitf1 itamex/hitf2 itamex/hitf3 } -itamex/drop = "sounds/dlc1/hammer/itamex_drop.ogg" -itamex/slam = "sounds/dlc1/hammer/itamex_slam.ogg" -itamex/spin = "sounds/dlc1/hammer/itamex_spin.ogg" +itamex/drop = "sounds/dlc/hammer/itamex_drop.ogg" +itamex/slam = "sounds/dlc/hammer/itamex_slam.ogg" +itamex/spin = "sounds/dlc/hammer/itamex_spin.ogg" -blast/select = "sounds/dlc1/blast/blast_select.ogg" -blast/deselect = "sounds/dlc1/blast/blast_deselect.ogg" -blast/checkout = "sounds/dlc1/blast/blast_idle.ogg" -blast/meleestart = "sounds/dlc1/blast/blast_meleestart.ogg" -blast/meleeend = "sounds/dlc1/blast/blast_meleeend.ogg" -blast/trigger = "sounds/dlc1/blast/blast_trigger.ogg" -blast/fire1 = "sounds/dlc1/blast/blast_fire1.ogg" -blast/fire2 = "sounds/dlc1/blast/blast_fire2.ogg" +blast/select = "sounds/dlc/blast/blast_select.ogg" +blast/deselect = "sounds/dlc/blast/blast_deselect.ogg" +blast/checkout = "sounds/dlc/blast/blast_idle.ogg" +blast/meleestart = "sounds/dlc/blast/blast_meleestart.ogg" +blast/meleeend = "sounds/dlc/blast/blast_meleeend.ogg" +blast/trigger = "sounds/dlc/blast/blast_trigger.ogg" +blast/fire1 = "sounds/dlc/blast/blast_fire1.ogg" +blast/fire2 = "sounds/dlc/blast/blast_fire2.ogg" $random blast/fire { blast/fire1 blast/fire2 } -blast/charge = "sounds/dlc1/blast/blast_charge.ogg" -blast/altfire1 = "sounds/dlc1/blast/blast_altfire1.ogg" -blast/altfire2 = "sounds/dlc1/blast/blast_altfire2.ogg" +blast/charge = "sounds/dlc/blast/blast_charge.ogg" +blast/altfire1 = "sounds/dlc/blast/blast_altfire1.ogg" +blast/altfire2 = "sounds/dlc/blast/blast_altfire2.ogg" $random blast/altfire { blast/altfire1 blast/altfire2 } -blast/hit1 = "sounds/dlc1/blast/blast_hit1.ogg" -blast/hit2 = "sounds/dlc1/blast/blast_hit2.ogg" -blast/hit3 = "sounds/dlc1/blast/blast_hit3.ogg" -blast/hit4 = "sounds/dlc1/blast/blast_hit4.ogg" +blast/hit1 = "sounds/dlc/blast/blast_hit1.ogg" +blast/hit2 = "sounds/dlc/blast/blast_hit2.ogg" +blast/hit3 = "sounds/dlc/blast/blast_hit3.ogg" +blast/hit4 = "sounds/dlc/blast/blast_hit4.ogg" $random blast/hit { blast/hit1 blast/hit2 blast/hit3 blast/hit4 } -blast/althit1 = "sounds/dlc1/blast/blast_althit1.ogg" -blast/althit2 = "sounds/dlc1/blast/blast_althit2.ogg" +blast/althit1 = "sounds/dlc/blast/blast_althit1.ogg" +blast/althit2 = "sounds/dlc/blast/blast_althit2.ogg" $random blast/althit { blast/althit1 blast/althit2 } -blast/magout = "sounds/dlc1/blast/blast_magout.ogg" -blast/magin = "sounds/dlc1/blast/blast_magin.ogg" +blast/magout = "sounds/dlc/blast/blast_magout.ogg" +blast/magin = "sounds/dlc/blast/blast_magin.ogg" // TODO puntzer beta // TODO puntzer gamma -sheen/specialpick = "sounds/dlc1/sheen/sheen_specialpickup.ogg" -sheen/select = "sounds/dlc1/sheen/sheen_select.ogg" -sheen/deselect = "sounds/dlc1/sheen/sheen_deselect.ogg" -sheen/meleestart = "sounds/dlc1/sheen/sheen_meleestart.ogg" -sheen/meleeend = "sounds/dlc1/sheen/sheen_meleeend.ogg" -sheen/fire1 = "sounds/dlc1/sheen/sheen_fire1.ogg" -sheen/fire2 = "sounds/dlc1/sheen/sheen_fire2.ogg" -sheen/fire3 = "sounds/dlc1/sheen/sheen_fire3.ogg" +sheen/specialpick = "sounds/dlc/sheen/sheen_specialpickup.ogg" +sheen/select = "sounds/dlc/sheen/sheen_select.ogg" +sheen/deselect = "sounds/dlc/sheen/sheen_deselect.ogg" +sheen/meleestart = "sounds/dlc/sheen/sheen_meleestart.ogg" +sheen/meleeend = "sounds/dlc/sheen/sheen_meleeend.ogg" +sheen/fire1 = "sounds/dlc/sheen/sheen_fire1.ogg" +sheen/fire2 = "sounds/dlc/sheen/sheen_fire2.ogg" +sheen/fire3 = "sounds/dlc/sheen/sheen_fire3.ogg" $random sheen/fire { sheen/fire1 sheen/fire2 sheen/fire3 } $limit sheen/fire 16 -sheen/700rpm = "sounds/dlc1/sheen/sheen_700rpm.ogg" -sheen/2100rpm = "sounds/dlc1/sheen/sheen_2100rpm.ogg" -sheen/crankin = "sounds/dlc1/sheen/sheen_crankin.ogg" -sheen/crankout = "sounds/dlc1/sheen/sheen_crankout.ogg" -sheen/overheat = "sounds/dlc1/sheen/sheen_overheat.ogg" -sheen/unlock = "sounds/dlc1/sheen/sheen_unlock.ogg" -sheen/casing1 = "sounds/dlc1/sheen/sheen_case1.ogg" -sheen/casing2 = "sounds/dlc1/sheen/sheen_case2.ogg" -sheen/casing3 = "sounds/dlc1/sheen/sheen_case3.ogg" -sheen/casing4 = "sounds/dlc1/sheen/sheen_case4.ogg" +sheen/700rpm = "sounds/dlc/sheen/sheen_700rpm.ogg" +sheen/2100rpm = "sounds/dlc/sheen/sheen_2100rpm.ogg" +sheen/crankin = "sounds/dlc/sheen/sheen_crankin.ogg" +sheen/crankout = "sounds/dlc/sheen/sheen_crankout.ogg" +sheen/overheat = "sounds/dlc/sheen/sheen_overheat.ogg" +sheen/unlock = "sounds/dlc/sheen/sheen_unlock.ogg" +sheen/casing1 = "sounds/dlc/sheen/sheen_case1.ogg" +sheen/casing2 = "sounds/dlc/sheen/sheen_case2.ogg" +sheen/casing3 = "sounds/dlc/sheen/sheen_case3.ogg" +sheen/casing4 = "sounds/dlc/sheen/sheen_case4.ogg" $random sheen/casing { sheen/casing1 sheen/casing2 sheen/casing3 sheen/casing4 } -quadshot/select = "sounds/dlc1/quadshot/quad_select.ogg" -quadshot/deselect = "sounds/dlc1/quadshot/quad_deselect.ogg" -quadshot/selectfast = "sounds/dlc1/quadshot/quad_selectfast.ogg" -quadshot/deselectfast = "sounds/dlc1/quadshot/quad_deselectfast.ogg" -quadshot/onehand = "sounds/dlc1/quadshot/quad_onehand.ogg" -quadshot/twohand = "sounds/dlc1/quadshot/quad_twohand.ogg" -quadshot/leverforward = "sounds/dlc1/quadshot/quad_leverforward.ogg" -quadshot/leverback = "sounds/dlc1/quadshot/quad_leverback.ogg" -quadshot/bayonetfire = "sounds/dlc1/quadshot/quad_bayonetfire.ogg" -quadshot/bayonetreturn = "sounds/dlc1/quadshot/quad_bayonetreturn.ogg" -quadshot/load1 = "sounds/dlc1/quadshot/quad_load1.ogg" -quadshot/load2 = "sounds/dlc1/quadshot/quad_load2.ogg" -quadshot/load3 = "sounds/dlc1/quadshot/quad_load3.ogg" -quadshot/load4 = "sounds/dlc1/quadshot/quad_load4.ogg" +quadshot/select = "sounds/dlc/quadshot/quad_select.ogg" +quadshot/deselect = "sounds/dlc/quadshot/quad_deselect.ogg" +quadshot/selectfast = "sounds/dlc/quadshot/quad_selectfast.ogg" +quadshot/deselectfast = "sounds/dlc/quadshot/quad_deselectfast.ogg" +quadshot/onehand = "sounds/dlc/quadshot/quad_onehand.ogg" +quadshot/twohand = "sounds/dlc/quadshot/quad_twohand.ogg" +quadshot/leverforward = "sounds/dlc/quadshot/quad_leverforward.ogg" +quadshot/leverback = "sounds/dlc/quadshot/quad_leverback.ogg" +quadshot/bayonetfire = "sounds/dlc/quadshot/quad_bayonetfire.ogg" +quadshot/bayonetreturn = "sounds/dlc/quadshot/quad_bayonetreturn.ogg" +quadshot/load1 = "sounds/dlc/quadshot/quad_load1.ogg" +quadshot/load2 = "sounds/dlc/quadshot/quad_load2.ogg" +quadshot/load3 = "sounds/dlc/quadshot/quad_load3.ogg" +quadshot/load4 = "sounds/dlc/quadshot/quad_load4.ogg" $random quadshot/load { quadshot/load1 quadshot/load2 quadshot/load3 quadshot/load4 } -quadshot/fireone = "sounds/dlc1/quadshot/quad_fireone.ogg" -quadshot/firetwo = "sounds/dlc1/quadshot/quad_firetwo.ogg" -quadshot/firethree = "sounds/dlc1/quadshot/quad_firethree.ogg" -quadshot/firefour = "sounds/dlc1/quadshot/quad_firefour.ogg" -quadshot/firefive = "sounds/dlc1/quadshot/quad_firefive.ogg" -quadshot/casing1 = "sounds/dlc1/quadshot/quad_casing1.ogg" -quadshot/casing2 = "sounds/dlc1/quadshot/quad_casing2.ogg" -quadshot/casing3 = "sounds/dlc1/quadshot/quad_casing3.ogg" -quadshot/casing4 = "sounds/dlc1/quadshot/quad_casing4.ogg" +quadshot/fireone = "sounds/dlc/quadshot/quad_fireone.ogg" +quadshot/firetwo = "sounds/dlc/quadshot/quad_firetwo.ogg" +quadshot/firethree = "sounds/dlc/quadshot/quad_firethree.ogg" +quadshot/firefour = "sounds/dlc/quadshot/quad_firefour.ogg" +quadshot/firefive = "sounds/dlc/quadshot/quad_firefive.ogg" +quadshot/casing1 = "sounds/dlc/quadshot/quad_casing1.ogg" +quadshot/casing2 = "sounds/dlc/quadshot/quad_casing2.ogg" +quadshot/casing3 = "sounds/dlc/quadshot/quad_casing3.ogg" +quadshot/casing4 = "sounds/dlc/quadshot/quad_casing4.ogg" $random quadshot/casing { quadshot/casing1 quadshot/casing2 quadshot/casing3 quadshot/casing4 } -quadshot/hit1 = "sounds/dlc1/quadshot/quad_hit1.ogg" -quadshot/hit2 = "sounds/dlc1/quadshot/quad_hit2.ogg" -quadshot/hit3 = "sounds/dlc1/quadshot/quad_hit3.ogg" +quadshot/hit1 = "sounds/dlc/quadshot/quad_hit1.ogg" +quadshot/hit2 = "sounds/dlc/quadshot/quad_hit2.ogg" +quadshot/hit3 = "sounds/dlc/quadshot/quad_hit3.ogg" $random quadshot/hit { quadshot/hit1 quadshot/hit2 quadshot/hit3 } $limit quadshot/hit 16 -quadshot/twohit1 = "sounds/dlc1/quadshot/quad_explo1.ogg" -quadshot/twohit2 = "sounds/dlc1/quadshot/quad_explo2.ogg" -quadshot/twohit3 = "sounds/dlc1/quadshot/quad_explo3.ogg" +quadshot/twohit1 = "sounds/dlc/quadshot/quad_explo1.ogg" +quadshot/twohit2 = "sounds/dlc/quadshot/quad_explo2.ogg" +quadshot/twohit3 = "sounds/dlc/quadshot/quad_explo3.ogg" $random quadshot/twohit { quadshot/twohit1 quadshot/twohit2 quadshot/twohit3 } $limit quadshot/twohit 8 -quadshot/extrahit = "sounds/dlc1/quadshot/quad_xexpl.ogg" -quadshot/pointblank = "sounds/dlc1/quadshot/quad_xxexpl.ogg" -quadshot/fly = "sounds/dlc1/quadshot/quad_fly.ogg" +quadshot/extrahit = "sounds/dlc/quadshot/quad_xexpl.ogg" +quadshot/pointblank = "sounds/dlc/quadshot/quad_xxexpl.ogg" +quadshot/fly = "sounds/dlc/quadshot/quad_fly.ogg" // TODO sparkster rifle // TODO ray-khom -mister/select = "sounds/dlc1/mister/mr_select.ogg" -mister/deselect = "sounds/dlc1/mister/mr_deselect.ogg" -mister/meleestart = "sounds/dlc1/mister/mr_meleestart.ogg" -mister/meleeend = "sounds/dlc1/mister/mr_meleeend.ogg" -mister/boltback = "sounds/dlc1/mister/mr_boltback.ogg" -mister/boltforward = "sounds/dlc1/mister/mr_boltforward.ogg" -mister/fireselect = "sounds/dlc1/mister/mr_firesel.ogg" -mister/lowammo = "sounds/dlc1/mister/mr_lowammo.ogg" -mister/noammo = "sounds/dlc1/mister/mr_noammo.ogg" -mister/firesemi = "sounds/dlc1/mister/mr_fire_semi.ogg" -mister/firescatter = "sounds/dlc1/mister/mr_fire_scatter.ogg" -mister/firestream = "sounds/dlc1/mister/mr_fire_stream.ogg" -mister/fireover = "sounds/dlc1/mister/mr_fire_over.ogg" -mister/chargeover = "sounds/dlc1/mister/mr_charge_over.ogg" -mister/holdover = "sounds/dlc1/mister/mr_hold_over.ogg" -mister/beepover = "sounds/dlc1/mister/mr_beep_over.ogg" -mister/cancelover = "sounds/dlc1/mister/mr_cancel_over.ogg" -mister/magout = "sounds/dlc1/mister/mr_magout.ogg" -mister/magin = "sounds/dlc1/mister/mr_magin.ogg" +mister/select = "sounds/dlc/mister/mr_select.ogg" +mister/deselect = "sounds/dlc/mister/mr_deselect.ogg" +mister/meleestart = "sounds/dlc/mister/mr_meleestart.ogg" +mister/meleeend = "sounds/dlc/mister/mr_meleeend.ogg" +mister/boltback = "sounds/dlc/mister/mr_boltback.ogg" +mister/boltforward = "sounds/dlc/mister/mr_boltforward.ogg" +mister/fireselect = "sounds/dlc/mister/mr_firesel.ogg" +mister/lowammo = "sounds/dlc/mister/mr_lowammo.ogg" +mister/noammo = "sounds/dlc/mister/mr_noammo.ogg" +mister/firesemi = "sounds/dlc/mister/mr_fire_semi.ogg" +mister/firescatter = "sounds/dlc/mister/mr_fire_scatter.ogg" +mister/firestream = "sounds/dlc/mister/mr_fire_stream.ogg" +mister/fireover = "sounds/dlc/mister/mr_fire_over.ogg" +mister/chargeover = "sounds/dlc/mister/mr_charge_over.ogg" +mister/holdover = "sounds/dlc/mister/mr_hold_over.ogg" +mister/beepover = "sounds/dlc/mister/mr_beep_over.ogg" +mister/cancelover = "sounds/dlc/mister/mr_cancel_over.ogg" +mister/magout = "sounds/dlc/mister/mr_magout.ogg" +mister/magin = "sounds/dlc/mister/mr_magin.ogg" $alias mister/mag1 explodium/mag1 $alias mister/mag2 explodium/mag2 $alias mister/mag3 explodium/mag3 @@ -139,59 +139,59 @@ $pitchset mister/mag1 0.8 $pitchset mister/mag2 0.8 $pitchset mister/mag3 0.8 $random mister/mag { mister/mag1 mister/mag2 mister/mag3 } -mister/grenade = "sounds/dlc1/mister/mr_grenade.ogg" -mister/grenadeopen = "sounds/dlc1/mister/mr_grenadeopen.ogg" -mister/grenadeget = "sounds/dlc1/mister/mr_grenadeget.ogg" +mister/grenade = "sounds/dlc/mister/mr_grenade.ogg" +mister/grenadeopen = "sounds/dlc/mister/mr_grenadeopen.ogg" +mister/grenadeget = "sounds/dlc/mister/mr_grenadeget.ogg" $alias mister/magget mister/grenadeget -mister/grenadein = "sounds/dlc1/mister/mr_grenadein.ogg" -mister/grenadeclose = "sounds/dlc1/mister/mr_grenadeclose.ogg" -mister/hitsemi1 = "sounds/dlc1/mister/mr_hit11.ogg" -mister/hitsemi2 = "sounds/dlc1/mister/mr_hit12.ogg" -mister/hitsemi3 = "sounds/dlc1/mister/mr_hit13.ogg" +mister/grenadein = "sounds/dlc/mister/mr_grenadein.ogg" +mister/grenadeclose = "sounds/dlc/mister/mr_grenadeclose.ogg" +mister/hitsemi1 = "sounds/dlc/mister/mr_hit11.ogg" +mister/hitsemi2 = "sounds/dlc/mister/mr_hit12.ogg" +mister/hitsemi3 = "sounds/dlc/mister/mr_hit13.ogg" $random mister/hitsemi { mister/hitsemi1 mister/hitsemi2 mister/hitsemi3 } $limit mister/hitsemi 8 -mister/hitscatter1 = "sounds/dlc1/mister/mr_hit21.ogg" -mister/hitscatter2 = "sounds/dlc1/mister/mr_hit22.ogg" -mister/hitscatter3 = "sounds/dlc1/mister/mr_hit23.ogg" +mister/hitscatter1 = "sounds/dlc/mister/mr_hit21.ogg" +mister/hitscatter2 = "sounds/dlc/mister/mr_hit22.ogg" +mister/hitscatter3 = "sounds/dlc/mister/mr_hit23.ogg" $random mister/hitscatter { mister/hitscatter1 mister/hitscatter2 mister/hitscatter3 } $limit mister/hitscatter 32 -mister/hitstream1 = "sounds/dlc1/mister/mr_hit31.ogg" -mister/hitstream2 = "sounds/dlc1/mister/mr_hit32.ogg" -mister/hitstream3 = "sounds/dlc1/mister/mr_hit33.ogg" +mister/hitstream1 = "sounds/dlc/mister/mr_hit31.ogg" +mister/hitstream2 = "sounds/dlc/mister/mr_hit32.ogg" +mister/hitstream3 = "sounds/dlc/mister/mr_hit33.ogg" $random mister/hitstream { mister/hitstream1 mister/hitstream2 mister/hitstream3 } $limit mister/hitstream 16 -mister/hitover1 = "sounds/dlc1/mister/mr_hit41.ogg" -mister/hitover2 = "sounds/dlc1/mister/mr_hit42.ogg" -mister/hitover3 = "sounds/dlc1/mister/mr_hit43.ogg" +mister/hitover1 = "sounds/dlc/mister/mr_hit41.ogg" +mister/hitover2 = "sounds/dlc/mister/mr_hit42.ogg" +mister/hitover3 = "sounds/dlc/mister/mr_hit43.ogg" $random mister/hitover { mister/hitover1 mister/hitover2 mister/hitover3 } $limit mister/hitover 4 -mister/hitgrenade1 = "sounds/dlc1/mister/mr_hitg11.ogg" -mister/hitgrenade2 = "sounds/dlc1/mister/mr_hitg12.ogg" -mister/hitgrenade3 = "sounds/dlc1/mister/mr_hitg13.ogg" +mister/hitgrenade1 = "sounds/dlc/mister/mr_hitg11.ogg" +mister/hitgrenade2 = "sounds/dlc/mister/mr_hitg12.ogg" +mister/hitgrenade3 = "sounds/dlc/mister/mr_hitg13.ogg" $random mister/hitgrenade { mister/hitgrenade1 mister/hitgrenade2 mister/hitgrenade3 } $limit mister/hitgrenade 4 -mister/hitgrenadesub1 = "sounds/dlc1/mister/mr_hitg21.ogg" -mister/hitgrenadesub2 = "sounds/dlc1/mister/mr_hitg22.ogg" -mister/hitgrenadesub3 = "sounds/dlc1/mister/mr_hitg23.ogg" +mister/hitgrenadesub1 = "sounds/dlc/mister/mr_hitg21.ogg" +mister/hitgrenadesub2 = "sounds/dlc/mister/mr_hitg22.ogg" +mister/hitgrenadesub3 = "sounds/dlc/mister/mr_hitg23.ogg" $random mister/hitgrenadesub { mister/hitgrenadesub1 mister/hitgrenadesub2 mister/hitgrenadesub3 } $limit mister/hitgrenadesub 16 -mister/casing1 = "sounds/dlc1/mister/mr_casing1.ogg" -mister/casing2 = "sounds/dlc1/mister/mr_casing2.ogg" -mister/casing3 = "sounds/dlc1/mister/mr_casing3.ogg" -mister/casing4 = "sounds/dlc1/mister/mr_casing4.ogg" +mister/casing1 = "sounds/dlc/mister/mr_casing1.ogg" +mister/casing2 = "sounds/dlc/mister/mr_casing2.ogg" +mister/casing3 = "sounds/dlc/mister/mr_casing3.ogg" +mister/casing4 = "sounds/dlc/mister/mr_casing4.ogg" $random mister/casing { mister/casing1 mister/casing2 mister/casing3 mister/casing4 } -mister/gcasing1 = "sounds/dlc1/mister/mr_gcasing1.ogg" -mister/gcasing2 = "sounds/dlc1/mister/mr_gcasing2.ogg" -mister/gcasing3 = "sounds/dlc1/mister/mr_gcasing3.ogg" -mister/gcasing4 = "sounds/dlc1/mister/mr_gcasing4.ogg" +mister/gcasing1 = "sounds/dlc/mister/mr_gcasing1.ogg" +mister/gcasing2 = "sounds/dlc/mister/mr_gcasing2.ogg" +mister/gcasing3 = "sounds/dlc/mister/mr_gcasing3.ogg" +mister/gcasing4 = "sounds/dlc/mister/mr_gcasing4.ogg" $random mister/gcasing { mister/gcasing1 mister/gcasing2 mister/gcasing3 mister/gcasing4 } -mister/gbounce1 = "sounds/dlc1/mister/mr_gbounce11.ogg" -mister/gbounce2 = "sounds/dlc1/mister/mr_gbounce12.ogg" -mister/gbounce3 = "sounds/dlc1/mister/mr_gbounce13.ogg" +mister/gbounce1 = "sounds/dlc/mister/mr_gbounce11.ogg" +mister/gbounce2 = "sounds/dlc/mister/mr_gbounce12.ogg" +mister/gbounce3 = "sounds/dlc/mister/mr_gbounce13.ogg" $random mister/gbounce { mister/gbounce1 mister/gbounce2 mister/gbounce3 } -mister/gbouncesub1 = "sounds/dlc1/mister/mr_gbounce21.ogg" -mister/gbouncesub2 = "sounds/dlc1/mister/mr_gbounce22.ogg" -mister/gbouncesub3 = "sounds/dlc1/mister/mr_gbounce23.ogg" +mister/gbouncesub1 = "sounds/dlc/mister/mr_gbounce21.ogg" +mister/gbouncesub2 = "sounds/dlc/mister/mr_gbounce22.ogg" +mister/gbouncesub3 = "sounds/dlc/mister/mr_gbounce23.ogg" $random mister/gbouncesub { mister/gbouncesub1 mister/gbouncesub2 mister/gbouncesub3 } // TODO rafan-kos diff --git a/sndinfo.misc b/sndinfo.misc index 304c30915..fd795ee58 100644 --- a/sndinfo.misc +++ b/sndinfo.misc @@ -93,6 +93,3 @@ wolf3d/pushwall = "sounds/wolfstuff/wolf3d_pushwall.ogg" wolf3d/ssdie = "sounds/wolfstuff/wolf3d_ssdie.ogg" wolf3d/ssfire = "sounds/wolfstuff/wolf3d_ssfire.ogg" wolf3d/sssight = "sounds/wolfstuff/wolf3d_sssight.ogg" - -// minigames -madcat/boot = "sounds/MADCAT.ogg" diff --git a/sounds/MADCAT.ogg b/sounds/MADCAT.ogg deleted file mode 100644 index d9d80fbfd..000000000 Binary files a/sounds/MADCAT.ogg and /dev/null differ diff --git a/sounds/dlc1/blast/blast_altfire1.ogg b/sounds/dlc/blast/blast_altfire1.ogg similarity index 100% rename from sounds/dlc1/blast/blast_altfire1.ogg rename to sounds/dlc/blast/blast_altfire1.ogg diff --git a/sounds/dlc1/blast/blast_altfire2.ogg b/sounds/dlc/blast/blast_altfire2.ogg similarity index 100% rename from sounds/dlc1/blast/blast_altfire2.ogg rename to sounds/dlc/blast/blast_altfire2.ogg diff --git a/sounds/dlc1/blast/blast_althit1.ogg b/sounds/dlc/blast/blast_althit1.ogg similarity index 100% rename from sounds/dlc1/blast/blast_althit1.ogg rename to sounds/dlc/blast/blast_althit1.ogg diff --git a/sounds/dlc1/blast/blast_althit2.ogg b/sounds/dlc/blast/blast_althit2.ogg similarity index 100% rename from sounds/dlc1/blast/blast_althit2.ogg rename to sounds/dlc/blast/blast_althit2.ogg diff --git a/sounds/dlc1/blast/blast_charge.ogg b/sounds/dlc/blast/blast_charge.ogg similarity index 100% rename from sounds/dlc1/blast/blast_charge.ogg rename to sounds/dlc/blast/blast_charge.ogg diff --git a/sounds/dlc1/blast/blast_deselect.ogg b/sounds/dlc/blast/blast_deselect.ogg similarity index 100% rename from sounds/dlc1/blast/blast_deselect.ogg rename to sounds/dlc/blast/blast_deselect.ogg diff --git a/sounds/dlc1/blast/blast_fire1.ogg b/sounds/dlc/blast/blast_fire1.ogg similarity index 100% rename from sounds/dlc1/blast/blast_fire1.ogg rename to sounds/dlc/blast/blast_fire1.ogg diff --git a/sounds/dlc1/blast/blast_fire2.ogg b/sounds/dlc/blast/blast_fire2.ogg similarity index 100% rename from sounds/dlc1/blast/blast_fire2.ogg rename to sounds/dlc/blast/blast_fire2.ogg diff --git a/sounds/dlc1/blast/blast_hit1.ogg b/sounds/dlc/blast/blast_hit1.ogg similarity index 100% rename from sounds/dlc1/blast/blast_hit1.ogg rename to sounds/dlc/blast/blast_hit1.ogg diff --git a/sounds/dlc1/blast/blast_hit2.ogg b/sounds/dlc/blast/blast_hit2.ogg similarity index 100% rename from sounds/dlc1/blast/blast_hit2.ogg rename to sounds/dlc/blast/blast_hit2.ogg diff --git a/sounds/dlc1/blast/blast_hit3.ogg b/sounds/dlc/blast/blast_hit3.ogg similarity index 100% rename from sounds/dlc1/blast/blast_hit3.ogg rename to sounds/dlc/blast/blast_hit3.ogg diff --git a/sounds/dlc1/blast/blast_hit4.ogg b/sounds/dlc/blast/blast_hit4.ogg similarity index 100% rename from sounds/dlc1/blast/blast_hit4.ogg rename to sounds/dlc/blast/blast_hit4.ogg diff --git a/sounds/dlc1/blast/blast_idle.ogg b/sounds/dlc/blast/blast_idle.ogg similarity index 100% rename from sounds/dlc1/blast/blast_idle.ogg rename to sounds/dlc/blast/blast_idle.ogg diff --git a/sounds/dlc1/blast/blast_magin.ogg b/sounds/dlc/blast/blast_magin.ogg similarity index 100% rename from sounds/dlc1/blast/blast_magin.ogg rename to sounds/dlc/blast/blast_magin.ogg diff --git a/sounds/dlc1/blast/blast_magout.ogg b/sounds/dlc/blast/blast_magout.ogg similarity index 100% rename from sounds/dlc1/blast/blast_magout.ogg rename to sounds/dlc/blast/blast_magout.ogg diff --git a/sounds/dlc1/blast/blast_meleeend.ogg b/sounds/dlc/blast/blast_meleeend.ogg similarity index 100% rename from sounds/dlc1/blast/blast_meleeend.ogg rename to sounds/dlc/blast/blast_meleeend.ogg diff --git a/sounds/dlc1/blast/blast_meleestart.ogg b/sounds/dlc/blast/blast_meleestart.ogg similarity index 100% rename from sounds/dlc1/blast/blast_meleestart.ogg rename to sounds/dlc/blast/blast_meleestart.ogg diff --git a/sounds/dlc1/blast/blast_select.ogg b/sounds/dlc/blast/blast_select.ogg similarity index 100% rename from sounds/dlc1/blast/blast_select.ogg rename to sounds/dlc/blast/blast_select.ogg diff --git a/sounds/dlc1/blast/blast_trigger.ogg b/sounds/dlc/blast/blast_trigger.ogg similarity index 100% rename from sounds/dlc1/blast/blast_trigger.ogg rename to sounds/dlc/blast/blast_trigger.ogg diff --git a/sounds/dlc1/hammer/itamex_deselect.ogg b/sounds/dlc/hammer/itamex_deselect.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_deselect.ogg rename to sounds/dlc/hammer/itamex_deselect.ogg diff --git a/sounds/dlc1/hammer/itamex_drop.ogg b/sounds/dlc/hammer/itamex_drop.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_drop.ogg rename to sounds/dlc/hammer/itamex_drop.ogg diff --git a/sounds/dlc1/hammer/itamex_hit1.ogg b/sounds/dlc/hammer/itamex_hit1.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_hit1.ogg rename to sounds/dlc/hammer/itamex_hit1.ogg diff --git a/sounds/dlc1/hammer/itamex_hit2.ogg b/sounds/dlc/hammer/itamex_hit2.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_hit2.ogg rename to sounds/dlc/hammer/itamex_hit2.ogg diff --git a/sounds/dlc1/hammer/itamex_hit3.ogg b/sounds/dlc/hammer/itamex_hit3.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_hit3.ogg rename to sounds/dlc/hammer/itamex_hit3.ogg diff --git a/sounds/dlc1/hammer/itamex_hitf1.ogg b/sounds/dlc/hammer/itamex_hitf1.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_hitf1.ogg rename to sounds/dlc/hammer/itamex_hitf1.ogg diff --git a/sounds/dlc1/hammer/itamex_hitf2.ogg b/sounds/dlc/hammer/itamex_hitf2.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_hitf2.ogg rename to sounds/dlc/hammer/itamex_hitf2.ogg diff --git a/sounds/dlc1/hammer/itamex_hitf3.ogg b/sounds/dlc/hammer/itamex_hitf3.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_hitf3.ogg rename to sounds/dlc/hammer/itamex_hitf3.ogg diff --git a/sounds/dlc1/hammer/itamex_meleeend.ogg b/sounds/dlc/hammer/itamex_meleeend.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_meleeend.ogg rename to sounds/dlc/hammer/itamex_meleeend.ogg diff --git a/sounds/dlc1/hammer/itamex_meleestart.ogg b/sounds/dlc/hammer/itamex_meleestart.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_meleestart.ogg rename to sounds/dlc/hammer/itamex_meleestart.ogg diff --git a/sounds/dlc1/hammer/itamex_select.ogg b/sounds/dlc/hammer/itamex_select.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_select.ogg rename to sounds/dlc/hammer/itamex_select.ogg diff --git a/sounds/dlc1/hammer/itamex_slam.ogg b/sounds/dlc/hammer/itamex_slam.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_slam.ogg rename to sounds/dlc/hammer/itamex_slam.ogg diff --git a/sounds/dlc1/hammer/itamex_spin.ogg b/sounds/dlc/hammer/itamex_spin.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_spin.ogg rename to sounds/dlc/hammer/itamex_spin.ogg diff --git a/sounds/dlc1/hammer/itamex_swing1.ogg b/sounds/dlc/hammer/itamex_swing1.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_swing1.ogg rename to sounds/dlc/hammer/itamex_swing1.ogg diff --git a/sounds/dlc1/hammer/itamex_swing2.ogg b/sounds/dlc/hammer/itamex_swing2.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_swing2.ogg rename to sounds/dlc/hammer/itamex_swing2.ogg diff --git a/sounds/dlc1/hammer/itamex_swing3.ogg b/sounds/dlc/hammer/itamex_swing3.ogg similarity index 100% rename from sounds/dlc1/hammer/itamex_swing3.ogg rename to sounds/dlc/hammer/itamex_swing3.ogg diff --git a/sounds/dlc1/mister/mr_beep_over.ogg b/sounds/dlc/mister/mr_beep_over.ogg similarity index 100% rename from sounds/dlc1/mister/mr_beep_over.ogg rename to sounds/dlc/mister/mr_beep_over.ogg diff --git a/sounds/dlc1/mister/mr_boltback.ogg b/sounds/dlc/mister/mr_boltback.ogg similarity index 100% rename from sounds/dlc1/mister/mr_boltback.ogg rename to sounds/dlc/mister/mr_boltback.ogg diff --git a/sounds/dlc1/mister/mr_boltforward.ogg b/sounds/dlc/mister/mr_boltforward.ogg similarity index 100% rename from sounds/dlc1/mister/mr_boltforward.ogg rename to sounds/dlc/mister/mr_boltforward.ogg diff --git a/sounds/dlc1/mister/mr_cancel_over.ogg b/sounds/dlc/mister/mr_cancel_over.ogg similarity index 100% rename from sounds/dlc1/mister/mr_cancel_over.ogg rename to sounds/dlc/mister/mr_cancel_over.ogg diff --git a/sounds/dlc1/mister/mr_casing1.ogg b/sounds/dlc/mister/mr_casing1.ogg similarity index 100% rename from sounds/dlc1/mister/mr_casing1.ogg rename to sounds/dlc/mister/mr_casing1.ogg diff --git a/sounds/dlc1/mister/mr_casing2.ogg b/sounds/dlc/mister/mr_casing2.ogg similarity index 100% rename from sounds/dlc1/mister/mr_casing2.ogg rename to sounds/dlc/mister/mr_casing2.ogg diff --git a/sounds/dlc1/mister/mr_casing3.ogg b/sounds/dlc/mister/mr_casing3.ogg similarity index 100% rename from sounds/dlc1/mister/mr_casing3.ogg rename to sounds/dlc/mister/mr_casing3.ogg diff --git a/sounds/dlc1/mister/mr_casing4.ogg b/sounds/dlc/mister/mr_casing4.ogg similarity index 100% rename from sounds/dlc1/mister/mr_casing4.ogg rename to sounds/dlc/mister/mr_casing4.ogg diff --git a/sounds/dlc1/mister/mr_charge_over.ogg b/sounds/dlc/mister/mr_charge_over.ogg similarity index 100% rename from sounds/dlc1/mister/mr_charge_over.ogg rename to sounds/dlc/mister/mr_charge_over.ogg diff --git a/sounds/dlc1/mister/mr_deselect.ogg b/sounds/dlc/mister/mr_deselect.ogg similarity index 100% rename from sounds/dlc1/mister/mr_deselect.ogg rename to sounds/dlc/mister/mr_deselect.ogg diff --git a/sounds/dlc1/mister/mr_fire_over.ogg b/sounds/dlc/mister/mr_fire_over.ogg similarity index 100% rename from sounds/dlc1/mister/mr_fire_over.ogg rename to sounds/dlc/mister/mr_fire_over.ogg diff --git a/sounds/dlc1/mister/mr_fire_scatter.ogg b/sounds/dlc/mister/mr_fire_scatter.ogg similarity index 100% rename from sounds/dlc1/mister/mr_fire_scatter.ogg rename to sounds/dlc/mister/mr_fire_scatter.ogg diff --git a/sounds/dlc1/mister/mr_fire_semi.ogg b/sounds/dlc/mister/mr_fire_semi.ogg similarity index 100% rename from sounds/dlc1/mister/mr_fire_semi.ogg rename to sounds/dlc/mister/mr_fire_semi.ogg diff --git a/sounds/dlc1/mister/mr_fire_stream.ogg b/sounds/dlc/mister/mr_fire_stream.ogg similarity index 100% rename from sounds/dlc1/mister/mr_fire_stream.ogg rename to sounds/dlc/mister/mr_fire_stream.ogg diff --git a/sounds/dlc1/mister/mr_firesel.ogg b/sounds/dlc/mister/mr_firesel.ogg similarity index 100% rename from sounds/dlc1/mister/mr_firesel.ogg rename to sounds/dlc/mister/mr_firesel.ogg diff --git a/sounds/dlc1/mister/mr_gbounce11.ogg b/sounds/dlc/mister/mr_gbounce11.ogg similarity index 100% rename from sounds/dlc1/mister/mr_gbounce11.ogg rename to sounds/dlc/mister/mr_gbounce11.ogg diff --git a/sounds/dlc1/mister/mr_gbounce12.ogg b/sounds/dlc/mister/mr_gbounce12.ogg similarity index 100% rename from sounds/dlc1/mister/mr_gbounce12.ogg rename to sounds/dlc/mister/mr_gbounce12.ogg diff --git a/sounds/dlc1/mister/mr_gbounce13.ogg b/sounds/dlc/mister/mr_gbounce13.ogg similarity index 100% rename from sounds/dlc1/mister/mr_gbounce13.ogg rename to sounds/dlc/mister/mr_gbounce13.ogg diff --git a/sounds/dlc1/mister/mr_gbounce21.ogg b/sounds/dlc/mister/mr_gbounce21.ogg similarity index 100% rename from sounds/dlc1/mister/mr_gbounce21.ogg rename to sounds/dlc/mister/mr_gbounce21.ogg diff --git a/sounds/dlc1/mister/mr_gbounce22.ogg b/sounds/dlc/mister/mr_gbounce22.ogg similarity index 100% rename from sounds/dlc1/mister/mr_gbounce22.ogg rename to sounds/dlc/mister/mr_gbounce22.ogg diff --git a/sounds/dlc1/mister/mr_gbounce23.ogg b/sounds/dlc/mister/mr_gbounce23.ogg similarity index 100% rename from sounds/dlc1/mister/mr_gbounce23.ogg rename to sounds/dlc/mister/mr_gbounce23.ogg diff --git a/sounds/dlc1/mister/mr_gcasing1.ogg b/sounds/dlc/mister/mr_gcasing1.ogg similarity index 100% rename from sounds/dlc1/mister/mr_gcasing1.ogg rename to sounds/dlc/mister/mr_gcasing1.ogg diff --git a/sounds/dlc1/mister/mr_gcasing2.ogg b/sounds/dlc/mister/mr_gcasing2.ogg similarity index 100% rename from sounds/dlc1/mister/mr_gcasing2.ogg rename to sounds/dlc/mister/mr_gcasing2.ogg diff --git a/sounds/dlc1/mister/mr_gcasing3.ogg b/sounds/dlc/mister/mr_gcasing3.ogg similarity index 100% rename from sounds/dlc1/mister/mr_gcasing3.ogg rename to sounds/dlc/mister/mr_gcasing3.ogg diff --git a/sounds/dlc1/mister/mr_gcasing4.ogg b/sounds/dlc/mister/mr_gcasing4.ogg similarity index 100% rename from sounds/dlc1/mister/mr_gcasing4.ogg rename to sounds/dlc/mister/mr_gcasing4.ogg diff --git a/sounds/dlc1/mister/mr_grenade.ogg b/sounds/dlc/mister/mr_grenade.ogg similarity index 100% rename from sounds/dlc1/mister/mr_grenade.ogg rename to sounds/dlc/mister/mr_grenade.ogg diff --git a/sounds/dlc1/mister/mr_grenadeclose.ogg b/sounds/dlc/mister/mr_grenadeclose.ogg similarity index 100% rename from sounds/dlc1/mister/mr_grenadeclose.ogg rename to sounds/dlc/mister/mr_grenadeclose.ogg diff --git a/sounds/dlc1/mister/mr_grenadeget.ogg b/sounds/dlc/mister/mr_grenadeget.ogg similarity index 100% rename from sounds/dlc1/mister/mr_grenadeget.ogg rename to sounds/dlc/mister/mr_grenadeget.ogg diff --git a/sounds/dlc1/mister/mr_grenadein.ogg b/sounds/dlc/mister/mr_grenadein.ogg similarity index 100% rename from sounds/dlc1/mister/mr_grenadein.ogg rename to sounds/dlc/mister/mr_grenadein.ogg diff --git a/sounds/dlc1/mister/mr_grenadeopen.ogg b/sounds/dlc/mister/mr_grenadeopen.ogg similarity index 100% rename from sounds/dlc1/mister/mr_grenadeopen.ogg rename to sounds/dlc/mister/mr_grenadeopen.ogg diff --git a/sounds/dlc1/mister/mr_hit11.ogg b/sounds/dlc/mister/mr_hit11.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hit11.ogg rename to sounds/dlc/mister/mr_hit11.ogg diff --git a/sounds/dlc1/mister/mr_hit12.ogg b/sounds/dlc/mister/mr_hit12.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hit12.ogg rename to sounds/dlc/mister/mr_hit12.ogg diff --git a/sounds/dlc1/mister/mr_hit13.ogg b/sounds/dlc/mister/mr_hit13.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hit13.ogg rename to sounds/dlc/mister/mr_hit13.ogg diff --git a/sounds/dlc1/mister/mr_hit21.ogg b/sounds/dlc/mister/mr_hit21.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hit21.ogg rename to sounds/dlc/mister/mr_hit21.ogg diff --git a/sounds/dlc1/mister/mr_hit22.ogg b/sounds/dlc/mister/mr_hit22.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hit22.ogg rename to sounds/dlc/mister/mr_hit22.ogg diff --git a/sounds/dlc1/mister/mr_hit23.ogg b/sounds/dlc/mister/mr_hit23.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hit23.ogg rename to sounds/dlc/mister/mr_hit23.ogg diff --git a/sounds/dlc1/mister/mr_hit31.ogg b/sounds/dlc/mister/mr_hit31.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hit31.ogg rename to sounds/dlc/mister/mr_hit31.ogg diff --git a/sounds/dlc1/mister/mr_hit32.ogg b/sounds/dlc/mister/mr_hit32.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hit32.ogg rename to sounds/dlc/mister/mr_hit32.ogg diff --git a/sounds/dlc1/mister/mr_hit33.ogg b/sounds/dlc/mister/mr_hit33.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hit33.ogg rename to sounds/dlc/mister/mr_hit33.ogg diff --git a/sounds/dlc1/mister/mr_hit41.ogg b/sounds/dlc/mister/mr_hit41.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hit41.ogg rename to sounds/dlc/mister/mr_hit41.ogg diff --git a/sounds/dlc1/mister/mr_hit42.ogg b/sounds/dlc/mister/mr_hit42.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hit42.ogg rename to sounds/dlc/mister/mr_hit42.ogg diff --git a/sounds/dlc1/mister/mr_hit43.ogg b/sounds/dlc/mister/mr_hit43.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hit43.ogg rename to sounds/dlc/mister/mr_hit43.ogg diff --git a/sounds/dlc1/mister/mr_hitg11.ogg b/sounds/dlc/mister/mr_hitg11.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hitg11.ogg rename to sounds/dlc/mister/mr_hitg11.ogg diff --git a/sounds/dlc1/mister/mr_hitg12.ogg b/sounds/dlc/mister/mr_hitg12.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hitg12.ogg rename to sounds/dlc/mister/mr_hitg12.ogg diff --git a/sounds/dlc1/mister/mr_hitg13.ogg b/sounds/dlc/mister/mr_hitg13.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hitg13.ogg rename to sounds/dlc/mister/mr_hitg13.ogg diff --git a/sounds/dlc1/mister/mr_hitg21.ogg b/sounds/dlc/mister/mr_hitg21.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hitg21.ogg rename to sounds/dlc/mister/mr_hitg21.ogg diff --git a/sounds/dlc1/mister/mr_hitg22.ogg b/sounds/dlc/mister/mr_hitg22.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hitg22.ogg rename to sounds/dlc/mister/mr_hitg22.ogg diff --git a/sounds/dlc1/mister/mr_hitg23.ogg b/sounds/dlc/mister/mr_hitg23.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hitg23.ogg rename to sounds/dlc/mister/mr_hitg23.ogg diff --git a/sounds/dlc1/mister/mr_hold_over.ogg b/sounds/dlc/mister/mr_hold_over.ogg similarity index 100% rename from sounds/dlc1/mister/mr_hold_over.ogg rename to sounds/dlc/mister/mr_hold_over.ogg diff --git a/sounds/dlc1/mister/mr_lowammo.ogg b/sounds/dlc/mister/mr_lowammo.ogg similarity index 100% rename from sounds/dlc1/mister/mr_lowammo.ogg rename to sounds/dlc/mister/mr_lowammo.ogg diff --git a/sounds/dlc1/mister/mr_magin.ogg b/sounds/dlc/mister/mr_magin.ogg similarity index 100% rename from sounds/dlc1/mister/mr_magin.ogg rename to sounds/dlc/mister/mr_magin.ogg diff --git a/sounds/dlc1/mister/mr_magout.ogg b/sounds/dlc/mister/mr_magout.ogg similarity index 100% rename from sounds/dlc1/mister/mr_magout.ogg rename to sounds/dlc/mister/mr_magout.ogg diff --git a/sounds/dlc1/mister/mr_meleeend.ogg b/sounds/dlc/mister/mr_meleeend.ogg similarity index 100% rename from sounds/dlc1/mister/mr_meleeend.ogg rename to sounds/dlc/mister/mr_meleeend.ogg diff --git a/sounds/dlc1/mister/mr_meleestart.ogg b/sounds/dlc/mister/mr_meleestart.ogg similarity index 100% rename from sounds/dlc1/mister/mr_meleestart.ogg rename to sounds/dlc/mister/mr_meleestart.ogg diff --git a/sounds/dlc1/mister/mr_noammo.ogg b/sounds/dlc/mister/mr_noammo.ogg similarity index 100% rename from sounds/dlc1/mister/mr_noammo.ogg rename to sounds/dlc/mister/mr_noammo.ogg diff --git a/sounds/dlc1/mister/mr_select.ogg b/sounds/dlc/mister/mr_select.ogg similarity index 100% rename from sounds/dlc1/mister/mr_select.ogg rename to sounds/dlc/mister/mr_select.ogg diff --git a/sounds/dlc1/quadshot/quad_bayonetfire.ogg b/sounds/dlc/quadshot/quad_bayonetfire.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_bayonetfire.ogg rename to sounds/dlc/quadshot/quad_bayonetfire.ogg diff --git a/sounds/dlc1/quadshot/quad_bayonetreturn.ogg b/sounds/dlc/quadshot/quad_bayonetreturn.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_bayonetreturn.ogg rename to sounds/dlc/quadshot/quad_bayonetreturn.ogg diff --git a/sounds/dlc1/quadshot/quad_casing1.ogg b/sounds/dlc/quadshot/quad_casing1.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_casing1.ogg rename to sounds/dlc/quadshot/quad_casing1.ogg diff --git a/sounds/dlc1/quadshot/quad_casing2.ogg b/sounds/dlc/quadshot/quad_casing2.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_casing2.ogg rename to sounds/dlc/quadshot/quad_casing2.ogg diff --git a/sounds/dlc1/quadshot/quad_casing3.ogg b/sounds/dlc/quadshot/quad_casing3.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_casing3.ogg rename to sounds/dlc/quadshot/quad_casing3.ogg diff --git a/sounds/dlc1/quadshot/quad_casing4.ogg b/sounds/dlc/quadshot/quad_casing4.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_casing4.ogg rename to sounds/dlc/quadshot/quad_casing4.ogg diff --git a/sounds/dlc1/quadshot/quad_deselect.ogg b/sounds/dlc/quadshot/quad_deselect.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_deselect.ogg rename to sounds/dlc/quadshot/quad_deselect.ogg diff --git a/sounds/dlc1/quadshot/quad_deselectfast.ogg b/sounds/dlc/quadshot/quad_deselectfast.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_deselectfast.ogg rename to sounds/dlc/quadshot/quad_deselectfast.ogg diff --git a/sounds/dlc1/quadshot/quad_explo1.ogg b/sounds/dlc/quadshot/quad_explo1.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_explo1.ogg rename to sounds/dlc/quadshot/quad_explo1.ogg diff --git a/sounds/dlc1/quadshot/quad_explo2.ogg b/sounds/dlc/quadshot/quad_explo2.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_explo2.ogg rename to sounds/dlc/quadshot/quad_explo2.ogg diff --git a/sounds/dlc1/quadshot/quad_explo3.ogg b/sounds/dlc/quadshot/quad_explo3.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_explo3.ogg rename to sounds/dlc/quadshot/quad_explo3.ogg diff --git a/sounds/dlc1/quadshot/quad_firefive.ogg b/sounds/dlc/quadshot/quad_firefive.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_firefive.ogg rename to sounds/dlc/quadshot/quad_firefive.ogg diff --git a/sounds/dlc1/quadshot/quad_firefour.ogg b/sounds/dlc/quadshot/quad_firefour.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_firefour.ogg rename to sounds/dlc/quadshot/quad_firefour.ogg diff --git a/sounds/dlc1/quadshot/quad_fireone.ogg b/sounds/dlc/quadshot/quad_fireone.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_fireone.ogg rename to sounds/dlc/quadshot/quad_fireone.ogg diff --git a/sounds/dlc1/quadshot/quad_firethree.ogg b/sounds/dlc/quadshot/quad_firethree.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_firethree.ogg rename to sounds/dlc/quadshot/quad_firethree.ogg diff --git a/sounds/dlc1/quadshot/quad_firetwo.ogg b/sounds/dlc/quadshot/quad_firetwo.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_firetwo.ogg rename to sounds/dlc/quadshot/quad_firetwo.ogg diff --git a/sounds/dlc1/quadshot/quad_fly.ogg b/sounds/dlc/quadshot/quad_fly.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_fly.ogg rename to sounds/dlc/quadshot/quad_fly.ogg diff --git a/sounds/dlc1/quadshot/quad_hit1.ogg b/sounds/dlc/quadshot/quad_hit1.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_hit1.ogg rename to sounds/dlc/quadshot/quad_hit1.ogg diff --git a/sounds/dlc1/quadshot/quad_hit2.ogg b/sounds/dlc/quadshot/quad_hit2.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_hit2.ogg rename to sounds/dlc/quadshot/quad_hit2.ogg diff --git a/sounds/dlc1/quadshot/quad_hit3.ogg b/sounds/dlc/quadshot/quad_hit3.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_hit3.ogg rename to sounds/dlc/quadshot/quad_hit3.ogg diff --git a/sounds/dlc1/quadshot/quad_leverback.ogg b/sounds/dlc/quadshot/quad_leverback.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_leverback.ogg rename to sounds/dlc/quadshot/quad_leverback.ogg diff --git a/sounds/dlc1/quadshot/quad_leverforward.ogg b/sounds/dlc/quadshot/quad_leverforward.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_leverforward.ogg rename to sounds/dlc/quadshot/quad_leverforward.ogg diff --git a/sounds/dlc1/quadshot/quad_load1.ogg b/sounds/dlc/quadshot/quad_load1.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_load1.ogg rename to sounds/dlc/quadshot/quad_load1.ogg diff --git a/sounds/dlc1/quadshot/quad_load2.ogg b/sounds/dlc/quadshot/quad_load2.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_load2.ogg rename to sounds/dlc/quadshot/quad_load2.ogg diff --git a/sounds/dlc1/quadshot/quad_load3.ogg b/sounds/dlc/quadshot/quad_load3.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_load3.ogg rename to sounds/dlc/quadshot/quad_load3.ogg diff --git a/sounds/dlc1/quadshot/quad_load4.ogg b/sounds/dlc/quadshot/quad_load4.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_load4.ogg rename to sounds/dlc/quadshot/quad_load4.ogg diff --git a/sounds/dlc1/quadshot/quad_onehand.ogg b/sounds/dlc/quadshot/quad_onehand.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_onehand.ogg rename to sounds/dlc/quadshot/quad_onehand.ogg diff --git a/sounds/dlc1/quadshot/quad_select.ogg b/sounds/dlc/quadshot/quad_select.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_select.ogg rename to sounds/dlc/quadshot/quad_select.ogg diff --git a/sounds/dlc1/quadshot/quad_selectfast.ogg b/sounds/dlc/quadshot/quad_selectfast.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_selectfast.ogg rename to sounds/dlc/quadshot/quad_selectfast.ogg diff --git a/sounds/dlc1/quadshot/quad_twohand.ogg b/sounds/dlc/quadshot/quad_twohand.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_twohand.ogg rename to sounds/dlc/quadshot/quad_twohand.ogg diff --git a/sounds/dlc1/quadshot/quad_xexpl.ogg b/sounds/dlc/quadshot/quad_xexpl.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_xexpl.ogg rename to sounds/dlc/quadshot/quad_xexpl.ogg diff --git a/sounds/dlc1/quadshot/quad_xxexpl.ogg b/sounds/dlc/quadshot/quad_xxexpl.ogg similarity index 100% rename from sounds/dlc1/quadshot/quad_xxexpl.ogg rename to sounds/dlc/quadshot/quad_xxexpl.ogg diff --git a/sounds/dlc1/sheen/sheen_2100rpm.ogg b/sounds/dlc/sheen/sheen_2100rpm.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_2100rpm.ogg rename to sounds/dlc/sheen/sheen_2100rpm.ogg diff --git a/sounds/dlc1/sheen/sheen_700rpm.ogg b/sounds/dlc/sheen/sheen_700rpm.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_700rpm.ogg rename to sounds/dlc/sheen/sheen_700rpm.ogg diff --git a/sounds/dlc1/sheen/sheen_case1.ogg b/sounds/dlc/sheen/sheen_case1.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_case1.ogg rename to sounds/dlc/sheen/sheen_case1.ogg diff --git a/sounds/dlc1/sheen/sheen_case2.ogg b/sounds/dlc/sheen/sheen_case2.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_case2.ogg rename to sounds/dlc/sheen/sheen_case2.ogg diff --git a/sounds/dlc1/sheen/sheen_case3.ogg b/sounds/dlc/sheen/sheen_case3.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_case3.ogg rename to sounds/dlc/sheen/sheen_case3.ogg diff --git a/sounds/dlc1/sheen/sheen_case4.ogg b/sounds/dlc/sheen/sheen_case4.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_case4.ogg rename to sounds/dlc/sheen/sheen_case4.ogg diff --git a/sounds/dlc1/sheen/sheen_crankin.ogg b/sounds/dlc/sheen/sheen_crankin.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_crankin.ogg rename to sounds/dlc/sheen/sheen_crankin.ogg diff --git a/sounds/dlc1/sheen/sheen_crankout.ogg b/sounds/dlc/sheen/sheen_crankout.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_crankout.ogg rename to sounds/dlc/sheen/sheen_crankout.ogg diff --git a/sounds/dlc1/sheen/sheen_deselect.ogg b/sounds/dlc/sheen/sheen_deselect.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_deselect.ogg rename to sounds/dlc/sheen/sheen_deselect.ogg diff --git a/sounds/dlc1/sheen/sheen_fire1.ogg b/sounds/dlc/sheen/sheen_fire1.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_fire1.ogg rename to sounds/dlc/sheen/sheen_fire1.ogg diff --git a/sounds/dlc1/sheen/sheen_fire2.ogg b/sounds/dlc/sheen/sheen_fire2.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_fire2.ogg rename to sounds/dlc/sheen/sheen_fire2.ogg diff --git a/sounds/dlc1/sheen/sheen_fire3.ogg b/sounds/dlc/sheen/sheen_fire3.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_fire3.ogg rename to sounds/dlc/sheen/sheen_fire3.ogg diff --git a/sounds/dlc1/sheen/sheen_meleeend.ogg b/sounds/dlc/sheen/sheen_meleeend.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_meleeend.ogg rename to sounds/dlc/sheen/sheen_meleeend.ogg diff --git a/sounds/dlc1/sheen/sheen_meleestart.ogg b/sounds/dlc/sheen/sheen_meleestart.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_meleestart.ogg rename to sounds/dlc/sheen/sheen_meleestart.ogg diff --git a/sounds/dlc1/sheen/sheen_overheat.ogg b/sounds/dlc/sheen/sheen_overheat.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_overheat.ogg rename to sounds/dlc/sheen/sheen_overheat.ogg diff --git a/sounds/dlc1/sheen/sheen_select.ogg b/sounds/dlc/sheen/sheen_select.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_select.ogg rename to sounds/dlc/sheen/sheen_select.ogg diff --git a/sounds/dlc1/sheen/sheen_specialpickup.ogg b/sounds/dlc/sheen/sheen_specialpickup.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_specialpickup.ogg rename to sounds/dlc/sheen/sheen_specialpickup.ogg diff --git a/sounds/dlc1/sheen/sheen_unlock.ogg b/sounds/dlc/sheen/sheen_unlock.ogg similarity index 100% rename from sounds/dlc1/sheen/sheen_unlock.ogg rename to sounds/dlc/sheen/sheen_unlock.ogg diff --git a/zscript.txt b/zscript.txt index fd487ad06..a1befde13 100644 --- a/zscript.txt +++ b/zscript.txt @@ -146,31 +146,27 @@ version "4.11" #include "zscript/weapons/swwm_deathlydeathcannon_altfx.zsc" // split due to size #include "zscript/weapons/swwm_weapons_hud.zsc" #include "zscript/weapons/swwm_weapons_canvas.zsc" -// DLC1 - Weapon Set -#include "zscript/dlc1/swwm_ammoitems_dlc.zsc" -#include "zscript/dlc1/swwm_hammertime.zsc" -#include "zscript/dlc1/swwm_hammertime_fx.zsc" -//#include "zscript/dlc1/swwm_blastin.zsc" -//#include "zscript/dlc1/swwm_blastin_fx.zsc" -//#include "zscript/dlc1/swwm_rebolber.zsc" -//#include "zscript/dlc1/swwm_rebolber_fx.zsc" -//#include "zscript/dlc1/swwm_supermarioworld.zsc" -//#include "zscript/dlc1/swwm_supermarioworld_fx.zsc" -#include "zscript/dlc1/swwm_heavymahsheengun.zsc" -#include "zscript/dlc1/swwm_heavymahsheengun_fx.zsc" -#include "zscript/dlc1/swwm_notashotgun.zsc" -#include "zscript/dlc1/swwm_notashotgun_fx.zsc" -//#include "zscript/dlc1/swwm_blueballs.zsc" -//#include "zscript/dlc1/swwm_blueballs_fx.zsc" -#include "zscript/dlc1/swwm_mister.zsc" -#include "zscript/dlc1/swwm_mister_fx.zsc" -//#include "zscript/dlc1/swwm_thiccbolts.zsc" -//#include "zscript/dlc1/swwm_thiccbolts_fx.zsc" -//#include "zscript/dlc1/swwm_ultimate.zsc" -//#include "zscript/dlc1/swwm_ultimate_fx.zsc" -#include "zscript/dlc1/swwm_dlcweapons_hud.zsc" -#include "zscript/dlc1/swwm_dlcweapons_canvas.zsc" -// DLC2 - Game Set -//#include "zscript/dlc2/swwm_kbasetab_games.zsc" -//#include "zscript/dlc2/swwm_madcat.zsc" -//#include "zscript/dlc2/swwm_minigames.zsc" +// additional weapons +#include "zscript/dlc/swwm_ammoitems_dlc.zsc" +#include "zscript/dlc/swwm_hammertime.zsc" +#include "zscript/dlc/swwm_hammertime_fx.zsc" +//#include "zscript/dlc/swwm_blastin.zsc" +//#include "zscript/dlc/swwm_blastin_fx.zsc" +//#include "zscript/dlc/swwm_rebolber.zsc" +//#include "zscript/dlc/swwm_rebolber_fx.zsc" +//#include "zscript/dlc/swwm_supermarioworld.zsc" +//#include "zscript/dlc/swwm_supermarioworld_fx.zsc" +#include "zscript/dlc/swwm_heavymahsheengun.zsc" +#include "zscript/dlc/swwm_heavymahsheengun_fx.zsc" +#include "zscript/dlc/swwm_notashotgun.zsc" +#include "zscript/dlc/swwm_notashotgun_fx.zsc" +//#include "zscript/dlc/swwm_blueballs.zsc" +//#include "zscript/dlc/swwm_blueballs_fx.zsc" +#include "zscript/dlc/swwm_mister.zsc" +#include "zscript/dlc/swwm_mister_fx.zsc" +//#include "zscript/dlc/swwm_thiccbolts.zsc" +//#include "zscript/dlc/swwm_thiccbolts_fx.zsc" +//#include "zscript/dlc/swwm_ultimate.zsc" +//#include "zscript/dlc/swwm_ultimate_fx.zsc" +#include "zscript/dlc/swwm_dlcweapons_hud.zsc" +#include "zscript/dlc/swwm_dlcweapons_canvas.zsc" diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc/swwm_ammoitems_dlc.zsc similarity index 100% rename from zscript/dlc1/swwm_ammoitems_dlc.zsc rename to zscript/dlc/swwm_ammoitems_dlc.zsc diff --git a/zscript/dlc1/swwm_blastin.zsc b/zscript/dlc/swwm_blastin.zsc similarity index 100% rename from zscript/dlc1/swwm_blastin.zsc rename to zscript/dlc/swwm_blastin.zsc diff --git a/zscript/dlc1/swwm_blastin_fx.zsc b/zscript/dlc/swwm_blastin_fx.zsc similarity index 100% rename from zscript/dlc1/swwm_blastin_fx.zsc rename to zscript/dlc/swwm_blastin_fx.zsc diff --git a/zscript/dlc1/swwm_blueballs.zsc b/zscript/dlc/swwm_blueballs.zsc similarity index 100% rename from zscript/dlc1/swwm_blueballs.zsc rename to zscript/dlc/swwm_blueballs.zsc diff --git a/zscript/dlc1/swwm_blueballs_fx.zsc b/zscript/dlc/swwm_blueballs_fx.zsc similarity index 100% rename from zscript/dlc1/swwm_blueballs_fx.zsc rename to zscript/dlc/swwm_blueballs_fx.zsc diff --git a/zscript/dlc1/swwm_dlcweapons_canvas.zsc b/zscript/dlc/swwm_dlcweapons_canvas.zsc similarity index 100% rename from zscript/dlc1/swwm_dlcweapons_canvas.zsc rename to zscript/dlc/swwm_dlcweapons_canvas.zsc diff --git a/zscript/dlc1/swwm_dlcweapons_hud.zsc b/zscript/dlc/swwm_dlcweapons_hud.zsc similarity index 100% rename from zscript/dlc1/swwm_dlcweapons_hud.zsc rename to zscript/dlc/swwm_dlcweapons_hud.zsc diff --git a/zscript/dlc1/swwm_hammertime.zsc b/zscript/dlc/swwm_hammertime.zsc similarity index 100% rename from zscript/dlc1/swwm_hammertime.zsc rename to zscript/dlc/swwm_hammertime.zsc diff --git a/zscript/dlc1/swwm_hammertime_fx.zsc b/zscript/dlc/swwm_hammertime_fx.zsc similarity index 100% rename from zscript/dlc1/swwm_hammertime_fx.zsc rename to zscript/dlc/swwm_hammertime_fx.zsc diff --git a/zscript/dlc1/swwm_heavymahsheengun.zsc b/zscript/dlc/swwm_heavymahsheengun.zsc similarity index 100% rename from zscript/dlc1/swwm_heavymahsheengun.zsc rename to zscript/dlc/swwm_heavymahsheengun.zsc diff --git a/zscript/dlc1/swwm_heavymahsheengun_fx.zsc b/zscript/dlc/swwm_heavymahsheengun_fx.zsc similarity index 100% rename from zscript/dlc1/swwm_heavymahsheengun_fx.zsc rename to zscript/dlc/swwm_heavymahsheengun_fx.zsc diff --git a/zscript/dlc1/swwm_mister.zsc b/zscript/dlc/swwm_mister.zsc similarity index 100% rename from zscript/dlc1/swwm_mister.zsc rename to zscript/dlc/swwm_mister.zsc diff --git a/zscript/dlc1/swwm_mister_fx.zsc b/zscript/dlc/swwm_mister_fx.zsc similarity index 100% rename from zscript/dlc1/swwm_mister_fx.zsc rename to zscript/dlc/swwm_mister_fx.zsc diff --git a/zscript/dlc1/swwm_notashotgun.zsc b/zscript/dlc/swwm_notashotgun.zsc similarity index 100% rename from zscript/dlc1/swwm_notashotgun.zsc rename to zscript/dlc/swwm_notashotgun.zsc diff --git a/zscript/dlc1/swwm_notashotgun_fx.zsc b/zscript/dlc/swwm_notashotgun_fx.zsc similarity index 100% rename from zscript/dlc1/swwm_notashotgun_fx.zsc rename to zscript/dlc/swwm_notashotgun_fx.zsc diff --git a/zscript/dlc1/swwm_rebolber.zsc b/zscript/dlc/swwm_rebolber.zsc similarity index 100% rename from zscript/dlc1/swwm_rebolber.zsc rename to zscript/dlc/swwm_rebolber.zsc diff --git a/zscript/dlc1/swwm_rebolber_fx.zsc b/zscript/dlc/swwm_rebolber_fx.zsc similarity index 100% rename from zscript/dlc1/swwm_rebolber_fx.zsc rename to zscript/dlc/swwm_rebolber_fx.zsc diff --git a/zscript/dlc1/swwm_supermarioworld.zsc b/zscript/dlc/swwm_supermarioworld.zsc similarity index 100% rename from zscript/dlc1/swwm_supermarioworld.zsc rename to zscript/dlc/swwm_supermarioworld.zsc diff --git a/zscript/dlc1/swwm_supermarioworld_fx.zsc b/zscript/dlc/swwm_supermarioworld_fx.zsc similarity index 100% rename from zscript/dlc1/swwm_supermarioworld_fx.zsc rename to zscript/dlc/swwm_supermarioworld_fx.zsc diff --git a/zscript/dlc1/swwm_thiccbolts.zsc b/zscript/dlc/swwm_thiccbolts.zsc similarity index 100% rename from zscript/dlc1/swwm_thiccbolts.zsc rename to zscript/dlc/swwm_thiccbolts.zsc diff --git a/zscript/dlc1/swwm_thiccbolts_fx.zsc b/zscript/dlc/swwm_thiccbolts_fx.zsc similarity index 100% rename from zscript/dlc1/swwm_thiccbolts_fx.zsc rename to zscript/dlc/swwm_thiccbolts_fx.zsc diff --git a/zscript/dlc1/swwm_ultimate.zsc b/zscript/dlc/swwm_ultimate.zsc similarity index 100% rename from zscript/dlc1/swwm_ultimate.zsc rename to zscript/dlc/swwm_ultimate.zsc diff --git a/zscript/dlc1/swwm_ultimate_fx.zsc b/zscript/dlc/swwm_ultimate_fx.zsc similarity index 100% rename from zscript/dlc1/swwm_ultimate_fx.zsc rename to zscript/dlc/swwm_ultimate_fx.zsc diff --git a/zscript/dlc2/swwm_kbasetab_games.zsc b/zscript/dlc2/swwm_kbasetab_games.zsc deleted file mode 100644 index 0ef6fbc0d..000000000 --- a/zscript/dlc2/swwm_kbasetab_games.zsc +++ /dev/null @@ -1,170 +0,0 @@ -// a game inside a game? - -Class DemolitionistGameTab : DemolitionistMenuTabCustom -{ - MadcatGame game; - Array > gamelist; - int sel; - - override DemolitionistMenuTab Init( DemolitionistMenu master ) - { - title = StringTable.Localize("$SWWM_GAMETAB"); - foreach ( cls:AllClasses ) - { - if ( cls.isAbstract() || !(cls is 'MadcatGame') ) continue; - gamelist.Push((Class)(cls)); - } - bDirectInput = true; - return Super.Init(master); - } - - override void OnDestroy() - { - Super.OnDestroy(); - if ( game ) game.Destroy(); - } - - override void OnSelect() - { - sel = master.shnd.menustate.At("LastGame").ToInt(); - // auto-add lore for kris - let lore = SWWMLoreLibrary.Find(players[consoleplayer]); - bool found = false; - foreach ( ent:lore.ent ) - { - if ( !(ent.tag ~== "$SWWM_LORETAG_MADCAT") ) continue; - found = true; - break; - } - if ( !found ) - { - EventHandler.SendNetworkEvent("swwmgamelore",consoleplayer); - // notify - master.tmsg = StringTable.Localize("$SWWM_NEWLORE"); - master.tmsgtic = Menu.MenuTime()+70; - } - } - override void OnDeselect() - { - master.shnd.menustate.Insert("LastGame",String.Format("%d",sel)); - if ( game ) game.Destroy(); - } - - override void MenuInput( int key ) - { - // while a game is running, only the back button can be used - if ( game ) - { - if ( key == MK_BACK ) - { - game.Destroy(); - master.MenuSound("menu/democlose"); - } - return; - } - switch ( key ) - { - case MK_DOWN: - if ( sel > 0 ) - { - sel--; - master.MenuSound("menu/demoscroll"); - } - break; - case MK_UP: - if ( sel < gamelist.Size()-1 ) - { - sel++; - master.MenuSound("menu/demoscroll"); - } - break; - case MK_ENTER: - master.MenuSound("menu/demosel"); - game = MadcatGame(new(gamelist[sel])); - game.Init(); - break; - } - } - - override void MouseInput( Vector2 pos, int btn ) - { - if ( game ) return; - if ( btn != MB_LEFT ) return; - String str; - double xx, yy; - yy = int(master.ws.y-14*gamelist.Size())/2; - for ( int i=0; i yy+h ) continue; - sel = i; - MenuInput(MK_ENTER); - break; - } - } - - override bool DirectInput( UIEvent ev ) - { - if ( !game ) return false; - return game.ProcessInput(ev.keychar,ev.type==UIEvent.Type_KeyUp); - } - - override void Ticker() - { - if ( game ) game.Tick(); - } - - override void Drawer( double fractic ) - { - if ( game ) - { // calculate res to fit - double scl = max(floor(((master.ws.y-120)*master.hs)/240.),1.); - Vector2 res = ((384,240)*scl)/master.hs; - String str = StringTable.Localize("$SWWM_GAMETITLE_"..game.GetClassName()); - double xx = int(master.ws.x-master.mSmallFont.StringWidth(str))/2; - double yy = int(master.ws.y-res.y)/2; - Screen.DrawText(master.mSmallFont,Font.CR_FIRE,master.origin.x+xx,master.origin.y+yy-32,str,DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true); - int cw = int(ceil((master.mSmallFont.StringWidth(str)+8)/6.))*6; - xx = int(master.ws.x-cw)/2; - for ( int i=0; i=4)?0x2727:0x2726,DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true); - Screen.DrawChar(master.mSmallFont,Font.CR_GREEN,master.origin.x+xx+w+6,master.origin.y+yy,((Menu.MenuTime()&8)>=4)?0x2727:0x2726,DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true); - } - yy += 14; - } - } - } -} diff --git a/zscript/dlc2/swwm_madcat.zsc b/zscript/dlc2/swwm_madcat.zsc deleted file mode 100644 index 00ac6637a..000000000 --- a/zscript/dlc2/swwm_madcat.zsc +++ /dev/null @@ -1,262 +0,0 @@ -// shared MADCAT framework code - -// skeleton class, doesn't have much other than the bare generic essentials -Class MadcatGameState abstract ui -{ - Name GameName; - - abstract MadcatGameState Init(); -} - -// state manager static thinker, to keep progress throughout a play session -// must be created by the static handler on map load if it doesn't exist -Class MadcatGameStateManager : Thinker -{ - ui Array GameState; - - // return state object for a specific game name - // returns null if no state exists (caller must add a new one) - static ui MadcatGameState GetState( Name GameName ) - { - let gsm = MadcatGameStateManager(ThinkerIterator.Create("MadcatGameStateManager").Next()); - if ( !gsm ) ThrowAbortException("Game State Manager not found."); - foreach ( gs:gsm.GameState ) - { - if ( gs.GameName != GameName ) continue; - return gs; - } - return null; - } - - // adds a new game state object to the list - // if an object for the same game already exists, destroy and replace it - static ui void AddState( MadcatGameState NewState ) - { - let gsm = MadcatGameStateManager(ThinkerIterator.Create("MadcatGameStateManager").Next()); - if ( !gsm ) ThrowAbortException("Game State Manager not found."); - for ( int i=0; i= 18 ) continue; - if ( boot_tiles[j+147] && (boot_tiles[j+147] < 195) ) boot_tiles[j+147] += 21; - } - for ( int j=-1; j= 18 ) continue; - if ( (boot_tiles[j+171] < 195) ) boot_tiles[j+171] += 21; - } - for ( int j=-2; j= 18 ) continue; - if ( (boot_tiles[j+195] < 195) ) boot_tiles[j+195] += 21; - } - } - private void Boot_ClearTiles() - { - for ( int i=0; i<360; i++ ) boot_tiles[i] = 0; - } - - // game has been booted up - virtual void Init() - { - oldmus = musplaying.name; - oldorder = musplaying.baseorder; - oldloop = musplaying.loop; - S_ChangeMusic(""); - bClosed = false; - global_state = CAT_BOOT; - boot_state = BS_FADEIN; - boot_timer = -16; - boot_tileset = TexMan.CheckForTexture("graphics/Games/MadcatTiles.png"); - } - - // game is ticking - virtual void Tick() - { - // only bootup is handled here - if ( global_state != CAT_BOOT ) return; - switch ( boot_state ) - { - case BS_FADEIN: - if ( boot_timer == 0 ) Boot_PrepareTitle(); - else if ( !(boot_timer%4) && (boot_timer >= 4) ) Boot_FadeInTiles(); - boot_timer++; - if ( boot_timer > 12 ) - { - boot_state++; - boot_timer = -16; - } - break; - case BS_FLASH: - Boot_FlashState(); - boot_timer++; - if ( boot_timer > 80 ) - { - boot_state++; - boot_timer = 0; - } - else if ( boot_timer == 0 ) S_StartSound("madcat/boot",CHAN_VOICE,CHANF_UI,1.,0.); - break; - case BS_FADEOUT: - if ( boot_timer == 0 ) - { - Boot_PrepareTitle(); - Boot_PreFadeOutTiles(); - } - else if ( !(boot_timer%4) && (boot_timer >= 4) ) Boot_FadeOutTiles(); - boot_timer++; - if ( boot_timer > 12 ) - { - boot_state++; - boot_timer = 0; - } - break; - case BS_IDLE: - boot_timer++; - if ( boot_timer == 4 ) Boot_ClearTiles(); - else if ( boot_timer >= 40 ) - { - global_state = CAT_MENU; - boot_state = 0; - boot_timer = 0; - } - break; - } - } - - // draw on the virtual screen - // coordinates are absolute - virtual void Draw( Vector2 screen_pos, double screen_zoom, double fractic ) - { - // only bootup is handled here - if ( global_state != CAT_BOOT ) return; - for ( int i=0; i<360; i++ ) - { - int tsx = (boot_tiles[i]&0x0F)*8; - int tsy = ((boot_tiles[i]&0xF0)>>4)*8; - int fsx = (i%24)*16; - int fsy = (i/24)*16; - Screen.DrawTexture(boot_tileset,false, - screen_pos.x+fsx*screen_zoom, - screen_pos.y+fsy*screen_zoom, - DTA_ScaleX,screen_zoom,DTA_ScaleY,screen_zoom, - DTA_SrcX,tsx,DTA_SrcY,tsy, - DTA_SrcWidth,8,DTA_SrcHeight,8, - DTA_DestWidth,16,DTA_DestHeight,16); - } - } - - // process keyboard input - virtual bool ProcessInput( int key, bool release ) - { - return false; - } - - // game has been closed - virtual void Close() - { - bClosed = true; - S_ChangeMusic(oldmus,oldorder,oldloop); - } - - override void OnDestroy() - { - if ( !bClosed ) Close(); - Super.OnDestroy(); - } -} diff --git a/zscript/dlc2/swwm_minigames.zsc b/zscript/dlc2/swwm_minigames.zsc deleted file mode 100644 index 6d4970f01..000000000 --- a/zscript/dlc2/swwm_minigames.zsc +++ /dev/null @@ -1 +0,0 @@ -// basic minigames