From 67e637bd94c75872c44ab25ab4a22bc2387a1ce0 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Wed, 18 Oct 2023 22:51:34 +0200 Subject: [PATCH] Some cleaning up. --- MAPPING.md | 146 +++++++++--------- README.md | 6 +- docimg/hudsample.png | Bin 23381 -> 23432 bytes language.version | 4 +- zscript/compat/swwm_compat.zsc | 4 +- zscript/items/swwm_collectibles.zsc | 2 + zscript/utility/swwm_utility_achievements.zsc | 8 +- 7 files changed, 87 insertions(+), 83 deletions(-) diff --git a/MAPPING.md b/MAPPING.md index 537ada003..0be76b6ad 100644 --- a/MAPPING.md +++ b/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" } ``` diff --git a/README.md b/README.md index 61ad97be4..938dd3c5e 100644 --- a/README.md +++ b/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) diff --git a/docimg/hudsample.png b/docimg/hudsample.png index 60bba387071f9f87c2656fcb69c50435273ac3e5..3eb128c70a31d0b4d7e908f969ba25c32e21f6f9 100644 GIT binary patch delta 6346 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 diff --git a/language.version b/language.version index ae6978227..0f609aae3 100644 --- a/language.version +++ b/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-"; diff --git a/zscript/compat/swwm_compat.zsc b/zscript/compat/swwm_compat.zsc index c9f7d8668..e7027f808 100644 --- a/zscript/compat/swwm_compat.zsc +++ b/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)); diff --git a/zscript/items/swwm_collectibles.zsc b/zscript/items/swwm_collectibles.zsc index d7f7c1f60..5104651e7 100644 --- a/zscript/items/swwm_collectibles.zsc +++ b/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 { diff --git a/zscript/utility/swwm_utility_achievements.zsc b/zscript/utility/swwm_utility_achievements.zsc index f1eb48b9f..78ede01ad 100644 --- a/zscript/utility/swwm_utility_achievements.zsc +++ b/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));