Some cleaning up.

MAPPING.md

@@ -63,84 +63,86 @@ DoomEdNums
 	29023 = "RedShell4"
 	29024 = "RedShell6"
 	29025 = "GoldShell"
-	29028 = "EvisceratorShell"
-	29029 = "EvisceratorShell2"
-	29030 = "EvisceratorShell3"
-	29031 = "EvisceratorSixPack"
-	29032 = "HellblazerMissiles"
-	29033 = "HellblazerMissiles2"
-	29034 = "HellblazerMissiles3"
-	29035 = "HellblazerMissileMag"
-	29036 = "SparkUnit"
-	29037 = "SparkUnit2"
-	29038 = "SilverBulletAmmo"
-	29039 = "SilverBullets"
-	29040 = "SilverBullets2"
-	29041 = "SilverBullets3"
-	29042 = "CandyGunAmmo"
-	29043 = "CandyGunBullets"
-	29044 = "CandyGunBullets2"
-	29045 = "CandyGunBullets3"
-	29046 = "YnykronAmmo"
+	29026 = "EvisceratorShell"
+	29027 = "EvisceratorShell2"
+	29028 = "EvisceratorShell3"
+	29029 = "EvisceratorSixPack"
+	29030 = "HellblazerMissiles"
+	29031 = "HellblazerMissiles2"
+	29032 = "HellblazerMissiles3"
+	29033 = "HellblazerMissileMag"
+	29034 = "SparkUnit"
+	29035 = "SparkUnit2"
+	29036 = "SilverBulletAmmo"
+	29037 = "SilverBullets"
+	29038 = "SilverBullets2"
+	29039 = "SilverBullets3"
+	29040 = "CandyGunAmmo"
+	29041 = "CandyGunBullets"
+	29042 = "CandyGunBullets2"
+	29043 = "CandyGunBullets3"
+	29044 = "YnykronAmmo"
 	// DLC Ammo
-	29047 = "SMW05Ammo"
-	29048 = "SMW05Ammo2"
-	29049 = "SMW05Ammo3"
-	29050 = "SMW05SmallAmmo"
-	29051 = "SMW05BigAmmo"
-	29052 = "SheenAmmo"
-	29053 = "SheenAmmo2"
-	29054 = "SheenAmmo3"
-	29055 = "SheenSmallAmmo"
-	29056 = "SheenBigAmmo"
-	29057 = "QuadravolAmmo"
-	29058 = "QuadravolAmmo2"
-	29059 = "QuadravolAmmo3"
-	29060 = "SparksterBAmmo"
-	29061 = "SparksterBAmmo2"
-	29062 = "SparksterBAmmo3"
-	29063 = "SparksterRAmmo"
-	29064 = "SparksterRAmmo2"
-	29065 = "SparksterRAmmo3"
-	29066 = "RayBolt"
-	29067 = "RayBolt2"
-	29068 = "RayBolt5"
-	29069 = "RayAmmo"
-	29070 = "MisterRound"
-	29071 = "MisterRound2"
-	29072 = "MisterRound3"
-	29073 = "MisterRound5"
-	29074 = "MisterAmmo"
-	29075 = "MisterGAmmo"
-	29076 = "UltimatePod"
-	29077 = "UltimateAmmo"
+	29045 = "SMW05Ammo"
+	29046 = "SMW05Ammo2"
+	29047 = "SMW05Ammo3"
+	29048 = "SMW05SmallAmmo"
+	29049 = "SMW05BigAmmo"
+	29050 = "SheenAmmo"
+	29051 = "SheenAmmo2"
+	29052 = "SheenAmmo3"
+	29053 = "SheenSmallAmmo"
+	29054 = "SheenBigAmmo"
+	29055 = "QuadravolAmmo"
+	29056 = "QuadravolAmmo2"
+	29057 = "QuadravolAmmo3"
+	29058 = "SparksterBAmmo"
+	29059 = "SparksterBAmmo2"
+	29060 = "SparksterBAmmo3"
+	29061 = "SparksterRAmmo"
+	29062 = "SparksterRAmmo2"
+	29063 = "SparksterRAmmo3"
+	29064 = "RayBolt"
+	29065 = "RayBolt2"
+	29066 = "RayBolt5"
+	29067 = "RayAmmo"
+	29068 = "MisterRound"
+	29069 = "MisterRound2"
+	29070 = "MisterRound3"
+	29071 = "MisterRound5"
+	29072 = "MisterAmmo"
+	29073 = "MisterGAmmo"
+	29074 = "UltimatePod"
+	29075 = "UltimateAmmo"
 	// For Hexen
