From 639f9f4a7733a5937c3166b6b4e38a4c8e9b59ef Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Wed, 3 Apr 2024 21:42:52 +0200 Subject: [PATCH] Full removal of references to DLC2, only DLC Weaponset left. --- cvarinfo.base | 2 +- gldefs.txt | 12 +- gldefs/{dlc1 => dlc}/dlcammo.txt | 0 gldefs/{dlc1 => dlc}/hammer.txt | 0 gldefs/{dlc1 => dlc}/mortalrifle.txt | 0 gldefs/{dlc1 => dlc}/plasmablast.txt | 0 gldefs/{dlc1 => dlc}/quadravol.txt | 0 gldefs/{dlc1 => dlc}/sheenhmg.txt | 0 language.def_menu | 3 - language.es_menu | 3 - language.version | 4 +- modeldef.txt | 22 +- modeldef/{dlc1 => dlc}/dlcammo.txt | 0 modeldef/{dlc1 => dlc}/hammer.txt | 0 modeldef/{dlc1 => dlc}/mortalrifle.txt | 0 modeldef/{dlc1 => dlc}/newsparkster.txt | 0 modeldef/{dlc1 => dlc}/plasmablast.txt | 0 modeldef/{dlc1 => dlc}/puntzerbeta.txt | 0 modeldef/{dlc1 => dlc}/puntzergamma.txt | 0 modeldef/{dlc1 => dlc}/quadravol.txt | 0 modeldef/{dlc1 => dlc}/rafankos.txt | 0 modeldef/{dlc1 => dlc}/raykhom.txt | 0 modeldef/{dlc1 => dlc}/sheenhmg.txt | 0 sndinfo.dlcweapons | 282 +++++++++--------- sndinfo.misc | 3 - sounds/MADCAT.ogg | Bin 13651 -> 0 bytes sounds/{dlc1 => dlc}/blast/blast_altfire1.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_altfire2.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_althit1.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_althit2.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_charge.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_deselect.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_fire1.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_fire2.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_hit1.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_hit2.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_hit3.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_hit4.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_idle.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_magin.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_magout.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_meleeend.ogg | Bin .../{dlc1 => dlc}/blast/blast_meleestart.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_select.ogg | Bin sounds/{dlc1 => dlc}/blast/blast_trigger.ogg | Bin .../{dlc1 => dlc}/hammer/itamex_deselect.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_drop.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_hit1.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_hit2.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_hit3.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_hitf1.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_hitf2.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_hitf3.ogg | Bin .../{dlc1 => dlc}/hammer/itamex_meleeend.ogg | Bin .../hammer/itamex_meleestart.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_select.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_slam.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_spin.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_swing1.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_swing2.ogg | Bin sounds/{dlc1 => dlc}/hammer/itamex_swing3.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_beep_over.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_boltback.ogg | Bin .../{dlc1 => dlc}/mister/mr_boltforward.ogg | Bin .../{dlc1 => dlc}/mister/mr_cancel_over.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_casing1.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_casing2.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_casing3.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_casing4.ogg | Bin .../{dlc1 => dlc}/mister/mr_charge_over.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_deselect.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_fire_over.ogg | Bin .../{dlc1 => dlc}/mister/mr_fire_scatter.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_fire_semi.ogg | Bin .../{dlc1 => dlc}/mister/mr_fire_stream.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_firesel.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_gbounce11.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_gbounce12.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_gbounce13.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_gbounce21.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_gbounce22.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_gbounce23.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_gcasing1.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_gcasing2.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_gcasing3.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_gcasing4.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_grenade.ogg | Bin .../{dlc1 => dlc}/mister/mr_grenadeclose.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_grenadeget.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_grenadein.ogg | Bin .../{dlc1 => dlc}/mister/mr_grenadeopen.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hit11.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hit12.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hit13.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hit21.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hit22.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hit23.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hit31.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hit32.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hit33.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hit41.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hit42.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hit43.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hitg11.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hitg12.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hitg13.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hitg21.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hitg22.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hitg23.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_hold_over.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_lowammo.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_magin.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_magout.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_meleeend.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_meleestart.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_noammo.ogg | Bin sounds/{dlc1 => dlc}/mister/mr_select.ogg | Bin .../quadshot/quad_bayonetfire.ogg | Bin .../quadshot/quad_bayonetreturn.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_casing1.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_casing2.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_casing3.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_casing4.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_deselect.ogg | Bin .../quadshot/quad_deselectfast.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_explo1.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_explo2.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_explo3.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_firefive.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_firefour.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_fireone.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_firethree.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_firetwo.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_fly.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_hit1.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_hit2.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_hit3.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_leverback.ogg | Bin .../quadshot/quad_leverforward.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_load1.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_load2.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_load3.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_load4.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_onehand.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_select.ogg | Bin .../quadshot/quad_selectfast.ogg | Bin .../{dlc1 => dlc}/quadshot/quad_twohand.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_xexpl.ogg | Bin sounds/{dlc1 => dlc}/quadshot/quad_xxexpl.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_2100rpm.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_700rpm.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_case1.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_case2.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_case3.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_case4.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_crankin.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_crankout.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_deselect.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_fire1.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_fire2.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_fire3.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_meleeend.ogg | Bin .../{dlc1 => dlc}/sheen/sheen_meleestart.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_overheat.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_select.ogg | Bin .../sheen/sheen_specialpickup.ogg | Bin sounds/{dlc1 => dlc}/sheen/sheen_unlock.ogg | Bin zscript.txt | 52 ++-- zscript/{dlc1 => dlc}/swwm_ammoitems_dlc.zsc | 0 zscript/{dlc1 => dlc}/swwm_blastin.zsc | 0 zscript/{dlc1 => dlc}/swwm_blastin_fx.zsc | 0 zscript/{dlc1 => dlc}/swwm_blueballs.zsc | 0 zscript/{dlc1 => dlc}/swwm_blueballs_fx.zsc | 0 .../{dlc1 => dlc}/swwm_dlcweapons_canvas.zsc | 0 zscript/{dlc1 => dlc}/swwm_dlcweapons_hud.zsc | 0 zscript/{dlc1 => dlc}/swwm_hammertime.zsc | 0 zscript/{dlc1 => dlc}/swwm_hammertime_fx.zsc | 0 .../{dlc1 => dlc}/swwm_heavymahsheengun.zsc | 0 .../swwm_heavymahsheengun_fx.zsc | 0 zscript/{dlc1 => dlc}/swwm_mister.zsc | 0 zscript/{dlc1 => dlc}/swwm_mister_fx.zsc | 0 zscript/{dlc1 => dlc}/swwm_notashotgun.zsc | 0 zscript/{dlc1 => dlc}/swwm_notashotgun_fx.zsc | 0 zscript/{dlc1 => dlc}/swwm_rebolber.zsc | 0 zscript/{dlc1 => dlc}/swwm_rebolber_fx.zsc | 0 .../{dlc1 => dlc}/swwm_supermarioworld.zsc | 0 .../{dlc1 => dlc}/swwm_supermarioworld_fx.zsc | 0 zscript/{dlc1 => dlc}/swwm_thiccbolts.zsc | 0 zscript/{dlc1 => dlc}/swwm_thiccbolts_fx.zsc | 0 zscript/{dlc1 => dlc}/swwm_ultimate.zsc | 0 zscript/{dlc1 => dlc}/swwm_ultimate_fx.zsc | 0 zscript/dlc2/swwm_kbasetab_games.zsc | 170 ----------- zscript/dlc2/swwm_madcat.zsc | 262 ---------------- zscript/dlc2/swwm_minigames.zsc | 1 - 194 files changed, 185 insertions(+), 631 deletions(-) rename gldefs/{dlc1 => dlc}/dlcammo.txt (100%) rename gldefs/{dlc1 => dlc}/hammer.txt (100%) rename gldefs/{dlc1 => dlc}/mortalrifle.txt (100%) rename gldefs/{dlc1 => dlc}/plasmablast.txt (100%) rename gldefs/{dlc1 => dlc}/quadravol.txt (100%) rename gldefs/{dlc1 => dlc}/sheenhmg.txt (100%) rename modeldef/{dlc1 => dlc}/dlcammo.txt (100%) rename modeldef/{dlc1 => dlc}/hammer.txt (100%) rename modeldef/{dlc1 => dlc}/mortalrifle.txt (100%) rename modeldef/{dlc1 => dlc}/newsparkster.txt (100%) rename modeldef/{dlc1 => dlc}/plasmablast.txt (100%) rename modeldef/{dlc1 => dlc}/puntzerbeta.txt (100%) rename modeldef/{dlc1 => dlc}/puntzergamma.txt (100%) rename modeldef/{dlc1 => dlc}/quadravol.txt (100%) rename modeldef/{dlc1 => dlc}/rafankos.txt (100%) rename modeldef/{dlc1 => dlc}/raykhom.txt (100%) rename modeldef/{dlc1 => dlc}/sheenhmg.txt (100%) delete mode 100644 sounds/MADCAT.ogg rename sounds/{dlc1 => dlc}/blast/blast_altfire1.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_altfire2.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_althit1.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_althit2.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_charge.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_deselect.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_fire1.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_fire2.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_hit1.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_hit2.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_hit3.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_hit4.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_idle.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_magin.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_magout.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_meleeend.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_meleestart.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_select.ogg (100%) rename sounds/{dlc1 => dlc}/blast/blast_trigger.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_deselect.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_drop.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_hit1.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_hit2.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_hit3.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_hitf1.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_hitf2.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_hitf3.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_meleeend.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_meleestart.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_select.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_slam.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_spin.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_swing1.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_swing2.ogg (100%) rename sounds/{dlc1 => dlc}/hammer/itamex_swing3.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_beep_over.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_boltback.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_boltforward.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_cancel_over.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_casing1.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_casing2.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_casing3.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_casing4.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_charge_over.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_deselect.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_fire_over.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_fire_scatter.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_fire_semi.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_fire_stream.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_firesel.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_gbounce11.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_gbounce12.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_gbounce13.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_gbounce21.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_gbounce22.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_gbounce23.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_gcasing1.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_gcasing2.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_gcasing3.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_gcasing4.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_grenade.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_grenadeclose.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_grenadeget.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_grenadein.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_grenadeopen.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hit11.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hit12.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hit13.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hit21.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hit22.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hit23.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hit31.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hit32.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hit33.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hit41.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hit42.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hit43.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hitg11.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hitg12.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hitg13.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hitg21.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hitg22.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hitg23.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_hold_over.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_lowammo.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_magin.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_magout.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_meleeend.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_meleestart.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_noammo.ogg (100%) rename sounds/{dlc1 => dlc}/mister/mr_select.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_bayonetfire.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_bayonetreturn.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_casing1.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_casing2.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_casing3.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_casing4.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_deselect.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_deselectfast.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_explo1.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_explo2.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_explo3.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_firefive.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_firefour.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_fireone.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_firethree.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_firetwo.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_fly.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_hit1.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_hit2.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_hit3.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_leverback.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_leverforward.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_load1.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_load2.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_load3.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_load4.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_onehand.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_select.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_selectfast.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_twohand.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_xexpl.ogg (100%) rename sounds/{dlc1 => dlc}/quadshot/quad_xxexpl.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_2100rpm.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_700rpm.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_case1.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_case2.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_case3.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_case4.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_crankin.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_crankout.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_deselect.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_fire1.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_fire2.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_fire3.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_meleeend.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_meleestart.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_overheat.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_select.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_specialpickup.ogg (100%) rename sounds/{dlc1 => dlc}/sheen/sheen_unlock.ogg (100%) rename zscript/{dlc1 => dlc}/swwm_ammoitems_dlc.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_blastin.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_blastin_fx.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_blueballs.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_blueballs_fx.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_dlcweapons_canvas.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_dlcweapons_hud.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_hammertime.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_hammertime_fx.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_heavymahsheengun.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_heavymahsheengun_fx.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_mister.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_mister_fx.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_notashotgun.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_notashotgun_fx.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_rebolber.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_rebolber_fx.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_supermarioworld.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_supermarioworld_fx.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_thiccbolts.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_thiccbolts_fx.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_ultimate.zsc (100%) rename zscript/{dlc1 => dlc}/swwm_ultimate_fx.zsc (100%) delete mode 100644 zscript/dlc2/swwm_kbasetab_games.zsc delete mode 100644 zscript/dlc2/swwm_madcat.zsc delete mode 100644 zscript/dlc2/swwm_minigames.zsc 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 d9d80fbfdb68427ab1066ab4637581247e4e4278..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13651 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 > 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