1.1 release.

FuturePlans.md

@@ -1,4 +1,18 @@
-This is just a bit of *"future planning"* for stuff that I ***might*** add after the first release.
+This is just a bit of *"future planning"* for stuff that I ***might*** add later on.
+
+## 1.2 update *(A Needed Change)*:
+
+I REALLY need to do this, it's starting to become very problematic to maintain the Demolitionist Menu as-is.
+
+* **Demolitionist Menu Refactor:**
+  - Non 16:10 ratio support
+  - Smooth scrolling, better mouse input
+  - Much cleaner code, easier maintenance and extension
+  - Modular design, add-on tab support
+
+## 1.3 update *(The Second Batch)*:
+
+More weapons, because we need 'em.
 
 * **DLC Weaponset:**
   - [1] Itamex Reinforced Hammer *(UnSX 5)*
@@ -21,15 +35,25 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add after
     - The Most Silent Takedown *(Kill 30 enemies with the Ray-Khom primary without alerting them)*
   - [0] Grand Lance *(SWWM Iridium)*
     - Penetrator *(Strike through 20 enemies in a row with a single Grand Lance secondary)*
+
+## 1.4 update *(Arsenal Appendix)*:
+
+A couple extra weapons, not enough for a full batch, but still worthy additions.
+
 * **DLC Weaponset 2:**
   - [1] Hand of Divine *(Total Madness)*
     - Facepunching Extraordinaire *(Kill 300 enemies with the Hand of Divine)*
   - [6] Sparkster x3 *(UnSX 2)*
-    - A Fine Sparking *(Kill 50 enemies at once with a Sparkster Rifle combo shot)*
+    - A Fine Sparking *(Kill 30 enemies at once with a Sparkster Rifle combo shot)*
   - [9] Mortal Rifle *(UnSX 2)*
-    - Railed Hard *(Shoot through 30 enemies with a single Mortal Rifle overpressure shot)*
+    - Railed Hard *(Shoot through 16 enemies with a single Mortal Rifle overpressure shot)*
   - [0] Rafan-Kos *(UnSX 4)*
     - Blasting Ropes *(Melt a grand total of 1000 enemies with the Rafan-Kos)*
