Broken transparency in one graphic (oops).

Mag ammo can now be sold.
Fix selling prices of bulk items.
Fix rare case where mag ammo can be picked up without a parent.
Various other adjustments.

FuturePlans.md

@@ -19,11 +19,11 @@ More weapons, because we need 'em. In addition, all the "easy to implement" mini
     - Gravely Roast *(Perform 50 bayonet combos with the Quadravol)*
   - [7] Sparkster x3 *(UnSX 2)*
     - A Fine Sparking *(Kill 30 enemies at once with a Sparkster Rifle combo shot)*
-  - [8] Mortal Rifle *(UnSX 2)*
+  - [8] Ray-Khom *(UnSX)*
-    - Railed Hard *(Shoot through 16 enemies with a single Mortal Rifle overpressure shot)*
-  - [9] Ray-Khom *(UnSX)*
     - The Most Silent Takedown *(Kill 30 enemies with the Ray-Khom primary without alerting them)*
     - John Romero's Curse *(Fry yourself by discharging an electric weapon in water)*
+  - [9] Mortal Rifle *(UnSX 2)*
+    - 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)*
 * **Minigames:**
@@ -63,7 +63,7 @@ Re-animation of old FK models. Plus extra score incentives and achievements.
   - Pachinko Code *(Find the Secret Menu)*
   - Double Succ *(Merge two Ynykron singularities)*
   - The Ultimate Combo *(Hit a Ynykron singularity with a Ynykron beam)*
-  - Author Appeal *(Smooch a boss brain)*
+  - Yukkuri Love *(Smooch a boss brain)*
   - Power of Love *(Recover a total of 500 health by kissing the Kirin Plush)*
   - Arsenal of Olden Times *(Find all classic UnSX weapons)*<br/>
     *(Quadravol, Biospark Carbine, Sparkster Rifle, Ray-Khom, Mortal Rifle, Ynykron, Rafan-Kos and K79-D)*<br/>
@@ -72,7 +72,7 @@ Re-animation of old FK models. Plus extra score incentives and achievements.
   - Assortment of Thingamajigs *(Find all items)*
   - Words Words Words *(Read 100 library entries)*
   - Oops I Pressed It *(Turn the engine off)*
-  - Dangerous Ball Action *(Knock yourself out with your own lead ball)*
+  - Dangerous Ball Action *(Land a lead ball crit on yourself)*
   - Total Ball Destruction *(Kill the Icon of Sin with a lead ball)*
   - Say The Line Vinny *(Spin attack with the Itamex Hammer for 60 seconds)*
   - Whateverbuster *(Use the Wallbuster shuffle function 100 times)*
@@ -102,6 +102,7 @@ Things that I'm unsure when will be added *(or if they can be added)*.
 * **Customized cluster text stuff if that ever gets scriptified**
 * **Official Sunder support *(when the WAD is complete)***
 * **Gib models *(May happen by 1.3, hopefully)***
+* **Hexen key and puzzle item models *(uncertain)***
 
 ## Other Projects
 
@@ -127,7 +128,7 @@ Add-ons and other related stuff.
 * **Kirin side mod *(Red Star of Innocence)*:**
   - Finally, you get to play as the precious femboy emperor
   - Anarukon firearms? Anarukon firearms
-  - Designed entirely for Hexen's funky gameplay™
+  - Designed primarily 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**

LICENSE.code

@@ -1,4 +1,4 @@
-Copyright (c) 2020-2022 Marisa Kirisame, UnSX Team
+Copyright (c) 2020-2022 Marisa the Magician, UnSX Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NETNOTCH.dat

@@ -1 +0,0 @@
-<EFBFBD><EFBFBD>鈿鈿鈿鈿鈿鈿鈿鈿鈿鈿鈿鈿<EFBFBD><EFBFBD>w

NOTCH.dat

@@ -1 +0,0 @@
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>镲镲镲镲铑铑铑铑揶揶揶揶眄眄眄眄葺葺葺葺葺葺葺葺葺葺葺葺葺葺葺葺葺葺葺葺眄眄眄眄揶揶揶揶眄眄眄眄铑铑铑铑铑铑铑铑镲镲镲镲<EFBFBD><EFBFBD><EFBFBD><EFBFBD>镲镲镲镲<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

PYWHEEL.txt