-	29078 = "FabricatorTier1"
-	29079 = "FabricatorTier2"
-	29080 = "FabricatorTier3"
-	29081 = "FabricatorTier4"
+	29076 = "FabricatorTier1"
+	29077 = "FabricatorTier2"
+	29078 = "FabricatorTier3"
+	29079 = "FabricatorTier4"
 	// Backpack
-	29082 = "HammerspaceEmbiggener"
+	29080 = "HammerspaceEmbiggener"
 	// Health
-	29083 = "HealthNuggetItem"
-	29084 = "TetraHealthItem"
-	29085 = "CubeHealthItem"
-	29086 = "RefresherItem"
+	29081 = "HealthNuggetItem"
+	29082 = "TetraHealthItem"
+	29083 = "CubeHealthItem"
+	29084 = "RefresherItem"
 	// Armor
-	29087 = "ArmorNuggetItem"
-	29088 = "BlastSuitItem"
-	29089 = "WarArmorItem"
+	29085 = "ArmorNuggetItem"
+	29086 = "BlastSuitItem"
+	29087 = "WarArmorItem"
 	// Powerups
-	29090 = "GrilledCheeseSandwich"
-	29091 = "GhostArtifact"
-	29092 = "GravitySuppressor"
-	29093 = "FuckingInvinciball"
-	29094 = "Ragekit"
-	29095 = "SWWMLamp"
-	29096 = "EBarrier"
-	29097 = "Mykradvo"
-	29098 = "DivineSprite"
-	29099 = "AngerySigil"
+	29088 = "GrilledCheeseSandwich"
+	29089 = "GhostArtifact"
+	29090 = "GravitySuppressor"
+	29091 = "FuckingInvinciball"
+	29092 = "Ragekit"
+	29093 = "SWWMLamp"
+	29094 = "EBarrier"
+	29095 = "Mykradvo"
+	29096 = "DivineSprite"
+	29097 = "AngerySigil"
+	//29098 = "BallsyBomb"
+	//29099 = "SWWMSentryItem"
 }
 ```
 

README.md

@@ -200,7 +200,7 @@ This weapon made the **Unreal Engine** cry, so **GZDoom** may suffer a lot too.
 ### Eviscerator shells ~ Replaces Ammo Box, Claw Orb
 ![](docimg/evisceratorammo.png)
 
-Little bundles of fun *(in hot lead form)* found either as single units *(sometimes bunched up)* or six-packs. There is no explanation for why they have an **OwO** face scribbled on.
+Little bundles of fun *(in hot lead form)* found either as single units, in duos, or in trios. There is no explanation for why they have an **OwO** face scribbled on.
 
 ### Sheen HMG *(slot 5)* ~ Replaces Chaingun, Dragon Claw, Quietus (hilt)
 ![](docimg/sheenhmg.png)
@@ -240,7 +240,7 @@ This thing is more explosive than it looks, so if you're reading this, Icarus, *
 ### Hellblazers ~ Replaces Rockets, Flame Orb
 ![](docimg/hellblazerammo.png)
 
-Ammo for the **Hellblazer**, found either as single units or packs. The **"Blazer"** 25mm micro-missile packs one hell of a punch with its highly explosive charge, with not just one mighty immediate blast, but also a short-lived lingering aura of big blazing hurt around itself too.
+Ammo for the **Hellblazer**, found either as single units or in bunches. The **"Blazer"** 25mm micro-missile packs one hell of a punch with its highly explosive charge, with not just one mighty immediate blast, but also a short-lived lingering aura of big blazing hurt around itself too.
 
 ### Quadravol *(slot 6)* ~ Replaces Rocket Launcher, Phoenix Rod, Hammer of Retribution
 ![](docimg/quadravol.png)
@@ -331,7 +331,7 @@ Note that going prone *(crouching)* will automatically disable the recoil compen
 
 The 1.150 caliber **eXplosive Super Burst** bullets employ an **Explodium** shaped charge to be shot with enough energy to reach a relatively high velocity, allowing their massive bulk to penetrate several targets including walls.
 
-In the world, they may pop up as spare bullets. Each five bullets picked up will be automatically converted to a full mag in your inventory. They are hard to come by as full mags, so expect to be finding singular rounds more often than not.
+In the world, they may pop up as spare bullets. Each five bullets picked up will be automatically converted to a full mag in your inventory. They are hard to come by, so expect to be finding singular rounds more often than not.
 
 ### Ray-Khom *(slot 8)* ~ Replaces Plasma Rifle, Hellstaff, Arc of Death
 ![](docimg/raykhom.png)

language.version

@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r989 \cu(Wed 18 Oct 22:01:03 CEST 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r989 \cu(2023-10-18 22:01:03)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r990 \cu(Wed 18 Oct 22:51:34 CEST 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r990 \cu(2023-10-18 22:51:34)\c-";

zscript/compat/swwm_compat.zsc

@@ -150,8 +150,8 @@ Class SWWMLevelCompatibility : LevelPostProcessor
 				}
 			}
 			break;
-		// Ultimate Doom 2 MAP20 (dv2.9)
-		case 'CC53CFFCB30E873669AA2F09DA0D3566':
+		// Ultimate Doom 2 MAP20 (dv3.1)
+		case '96C5914A9B4A2383DE6BBE363940DF2F':
 			// add a "sector enter" action for reaching the exit room
 			// and make it trigger a dialogue
 			uint nt = AddThing(9998,(-9360,12768,12));

zscript/items/swwm_collectibles.zsc

@@ -212,6 +212,7 @@ Class MothPlushy : SWWMCollectible
 		Stamina 7000;
 	}
 }
+// 1.3 Saya's Mug
 Class SayasMug : SWWMCollectible
 {
 	Default
@@ -236,6 +237,7 @@ Class DemoPlush : SWWMCollectible
 		Stamina 6000;
 	}
 }
+// TBD 1.4 Blahaj
 // Hexen
 Class KirinSippy : SWWMCollectible
 {

zscript/utility/swwm_utility_achievements.zsc

@@ -24,7 +24,7 @@ extend class SWWMUtility
 		String pval = hnd.achievementprogress.At(pvar);
 		if ( pval == "" )
 		{
-			if ( developer >= 2 ) Console.Printf("AchievementProgress: achievement '"..pvar.."' not found");
+			if ( developer >= 2 ) Console.Printf("GetAchievementProgress: achievement '"..pvar.."' not found");
 			return 0;
 		}
 		return pval.ToInt();
@@ -51,7 +51,7 @@ extend class SWWMUtility
 		String pval = hnd.achievementprogress.At(pvar);
 		if ( pval == "" )
 		{
-			if ( developer >= 2 ) Console.Printf("AchievementProgress: achievement '"..pvar.."' not found");
+			if ( developer >= 2 ) Console.Printf("AchievementProgressInc: achievement '"..pvar.."' not found");
 			return;
 		}
 		hnd.achievementprogress.Insert(pvar,String.Format("%d",pval.ToInt()+inc));
@@ -64,7 +64,7 @@ extend class SWWMUtility
 		String pval = hnd.achievementprogress.At(pvar);
 		if ( pval == "" )
 		{
-			if ( developer >= 2 ) Console.Printf("AchievementProgress: achievement '"..pvar.."' not found");
+			if ( developer >= 2 ) Console.Printf("AchievementProgressIncDOuble: achievement '"..pvar.."' not found");
 			return;
 		}
 		if ( pval == "NaN" )	// this can happen, yup
@@ -80,7 +80,7 @@ extend class SWWMUtility
 		String pval = hnd.achievementprogress.At(pvar);
 		if ( pval == "" )
 		{
-			if ( developer >= 2 ) Console.Printf("AchievementProgress: achievement '"..pvar.."' not found");
+			if ( developer >= 2 ) Console.Printf("AchievementProgressOr: achievement '"..pvar.."' not found");
 			return;
 		}
 		hnd.achievementprogress.Insert(pvar,String.Format("%d",pval.ToInt()|val));