From 644f42ce85e502a21741602fd337ba49cf2f1f70 Mon Sep 17 00:00:00 2001
From: MsrSgtShooterPerson <gtdcarthage@gmail.com>
Date: Sat, 9 Nov 2024 00:13:41 +0800
Subject: [PATCH] Fixed issue with OTEX liquid flats "flashing" with GLDEFS
 glow due to only one texture in animated sets being marked as glowing.

---
 modules/zdoom_otex.lua | 102 ++++++++++++++++++++++++++++++++++++++++-
 scripts/shapes.lua     |   2 +-
 2 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/modules/zdoom_otex.lua b/modules/zdoom_otex.lua
index 7272a4af4..66f6a2676 100644
--- a/modules/zdoom_otex.lua
+++ b/modules/zdoom_otex.lua
@@ -435,8 +435,8 @@ OTEX_SPECIAL_RESOURCES =
   liquid_defs =
   {
     otex_blood = { mat="OBLODA01", special=0},
-    otex_goop = { mat="OGOOPY01", special=0},
-    otex_ice = { mat="OICYWA01", special=0},
+    otex_goop = { mat="OGOOPY01", light_add=16, special=0},
+    otex_ice = { mat="OICYWA01", light_add=8, special=0},
    
     otex_lavaA1 = { mat="OLAVAA01", light_add=56, special=5, damage=10},
     otex_lavaA2 = { mat="OLAVAA02", light_add=56, special=5, damage=10},
@@ -521,20 +521,118 @@ OTEX_SPECIAL_RESOURCES =
 OTEX_GLOWING_FLATS =
 [[
 OBLODA01
+    OBLODA02
+    OBLODA03
+    OBLODA04
+    OBLODA05
+    OBLODA06
+    OBLODA07
+    OBLODA08
+
     OGOOPY01
+    OGOOPY02
+    OGOOPY03
+    OGOOPY04
+    OGOOPY05
+    OGOOPY06
+    OGOOPY07
+    OGOOPY08
+
     OICYWA01
+    OICYWA02
+    OICYWA03
+    OICYWA04
+    OICYWA05
+    OICYWA06
+    OICYWA07
+    OICYWA08
+  
     OLAVAA01
     OLAVAA02
     OLAVAB01
+
     OLAVAC01
+    OLAVAC02
+    OLAVAC03
+    OLAVAC04
+    OLAVAC05
+    OLAVAC06
+    OLAVAC07
+    OLAVAC08
+
     OLAVAD01
+    OLAVAD02
+    OLAVAD03
+    OLAVAD04
+    OLAVAD05
+    OLAVAD06
+    OLAVAD07
+    OLAVAD08
+
     OLAVAE01
+    OLAVAE02
+    OLAVAE03
+    OLAVAE04
+    OLAVAE05
+    OLAVAE06
+    OLAVAE07
+    OLAVAE08
+
     OLAVAF01
+    OLAVAF02
+    OLAVAF03
+    OLAVAF04
+    OLAVAF05
+    OLAVAF06
+    OLAVAF07
+    OLAVAF08
+    OLAVAF09
+    OLAVAF10
+
     ONUKEA01
+    ONUKEA02
+    ONUKEA03
+    ONUKEA04
+    ONUKEA05
+    ONUKEA06
+    ONUKEA07
+    ONUKEA08
+
     OSLUDG01
+    OSLUDG02
+    OSLUDG03
+    OSLUDG04
+    OSLUDG05
+    OSLUDG06
+    OSLUDG07
+    OSLUDG08
+
     OPOOPY01
+    OPOOPY02
+    OPOOPY03
+    OPOOPY04
+    OPOOPY05
+    OPOOPY06
+    OPOOPY07
+    OPOOPY08
+
     OTAR__01
+    OTAR__02
+    OTAR__03
+    OTAR__04
+    OTAR__05
+    OTAR__06
+    OTAR__07
+    OTAR__08
+
     OWATER01
+    OWATER02
+    OWATER03
+    OWATER04
+    OWATER05
+    OWATER06
+    OWATER07
+    OWATER08
 ]]
 
 function OTEX_PROC_MODULE.setup(self)
diff --git a/scripts/shapes.lua b/scripts/shapes.lua
index 7b9b11bd2..98c10530d 100644
--- a/scripts/shapes.lua
+++ b/scripts/shapes.lua
@@ -6599,7 +6599,7 @@ GROW_CAUSEWAY_WATERLOCKED_CROSSED_OUT =
 
 GROW_CAUSEWAY_WATERLOCKED_CENTER_PILLAR =
 {
-  prob = 35,
+  prob = 45,
   skip_prob = 80,
 
   structure =