@@ -1,8 +1,7 @@
 Demolitionist
 {
-	include "PusherWeapon";
-	//include "ItamexHammer";
 	include "DeepImpact";
+	//include "ItamexHammer";
 	include "ExplodiumGun";
 	//include "PlasmaBlast";
 	include "Spreadgun";

README.md

@@ -83,15 +83,6 @@ The signature **SWWM** melee weapon, an **Impact Hammer** on steroids.
 
 Equipped by default on spawned players.
 
-### Pusher (slot 1) ~ Replaces Chainsaw, Gauntlets, Timon's Axe
-![](docimg/pusher.png)
-
-What was going to be the new melee weapon in **Ultra Suite 2**, but it never happened. A pimped up jackhammer.
-
-**Primary fire:** Drill at whatever you're facing.
-
-**Secondary fire:** Pull the drill bit back all the way in, then on button release push it back out with immense force. This will pretty much pierce a hole through anything, but if you miss there's a chance you'll lose grip on the weapon and it'll go flying until it hits something.
-
 ### Explodium Gun (slot 2) ~ Replaces Pistol, Elven Wand, Hexen starting weapons
 ![](docimg/explodiumgun.png)
 
@@ -128,16 +119,15 @@ on replaced item, may also come in bundles:
 
  - **Standard buckshot (red):** Lots of tiny pellets ready to tear enemies to shreds. Most common.
  - **Slug (green):** Concentrated damage in a single, large projectile. Common.
- - **Dragon's breath (white):** Fiery pain in one shot for everything in front of you. Not very effective underwater, but still deals some small heat damage. Somewhat rare.
+ - **Kinylum saltshot (blue):** Highly volatile shards of **Kinylum** that leave behind a trail of burning plasma. Somewhat rare.
- - **Kinylum saltshot (blue):** Highly volatile shards of **Kinylum** that leave behind a trail of burning plasma. Rare.
+ - ***"The ball"* (purple):** A big lead ball, 'nuff said. Rare.
  - **Telebrium flechette (black):** A discharge of puncturing darts tipped with pure Telebrium, highly corrosive, effects may spread through emitted fumes. Very rare.
- - ***"The ball"* (purple):** A big lead ball, 'nuff said. Somewhat rare.
  - **Golden shell (self-explanatory color):** An extremely rare, but very valuable type. Fires a sabot packed with a very dense, high-grade **Explodium** charge, the shell also contains some gold glitter, but it's just for show. Clearly designed by someone completely insane, and definitely guaranteed to not fail catastrophically and blow up your gun, your hands, your arms, and the rest of your upper body. Unlike the others, this one is only available as a rare drop from powerful monsters (over 1000HP) and bosses. They may also appear in **Chanceboxes**.
 
 ### Wallbuster (slot 4) ~ Replaces SSG, Ethereal Crossbow, Frost Shards
 ![](docimg/wallbuster.png)
 
-A ludicrously overkill weapon, courtesy of the always-overkill **Blackmann Arms**. Sporting a pentagonal array of 5-barrel cylinders, for a grand total of 25 barrels. Everything in front of you is pretty much dead. Cannot use dragon's breath, flechettes or golden shells.
+A ludicrously overkill weapon, courtesy of the always-overkill **Blackmann Arms**. Sporting a pentagonal array of 5-barrel cylinders, for a grand total of 25 barrels. Everything in front of you is pretty much dead. Cannot use flechettes or golden shells.
 
 **Primary fire:** Shoot one barrel at a time.
 
@@ -302,7 +292,7 @@ All of these can be carried in your inventory indefinitely before use, except in
 ### Health Nugget ~ Replaces Health Bonus, Timebomb of the Ancients, Disc of Repulsion, Flechette, Mystic Ambit Incant
 ![](docimg/nuggethealth.png)
 
-+1 health boost, up to a cap of 200 points. Comes in bundles when replacing things other than health bonuses.
++2 health boost, up to a cap of 200 points. Comes in bundles when replacing things other than health bonuses.
 
 ### Health Tetrahedron ~ Replaces Stimpack, Crystal Vial
 ![](docimg/tetrahealth.png)
@@ -322,7 +312,7 @@ This artifact provides a +100 health boost plus a regeneration effect that heals
 ### Armor Nugget ~ Replaces Armor Bonus, Timebomb of the Ancients, Disc of Repulsion, Flechette, Mystic Ambit Incant
 ![](docimg/nuggetarmor.png)
 
-Cumulative armor items that can increase resistance to all damage by as much as you can find. Each nugget adds 1% to the total. Above 100%, damage gets turned into additional health *(up to the standard 100% cap)*. The upper cap for these is 200%. Comes in bundles when replacing things other than armor bonuses.
+Cumulative armor items that can increase resistance to all damage by as much as you can find. Each nugget adds 5% to the total. Above 100%, damage gets turned into additional health *(up to the standard 100% cap)*. The upper cap for these is 200%. Comes in bundles when replacing things other than armor bonuses.
 
 ### Blast Suit ~ Replaces Green Armor, Silver Shield, Platinum Helm, Amulet of Warding
 ![](docimg/blastsuit.png)
@@ -393,8 +383,6 @@ Each of these you pick up increases your ammo capacity *(not necessarily doublin
 
 In some special cases you may find "Bulk" versions. These generally only pop up if the mapper decided to spawn several overlapping backpacks in one spot, as they result from all of those items merging together.
 
-Note: In multiplayer, these can be traded between players, but do note that the receiver will not get any extra ammo from it.
-
 ### Universal Ammo Fabricator ~ Replaces Mana / Krater of Might
 ![](docimg/fabricator.png)
 

achievements.lst

@@ -98,7 +98,6 @@ step,30,yes,any
 stomp,40,yes,any
 sunny,15,yes,any
 tele,0,no,any
-tender,100,yes,any
 thicc,100,yes,any
 thruwall,20,yes,any
 tornado,0,no,heretic

credits.txt

@@ -27,9 +27,7 @@ Most of the work here is original, but there are some notable exceptions:
  - The anti-BD feature uses art and music by IOSYS, art was edited into the Doom palette.
  - The crash handler uses a short clip of the Curb Your Enthusiasm theme.
  - Tewi font by lucy (https://github.com/lucy/tewi-font). Modified to add gradients and drop shadow.
- - MPlus font by M⁺ FONTS PROJECT (http://mplus-fonts.osdn.jp/mplus-bitmap-fonts). Modified to add gradients and drop shadow.
  - Miniwi font by Josuah Demangeon (http://josuah.net). Modified to add gradients and drop shadow.
- - k6x8 font by littlelimit (https://littlelimit.net/k6x8.htm). Modified to add gradients and drop shadow.
  - Nashgore footprint texture by Valerie Lavender.
  - Slope alignment utility code by ZZYZX & Nash.
  - Intermission fanart:

cvarinfo.base

@@ -38,7 +38,6 @@ nosave int swwm_maxtargetdist = 2000;		// maximum distance for target healthbars
 nosave int swwm_maxtargets = 40;		// maximum targeter healthbars to display (0 = unlimited)
 nosave int swwm_maxscorenums = 0;		// maximum score numbers to display (0 = unlimited)
 nosave int swwm_maxdamnums = 0;			// maximum damage/healing numbers to display (0 = unlimited)
-nosave bool swwm_hudscale = false;		// HUD scaling (false = tight scaling, true = loose scaling)
 nosave int swwm_barscalerel = -1;		// target healthbar scaling (relative)
 nosave int swwm_numscalerel = 0;		// damnum scaling (relative)
 nosave int swwm_scrscalerel = -1;		// score scaling (relative)
@@ -72,7 +71,7 @@ server bool swwm_shotgib = true;		// buckshot can gib (some people don't like th
 user bool swwm_collectanim = true;		// player special gestures for collectables (first person only)
 user bool swwm_collectanimkey = true;		// same but for key items
 server bool swwm_shadows = true;		// enables blob shadows under mod entities, like in UT (except it also affects inventory items)
-nosave bool swwm_precisecrosshair = true;	// use mod's own, more precise crosshair
+nosave int swwm_precisecrosshair = 1;		// use mod's own, more precise crosshair (2 - force even when crosshair is not on)
 nosave bool swwm_ldspoil = false;		// [LD] always shows "Legendary" prefix on Legendary monsters, otherwise only when they've transformed
 nosave bool swwm_camhud = false;		// keep full hud visible when operating cameras, otherwise only shows messages
 server bool swwm_uncapalert = false;		// all noise alerts have infinite range
@@ -120,6 +119,10 @@ nosave string swwm_menuposehistory = "";	// stores currently seen poses for the
 nosave string swwm_titlesubhistory = "";	// stores currently seen subtitles for the title screen, for shuffling
 nosave noarchive int swwm_profstart = 0;	// starts profiling as soon as handler is registered for specified >0 tics
 server bool swwm_nodeathexit = false;		// completely sidesteps the inventory resetting of death exits, if you hate those
+server bool swwm_extendedpickup = false;	// items will have an additional "virtual hitbox" that's the same size as vanilla
+nosave bool swwm_voicelog = false;		// adds player voicelines to the message log
+nosave bool swwm_skipskill = false;		// skips skill confirmations
+nosave bool swwm_althud = false;		// alternate, more compact hud (like in the side mods)
 
 // minimap settings
 nosave bool swwm_mm_enable = true;		// show a minimap below the score counter

fonts/MiniHUDOutline/font.inf

@@ -0,0 +1,4 @@
+TranslationType Standard
+SpaceWidth 5
+FontHeight 6
+Kerning -1