Heretic: Adding Translucency Option (#1251)

* Heretic: Adding Translucency Option - not functionally yet * Heretic: Adding certain sprites to be translucent and disable item/projectile destinction * Heretic: Adding further translucency effects. * Heretic: Dirty Translucent Goldwand firing. * Heretic: Translucency gun flash Goldwand * Heretic: Translucency gun flash Blaster, Hellrod * Heretic: Reconstructing maxlight when loading to align with Doom. * Heretic: Translucency gun flash Gauntlet, PhoenixRod * Heretic: Restructured Translucent Weapon Fire evaluation. Added separate Offset struct, reworked drawing of player sprites. * Heretic: Translucency conditions and selection changed - Use Item for Weapon-Flash selection - Added MISCMISSILE Flag to further projectile effects. - Restructured conditions (work in progress). * Heretic: Restructured Translucent Weapon Fire evaluation. (2nd) * Heretic: Translucency Option cleanup - fix typo for MISCMISSILES - Rearrange Menu * Heretic: Changed Translucency for various things - added/removed some translucent effects. - make goopods translucent upon explosion. - make leadermummy translucent upon facing enemy for ranged-attack. * Heretic: Add Miscmissle Flag directly to MT_POD .. instead of assigning it upon explosion. * Heretic: Translucency Option fixing whitespaces, adding comments and cleanup flags - remove translucency flag from goldwand ammo - adding / moving comments - fixing whitespace. * Heretic: Weapon Translucency considering Invisibility Powerup Should not draw base frame when being invisible anyways. * Heretic: Undo Translucency for dying Mummyleaders. * Revert "Heretic: Reconstructing maxlight when loading to align with Doom." This reverts commit 0cb6f26. * Heretic: Gauntlets no longer considered for weapon sprite translucency. * Heretic: Moved Translucency offsets to r_things.c .. instead of info.c * Heretic: Fixing Whitespaces in info.h * Heretic: Renamed translucency option for weapon flashes. * Heretic: Removed MISCMISSILE Flag Not required with the current translucency options. * Heretic: Reworked y-offets for translucency Using FRACUNIT and doing a 1px correction for HROD_F1.
fabiangreffrath · Jan 2, 2025 · ccdea7c · ccdea7c
1 parent 27ea096
commit ccdea7c
Show file tree

Hide file tree

Showing 9 changed files with 304 additions and 102 deletions.
diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
@@ -886,6 +886,7 @@ void D_BindVariables(void)
     M_BindIntVariable("crispy_secretmessage",   &crispy->secretmessage);
     M_BindIntVariable("crispy_smoothlight",     &crispy->smoothlight);
     M_BindIntVariable("crispy_soundmono",       &crispy->soundmono);
+    M_BindIntVariable("crispy_translucency",    &crispy->translucency);
 #ifdef CRISPY_TRUECOLOR
     M_BindIntVariable("crispy_truecolor",       &crispy->truecolor);
 #endif

diff --git a/src/heretic/doomdef.h b/src/heretic/doomdef.h
@@ -254,6 +254,7 @@ typedef struct
 
 #define	MF_TRANSLATION	0xc000000 // if 0x4 0x8 or 0xc, use a translation
 #define	MF_TRANSSHIFT	26      // table for player colormaps
+#define MF_TRANSLUCENT  0x80000000 // [crispy] translucent sprite
 
 // --- mobj.flags2 ---
 

diff --git a/src/heretic/info.c b/src/heretic/info.c
diff --git a/src/heretic/mn_menu.c b/src/heretic/mn_menu.c
@@ -77,6 +77,7 @@ typedef enum
     MENU_MOUSE,
     MENU_CRISPNESS1,
     MENU_CRISPNESS2,
+    MENU_CRISPNESS3,
     MENU_NONE
 } MenuType_t;
 
@@ -133,6 +134,7 @@ static boolean CrispySmoothing(int option);
 static boolean CrispyBrightmaps(int option);
 static boolean CrispySmoothLighting(int option);
 static boolean CrispySoundMono(int option);
+static boolean CrispyTranslucency(int option);
 static boolean CrispySndChannels(int option);
 static boolean CrispyAutomapStats(int option);
 static boolean CrispyLevelTime(int option);
