diff --git a/filter/game-doomchex/CREDITS.txt b/filter/doom.id/CREDITS.txt similarity index 100% rename from filter/game-doomchex/CREDITS.txt rename to filter/doom.id/CREDITS.txt diff --git a/filter/game-doomchex/DECORATE.txt b/filter/doom.id/DECORATE.txt similarity index 100% rename from filter/game-doomchex/DECORATE.txt rename to filter/doom.id/DECORATE.txt diff --git a/filter/game-doomchex/GLDEFS.txt b/filter/doom.id/GLDEFS.txt similarity index 100% rename from filter/game-doomchex/GLDEFS.txt rename to filter/doom.id/GLDEFS.txt diff --git a/filter/game-doomchex/INFO.txt b/filter/doom.id/INFO.txt similarity index 100% rename from filter/game-doomchex/INFO.txt rename to filter/doom.id/INFO.txt diff --git a/filter/game-doomchex/SNDINFO.txt b/filter/doom.id/SNDINFO.txt similarity index 100% rename from filter/game-doomchex/SNDINFO.txt rename to filter/doom.id/SNDINFO.txt diff --git a/filter/game-doomchex/TERRAIN.txt b/filter/doom.id/TERRAIN.txt similarity index 100% rename from filter/game-doomchex/TERRAIN.txt rename to filter/doom.id/TERRAIN.txt diff --git a/filter/game-doomchex/graphics/BMSLIMA0.png b/filter/doom.id/graphics/BMSLIMA0.png similarity index 100% rename from filter/game-doomchex/graphics/BMSLIMA0.png rename to filter/doom.id/graphics/BMSLIMA0.png diff --git a/filter/game-doomchex/graphics/BMSLIMB0.png b/filter/doom.id/graphics/BMSLIMB0.png similarity index 100% rename from filter/game-doomchex/graphics/BMSLIMB0.png rename to filter/doom.id/graphics/BMSLIMB0.png diff --git a/filter/game-doomchex/graphics/BMSLIMC0.png b/filter/doom.id/graphics/BMSLIMC0.png similarity index 100% rename from filter/game-doomchex/graphics/BMSLIMC0.png rename to filter/doom.id/graphics/BMSLIMC0.png diff --git a/filter/game-doomchex/graphics/BMSLIMD0.png b/filter/doom.id/graphics/BMSLIMD0.png similarity index 100% rename from filter/game-doomchex/graphics/BMSLIMD0.png rename to filter/doom.id/graphics/BMSLIMD0.png diff --git a/filter/game-doomchex/graphics/BMSLIME0.png b/filter/doom.id/graphics/BMSLIME0.png similarity index 100% rename from filter/game-doomchex/graphics/BMSLIME0.png rename to filter/doom.id/graphics/BMSLIME0.png diff --git a/filter/game-doomchex/graphics/BMSLIMF0.png b/filter/doom.id/graphics/BMSLIMF0.png similarity index 100% rename from filter/game-doomchex/graphics/BMSLIMF0.png rename to filter/doom.id/graphics/BMSLIMF0.png diff --git a/filter/game-doomchex/graphics/BMSLIMG0.png b/filter/doom.id/graphics/BMSLIMG0.png similarity index 100% rename from filter/game-doomchex/graphics/BMSLIMG0.png rename to filter/doom.id/graphics/BMSLIMG0.png diff --git a/filter/game-doomchex/graphics/BMSLIMH0.png b/filter/doom.id/graphics/BMSLIMH0.png similarity index 100% rename from filter/game-doomchex/graphics/BMSLIMH0.png rename to filter/doom.id/graphics/BMSLIMH0.png diff --git a/filter/game-doomchex/sounds/ACID5.ogg b/filter/doom.id/sounds/ACID5.ogg similarity index 100% rename from filter/game-doomchex/sounds/ACID5.ogg rename to filter/doom.id/sounds/ACID5.ogg diff --git a/filter/game-doomchex/sounds/GLOOP.ogg b/filter/doom.id/sounds/GLOOP.ogg similarity index 100% rename from filter/game-doomchex/sounds/GLOOP.ogg rename to filter/doom.id/sounds/GLOOP.ogg diff --git a/filter/game-doomchex/sounds/MUCK5.ogg b/filter/doom.id/sounds/MUCK5.ogg similarity index 100% rename from filter/game-doomchex/sounds/MUCK5.ogg rename to filter/doom.id/sounds/MUCK5.ogg diff --git a/filter/game-doomchex/sprites/BSPHA0.png b/filter/doom.id/sprites/BSPHA0.png similarity index 100% rename from filter/game-doomchex/sprites/BSPHA0.png rename to filter/doom.id/sprites/BSPHA0.png diff --git a/filter/game-doomchex/sprites/BSPHB0.png b/filter/doom.id/sprites/BSPHB0.png similarity index 100% rename from filter/game-doomchex/sprites/BSPHB0.png rename to filter/doom.id/sprites/BSPHB0.png diff --git a/filter/game-doomchex/sprites/BSPHC0.png b/filter/doom.id/sprites/BSPHC0.png similarity index 100% rename from filter/game-doomchex/sprites/BSPHC0.png rename to filter/doom.id/sprites/BSPHC0.png diff --git a/filter/game-doomchex/sprites/BSPHD0.png b/filter/doom.id/sprites/BSPHD0.png similarity index 100% rename from filter/game-doomchex/sprites/BSPHD0.png rename to filter/doom.id/sprites/BSPHD0.png diff --git a/filter/game-doomchex/sprites/BSPHE0.png b/filter/doom.id/sprites/BSPHE0.png similarity index 100% rename from filter/game-doomchex/sprites/BSPHE0.png rename to filter/doom.id/sprites/BSPHE0.png diff --git a/filter/game-doomchex/sprites/BSPHF0.png b/filter/doom.id/sprites/BSPHF0.png similarity index 100% rename from filter/game-doomchex/sprites/BSPHF0.png rename to filter/doom.id/sprites/BSPHF0.png diff --git a/filter/game-doomchex/sprites/BSPHG0.png b/filter/doom.id/sprites/BSPHG0.png similarity index 100% rename from filter/game-doomchex/sprites/BSPHG0.png rename to filter/doom.id/sprites/BSPHG0.png diff --git a/filter/game-doomchex/sprites/BSPHH0.png b/filter/doom.id/sprites/BSPHH0.png similarity index 100% rename from filter/game-doomchex/sprites/BSPHH0.png rename to filter/doom.id/sprites/BSPHH0.png diff --git a/filter/game-doomchex/sprites/BSPHI0.png b/filter/doom.id/sprites/BSPHI0.png similarity index 100% rename from filter/game-doomchex/sprites/BSPHI0.png rename to filter/doom.id/sprites/BSPHI0.png diff --git a/filter/game-doomchex/sprites/BSPHJ0.png b/filter/doom.id/sprites/BSPHJ0.png similarity index 100% rename from filter/game-doomchex/sprites/BSPHJ0.png rename to filter/doom.id/sprites/BSPHJ0.png diff --git a/filter/game-doomchex/sprites/BSPHK0.png b/filter/doom.id/sprites/BSPHK0.png similarity index 100% rename from filter/game-doomchex/sprites/BSPHK0.png rename to filter/doom.id/sprites/BSPHK0.png diff --git a/filter/game-doomchex/sprites/LVASA0.png b/filter/doom.id/sprites/LVASA0.png similarity index 100% rename from filter/game-doomchex/sprites/LVASA0.png rename to filter/doom.id/sprites/LVASA0.png diff --git a/filter/game-doomchex/sprites/LVASB0.png b/filter/doom.id/sprites/LVASB0.png similarity index 100% rename from filter/game-doomchex/sprites/LVASB0.png rename to filter/doom.id/sprites/LVASB0.png diff --git a/filter/game-doomchex/sprites/LVASC0.png b/filter/doom.id/sprites/LVASC0.png similarity index 100% rename from filter/game-doomchex/sprites/LVASC0.png rename to filter/doom.id/sprites/LVASC0.png diff --git a/filter/game-doomchex/sprites/LVASD0.png b/filter/doom.id/sprites/LVASD0.png similarity index 100% rename from filter/game-doomchex/sprites/LVASD0.png rename to filter/doom.id/sprites/LVASD0.png diff --git a/filter/game-doomchex/sprites/LVASE0.png b/filter/doom.id/sprites/LVASE0.png similarity index 100% rename from filter/game-doomchex/sprites/LVASE0.png rename to filter/doom.id/sprites/LVASE0.png diff --git a/filter/game-doomchex/sprites/LVASF0.png b/filter/doom.id/sprites/LVASF0.png similarity index 100% rename from filter/game-doomchex/sprites/LVASF0.png rename to filter/doom.id/sprites/LVASF0.png diff --git a/filter/game-doomchex/sprites/LVASG0.png b/filter/doom.id/sprites/LVASG0.png similarity index 100% rename from filter/game-doomchex/sprites/LVASG0.png rename to filter/doom.id/sprites/LVASG0.png diff --git a/filter/game-doomchex/sprites/LVASH0.png b/filter/doom.id/sprites/LVASH0.png similarity index 100% rename from filter/game-doomchex/sprites/LVASH0.png rename to filter/doom.id/sprites/LVASH0.png diff --git a/filter/game-doomchex/sprites/LVASI0.png b/filter/doom.id/sprites/LVASI0.png similarity index 100% rename from filter/game-doomchex/sprites/LVASI0.png rename to filter/doom.id/sprites/LVASI0.png diff --git a/filter/game-doomchex/sprites/LVASJ0.png b/filter/doom.id/sprites/LVASJ0.png similarity index 100% rename from filter/game-doomchex/sprites/LVASJ0.png rename to filter/doom.id/sprites/LVASJ0.png diff --git a/filter/game-doomchex/sprites/LVASK0.png b/filter/doom.id/sprites/LVASK0.png similarity index 100% rename from filter/game-doomchex/sprites/LVASK0.png rename to filter/doom.id/sprites/LVASK0.png diff --git a/filter/game-doomchex/sprites/MUDSA0.png b/filter/doom.id/sprites/MUDSA0.png similarity index 100% rename from filter/game-doomchex/sprites/MUDSA0.png rename to filter/doom.id/sprites/MUDSA0.png diff --git a/filter/game-doomchex/sprites/MUDSB0.png b/filter/doom.id/sprites/MUDSB0.png similarity index 100% rename from filter/game-doomchex/sprites/MUDSB0.png rename to filter/doom.id/sprites/MUDSB0.png diff --git a/filter/game-doomchex/sprites/MUDSC0.png b/filter/doom.id/sprites/MUDSC0.png similarity index 100% rename from filter/game-doomchex/sprites/MUDSC0.png rename to filter/doom.id/sprites/MUDSC0.png diff --git a/filter/game-doomchex/sprites/MUDSD0.png b/filter/doom.id/sprites/MUDSD0.png similarity index 100% rename from filter/game-doomchex/sprites/MUDSD0.png rename to filter/doom.id/sprites/MUDSD0.png diff --git a/filter/game-doomchex/sprites/MUDSE0.png b/filter/doom.id/sprites/MUDSE0.png similarity index 100% rename from filter/game-doomchex/sprites/MUDSE0.png rename to filter/doom.id/sprites/MUDSE0.png diff --git a/filter/game-doomchex/sprites/MUDSF0.png b/filter/doom.id/sprites/MUDSF0.png similarity index 100% rename from filter/game-doomchex/sprites/MUDSF0.png rename to filter/doom.id/sprites/MUDSF0.png diff --git a/filter/game-doomchex/sprites/MUDSG0.png b/filter/doom.id/sprites/MUDSG0.png similarity index 100% rename from filter/game-doomchex/sprites/MUDSG0.png rename to filter/doom.id/sprites/MUDSG0.png diff --git a/filter/game-doomchex/sprites/MUDSH0.png b/filter/doom.id/sprites/MUDSH0.png similarity index 100% rename from filter/game-doomchex/sprites/MUDSH0.png rename to filter/doom.id/sprites/MUDSH0.png diff --git a/filter/game-doomchex/sprites/SLDGA0.png b/filter/doom.id/sprites/SLDGA0.png similarity index 100% rename from filter/game-doomchex/sprites/SLDGA0.png rename to filter/doom.id/sprites/SLDGA0.png diff --git a/filter/game-doomchex/sprites/SLDGB0.png b/filter/doom.id/sprites/SLDGB0.png similarity index 100% rename from filter/game-doomchex/sprites/SLDGB0.png rename to filter/doom.id/sprites/SLDGB0.png diff --git a/filter/game-doomchex/sprites/SLDGC0.png b/filter/doom.id/sprites/SLDGC0.png similarity index 100% rename from filter/game-doomchex/sprites/SLDGC0.png rename to filter/doom.id/sprites/SLDGC0.png diff --git a/filter/game-doomchex/sprites/SLDGD0.png b/filter/doom.id/sprites/SLDGD0.png similarity index 100% rename from filter/game-doomchex/sprites/SLDGD0.png rename to filter/doom.id/sprites/SLDGD0.png diff --git a/filter/game-doomchex/sprites/SLDGE0.png b/filter/doom.id/sprites/SLDGE0.png similarity index 100% rename from filter/game-doomchex/sprites/SLDGE0.png rename to filter/doom.id/sprites/SLDGE0.png diff --git a/filter/game-doomchex/sprites/SLDGF0.png b/filter/doom.id/sprites/SLDGF0.png similarity index 100% rename from filter/game-doomchex/sprites/SLDGF0.png rename to filter/doom.id/sprites/SLDGF0.png diff --git a/filter/game-doomchex/sprites/SLDGG0.png b/filter/doom.id/sprites/SLDGG0.png similarity index 100% rename from filter/game-doomchex/sprites/SLDGG0.png rename to filter/doom.id/sprites/SLDGG0.png diff --git a/filter/game-doomchex/sprites/SLDGH0.png b/filter/doom.id/sprites/SLDGH0.png similarity index 100% rename from filter/game-doomchex/sprites/SLDGH0.png rename to filter/doom.id/sprites/SLDGH0.png diff --git a/filter/game-doomchex/sprites/SLIMA0.png b/filter/doom.id/sprites/SLIMA0.png similarity index 100% rename from filter/game-doomchex/sprites/SLIMA0.png rename to filter/doom.id/sprites/SLIMA0.png diff --git a/filter/game-doomchex/sprites/SLIMB0.png b/filter/doom.id/sprites/SLIMB0.png similarity index 100% rename from filter/game-doomchex/sprites/SLIMB0.png rename to filter/doom.id/sprites/SLIMB0.png diff --git a/filter/game-doomchex/sprites/SLIMC0.png b/filter/doom.id/sprites/SLIMC0.png similarity index 100% rename from filter/game-doomchex/sprites/SLIMC0.png rename to filter/doom.id/sprites/SLIMC0.png diff --git a/filter/game-doomchex/sprites/SLIMD0.png b/filter/doom.id/sprites/SLIMD0.png similarity index 100% rename from filter/game-doomchex/sprites/SLIMD0.png rename to filter/doom.id/sprites/SLIMD0.png diff --git a/filter/game-doomchex/sprites/SLIME0.png b/filter/doom.id/sprites/SLIME0.png similarity index 100% rename from filter/game-doomchex/sprites/SLIME0.png rename to filter/doom.id/sprites/SLIME0.png diff --git a/filter/game-doomchex/sprites/SLIMF0.png b/filter/doom.id/sprites/SLIMF0.png similarity index 100% rename from filter/game-doomchex/sprites/SLIMF0.png rename to filter/doom.id/sprites/SLIMF0.png diff --git a/filter/game-doomchex/sprites/SLIMG0.png b/filter/doom.id/sprites/SLIMG0.png similarity index 100% rename from filter/game-doomchex/sprites/SLIMG0.png rename to filter/doom.id/sprites/SLIMG0.png diff --git a/filter/game-doomchex/sprites/SLIMH0.png b/filter/doom.id/sprites/SLIMH0.png similarity index 100% rename from filter/game-doomchex/sprites/SLIMH0.png rename to filter/doom.id/sprites/SLIMH0.png diff --git a/filter/game-doomchex/sprites/SPSHA0.png b/filter/doom.id/sprites/SPSHA0.png similarity index 100% rename from filter/game-doomchex/sprites/SPSHA0.png rename to filter/doom.id/sprites/SPSHA0.png diff --git a/filter/game-doomchex/sprites/SPSHB0.png b/filter/doom.id/sprites/SPSHB0.png similarity index 100% rename from filter/game-doomchex/sprites/SPSHB0.png rename to filter/doom.id/sprites/SPSHB0.png diff --git a/filter/game-doomchex/sprites/SPSHC0.png b/filter/doom.id/sprites/SPSHC0.png similarity index 100% rename from filter/game-doomchex/sprites/SPSHC0.png rename to filter/doom.id/sprites/SPSHC0.png diff --git a/filter/game-doomchex/sprites/SPSHD0.png b/filter/doom.id/sprites/SPSHD0.png similarity index 100% rename from filter/game-doomchex/sprites/SPSHD0.png rename to filter/doom.id/sprites/SPSHD0.png diff --git a/filter/game-doomchex/sprites/SPSHE0.png b/filter/doom.id/sprites/SPSHE0.png similarity index 100% rename from filter/game-doomchex/sprites/SPSHE0.png rename to filter/doom.id/sprites/SPSHE0.png diff --git a/filter/game-doomchex/sprites/SPSHF0.png b/filter/doom.id/sprites/SPSHF0.png similarity index 100% rename from filter/game-doomchex/sprites/SPSHF0.png rename to filter/doom.id/sprites/SPSHF0.png diff --git a/filter/game-doomchex/sprites/SPSHG0.png b/filter/doom.id/sprites/SPSHG0.png similarity index 100% rename from filter/game-doomchex/sprites/SPSHG0.png rename to filter/doom.id/sprites/SPSHG0.png diff --git a/filter/game-doomchex/sprites/SPSHH0.png b/filter/doom.id/sprites/SPSHH0.png similarity index 100% rename from filter/game-doomchex/sprites/SPSHH0.png rename to filter/doom.id/sprites/SPSHH0.png diff --git a/filter/game-doomchex/sprites/SPSHI0.png b/filter/doom.id/sprites/SPSHI0.png similarity index 100% rename from filter/game-doomchex/sprites/SPSHI0.png rename to filter/doom.id/sprites/SPSHI0.png diff --git a/filter/game-doomchex/sprites/SPSHJ0.png b/filter/doom.id/sprites/SPSHJ0.png similarity index 100% rename from filter/game-doomchex/sprites/SPSHJ0.png rename to filter/doom.id/sprites/SPSHJ0.png diff --git a/filter/game-doomchex/sprites/SPSHK0.png b/filter/doom.id/sprites/SPSHK0.png similarity index 100% rename from filter/game-doomchex/sprites/SPSHK0.png rename to filter/doom.id/sprites/SPSHK0.png diff --git a/filter/doom.id/swwmgamesupported.txt b/filter/doom.id/swwmgamesupported.txt new file mode 100644 index 000000000..b047bb487 --- /dev/null +++ b/filter/doom.id/swwmgamesupported.txt @@ -0,0 +1 @@ +Commercial Doom diff --git a/filter/game-heretic/graphics/Achievements/AchievementFriend.png b/filter/heretic/graphics/Achievements/AchievementFriend.png similarity index 100% rename from filter/game-heretic/graphics/Achievements/AchievementFriend.png rename to filter/heretic/graphics/Achievements/AchievementFriend.png diff --git a/filter/heretic/swwmgamesupported.txt b/filter/heretic/swwmgamesupported.txt new file mode 100644 index 000000000..af69613ad --- /dev/null +++ b/filter/heretic/swwmgamesupported.txt @@ -0,0 +1 @@ +Heretic diff --git a/filter/game-hexen/graphics/Achievements/AchievementFriend.png b/filter/hexen/graphics/Achievements/AchievementFriend.png similarity index 100% rename from filter/game-hexen/graphics/Achievements/AchievementFriend.png rename to filter/hexen/graphics/Achievements/AchievementFriend.png diff --git a/filter/game-hexen/graphics/Achievements/AchievementPlush.png b/filter/hexen/graphics/Achievements/AchievementPlush.png similarity index 100% rename from filter/game-hexen/graphics/Achievements/AchievementPlush.png rename to filter/hexen/graphics/Achievements/AchievementPlush.png diff --git a/filter/hexen/swwmgamesupported.txt b/filter/hexen/swwmgamesupported.txt new file mode 100644 index 000000000..618936539 --- /dev/null +++ b/filter/hexen/swwmgamesupported.txt @@ -0,0 +1 @@ +Hexen diff --git a/language.def_base b/language.def_base index 04aa6051d..d1ce7cdc8 100644 --- a/language.def_base +++ b/language.def_base @@ -194,11 +194,16 @@ QUITMSG17 = "Butt bots gonna bot."; QUITMSG18 = "WHO IN THEIR RIGHT MIND\nWOULD FROST A CAKE WITH THEIR BUTT?"; QUITMSG19 = "World hard and cold,\ntiddy soft and warm."; // startup (don't localize) -STARTUP1 = " "; -STARTUP2 = " \ck★\cf∼\c- \cvDemo-chan says\c- \cf∼\ck★\c-"; -STARTUP3 = " "; -STARTUP4 = " \ck★\cf∼\c- \cvTERFs can fuck off\c- \cf∼\ck★\c-"; -STARTUP5 = " "; +STARTUP1 = +"\n" +" \ck★\cf∼\c- \cvDemo-chan says\c- \cf∼\ck★\c-\n" +"\n" +" \ck★\cf∼\c- \cvTERFs can fuck off\c- \cf∼\ck★\c-\n" +"\n"; +STARTUP2 = ""; +STARTUP3 = ""; +STARTUP4 = ""; +STARTUP5 = ""; // Re-tagged monsters FN_ZOMBIE_FUNN = "5"; FN_ZOMBIE_FUN1 = "Zomb"; diff --git a/language.version b/language.version index 9ceacb18b..78b8720bd 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r542 \cu(Mon 14 Jun 21:43:49 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r542 \cu(2021-06-14 21:43:49)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r543 \cu(Wed 16 Jun 17:47:21 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r543 \cu(2021-06-16 17:47:21)\c-"; diff --git a/sndinfo.txt b/sndinfo.txt index d60033b53..c5bf050bb 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -1,6 +1,12 @@ $pitchshiftrange 0 -crash/crash sounds/DUCK.ogg +crash/crash1 sounds/DUCK.ogg +crash/crash2 sounds/BORK98.ogg +crash/crash3 sounds/BORKXP.ogg +crash/crash4 sounds/GNOME.ogg +crash/crash5 sounds/RANCEMIFT.ogg +crash/crash6 sounds/ONO.ogg +$random crash/crash { crash/crash1 crash/crash2 crash/crash3 crash/crash4 crash/crash5 crash/crash6 } crash/glass sounds/GLASSCRK.ogg crash/curb sounds/CURB.ogg brutal/ezmodo sounds/EASYMODO.ogg @@ -9,6 +15,7 @@ haha/dab sounds/DAB.ogg bruh sounds/BRUH.ogg squeak sounds/SQUEAK.ogg recordscratch sounds/RECSCRAP.ogg +compat/warn sounds/UTWARN.ogg saya/giggle1 sounds/saya/saya_giggle1.ogg saya/giggle2 sounds/saya/saya_giggle2.ogg diff --git a/sounds/BORK98.ogg b/sounds/BORK98.ogg new file mode 100644 index 000000000..ec2b9d509 Binary files /dev/null and b/sounds/BORK98.ogg differ diff --git a/sounds/BORKXP.ogg b/sounds/BORKXP.ogg new file mode 100644 index 000000000..6a8313d37 Binary files /dev/null and b/sounds/BORKXP.ogg differ diff --git a/sounds/GNOME.ogg b/sounds/GNOME.ogg new file mode 100644 index 000000000..94e8caf54 Binary files /dev/null and b/sounds/GNOME.ogg differ diff --git a/sounds/ONO.ogg b/sounds/ONO.ogg new file mode 100644 index 000000000..b3ae4b599 Binary files /dev/null and b/sounds/ONO.ogg differ diff --git a/sounds/RANCEMIFT.ogg b/sounds/RANCEMIFT.ogg new file mode 100644 index 000000000..6414f2fed Binary files /dev/null and b/sounds/RANCEMIFT.ogg differ diff --git a/sounds/UTWARN.ogg b/sounds/UTWARN.ogg new file mode 100644 index 000000000..65e4027c2 Binary files /dev/null and b/sounds/UTWARN.ogg differ diff --git a/zscript/compat/swwm_hdoom.zsc b/zscript/compat/swwm_hdoom.zsc index d11fb3d5b..a55f47df8 100644 --- a/zscript/compat/swwm_hdoom.zsc +++ b/zscript/compat/swwm_hdoom.zsc @@ -28,13 +28,13 @@ Class SWWMHDoomHandler : StaticEventHandler return; SetRandomSeed[hdscreen](Random[hdscreen]()+consoleplayer+MSTime()); Console.Printf( - "\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\n" - "\cx┃ \cfOh my, someone appears to be \cgH \ckO \cdR \cvN \chY \ct♥ \cx┃\n" - "\cx┃ \cfWell, all you'll be getting here is the power of headpats. \cx┃\n" - "\cx┃ \cfIf you want Demo-chan to actually fuck some hot demon girls, \cx┃\n" - "\cx┃ \cfjust go commission a porn artist or something, idk. \cx┃\n" - "\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛"); - SWWMUtility.MarkAchievement('swwm_achievement_hdoom',players[consoleplayer]); + "\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\c-\n" + "\cx┃ \cfOh my, someone appears to be \cgH \ckO \cdR \cvN \chY \ct♥ \cx┃\c-\n" + "\cx┃ \cfWell, all you'll be getting here is the power of headpats. \cx┃\c-\n" + "\cx┃ \cfIf you want Demo-chan to actually fuck some hot demon girls, \cx┃\c-\n" + "\cx┃ \cfjust go commission a porn artist or something, idk. \cx┃\c-\n" + "\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\c-"); + S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); } override void WorldLoaded( WorldEvent e ) diff --git a/zscript/compat/swwm_shame.zsc b/zscript/compat/swwm_shame.zsc index 761b395fa..4de31b6df 100644 --- a/zscript/compat/swwm_shame.zsc +++ b/zscript/compat/swwm_shame.zsc @@ -31,15 +31,15 @@ Class SWWMBrutalHandler : StaticEventHandler return; SetRandomSeed[bdscreen](Random[bdscreen]()+consoleplayer+MSTime()); Console.Printf( - "\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\n" - "\cx┃ \cfIf you have BD on your autoload you really shouldn't. \cx┃\n" - "\cx┃ \cfIf you manually loaded it with this mod, why would you? \cx┃\n" - "\cx┃ \cfThey're not compatible and never will be. \cx┃\n" - "\cx┃ \cfThis mod will now shit the bed once you go in-game, \cx┃\n" - "\cx┃ \cfand trust me, it's better this way. \cx┃\n" - "\cx┃ \cf \cx┃\n" - "\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛"); - SWWMUtility.MarkAchievement('swwm_achievement_broccolidoccoli',players[consoleplayer]); + "\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\c-\n" + "\cx┃ \cfIf you have BD on your autoload you really shouldn't. \cx┃\c-\n" + "\cx┃ \cfIf you manually loaded it with this mod, why would you? \cx┃\c-\n" + "\cx┃ \cfThey're not compatible and never will be. \cx┃\c-\n" + "\cx┃ \cfThis mod will now shit the bed once you go in-game, \cx┃\c-\n" + "\cx┃ \cfand trust me, it's better this way. \cx┃\c-\n" + "\cx┃ \cf \cx┃\c-\n" + "\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\c-"); + S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); } override void WorldLoaded( WorldEvent e ) diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc index 7c5e114c5..deea49ffa 100644 --- a/zscript/dlc1/swwm_ammoitems_dlc.zsc +++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc @@ -338,8 +338,8 @@ Class RayBolt : MagAmmo Inventory.PickupMessage "$T_RAYBOLT"; Inventory.Icon "graphics/HUD/Icons/A_RayBolt.png"; MagAmmo.ParentAmmo "RayAmmo"; - MagAmmo.ClipSize 20; - Inventory.MaxAmount 25; + MagAmmo.ClipSize 10; + Inventory.MaxAmount 15; +FLOATBOB; FloatBobStrength 0.25; } @@ -392,9 +392,9 @@ Class RayAmmo : Ammo Stamina 150000; Inventory.Icon "graphics/HUD/Icons/A_RayAmmo.png"; Inventory.Amount 1; - Inventory.MaxAmount 3; + Inventory.MaxAmount 5; Ammo.BackpackAmount 0; - Ammo.BackpackMaxAmount 6; + Ammo.BackpackMaxAmount 9; Ammo.DropAmount 1; +FLOATBOB; FloatBobStrength 0.25; @@ -436,7 +436,6 @@ Class RayBattery : Ammo Ammo.BackpackAmount 0; Ammo.BackpackMaxAmount 4; Ammo.DropAmount 1; - +INVENTORY.IGNORESKILL; +FLOATBOB; FloatBobStrength 0.25; Accuracy 90; diff --git a/zscript/swwm_statichandler.zsc b/zscript/swwm_statichandler.zsc index 8f7268d7e..547dd26d2 100644 --- a/zscript/swwm_statichandler.zsc +++ b/zscript/swwm_statichandler.zsc @@ -124,6 +124,17 @@ Class SWWMStaticHandler : StaticEventHandler let cv = CVar.FindCVar('swwm_voicetype'); if ( types.Find(cv.GetString()) >= types.Size() ) cv.SetString("default"); + // warning for unsupported + if ( Wads.FindLump("swwmgamesupported.txt") != -1 ) return; + Console.Printf( + "\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\c-\n" + "\cx┃ \cr[\cgWARNING\cr] \cx┃\c-\n" + "\cx┃ \chSWWM \czGZ \cjis \cfNOT\cj compatible with the loaded IWAD. \cx┃\c-\n" + "\cx┃ \cjOnly \cfDoom\cj, \cfHeretic\cj and \cfHexen\cj are supported. \cx┃\c-\n" + "\cx┃ \cjIssues \cfCAN\cj and \cfWILL\cj happen. \cx┃\c-\n" + "\cx┃ \cr[\cgYOU ARE ON YOUR OWN\cr] \cx┃\c-\n" + "\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\c-"); + S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE); } override void ConsoleProcess( ConsoleEvent e )