From 131542583a7d8c254594630077e29ebae9be8fa6 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 11 Feb 2023 21:15:52 -0500 Subject: [PATCH 1/8] Fix some problems with Eder Tsogal's BS. - plResponderModifier [cRespBSDoorOps], [cSfxRespBSrotation] Changed all plSoundMsgs in these responders to NOT use the command `kIsLocalOnly` - this command prevented non-owners from hearing the door sound effects. - plPythonFileMod [cPythBlueSpiral] Added attributes 25 and 26 - BlueSpiral solution and running variable name strings. - plCoordinateInterface [LinkInPointDefault] Moved the default link in point down to Z=-4 to fix the avatars visibly spawning high up in the air and falling. --- compiled/dat/EderTsogal_District_tsoGarden.prp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiled/dat/EderTsogal_District_tsoGarden.prp b/compiled/dat/EderTsogal_District_tsoGarden.prp index 67c67e27..7f79974a 100644 --- a/compiled/dat/EderTsogal_District_tsoGarden.prp +++ b/compiled/dat/EderTsogal_District_tsoGarden.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca3619b631269142c27d9a022c216daa5dc4d7aa66e7f6a434edc8e11b4bd0ec -size 3753872 +oid sha256:564609da9e553eb055352aee7fb141291379d9e3d6516d45aa69c0a3157dbe78 +size 3752794 From 75c8eba1e3c378961d8fc8c25e1d94e5de4e4eb6 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sun, 12 Feb 2023 17:54:32 -0500 Subject: [PATCH 2/8] Update EderTsogal CubicEnvironmap for accuracy. The previous cubic environment map was taken from an angle that didn't match its intended use case, causing the reflection in the Bahro door to be very inaccurate. --- compiled/dat/EderTsogal_District_Textures.prp | 4 ++-- sources/textures/tga/EderTsogal/tsoenviro_BK.png | 3 +++ sources/textures/tga/EderTsogal/tsoenviro_DN.png | 3 +++ sources/textures/tga/EderTsogal/tsoenviro_FR.png | 3 +++ sources/textures/tga/EderTsogal/tsoenviro_LF.png | 3 +++ sources/textures/tga/EderTsogal/tsoenviro_RT.png | 3 +++ sources/textures/tga/EderTsogal/tsoenviro_UP.png | 3 +++ 7 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 sources/textures/tga/EderTsogal/tsoenviro_BK.png create mode 100644 sources/textures/tga/EderTsogal/tsoenviro_DN.png create mode 100644 sources/textures/tga/EderTsogal/tsoenviro_FR.png create mode 100644 sources/textures/tga/EderTsogal/tsoenviro_LF.png create mode 100644 sources/textures/tga/EderTsogal/tsoenviro_RT.png create mode 100644 sources/textures/tga/EderTsogal/tsoenviro_UP.png diff --git a/compiled/dat/EderTsogal_District_Textures.prp b/compiled/dat/EderTsogal_District_Textures.prp index 4e9d23d9..7e298290 100644 --- a/compiled/dat/EderTsogal_District_Textures.prp +++ b/compiled/dat/EderTsogal_District_Textures.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e5a60830873b3c19821e1045b9d8dd29bcfe83d9e6fe72ef470e3a2340a9f93 -size 12735016 +oid sha256:1e9202d02c974863b19d5b9076e9218913b0d3f415c0fdd0a287532eab812b9e +size 12734992 diff --git a/sources/textures/tga/EderTsogal/tsoenviro_BK.png b/sources/textures/tga/EderTsogal/tsoenviro_BK.png new file mode 100644 index 00000000..734722be --- /dev/null +++ b/sources/textures/tga/EderTsogal/tsoenviro_BK.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4fb00475c01ae0db4b8af81700efdabc251d37e049741635ef00def9399adf2 +size 83086 diff --git a/sources/textures/tga/EderTsogal/tsoenviro_DN.png b/sources/textures/tga/EderTsogal/tsoenviro_DN.png new file mode 100644 index 00000000..6299ad2c --- /dev/null +++ b/sources/textures/tga/EderTsogal/tsoenviro_DN.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45e79322b9a1213619fded6d0cfc722d85790a0022a88cd2066a5d94d2c50e1a +size 105516 diff --git a/sources/textures/tga/EderTsogal/tsoenviro_FR.png b/sources/textures/tga/EderTsogal/tsoenviro_FR.png new file mode 100644 index 00000000..e7626cbe --- /dev/null +++ b/sources/textures/tga/EderTsogal/tsoenviro_FR.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efdf4bd33408d1848de7c38d6727dfb526f1426e55cd46aae96f105d82a238c4 +size 91935 diff --git a/sources/textures/tga/EderTsogal/tsoenviro_LF.png b/sources/textures/tga/EderTsogal/tsoenviro_LF.png new file mode 100644 index 00000000..2a360ee6 --- /dev/null +++ b/sources/textures/tga/EderTsogal/tsoenviro_LF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba7637bf1bafa91f3f5ba94503cde8aa265fe64afeeb673e2e2e79571f66ec76 +size 82917 diff --git a/sources/textures/tga/EderTsogal/tsoenviro_RT.png b/sources/textures/tga/EderTsogal/tsoenviro_RT.png new file mode 100644 index 00000000..833cb936 --- /dev/null +++ b/sources/textures/tga/EderTsogal/tsoenviro_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7139cd9569e3d4c802ee0a44d33e78350156ebd20bb8447ecf8db1e27ddde20a +size 71562 diff --git a/sources/textures/tga/EderTsogal/tsoenviro_UP.png b/sources/textures/tga/EderTsogal/tsoenviro_UP.png new file mode 100644 index 00000000..9681c9ac --- /dev/null +++ b/sources/textures/tga/EderTsogal/tsoenviro_UP.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93981af2bd8515470269e8dc6c7f3d3fc72ba6283495957523c97dda0fa4152e +size 70575 From a4193bb3f5a9f472cab9cf6cd9cd9c3cd2bb04c7 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sun, 12 Feb 2023 20:10:07 -0500 Subject: [PATCH 3/8] Fix some problems with Eder Delin's BS. - plResponderModifier [cRespBSDoorOps], [cSfxRespBSrotation] Changed all plSoundMsgs in these responders to NOT use the command `kIsLocalOnly` - this command prevented non-owners from hearing the door sound effects. - plPythonFileMod [cPythBlueSpiral] Added attributes 25 and 26 - BlueSpiral solution and running variable name strings. - plCoordinateInterface [tsglBlueSpiralDoorPOS] Moved the OneShot position up to z=-0.82 to prevent the player from noticably sinking into the ground when playing the door press animation at the bahro door. --- compiled/dat/EderDelin_District_garden.prp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiled/dat/EderDelin_District_garden.prp b/compiled/dat/EderDelin_District_garden.prp index 001cee2f..11c6a9c2 100644 --- a/compiled/dat/EderDelin_District_garden.prp +++ b/compiled/dat/EderDelin_District_garden.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a17de122f7367e3e4ba8dcdf746a1461921cca1c49bfebe33933249123080606 -size 4780212 +oid sha256:caaa16662a26c612d31f1de004f9cba6500477b63f17cff579124094ce106ea0 +size 4778459 From b4f86ea7005ea4f37cddf1b96891e19c106e2843 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sun, 12 Feb 2023 20:17:07 -0500 Subject: [PATCH 4/8] Update EderDelin CubicEnvironmap for accuracy. The environment map was previously a duplicate of the incorrect environment map from Eder Tsogal. The end result is a very slight change in coloration at the top of the bahro door from white to pink. The bahro door in Eder Delin is too shrouded in shadow for this change to be readily apparent. --- compiled/dat/EderDelin_District_Textures.prp | 4 ++-- sources/textures/tga/EderDelin/tsoenviro_BK.png | 3 +++ sources/textures/tga/EderDelin/tsoenviro_DN.png | 3 +++ sources/textures/tga/EderDelin/tsoenviro_FR.png | 3 +++ sources/textures/tga/EderDelin/tsoenviro_LF.png | 3 +++ sources/textures/tga/EderDelin/tsoenviro_RT.png | 3 +++ sources/textures/tga/EderDelin/tsoenviro_UP.png | 3 +++ 7 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 sources/textures/tga/EderDelin/tsoenviro_BK.png create mode 100644 sources/textures/tga/EderDelin/tsoenviro_DN.png create mode 100644 sources/textures/tga/EderDelin/tsoenviro_FR.png create mode 100644 sources/textures/tga/EderDelin/tsoenviro_LF.png create mode 100644 sources/textures/tga/EderDelin/tsoenviro_RT.png create mode 100644 sources/textures/tga/EderDelin/tsoenviro_UP.png diff --git a/compiled/dat/EderDelin_District_Textures.prp b/compiled/dat/EderDelin_District_Textures.prp index b5af90e6..c168a7c9 100644 --- a/compiled/dat/EderDelin_District_Textures.prp +++ b/compiled/dat/EderDelin_District_Textures.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e251ec3aeebe1cfd8f5a87d2970c57e48e25923b506ed15cd91c08dd3121ae08 -size 17538205 +oid sha256:1bfea26f34a643f1da41f3305bb2ec6e4e045d7d31536fbe94f5a8ce73b4191b +size 17538181 diff --git a/sources/textures/tga/EderDelin/tsoenviro_BK.png b/sources/textures/tga/EderDelin/tsoenviro_BK.png new file mode 100644 index 00000000..972c6d8a --- /dev/null +++ b/sources/textures/tga/EderDelin/tsoenviro_BK.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ee8f2d50c39e28f5b76d0cd359240c41d275aa2a646c3b8ad3082a4fdae2b52 +size 102368 diff --git a/sources/textures/tga/EderDelin/tsoenviro_DN.png b/sources/textures/tga/EderDelin/tsoenviro_DN.png new file mode 100644 index 00000000..a94790c0 --- /dev/null +++ b/sources/textures/tga/EderDelin/tsoenviro_DN.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e89caf415a357a3abb6ecf5bce15d8e596f48a0a29130a8becfb025bd584d634 +size 68795 diff --git a/sources/textures/tga/EderDelin/tsoenviro_FR.png b/sources/textures/tga/EderDelin/tsoenviro_FR.png new file mode 100644 index 00000000..e1e689d7 --- /dev/null +++ b/sources/textures/tga/EderDelin/tsoenviro_FR.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cf4977baff0b9af404fe271f902d3e43f87a16ffdb817f17cef88f21541ed19 +size 41413 diff --git a/sources/textures/tga/EderDelin/tsoenviro_LF.png b/sources/textures/tga/EderDelin/tsoenviro_LF.png new file mode 100644 index 00000000..8e880fef --- /dev/null +++ b/sources/textures/tga/EderDelin/tsoenviro_LF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3325b7ab7533d8d83db61e5cb25de9795d56a7ddcb3be3c953186b7251ed7ba +size 70064 diff --git a/sources/textures/tga/EderDelin/tsoenviro_RT.png b/sources/textures/tga/EderDelin/tsoenviro_RT.png new file mode 100644 index 00000000..7a611518 --- /dev/null +++ b/sources/textures/tga/EderDelin/tsoenviro_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b0ad759a094eadae6ed21045945438105a7e665c4be2cccbf3dd7e7ae1778b1 +size 67622 diff --git a/sources/textures/tga/EderDelin/tsoenviro_UP.png b/sources/textures/tga/EderDelin/tsoenviro_UP.png new file mode 100644 index 00000000..81b21997 --- /dev/null +++ b/sources/textures/tga/EderDelin/tsoenviro_UP.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ef25521072f1d7972063ed7115640f887557fbfcbb32c81a21b5f07bca39f0e +size 79087 From 9f3881ed59c7a58943f308b1ba3b5d66fcb2cf7f Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 13 Feb 2023 19:43:04 -0500 Subject: [PATCH 5/8] Eder BS door animation synchronization fixes. This hardens the logic of synchronizing the bahro door animations by adding an extra notification to the Python script for when the bahro door begins to open. This also fixes Eder Delin's bahro door fast-forwarding open the first time the blue spiral game is completed in that Age. - [plResponderModifier] cRespBSDoorOps Added a `plNotifyMsg` back to the Python script at the beginning of the door open (first) responder state with a state of 0 to indicate that the door is not yet open. This change requires script changes. - Eder Delin ONLY [plAGMasterMod] AnimGroupedBSdoorClose_0 Removed the link to the owning `plMsgForwarder` - this link caused the door to fast-forward open. The field is nulled out in the Tsogal door, which is known to work correctly. --- compiled/dat/EderDelin_District_garden.prp | 4 ++-- compiled/dat/EderTsogal_District_tsoGarden.prp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiled/dat/EderDelin_District_garden.prp b/compiled/dat/EderDelin_District_garden.prp index 11c6a9c2..ad4e561f 100644 --- a/compiled/dat/EderDelin_District_garden.prp +++ b/compiled/dat/EderDelin_District_garden.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:caaa16662a26c612d31f1de004f9cba6500477b63f17cff579124094ce106ea0 -size 4778459 +oid sha256:df2a7a120ea96f802e435dccc1be310c6f1a109ec5c1eb1cf459b3d4e94e2cfd +size 4778494 diff --git a/compiled/dat/EderTsogal_District_tsoGarden.prp b/compiled/dat/EderTsogal_District_tsoGarden.prp index 7f79974a..76be955a 100644 --- a/compiled/dat/EderTsogal_District_tsoGarden.prp +++ b/compiled/dat/EderTsogal_District_tsoGarden.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:564609da9e553eb055352aee7fb141291379d9e3d6516d45aa69c0a3157dbe78 -size 3752794 +oid sha256:4566c2bb123afd69df7731ca75a400f7d88d67b55e902a7f0587a98f4bf77d11 +size 3752867 From 735fa78ec0bb103bd1fb4570ed9f8e78cd34013d Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 15 Feb 2023 19:14:03 -0500 Subject: [PATCH 6/8] Eder BS door clickable sanity fix. This turns off the door clickable while the door is animating. This should prevent the game state from changing due to unexpected user input during transitions. - [plResponderModifier] cRespBSDoorOps Disabled the door clickable when the door begins to open and re-enable it when the door fully closes. This is done in the responder itself instead of the code so that the clickable and visual states match exactly. Previously, the EderTsogal door sent an enable/disable to the clickable LogicModifier while the EderDelin door did nothing to try to prevent spurious clicks. The enable/disable of the logic modifier was maintained by routing the EnableMsg to the SceneObject with an instruction to enable/disable the physical and route the message to all modifiers. --- compiled/dat/EderDelin_District_garden.prp | 4 ++-- compiled/dat/EderTsogal_District_tsoGarden.prp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiled/dat/EderDelin_District_garden.prp b/compiled/dat/EderDelin_District_garden.prp index ad4e561f..0547e9c2 100644 --- a/compiled/dat/EderDelin_District_garden.prp +++ b/compiled/dat/EderDelin_District_garden.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df2a7a120ea96f802e435dccc1be310c6f1a109ec5c1eb1cf459b3d4e94e2cfd -size 4778494 +oid sha256:6b91ab0c8438ec19fdf0ecef75a040a46bc520011f6a77de6fa514b3998f5234 +size 4778729 diff --git a/compiled/dat/EderTsogal_District_tsoGarden.prp b/compiled/dat/EderTsogal_District_tsoGarden.prp index 76be955a..8f1f3a9c 100644 --- a/compiled/dat/EderTsogal_District_tsoGarden.prp +++ b/compiled/dat/EderTsogal_District_tsoGarden.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4566c2bb123afd69df7731ca75a400f7d88d67b55e902a7f0587a98f4bf77d11 -size 3752867 +oid sha256:369ed2fabd46e01b4d00d16376cc1accd6af06deb9e28170754680227f340dce +size 3752863 From f317cddc4d7e3b30c6f390ccc5c2a009fc5758e4 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 15 Feb 2023 20:31:04 -0500 Subject: [PATCH 7/8] Fix a few more graphical problems in EderTsogal. This fixes the jagged shadow on the bahro door by increasing the shadow caster's blur scale from 0 to 1. Also, some of the cloth seek points have been adjusted to avoid placing the player slightly above and below the ground. --- compiled/dat/EderTsogal_District_tsoGarden.prp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiled/dat/EderTsogal_District_tsoGarden.prp b/compiled/dat/EderTsogal_District_tsoGarden.prp index 8f1f3a9c..e0333050 100644 --- a/compiled/dat/EderTsogal_District_tsoGarden.prp +++ b/compiled/dat/EderTsogal_District_tsoGarden.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:369ed2fabd46e01b4d00d16376cc1accd6af06deb9e28170754680227f340dce +oid sha256:b2bba6b36c2274187e895e7d7042ab9c00b9d5d31adcb9896ca751f1ed0d0dfb size 3752863 From 4cb6bfa2e701194db95ccf20b921433987ef78f8 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 17 Feb 2023 13:49:32 -0500 Subject: [PATCH 8/8] Further improve Eder BS door state tracking. This adds more notifications to the responder to track the door closing state. This was done to fix some problems observed with the door clickable being re-enabled by the Python script racing the responder. Also, fix the door clickable responder in Eder Tsogal to properly enable/disable the clickable. - [plResponderModifier] cRespBSDoorOps Added new plNotifyMsgs for door closing and changed the state numbers to match the enum in xBlueSpiral.py. Also fixed Eder Tsogal's responder to properly enable/disable the door clickable, which must have been missed in the earlier commit. --- compiled/dat/EderDelin_District_garden.prp | 4 ++-- compiled/dat/EderTsogal_District_tsoGarden.prp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiled/dat/EderDelin_District_garden.prp b/compiled/dat/EderDelin_District_garden.prp index 0547e9c2..a355c1ef 100644 --- a/compiled/dat/EderDelin_District_garden.prp +++ b/compiled/dat/EderDelin_District_garden.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b91ab0c8438ec19fdf0ecef75a040a46bc520011f6a77de6fa514b3998f5234 -size 4778729 +oid sha256:e78cd0cf4e494a1d5a27977244ef142d03b8b37490d1a9e70f62ca2b1522f3d6 +size 4778875 diff --git a/compiled/dat/EderTsogal_District_tsoGarden.prp b/compiled/dat/EderTsogal_District_tsoGarden.prp index e0333050..84b2edb7 100644 --- a/compiled/dat/EderTsogal_District_tsoGarden.prp +++ b/compiled/dat/EderTsogal_District_tsoGarden.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2bba6b36c2274187e895e7d7042ab9c00b9d5d31adcb9896ca751f1ed0d0dfb -size 3752863 +oid sha256:700642b36e76d13acb34629ed3c3d013c8555bafa9be82cccc0db65f160b2899 +size 3753009