Full removal of references to DLC2, only DLC Weaponset left.

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)

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"

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 =

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 =

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-";

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"

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

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"