Skip to content

Commit 644f42c

Browse files
committed
Fixed issue with OTEX liquid flats "flashing" with GLDEFS glow due to only one texture in animated sets being marked as glowing.
1 parent 55b673c commit 644f42c

File tree

2 files changed

+101
-3
lines changed

2 files changed

+101
-3
lines changed

modules/zdoom_otex.lua

Lines changed: 100 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ OTEX_SPECIAL_RESOURCES =
435435
liquid_defs =
436436
{
437437
otex_blood = { mat="OBLODA01", special=0},
438-
otex_goop = { mat="OGOOPY01", special=0},
439-
otex_ice = { mat="OICYWA01", special=0},
438+
otex_goop = { mat="OGOOPY01", light_add=16, special=0},
439+
otex_ice = { mat="OICYWA01", light_add=8, special=0},
440440

441441
otex_lavaA1 = { mat="OLAVAA01", light_add=56, special=5, damage=10},
442442
otex_lavaA2 = { mat="OLAVAA02", light_add=56, special=5, damage=10},
@@ -521,20 +521,118 @@ OTEX_SPECIAL_RESOURCES =
521521
OTEX_GLOWING_FLATS =
522522
[[
523523
OBLODA01
524+
OBLODA02
525+
OBLODA03
526+
OBLODA04
527+
OBLODA05
528+
OBLODA06
529+
OBLODA07
530+
OBLODA08
531+
524532
OGOOPY01
533+
OGOOPY02
534+
OGOOPY03
535+
OGOOPY04
536+
OGOOPY05
537+
OGOOPY06
538+
OGOOPY07
539+
OGOOPY08
540+
525541
OICYWA01
542+
OICYWA02
543+
OICYWA03
544+
OICYWA04
545+
OICYWA05
546+
OICYWA06
547+
OICYWA07
548+
OICYWA08
549+
526550
OLAVAA01
527551
OLAVAA02
528552
OLAVAB01
553+
529554
OLAVAC01
555+
OLAVAC02
556+
OLAVAC03
557+
OLAVAC04
558+
OLAVAC05
559+
OLAVAC06
560+
OLAVAC07
561+
OLAVAC08
562+
530563
OLAVAD01
564+
OLAVAD02
565+
OLAVAD03
566+
OLAVAD04
567+
OLAVAD05
568+
OLAVAD06
569+
OLAVAD07
570+
OLAVAD08
571+
531572
OLAVAE01
573+
OLAVAE02
574+
OLAVAE03
575+
OLAVAE04
576+
OLAVAE05
577+
OLAVAE06
578+
OLAVAE07
579+
OLAVAE08
580+
532581
OLAVAF01
582+
OLAVAF02
583+
OLAVAF03
584+
OLAVAF04
585+
OLAVAF05
586+
OLAVAF06
587+
OLAVAF07
588+
OLAVAF08
589+
OLAVAF09
590+
OLAVAF10
591+
533592
ONUKEA01
593+
ONUKEA02
594+
ONUKEA03
595+
ONUKEA04
596+
ONUKEA05
597+
ONUKEA06
598+
ONUKEA07
599+
ONUKEA08
600+
534601
OSLUDG01
602+
OSLUDG02
603+
OSLUDG03
604+
OSLUDG04
605+
OSLUDG05
606+
OSLUDG06
607+
OSLUDG07
608+
OSLUDG08
609+
535610
OPOOPY01
611+
OPOOPY02
612+
OPOOPY03
613+
OPOOPY04
614+
OPOOPY05
615+
OPOOPY06
616+
OPOOPY07
617+
OPOOPY08
618+
536619
OTAR__01
620+
OTAR__02
621+
OTAR__03
622+
OTAR__04
623+
OTAR__05
624+
OTAR__06
625+
OTAR__07
626+
OTAR__08
627+
537628
OWATER01
629+
OWATER02
630+
OWATER03
631+
OWATER04
632+
OWATER05
633+
OWATER06
634+
OWATER07
635+
OWATER08
538636
]]
539637

540638
function OTEX_PROC_MODULE.setup(self)

scripts/shapes.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6599,7 +6599,7 @@ GROW_CAUSEWAY_WATERLOCKED_CROSSED_OUT =
65996599

66006600
GROW_CAUSEWAY_WATERLOCKED_CENTER_PILLAR =
66016601
{
6602-
prob = 35,
6602+
prob = 45,
66036603
skip_prob = 80,
66046604

66056605
structure =

0 commit comments

Comments
 (0)