+
+## 1.5 update *(The Final Stage)*:
+
+All the hard stuff *(some of these aren't guaranteed)*.
+
 * **DLC Gameset:**
   - Tetris
   - Pong
@@ -37,70 +61,6 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add after
   - **[Doom]** Demo Land Adventure *(platformer with shooty gameplay)*
   - **[Heretic]** Interstellar Demolitionist *(a somewhat simple vertical SHMUP, kinda Touhou styled)*
   - **[Hexen]** Demolition Quest *(a JRPG, kinda like early FF / BoF)*
-* **More collectibles (some of which were initially planned but didn't make it in time):**
-  - [Doom] Moth Plushy *("She loves a good lämp")*
-  - [Doom] AA-12 *("Ibuki's favorite shotgun. It's just a collectible model, so it doesn't actually shoot")*
-  - [Doom] Hege Cactus *("Appears to absorb all water, causing intense thirst")*
-  - [Doom] Hoagie *("Can't eat it, but looks delicious")*
-  - [Doom] Red Oni Milk *("It's a bit too obvious, isn't it?")*
-  - [Doom] Black Rat's Coven - Counter-Inquisition *("Man is this some good music")*
-  - [Heretic] Manarock *("A delicacy for gods, but instantly deadly for mortals")*
-  - [Heretic] Lithium - Volume One *("A work of art, one of the finest graphic novels")*
-  - [Hexen] Psykkonovexx *("Some crazy-ass Anarukon instrument, sounds amazing though")*
-* **More items:**
-  - [Heretic/Hexen] Safety Tether *(Original)*
-    - Sneaky Retreat *(Use 10 Safety Tethers)*
-  - Devastation Sigil *(SWWM)*
-    - Deva Station *(Use 10 Devastation Sigils)*
-  - Divine Sprite *(SWWM Platinum)*
-    - Divine Delight *(Use 10 Divine Sprites)*
-* **More achievements:**
-  - Piece of Candy *(Collect 1000 nuggets)*
-  - Kaboom *(Kill 30 enemies with planted Explodium Mags)*
-  - Pacifist *(Finish a map without dealing damage)*
-  - Untouchable *(Finish a map without taking damage)*
-  - Under Pressure *(Break a crusher)*
-  - The Longest Journey *(Walk a total of 1000km)*
-  - Mishe Trickery *(Successfully input a cheat code)*
-  - ...And a Dream *(Kill 10 enemies while having only 1 HP)*
-  - In a Hurry *(Beat a map with 0% kills, items and secrets)*
-  - Deadeye *(Land 7 consecutive Explodium Gun shots without missing)*
-  - Thorough Tenderizing *(Kill 100 enemies with the Pusher)*
-  - [Doom] Graffiti Master *(Doodle mustaches on 20 demon faces)*
-  - [Doom] Goodbye Franchise *(Rescue Commander Keen)*
-  - [Doom] Taking out the Trash *(Kill all Nazis in the Doom 2 secret maps)*
-  - [Doom] Environmental Disaster *(Destroy 1000 barrels)*
-  - [Doom] Cyberbullying *(Kill a Cyberdemon with its own rocket)*
-  - [Doom] Oh That's a Baseball *(Perfect parry a Lost Soul with the Silver Bullet)*
-  - [Doom] Dynamic Duo *(Defeat the Bruiser Brothers)*
-  - [Doom] Huge Guts *(Defeat the Tyrant of Babel)*
-  - [Doom] All Brain *(Defeat the Spider Mastermind)*
-  - [Doom] More Brain *(Defeat the Spider Sibling)*
-  - [Doom] Final Cleanup *(Complete Baphomet's Challenge)*
-  - [Doom] Simply Dead *(Defeat the Demonic Biomech Squad)*
-  - [Doom] Titan's Fall *(Defeat the Icon of Sin)*
-  - [Doom] Shot Until Dead *(Defeat the Last Tyrant)*
-  - [Doom] Evil Eternal *(Defeat the Archangelus)*
-  - [Doom] A Gazebo Most Insane *(Conquer the Sundered Realms)*
-  - [Heretic] What The Fuck? *(Punch a tornado???)*
-  - [Heretic] Crazy Heads *(Defeat the Iron Liches)*
-  - [Heretic] A Load of Bull *(Defeat the Maulotaur Servants)*
-  - [Heretic] Abracadabra I Win *(Defeat D'Sparil)*
-  - [Heretic] What's So Funny? *(Defeat the Iron Liches... again)*
-  - [Heretic] Big Mooscles *(Defeat the Maulotaur Servants... again)*
-  - [Hexen] Even Kirin is Upset *(Solve 20 "puzzles")*
-  - [Hexen] Extreme Kancho *(Break a stone spike)*
-  - [Hexen] It Just Works *(Defeat the Death Wyvern)*
-  - [Hexen] Magic Shmagic *(Defeat the Heresiarch)*
-  - [Hexen] You Again? *(Defeat another Heresiarch)*
-  - [Hexen] Domination *(Defeat Zedek)*
-  - [Hexen] Excommunication *(Defeat Traductus)*
-  - [Hexen] I Hate Puzzles *(Defeat Menelkir)*
-  - [Hexen] Worship This *(Defeat Korax)*
-  - [Hexen] Another One *(Defeat yet another Heresiarch)*
-  - [Hexen] And Another One *(Defeat... yup, one more Heresiarch)*
-  - [Hexen] The Last One *(Defeat the last Heresiarch)*
-  - [Hexen] Didn't I Kick Your Ass Before? *(Defeat the Deathkings)*
 * **Mothgirl summon for Lämp easter egg**
   - Layers of White *(Summon the White Lady)*
 * **Replace all hitscan with *"light projectiles"***
@@ -116,28 +76,51 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add after
   - Giggle
   - Shrug
   - Beckon
+* **Photo Mode**
+  - Dedicated poses
+  - Stickers
+* **Virtual Training Map**
+  - Featuring Maidbot as assistant
+
+## Unspecified
+
+Things that I'm unsure whether or not they'll be made.
+
 * **Japanese localization???**
 * ***(Maybe)* Fake livestream chat overlay, with dynamic reactions to all sorts of stuff**
 * **Customized cluster text stuff if that ever gets scriptified**
 * **Official Sunder support *(when the WAD is complete)***
-* **Photo Mode**
-  - Dedicated poses
-  - Stickers
+* **Original English Voice Acting**
+
+## Other Projects
+
+Add-ons and other related stuff.
+
 * **Monster/decoration replacements add-on:**
   - Potentially standalone, usable with other mods
   - Balanced for this mod
   - Unique bosses
   - Some extra enemy variants
-  - Coverage for all supported IWADs *(oof)*
-* **Original English Voice Acting:**
-  - Demolitionist
-  - Ibuki
-  - Saya
-  - Kirin
-* **Ibuki sub-mod *(Red Oni)***
-* **Saya sub-mod *(Red-Eyed Rampage)***
-* **Kirin sub-mod *(Red Star of Innocence)***
-* **Hardcore Mode sub-mod:**
+  - Coverage for all supported WADs *(oof)*
+* **Ibuki side mod *(Red Oni):***
+  - A more *"mundane"* arsenal
+  - Featuring a very big girl with very big... Assets
+  - Possibly will have its own DLC Weaponset too
+  - Featuring a toggleable companion
+  - Nudity, in a Doom mod? Wow, never seen that one before
+  - This one's surprisingly meant to be more of a power trip than SWWM GZ
+* **Saya side mod *(Red-Eyed Rampage)***
+  - The first mod where you play as a mere squishy person
+  - Spellcasting!
+  - A more interesting take on "infinite lives"
+  - Featuring the Pancor Jackhammer *(lol)*
+* **[Hexen]** **Kirin side mod *(Red Star of Innocence)***
+  - Finally, you get to play as the precious femboy emperor
+  - Designed entirely for Hexen's funky gameplay™
+  - Watch as our boy complains about *"puzzles"*
+  - Some unique touches to spice things up
+  - Basically a lite version of what you could expect in **UNDEATH**
+* ***(Maybe)* Hardcore Mode sub-mod:**
   - Featuring Demolitionist on Maidbot frame
   - More complex game mechanics
   - Manual Hammerspace management

README.md

@@ -405,13 +405,32 @@ A floating lamp companion, may attract moths. The moths will disperse and attack
 
 Reveals the entire layout of the map and shows key locations in the HUD. Also allows you to highlight pickups through walls when holding the **Item Sense** button.
 
-### Mykradvo Artifact ~ May randomly replace Ghost Artifact, Ragekit or Invinciball
+### Safety Tether ~ Replaces Chaos Device
+![](docimg/tether.png)
+
+On use, teleports you back to the start of the map. Basically acts exactly the same as a Chaos Device, although it also resets you to max health should you be under the weather. Additionally it also generates shockwaves on both ends, making your escape more dramatic.
+
+### Mykradvo Artifact ~ May randomly replace Ghost Artifact or Invinciball
 ![](docimg/mykradvo.png)
 
 When used, bursts into plasma tendrils that will seek all visible hostiles within 100m and fry them good. If there are no hostiles around, the artifact will simply not ignite.
 
 Has a chance to spawn in place of other items, but only one may spawn per map. Cannot be bought due to its rarity.
 
+### Divine Sprite ~ May randomly replace Grilled Cheese Sandwich
+![](docimg/sprite.png)
+
+Rapidly boosts your health dramatically, for 50 seconds. Its effects will obviously fade afterwards. Your HUD can't exactly report your actual health, but it's assumed this goes way beyond the one thousand cap, somehow.
+
+Only one may spawn per map, and you can't buy these either. If you manage to fetch one, use it wisely.
+
+### Devastation Sigil ~ May randomly replace Ragekit
+![](docimg/deva.png)
+
+50 seconds of absolute destructive potential for any damage you may deal, including to yourself (so be careful).
+
+Same conditions as the other two. Make sure you find the perfect chance to unleash this beast.
+
 ## The Collectibles
 ![](docimg/chancebox.png)
 
@@ -449,6 +468,11 @@ A perfectly generic cube. It is exactly 128mm across each side, sports a pure gr
 
 Eats your snacks and calls you a horny. Emits a giggle when you squeeze it. Yet another of Nukritas 2xx's little handcrafted dolls. May or may not be really haunted.
 
+### Mashiro Plush
+![](docimg/mothplushy.png)
+
+A cute plush doll of Saya's favorite moth girl. Apparently the Nukritas brothers give her one of these every time they piss her off, so she's got an entire pile in her bedroom. It appears that this one bears with it some sort of "contract", whatever that means.
+
 ### Demolitionist Plush (Heretic)
 ![](docimg/demoplush.png)
 

Roadmap.md

@@ -1,50 +0,0 @@
-~~**Swimming in Jizz:**~~
-
- - ~~This is where I make all the stuff before beta.~~
- - ~~It's been over nine months already, still a shorter dev time than my previous projects.~~
-
-~~**Icarus pls play:**~~
-
- - ~~Beta release.~~
- - ~~Finetuning the basics, rebalances, etc.~~
- - ~~See if I can add those damn swimming anims.~~
- - ~~Beg more artists for intermission fanart.~~
- - ~~Stuff to maybe add during this stage: Explodium Guns akimbo, Quick grenade.~~
- - ~~Collectibles. Froggy Chair was only the beginning.~~
-
-**Cutie Robutt Adventures:**
-
- - Going Gold™.
- - Think about the future. There are lots of things I could do now *(see FuturePlans.md)*.
-
-**Extra Funtimes:**
-
- - Extra Collectibles and Achievements.
- - DLC weaponset.
- - DLC minigame set.
-
-**LODS OF LORE:**
-
- - Finish writing all those damn side stories.
- - Make 'em fancy, maybe add some lil' art to them.
-
-**Funny Fellas:**
-
- - Monster/decoration replacement packs. All of it modeled and tweaked to fit the style and theme of the mod. Expect enhanced enemy behavior, not gonna keep it "vanilla".
- - Ibuki, Saya and Kirin companions.
- - Porting weapons to Hideous Destructor as a meme:
-   - Explodium Gun
-   - Wallbuster
-   - Biospark Carbine
-   - Silver Bullet JET
-
-**A Vast New World (2.0):**
-
- - Hardcore mode (separate mod).
- - DLC weaponset 2.
- - DLC itemset.
- - Official mapset.
-
-**At this point I'm just making shit up:**
-
- - Official comic.

TODO.md

@@ -1,21 +0,0 @@
-**Extra things after release:**
-
- - DLC weaponset
- - Additional collectibles not added due to time constraints
- - Additional achievements
- - "White Lady" rare Lämp spawn
- - More intermission art (shamefully e-begging on Twitter as usual orz)
- - Extra localizations (including Japanese)
- - Mod trailer video (doubt I'd be able to, I might ask someone instead)
- - Rewrite the entire Demolitionist Menu code from the ground up to be more easily extensible and adapt to any window size
- - Figure out what needs to be changed in player code to not desync in mp with prediction enabled
- - Hexen key and puzzle item models?
- - DLC itemset
- - DLC gameset
-
-**Very extra things for the future:**
-
- - Modeled Monster/Decoration replacers for all IWADs done in the style of the mod (will be very time consuming)
- - Another DLC weaponset
- - Official DM map pack
- - Official IWAD

achievements.lst

@@ -8,47 +8,38 @@
 #  gametype: the game this belongs to (any, doom, heretic, hexen, raven, etc.)
 acid,50,yes,any
 allcoll,-1,no,any
-allitems,30,yes,any
-allkills,30,yes,any
+allitems,30,yes,nothexen
+allkills,30,yes,nothexen
 allsecrets,30,yes,nothexen
 anom,10,yes,any
 anone,0,no,any
 balls,10,yes,any
-#barrel,1000,yes,doom
+barrel,1000,yes,doom
 barrier,20,yes,doom
-#baseball,0,no,doom
+baseball,0,no,doom
+blaze,0,no,nothexen
 bonk,300,yes,any
 bossdash,5,yes,any
 brake,10,yes,any
 bune,500,yes,any
 bustin,50,yes,any
 butts,100,yes,any
-#candy,1000,yes,any
-#cheat,0,no,any
+candy,1000,yes,any
+cheat,0,no,any
 cliffyb,0,no,nothexen
 clonk,0,no,any
 conga,10,yes,any
-#crush,0,no,any
-#cybully,0,no,doom
+crush,0,no,any
+cybully,0,no,doom
 #cum,1000,yes,any
 #dab,200,yes,any
 #dakka,60,no,any
-#deadeye,7,yes,any
-#deva,10,yes,any
+deadeye,7,yes,any
+deva,10,yes,any
 dime,0,no,any
-#divine,10,yes,any
-#doodle,20,yes,doom
+divine,10,yes,any
+doodle,20,yes,doom
 dosh,1000000000,no,any
-#doomboss1,0,no,doom
-#doomboss2,0,no,doom
-#doomboss3,0,no,doom
-#doomboss4,0,no,doom
-#doomboss5,0,no,doom
-#doomboss6,0,no,doom
-#doomboss7,0,no,doom
-#doomboss8,0,no,doom
-#doomboss9,0,no,doom
-#doomboss10,0,no,doom
 everything,0,no,any
 ezkill,50,yes,any
 #fisto,300,yes,any
@@ -62,29 +53,13 @@ ghost,30,yes,any
 gib,1500,yes,any
 golden,24,yes,any
 gravity,10,yes,raven
-#grenade,30,yes,any
-#hereticboss1,0,no,heretic
-#hereticboss2,0,no,heretic
-#hereticboss3,0,no,heretic
-#hereticboss4,0,no,heretic
-#hereticboss5,0,no,heretic
-#hexenboss1,0,no,hexen
-#hexenboss2,0,no,hexen
-#hexenboss3,0,no,hexen
-#hexenboss4,0,no,hexen
-#hexenboss5,0,no,hexen
-#hexenboss6,0,no,hexen
-#hexenboss7,0,no,hexen
-#hexenboss8,0,no,hexen
-#hexenboss9,0,no,hexen
-#hexenboss10,0,no,hexen
-#hexenboss11,0,no,hexen
+grenade,30,yes,any
 #hnd,6,yes,any
-#hurry,0,no,any
+hurry,0,no,any
 #ice,40,yes,any
 jump,150,yes,any
-#kancho,0,no,hexen
-#keen,0,no,doom
+kancho,0,no,hexen
+keen,0,no,doom
 lead,1500,yes,any
 #lightning,0,no,any
 ligma,0,no,any
@@ -93,20 +68,20 @@ love,10,yes,any
 mbf,0,no,doom
 mega,10000,yes,any
 moth,50,yes,any
-nice,0,no,any
+nice,0,no,nothexen
 oneguy,0,no,any
-#onehp,10,yes,any
-onestanding,0,no,any
+onehp,10,yes,any
+onestanding,0,no,nothexen
 oopsie,0,no,any
 par,15,yes,nothexen
 parry,200,yes,any
-#peace,0,no,any
+peace,0,no,nothexen
 #pene,20,yes,any
 #plasma,50,yes,any
 plush,10,yes,any
-#puzzle,20,yes,hexen
+puzzle,0,no,hexen
 rage,20,yes,any
-#rail,30,yes,any
+#rail,16,yes,any
 reflect,20,yes,any
 refresh,30,yes,any
 #roast,50,yes,any
@@ -117,20 +92,20 @@ shame,0,no,any
 shock,30,yes,any
 slayer,40,yes,any
 slemg,100,yes,any
-#sneaky,10,yes,raven
+sneaky,10,yes,raven
 sneeze,20,yes,any
-#spark,50,yes,any
+#spark,30,yes,any
 step,30,yes,any
 stomp,50,yes,any
 sunny,15,yes,any
 tele,0,no,any
-#tender,100,yes,any
+tender,100,yes,any
 thicc,100,yes,any
 thruwall,20,yes,any
-#tornado,0,no,heretic
-#trash,0,no,doom
-#travel,1000,yes,any
-#untouchable,0,no,any
+tornado,0,no,heretic
+trash,0,no,doom
+travel,1000,yes,any
+untouchable,0,no,nothexen
 wantdie,0,no,any
 wave,0,no,any
 yeet,0,no,doom

credits.txt

@@ -16,6 +16,7 @@ Most of the work here is original, but there are some notable exceptions:
    * Dark Souls
    * Dark Souls 2
    * Dark Souls 3
+ - In addition, a whole lot of stock sounds and internet meme sounds have also been used.
  - Some sprites and sounds are taken from (shareware) Wolfenstein 3D.
  - This mod uses Gutamatics, by Gutawer. Big thanks.
  - Title theme, "Traumatic State", by Teque (which a lot of people just know as "the AS-Golgotha music").

cvarinfo.achievements

@@ -3,8 +3,6 @@
 // cross-session achievement cvars (0: locked, 1: unlocked, 2: notified)
 nosave int swwm_achievement_acid = 0;
 nosave int swwm_achievement_allcoll = 0;
-nosave int swwm_achievement_allitems = 0;
-nosave int swwm_achievement_allkills = 0;
 nosave int swwm_achievement_anom = 0;
 nosave int swwm_achievement_anone = 0;
 nosave int swwm_achievement_balls = 0;
@@ -51,13 +49,10 @@ nosave int swwm_achievement_love = 0;
 nosave int swwm_achievement_mashiro = 0;
 nosave int swwm_achievement_mega = 0;
 nosave int swwm_achievement_moth = 0;
-nosave int swwm_achievement_nice = 0;
 nosave int swwm_achievement_oneguy = 0;
 nosave int swwm_achievement_onehp = 0;
-nosave int swwm_achievement_onestanding = 0;
 nosave int swwm_achievement_oopsie = 0;
 nosave int swwm_achievement_parry = 0;
-nosave int swwm_achievement_peace = 0;
 nosave int swwm_achievement_pene = 0;
 nosave int swwm_achievement_plasma = 0;
 nosave int swwm_achievement_plush = 0;
@@ -83,14 +78,11 @@ nosave int swwm_achievement_tender = 0;
 nosave int swwm_achievement_thicc = 0;
 nosave int swwm_achievement_thruwall = 0;
 nosave int swwm_achievement_travel = 0;
-nosave int swwm_achievement_untouchable = 0;
 nosave int swwm_achievement_wantdie = 0;
 nosave int swwm_achievement_wave = 0;
 // cross-session progress cvars
 nosave int swwm_progress_acid = 0;
 nosave int swwm_progress_allcoll = 0;
-nosave int swwm_progress_allitems = 0;
-nosave int swwm_progress_allkills = 0;
 nosave int swwm_progress_anom = 0;
 nosave int swwm_progress_balls = 0;
 nosave int swwm_progress_bonk = 0;

cvarinfo.base

@@ -1,6 +1,5 @@
 // main mod cvars
 user string swwm_voicetype = "default";		// voice for your demolitionist
-//user color swwm_tagcolor = "40 FF 00";	// color of your model tags, not available due to engine dickery
 nosave float swwm_flashstrength = 1.0;		// strength of screen flashes
 nosave int swwm_hudmargin = 10;			// margin around fullscreen hud elements
 nosave int swwm_maxshown = 4;			// max messages to show normally
@@ -53,7 +52,7 @@ nosave int swwm_scrscale = 2;			// score scaling (0 = use GZDoom scaling)
 nosave int swwm_numscale = 3;			// damnum scaling (0 = use GZDoom scaling)
 nosave int swwm_poiscale = 1;			// point of interest scaling (0 = use GZDoom scaling)
 nosave int swwm_detscale = 2;			// item sense scaling (0 = use GZDoom scaling)
-server bool swwm_blood = false;			// custom blood/gibbing
+server bool swwm_blood = true;			// custom blood/gibbing
 server int swwm_maxblood = 400;			// max blood effects at any time
 server int swwm_maxgibs = 100;			// max gibs at any time
 server int swwm_maxcasings = 200;		// max casings and spent mags at any time
@@ -69,7 +68,7 @@ server bool swwm_notrack = false;		// disables all combat tracking (useful to sp
 server bool swwm_ynykronalert = false;		// caps ynykron alert (so it doesn't wake everyone up)
 nosave bool swwm_menupause = true;		// pause the game when demolitionist menu is open
 nosave noarchive bool swwm_debugblast = false;	// debug visual aid for DoExplosion
-nosave bool swwm_funtags = false;		// replace vanilla monster names with silly ones
+nosave bool swwm_funtags = true;		// replace vanilla monster names with silly ones
 server bool swwm_omnibust = false;		// add wallbusting effect to all weapons
 server bool swwm_superfuel = false;		// enable unlimited fuel
 server bool swwm_partytime = false;		// killed enemies burst into confetti
@@ -87,10 +86,10 @@ nosave bool swwm_camhud = false;		// keep full hud visible when operating camera
 server bool swwm_uncapalert = false;		// all noise alerts have infinite range
 nosave int swwm_damagetarget = 1;		// conditional healthbar hiding (1 - hide until damage is first taken, 2 - hide if at full health)
 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_silencemap = false;		// silences the map when all kills/items/secrets are achieved
+server bool swwm_silencemap = true;		// silences the map when all kills/items/secrets are achieved
 nosave int swwm_shadowdist = 2000;		// max distance beyond which blob shadows are no longer rendered, helps performance
 server bool swwm_swapweapons = true;		// [DLC1] allows carrying only one weapon in each slot (excluding starter melee)
-nosave int swwm_forcestats = 0;			// always shows level stats on the HUD, not just when the automap is open (2 - also show map name, otherwise only stats)
+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_pistolstart = 0;		// enforces pistol start for all maps (excluding hubs) [2 - only between clusters]
 nosave int swwm_numcolor_scr = 5;		// font color for score numbers (default: gold)
@@ -99,8 +98,8 @@ nosave int swwm_numcolor_dmg = 6;		// font color for damage numbers (default: re
 nosave int swwm_numcolor_hp = 7;		// font color for health numbers (default: blue)
 nosave int swwm_numcolor_ap = 3;		// font color for armor numbers (default: green)
 server int swwm_drlaskill = 3;			// [DRLA Monsters] skill setting for monster spawns
-nosave bool swwm_itemsparkles = false;		// visual aid for low visibility items
-nosave bool swwm_itemglows = false;		// distant items glow
+nosave bool swwm_itemsparkles = true;		// visual aid for low visibility items
+nosave bool swwm_itemglows = true;		// distant items glow
 server bool swwm_singlefirst = false;		// single weapons are selected before dual ones, has to be a server cvar due to limitations
 nosave bool swwm_uniqstats = false;		// only list stats from the same map once, rather than for each single visit
 nosave int swwm_filterachievements = 1;		// filter for achievements at 0%: 0 - no filter, 1 - obscure text, 2 - don't show
@@ -108,14 +107,18 @@ nosave noarchive bool swwm_debugview = false;	// debug visual aid for various th
 nosave noarchive bool swwm_oldcheat = false;	// set to true if you used a SWWM Platinum cheat, so the easter egg only appears once per session
 server bool swwm_selflight = true;		// player emits light
 server bool swwm_usetopickup = false;		// allow item pickup only by pressing use
-server bool swwm_meleepickup = false;		// allow picking up items through melee
+server bool swwm_meleepickup = true;		// allow picking up items through melee
 nosave bool swwm_buttsfx = true;		// buttslam homerun SFX
 nosave int swwm_sewercount = 0;			// I'm sorry Civvie
-server bool swwm_ondemandammo = false;		// don't spawn ammo for unavailable weapons
+server bool swwm_ondemandammo = true;		// don't spawn ammo for unavailable weapons
 user float swwm_bumpstrength = 1.0;		// intensity of fov bumping
 server bool swwm_nomagdrop = true;		// does not drop spent magazines (the "environmentally conscious" option)
 user bool swwm_autousebarrier = true;		// auto-use elemental coating when standing on damaging floors
 server int swwm_enforceautousebarrier = 0;	// enforced auto-use for coating
+nosave bool swwm_nomapmsg = false;		// disables special map dialogue messages
+nosave bool swwm_weapontooltips = true;		// shows a tooltip on weapon operation when first selected
+nosave string swwm_tooltipshown = "";		// which weapons have already had their tooltips displayed
+nosave noarchive bool swwm_tooltipnote = false;	// set if the note on how to disable tooltips was already displayed
 
 // minimap settings
 nosave bool swwm_mm_enable = true;		// show a minimap below the score counter

filter/game-doom/cvarinfo.doomachievements

@@ -1,29 +1,28 @@
 // doom-exclusive achievements
 
 // cross-session achievement cvars (0: locked, 1: unlocked, 2: notified)
+nosave int swwm_achievement_allitems = 0;
+nosave int swwm_achievement_allkills = 0;
 nosave int swwm_achievement_allsecrets = 0;
 nosave int swwm_achievement_barrel = 0;
 nosave int swwm_achievement_barrier = 0;
 nosave int swwm_achievement_baseball = 0;
+nosave int swwm_achievement_blaze = 0;
 nosave int swwm_achievement_cliffyb = 0;
 nosave int swwm_achievement_cybully = 0;
 nosave int swwm_achievement_doodle = 0;
-nosave int swwm_achievement_doomboss1 = 0;
-nosave int swwm_achievement_doomboss2 = 0;
-nosave int swwm_achievement_doomboss3 = 0;
-nosave int swwm_achievement_doomboss4 = 0;
-nosave int swwm_achievement_doomboss5 = 0;
-nosave int swwm_achievement_doomboss6 = 0;
-nosave int swwm_achievement_doomboss7 = 0;
-nosave int swwm_achievement_doomboss8 = 0;
-nosave int swwm_achievement_doomboss9 = 0;
-nosave int swwm_achievement_doomboss10 = 0;
 nosave int swwm_achievement_keen = 0;
 nosave int swwm_achievement_mbf = 0;
+nosave int swwm_achievement_nice = 0;
+nosave int swwm_achievement_onestanding = 0;
 nosave int swwm_achievement_par = 0;
+nosave int swwm_achievement_peace = 0;
 nosave int swwm_achievement_trash = 0;
+nosave int swwm_achievement_untouchable = 0;
 nosave int swwm_achievement_yeet = 0;
 // cross-session progress cvars
+nosave int swwm_progress_allitems = 0;
+nosave int swwm_progress_allkills = 0;
 nosave int swwm_progress_allsecrets = 0;
 nosave int swwm_progress_barrel = 0;
 nosave int swwm_progress_barrier = 0;

filter/game-heretic/cvarinfo.hereticachievements

@@ -1,17 +1,21 @@
 // heretic-exclusive achievements
 
 // cross-session achievement cvars (0: locked, 1: unlocked, 2: notified)
+nosave int swwm_achievement_allitems = 0;
+nosave int swwm_achievement_allkills = 0;
 nosave int swwm_achievement_allsecrets = 0;
+nosave int swwm_achievement_blaze = 0;
 nosave int swwm_achievement_cliffyb = 0;
 nosave int swwm_achievement_gravity = 0;
-nosave int swwm_achievement_hereticboss1 = 0;
-nosave int swwm_achievement_hereticboss2 = 0;
-nosave int swwm_achievement_hereticboss3 = 0;
-nosave int swwm_achievement_hereticboss4 = 0;
-nosave int swwm_achievement_hereticboss5 = 0;
+nosave int swwm_achievement_nice = 0;
+nosave int swwm_achievement_onestanding = 0;
+nosave int swwm_achievement_peace = 0;
 nosave int swwm_achievement_sneaky = 0;
 nosave int swwm_achievement_tornado = 0;
+nosave int swwm_achievement_untouchable = 0;
 // cross-session progress cvars
+nosave int swwm_progress_allitems = 0;
+nosave int swwm_progress_allkills = 0;
 nosave int swwm_progress_allsecrets = 0;
 nosave int swwm_progress_gravity = 0;
 nosave int swwm_progress_sneaky = 0;

filter/game-hexen/cvarinfo.hexenachievements

@@ -2,21 +2,9 @@
 
 // cross-session achievement cvars (0: locked, 1: unlocked, 2: notified)
 nosave int swwm_achievement_gravity = 0;
-nosave int swwm_achievement_hexenboss1 = 0;
-nosave int swwm_achievement_hexenboss2 = 0;
-nosave int swwm_achievement_hexenboss3 = 0;
-nosave int swwm_achievement_hexenboss4 = 0;
-nosave int swwm_achievement_hexenboss5 = 0;
-nosave int swwm_achievement_hexenboss6 = 0;
-nosave int swwm_achievement_hexenboss7 = 0;
-nosave int swwm_achievement_hexenboss8 = 0;
-nosave int swwm_achievement_hexenboss9 = 0;
-nosave int swwm_achievement_hexenboss10 = 0;
-nosave int swwm_achievement_hexenboss11 = 0;
 nosave int swwm_achievement_kancho = 0;
 nosave int swwm_achievement_puzzle = 0;
 nosave int swwm_achievement_sneaky = 0;
 // cross-session progress cvars
 nosave int swwm_progress_gravity = 0;
-nosave int swwm_progress_puzzle = 0;
 nosave int swwm_progress_sneaky = 0;

gldefs.funstuff

@@ -10,6 +10,10 @@ HardwareShader Texture "models/PerfectlyGeneric.png"
 {
 	Shader "shaders/glsl/PerfectlyGeneric.fp"
 }
+Brightmap Texture "models/MothPlush.png"
+{
+	Map "models/MothPlush_bright.png"
+}
 Brightmap Texture "models/Chancebox.png"
 {
 	map "models/Chancebox_bright.png"

gldefs.misc

@@ -13,6 +13,16 @@ HardwareShader Texture "graphics/HUD/FuelBarS.png"
 	Shader "shaders/glsl/Fuzz_GraySmall2.fp"
 	Texture "noisetex" "textures/graynoise.png"
 }
+HardwareShader Texture "graphics/HUD/HealthBarD.png"
+{
+	Shader "shaders/glsl/HealthBarD.fp"
+	Texture "noisetex" "textures/graynoise.png"
+}
+HardwareShader Texture "graphics/HUD/EnemyBarD.png"
+{
+	Shader "shaders/glsl/HealthBarD.fp"
+	Texture "noisetex" "textures/graynoise.png"
+}
 HardwareShader Texture "graphics/tempbg.png"
 {
 	Shader "shaders/glsl/Fuzz.fp"
@@ -72,6 +82,10 @@ HardwareShader Texture "graphics/Fanart/Marisa6.jpg"
 {
 	Shader "shaders/glsl/Bilinear.fp"
 }
+HardwareShader Texture "graphics/Fanart/Marisa7.jpg"
+{
+	Shader "shaders/glsl/Bilinear.fp"
+}
 HardwareShader Texture "graphics/Fanart/RedeadITA.png"
 {
 	Shader "shaders/glsl/Oversample.fp"

gldefs.pickups

@@ -98,6 +98,45 @@ HardwareShader Texture "models/extra/AnomRingies.png"
 	Shader "shaders/glsl/Mykradvo2.fp"
 	Texture "warptex" "textures/heattex.png"
 }
+HardwareShader Sprite "DVSPA0"
+{
+	Shader "shaders/glsl/Divine.fp"
+	Texture "snoisetex" "textures/softnoise.png"
+}
+HardwareShader Texture "models/DivineSprite.png"
+{
+	Shader "shaders/glsl/Shinemask.fp"
+	Texture "masktex" "models/DivineSprite_mask.png"
+	Texture "envtex" "models/matcap/pearlmap.png"
+}
+Brightmap Texture "models/DivineSprite.png"
+{
+	map "models/DivineSprite_mask.png"
+	DisableFullbright
+}
+HardwareShader Texture "models/DevaSigil.png"
+{
+	Shader "shaders/glsl/Shinemask.fp"
+	Texture "masktex" "models/DevaSigil_mask.png"
+	Texture "envtex" "models/matcap/dekamap.png"
+}
+Brightmap Texture "models/SafetyTether.png"
+{
+	map "models/SafetyTether_bright.png"
+	DisableFullbright
+}
+HardwareShader Texture "models/SafetyTether.png"
+{
+	Shader "shaders/glsl/Shinemask.fp"
+	Texture "masktex" "models/SafetyTether_mask.png"
+	Texture "envtex" "models/matcap/silvermap.png"
+}
+HardwareShader Texture "models/SafetyTether_off.png"
+{
+	Shader "shaders/glsl/Shinemask.fp"
+	Texture "masktex" "models/SafetyTether_mask.png"
+	Texture "envtex" "models/matcap/silvermap.png"
+}
 
 PointLight ARMORNUGGETLIGHT
 {
@@ -271,3 +310,39 @@ Object MykradvoX2
 	Frame "XZW1B" { light "MYKRADVOLIGHT3" }
 }
 
+PointLight DIVINESLIGHT
+{
+	Color 0.6 0.9 1.0
+	Size 90
+	Attenuate 1
+}
+
+Object DivineSpriteX
+{
+	Frame "DVSP" { light "DIVINESLIGHT" }
+}
+
+PointLight DEVASLIGHT
+{
+	Color 0.7 0.9 1.0
+	Size 90
+	Attenuate 1
+	Subtractive 1
+}
+
+Object AngerySigilX
+{
+	Frame "BLPS" { light "DEVASLIGHT" }
+}
+
+PointLight SAFETYLIGHT
+{
+	Color 0.2 1.0 0.3
+	Size 50
+	Attenuate 1
+}
+
+Object SafetyTether
+{
+	Frame "XZW1B" { light "SAFETYLIGHT" }
+}

gldefs.pp

@@ -70,6 +70,29 @@ HardwareShader PostProcess scene
 	Uniform float xtrastr
 }
 
+HardwareShader PostProcess scene
+{
+	Name "DevastationShader"
+	Shader "shaders/pp/Devascreen.fp" 330
+	Texture BumpTex "textures/heattex.png"
+	Texture WarpTex1 "textures/devawarp1.png"
+	Texture WarpTex2 "textures/devawarp2.png"
+	Texture NoiseTex "textures/graynoise.png"
+	Uniform float timer
+	Uniform float xtrastr
+}
+
+HardwareShader PostProcess scene
+{
+	Name "DivineShader"
+	Shader "shaders/pp/Diviscreen.fp" 330
+	Texture BumpTex "textures/frosttex.png"
+	Texture WarpTex "textures/smoketex.png"
+	Texture NoiseTex "textures/graynoise.png"
+	Uniform float timer
+	Uniform float str
+}
+
 HardwareShader PostProcess scene
 {
 	Name "Glitch"

gldefs.shinemaps

@@ -63,3 +63,19 @@ HardwareShader Texture "models/matcap/glassmap.png"
 {
 	Shader "shaders/glsl/Shinemap.fp"
 }
+HardwareShader Texture "models/matcap/kinymap.png"
+{
+	Shader "shaders/glsl/Shinemap.fp"
+}
+HardwareShader Texture "models/matcap/nkrknmap.png"
+{
+	Shader "shaders/glsl/Shinemap.fp"
+}
+HardwareShader Texture "models/matcap/nokromap.png"
+{
+	Shader "shaders/glsl/Shinemap.fp"
+}
+HardwareShader Texture "models/matcap/pearlmap.png"
+{
+	Shader "shaders/glsl/Shinemap.fp"
+}