@@ -163,6 +165,7 @@ static void DrawMouseMenu(void);
 static void DrawCrispness(void);
 static void DrawCrispness1(void);
 static void DrawCrispness2(void);
+static void DrawCrispness3(void);
 void MN_LoadSlotText(void);
 
 // External Functions
@@ -359,7 +362,7 @@ static Menu_t Options2Menu = {
 
 static int crispnessmenupage;
 
-#define NUM_CRISPNESS_MENUS 2
+#define NUM_CRISPNESS_MENUS 3
 
 static MenuItem_t Crispness1Items[] = {
     {ITT_LRFUNC2, "HIGH RESOLUTION RENDERING:", CrispyHires, 0, MENU_NONE},
@@ -372,54 +375,80 @@ static MenuItem_t Crispness1Items[] = {
     {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
     {ITT_LRFUNC2, "APPLY BRIGHTMAPS TO:", CrispyBrightmaps, 0, MENU_NONE},
     {ITT_LRFUNC2, "SMOOTH DIMINISHING LIGHTING:", CrispySmoothLighting, 0, MENU_NONE},
-    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
-    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
-    {ITT_LRFUNC2, "MONO SFX:", CrispySoundMono, 0, MENU_NONE},
-    {ITT_LRFUNC2, "SOUND CHANNELS:", CrispySndChannels, 0, MENU_NONE},
+    {ITT_LRFUNC2, "ENABLE TRANSLUCENCY:", CrispyTranslucency, 0, MENU_NONE},
     {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
     {ITT_EFUNC, "NEXT PAGE", CrispyNextPage, 0, MENU_NONE},
+    {ITT_EFUNC, "LAST PAGE", CrispyPrevPage, 0, MENU_NONE},
 };
 
 static Menu_t Crispness1Menu = {
     68, 35,
     DrawCrispness,
-    16, Crispness1Items,
+    14, Crispness1Items,
     0,
     MENU_OPTIONS
 };
 
 static MenuItem_t Crispness2Items[] = {
+    {ITT_LRFUNC2, "MONO SFX:", CrispySoundMono, 0, MENU_NONE},
+    {ITT_LRFUNC2, "SOUND CHANNELS:", CrispySndChannels, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
     {ITT_LRFUNC2, "SHOW LEVEL STATS:", CrispyAutomapStats, 0, MENU_NONE},
     {ITT_LRFUNC2, "SHOW LEVEL TIME:", CrispyLevelTime, 0, MENU_NONE},
     {ITT_LRFUNC2, "SHOW PLAYER COORDS:", CrispyPlayerCoords, 0, MENU_NONE},
     {ITT_LRFUNC2, "REPORT REVEALED SECRETS:", CrispySecretMessage, 0, MENU_NONE},
     {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
     {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_EFUNC, "NEXT PAGE", CrispyNextPage, 0, MENU_NONE},
+    {ITT_EFUNC, "PREV PAGE", CrispyPrevPage, 0, MENU_NONE},
+};
+
+static Menu_t Crispness2Menu = {
+    68, 35,
+    DrawCrispness,
+    14, Crispness2Items,
+    0,
+    MENU_OPTIONS
+};
+
+static MenuItem_t Crispness3Items[] = {
     {ITT_LRFUNC2, "FREELOOK MODE:", CrispyFreelook, 0, MENU_NONE},
     {ITT_LRFUNC2, "PERMANENT MOUSELOOK:", CrispyMouselook, 0, MENU_NONE},
     {ITT_LRFUNC2, "PLAYER VIEW/WEAPON BOBBING:", CrispyBobfactor, 0, MENU_NONE},
     {ITT_LRFUNC2, "WEAPON ATTACK ALIGNMENT:", CrispyCenterWeapon, 0, MENU_NONE},
     {ITT_LRFUNC2, "DEFAULT DIFFICULTY:", CrispyDefaultskill, 0, MENU_NONE},
     {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_EMPTY, NULL, NULL, 0, MENU_NONE},
+    {ITT_EFUNC, "FIRST PAGE", CrispyNextPage, 0, MENU_NONE},
     {ITT_EFUNC, "PREV PAGE", CrispyPrevPage, 0, MENU_NONE},
 };
 
-static Menu_t Crispness2Menu = {
+static Menu_t Crispness3Menu = {
     68, 35,
     DrawCrispness,
-    13, Crispness2Items,
+    14, Crispness3Items,
     0,
     MENU_OPTIONS
 };
 
 static void (*CrispnessMenuDrawers[])(void) = {
     &DrawCrispness1,
     &DrawCrispness2,
+    &DrawCrispness3,
 };
 
 static MenuType_t CrispnessMenus[] = {
     MENU_CRISPNESS1,
     MENU_CRISPNESS2,
+    MENU_CRISPNESS3,
 };
 
 static const multiitem_t multiitem_bobfactor[NUM_BOBFACTORS] =
@@ -483,6 +512,14 @@ static const multiitem_t multiitem_difficulties[NUM_SKILLS] =
     {SKILL_HNTR, "YELLOWBELLIES"},
 };
 
+multiitem_t multiitem_translucency[NUM_TRANSLUCENCY] =
+{
+    {TRANSLUCENCY_OFF, "OFF"},
+    {TRANSLUCENCY_MISSILE, "PROJECTILES"},
+    {TRANSLUCENCY_ITEM, "WEAPON FLASHES"},
+    {TRANSLUCENCY_BOTH, "BOTH"},
+};
+
 static const multiitem_t multiitem_sndchannels[3] =
 {
     {8, "8"},
@@ -502,6 +539,7 @@ static Menu_t *Menus[] = {
     &MouseMenu,
     &Crispness1Menu,
     &Crispness2Menu,
+    &Crispness3Menu,
 };
 
 // [crispy] gamma correction messages
@@ -1735,6 +1773,12 @@ static boolean CrispySoundMono(int option)
     return true;
 }
 
+static boolean CrispyTranslucency(int choice)
+{
+    ChangeSettingEnum(&crispy->translucency, choice, NUM_TRANSLUCENCY);
+    return true;
+}
+
 static boolean CrispySndChannels(int option)
 {
     S_UpdateSndChannels(option);
@@ -2980,7 +3024,7 @@ static void DrawCrispnessNumericItem(int item, int x, int y, const char *zero,
 
 static void DrawCrispness1(void)
 {
-    DrawCrispnessHeader("CRISPNESS 1/2");
+    DrawCrispnessHeader("CRISPNESS 1/3");
 
     DrawCrispnessSubheader("RENDERING", 25);
 
@@ -3010,47 +3054,55 @@ static void DrawCrispness1(void)
     // Smooth Diminishing Lighting
     DrawCrispnessItem(crispy->smoothlight, 257, 125);
 
-    DrawCrispnessSubheader("AUDIBLE", 145);
-
-    // Mono SFX
-    DrawCrispnessItem(crispy->soundmono, 137, 155);
-
-    // Sound Channels
-    DrawCrispnessMultiItem(snd_Channels >> 4, 181, 165, multiitem_sndchannels, false);
+    // Translucency
+    DrawCrispnessMultiItem(crispy->translucency, 218, 135, multiitem_translucency, false);
 }
 
 static void DrawCrispness2(void)
 {
-    DrawCrispnessHeader("CRISPNESS 2/2");
+    DrawCrispnessHeader("CRISPNESS 2/3");
+
+    DrawCrispnessSubheader("AUDIBLE", 25);
+
+    // Mono SFX
+    DrawCrispnessItem(crispy->soundmono, 137, 35);
 
-    DrawCrispnessSubheader("NAVIGATIONAL", 25);
+    // Sound Channels
+    DrawCrispnessMultiItem(snd_Channels >> 4, 181, 45, multiitem_sndchannels, false);
+
+    DrawCrispnessSubheader("NAVIGATIONAL", 65);
 
     // Show level stats
-    DrawCrispnessMultiItem(crispy->automapstats, 190, 35, multiitem_widgets, false);
+    DrawCrispnessMultiItem(crispy->automapstats, 190, 75, multiitem_widgets, false);
 
     // Show level time
-    DrawCrispnessMultiItem(crispy->leveltime, 179, 45, multiitem_widgets, false);
+    DrawCrispnessMultiItem(crispy->leveltime, 179, 85, multiitem_widgets, false);
     // Show player coords
-    DrawCrispnessMultiItem(crispy->playercoords, 211, 55, multiitem_widgets, false);
+    DrawCrispnessMultiItem(crispy->playercoords, 211, 95, multiitem_widgets, false);
 
     // Show secret message
-    DrawCrispnessMultiItem(crispy->secretmessage, 250, 65, multiitem_secretmessage, false);
+    DrawCrispnessMultiItem(crispy->secretmessage, 250, 105, multiitem_secretmessage, false);
+}
 
-    DrawCrispnessSubheader("TACTICAL", 85);
+static void DrawCrispness3(void)
+{
+    DrawCrispnessHeader("CRISPNESS 3/3");
+
+    DrawCrispnessSubheader("TACTICAL", 25);
 
     // Freelook
-    DrawCrispnessMultiItem(crispy->freelook_hh, 175, 95, multiitem_freelook_hh, false);
+    DrawCrispnessMultiItem(crispy->freelook_hh, 175, 35, multiitem_freelook_hh, false);
 
     // Mouselook
-    DrawCrispnessItem(crispy->mouselook, 220, 105);
+    DrawCrispnessItem(crispy->mouselook, 220, 45);
 
     // Bobfactor
-    DrawCrispnessMultiItem(crispy->bobfactor, 265, 115, multiitem_bobfactor, false);
+    DrawCrispnessMultiItem(crispy->bobfactor, 265, 55, multiitem_bobfactor, false);
 
     // Weapon attack alignment
-    DrawCrispnessMultiItem(crispy->centerweapon, 245, 125, multiitem_centerweapon,
+    DrawCrispnessMultiItem(crispy->centerweapon, 245, 65, multiitem_centerweapon,
             crispy->bobfactor == BOBFACTOR_OFF);
 
     // Default difficulty
-    DrawCrispnessMultiItem(crispy->defaultskill, 200, 135, multiitem_difficulties, false);
-}
+    DrawCrispnessMultiItem(crispy->defaultskill, 200, 75, multiitem_difficulties, false);
+}
diff --git a/src/heretic/p_enemy.c b/src/heretic/p_enemy.c
@@ -626,7 +626,11 @@ void A_Look(mobj_t *actor, player_t *player, pspdef_t *psp)
         else
             goto seeyou;
     }
-
+    // [crispy] Undo Mummyleader translucency
+    if (actor->type == MT_MUMMYLEADER)
+    {
+        actor->flags &= ~MF_TRANSLUCENT;
+    }
 
     if (!P_LookForPlayers(actor, false))
         return;
@@ -701,6 +705,11 @@ void A_Chase(mobj_t *actor, player_t *player, pspdef_t *psp)
             actor->tics = 3;
         }
     }
+    // [crispy] Undo Mummyleader translucency
+    if (actor->type == MT_MUMMYLEADER)
+    {
+        actor->flags &= ~MF_TRANSLUCENT;
+    }
 
 //
 // turn towards movement direction if not there yet
@@ -822,6 +831,11 @@ void A_FaceTarget(mobj_t *actor, player_t *player, pspdef_t *psp)
     {                           // Target is a ghost
         actor->angle += P_SubRandom() << 21;
     }
+    // [crispy] Charging-up Mummyleaders are translucent in that state (blinking)
+    if (actor->type == MT_MUMMYLEADER)
+    {
+        actor->flags |= MF_TRANSLUCENT;
+    }
 }
 
 //----------------------------------------------------------------------------

diff --git a/src/heretic/p_inter.c b/src/heretic/p_inter.c
@@ -975,6 +975,15 @@ void P_KillMobj(mobj_t * source, mobj_t * target)
             return;
         }
     }
+
+    // [crispy] Exploding Goo-Pods are translucent
+    if (target->type == MT_POD)
+        target->flags |= MF_TRANSLUCENT;
+
+    // [crispy] Undo Mummyleader translucency
+    if (target->type == MT_MUMMYLEADER)
+        target->flags &= ~MF_TRANSLUCENT;
+
     if (target->health < -(target->info->spawnhealth >> 1)
         && target->info->xdeathstate)
     {                           // Extreme death