From 138b1729adf613ce858e14067aa66c1fae0aa83b Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Mon, 17 Apr 2023 20:20:54 -0500 Subject: [PATCH] d/jak2: fix `dig-sinking-plat`s in dig3 (#2519) --- decompiler/config/jak2/all-types.gc | 2 +- goal_src/jak2/levels/dig/dig-obs.gc | 15 ++++++++++++++- .../reference/jak2/levels/dig/dig-obs_REF.gc | 17 +++++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/decompiler/config/jak2/all-types.gc b/decompiler/config/jak2/all-types.gc index 4463618329..24fbcc8ba2 100644 --- a/decompiler/config/jak2/all-types.gc +++ b/decompiler/config/jak2/all-types.gc @@ -36704,7 +36704,7 @@ ) ) -(define-extern *dig-sinking-platform-constants* rigid-body-object-constants) +(define-extern *dig-sinking-platform-constants* rigid-body-platform-constants) (define-extern *dig-log-button-infos* (array dig-log-button-info)) (define-extern *dig-log-heights* (inline-array vector)) (define-extern dig-log-event-handler (function process int symbol event-message-block object :behavior dig-log)) diff --git a/goal_src/jak2/levels/dig/dig-obs.gc b/goal_src/jak2/levels/dig/dig-obs.gc index 34694c7771..38266f36b5 100644 --- a/goal_src/jak2/levels/dig/dig-obs.gc +++ b/goal_src/jak2/levels/dig/dig-obs.gc @@ -65,7 +65,7 @@ (none) ) -(define *dig-sinking-platform-constants* (new 'static 'rigid-body-object-constants +(define *dig-sinking-platform-constants* (new 'static 'rigid-body-platform-constants :info (new 'static 'rigid-body-info :mass 4.0 :inv-mass 0.25 @@ -82,6 +82,19 @@ :attack-force-scale 2.0 ) :name '*dig-sinking-platform-constants* + :drag-factor 2.0 + :buoyancy-factor 1.2 + :max-buoyancy-depth (meters 2) + :player-weight (meters 80) + :player-bonk-factor 0.5 + :player-dive-factor 1.0 + :player-force-distance (meters 30) + :player-force-clamp (meters 1000000) + :player-force-timeout #x1e + :explosion-force (meters 1000) + :control-point-count 5 + :platform #t + :sound-name "mud-plat" ) ) diff --git a/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc index f7057e9f97..4fc19a76f3 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc @@ -85,8 +85,8 @@ (none) ) -;; definition for symbol *dig-sinking-platform-constants*, type rigid-body-object-constants -(define *dig-sinking-platform-constants* (new 'static 'rigid-body-object-constants +;; definition for symbol *dig-sinking-platform-constants*, type rigid-body-platform-constants +(define *dig-sinking-platform-constants* (new 'static 'rigid-body-platform-constants :info (new 'static 'rigid-body-info :mass 4.0 :inv-mass 0.25 @@ -103,6 +103,19 @@ :attack-force-scale 2.0 ) :name '*dig-sinking-platform-constants* + :drag-factor 2.0 + :buoyancy-factor 1.2 + :max-buoyancy-depth (meters 2) + :player-weight (meters 80) + :player-bonk-factor 0.5 + :player-dive-factor 1.0 + :player-force-distance (meters 30) + :player-force-clamp (meters 1000000) + :player-force-timeout #x1e + :explosion-force (meters 1000) + :control-point-count 5 + :platform #t + :sound-name "mud-plat" ) )