From b3505252948d060164adcee2f3039fb5ca76d627 Mon Sep 17 00:00:00 2001
From: ManDude <7569514+ManDude@users.noreply.github.com>
Date: Tue, 20 Jun 2023 19:31:20 +0100
Subject: [PATCH] increase airlock open and post-close speed (#2758)

open: 150% -> 175%
post-close: 100% -> 175%
---
 goal_src/jak2/engine/entity/entity.gc  |  2 ++
 goal_src/jak2/levels/common/airlock.gc |  3 ++-
 goal_src/jak2/pc/debug/entity-debug.gc |  2 +-
 goal_src/jak2/pc/pckernel-impl.gc      |  1 +
 goal_src/jak2/pc/pckernel.gc           | 15 +++++++++++----
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/goal_src/jak2/engine/entity/entity.gc b/goal_src/jak2/engine/entity/entity.gc
index f6eb7a8e7c..c4f4d815a8 100644
--- a/goal_src/jak2/engine/entity/entity.gc
+++ b/goal_src/jak2/engine/entity/entity.gc
@@ -2233,6 +2233,8 @@
                                                              ;; ban specific entities
                                                              (not (let ((name (res-lump-struct (-> sv-48 entity) 'name string)))
                                                                   (or (string= name "fort-entry-gate-11")
+                                                                      (string= name "fort-elec-gate-11")
+                                                                      (string= name "fort-elec-gate-12")
                                                                       (string= name "com-airlock-outer-13")
                                                                       (string= name "com-airlock-inner-41")
                                                                       (string= name "under-lift-4")
diff --git a/goal_src/jak2/levels/common/airlock.gc b/goal_src/jak2/levels/common/airlock.gc
index 15d1062153..ac74bd6095 100644
--- a/goal_src/jak2/levels/common/airlock.gc
+++ b/goal_src/jak2/levels/common/airlock.gc
@@ -559,7 +559,8 @@
             )
         (rotate-gear! self 65536.0)
         (suspend)
-        (ja :num! (seek! 0.0))
+        ;; pc port note: added speed modifier
+        (ja :num! (seek! 0.0 (get-airlock-close-speed *pc-settings*)))
         (transform-post)
         )
       (when (nonzero? (-> self sound-id))
diff --git a/goal_src/jak2/pc/debug/entity-debug.gc b/goal_src/jak2/pc/debug/entity-debug.gc
index b88a57d0c3..40ac2d1980 100644
--- a/goal_src/jak2/pc/debug/entity-debug.gc
+++ b/goal_src/jak2/pc/debug/entity-debug.gc
@@ -48,7 +48,7 @@
                                (bucket-id debug-no-zbuf1))
       ;; basic info, actor id, etc
       (draw-string-xy
-          (string-format "~3L~A~0L ~A~%tags: ~D size: ~D aid: #x~x level: ~S~%R1/L1 scroll L3 toggle display-actor-info~%--------------------" (-> e type) name (length e) (asize-of e) (-> e aid) (aif (-> e extra) (-> it level name)))
+          (string-format "~3L~A~0L ~A~%tags: ~D size: ~D aid: #x~x level: ~S~%R1/L1 to scroll~%--------------------" (-> e type) name (length e) (asize-of e) (-> e aid) (aif (-> e extra) (-> it level name)))
           debug-buf 352 cur-y (font-color default) (font-flags shadow kerning middle))
       (+! cur-y (* LINE_HEIGHT 4))
       (cond
diff --git a/goal_src/jak2/pc/pckernel-impl.gc b/goal_src/jak2/pc/pckernel-impl.gc
index b7c76d6397..5d3e604577 100644
--- a/goal_src/jak2/pc/pckernel-impl.gc
+++ b/goal_src/jak2/pc/pckernel-impl.gc
@@ -60,6 +60,7 @@
   (:methods
     (eligible-for-fast-elevator? (_type_ process) symbol)
     (get-airlock-speed (_type_) float)
+    (get-airlock-close-speed (_type_) float)
     )
   )
 
diff --git a/goal_src/jak2/pc/pckernel.gc b/goal_src/jak2/pc/pckernel.gc
index d1fe83168a..321df62172 100644
--- a/goal_src/jak2/pc/pckernel.gc
+++ b/goal_src/jak2/pc/pckernel.gc
@@ -101,16 +101,23 @@
 (defmethod eligible-for-fast-elevator? pc-settings-jak2 ((obj pc-settings-jak2) (proc process))
   "is this a valid process for a fast elevator?"
   (and (-> obj fast-elevator?) (not (or (string= (-> proc name) "drill-lift-1")
-                                        (string= (-> proc name )"drill-lift-2"))))
+                                        (string= (-> proc name) "drill-lift-2"))))
   )
 
-(define *airlock-speed* 1.5)
+(define *airlock-speed* 1.75)
+(define *airlock-close-speed* 1.75)
+
 (defmethod get-airlock-speed pc-settings-jak2 ((obj pc-settings-jak2))
   "return the current speed modifier for airlocks"
   (if (-> obj fast-airlock?)
       *airlock-speed*
-      1.0)
-  )
+      1.0))
+
+(defmethod get-airlock-close-speed pc-settings-jak2 ((obj pc-settings-jak2))
+  "return the current closing speed modifier for airlocks"
+  (if (-> obj fast-airlock?)
+      *airlock-close-speed*
+      1.0))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;