From 203b2e9c82d96ffc4c46fae26812d01130f803be Mon Sep 17 00:00:00 2001 From: Novvator Date: Tue, 6 Apr 2021 14:25:53 +0100 Subject: [PATCH 1/2] arrow wall obeys to the freeze ability --- game/Assets/Scripts/Traps/ArrowWall.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/game/Assets/Scripts/Traps/ArrowWall.cs b/game/Assets/Scripts/Traps/ArrowWall.cs index bd4eaaf..cd3cd41 100644 --- a/game/Assets/Scripts/Traps/ArrowWall.cs +++ b/game/Assets/Scripts/Traps/ArrowWall.cs @@ -1,3 +1,4 @@ +using Ktyl.Util; using System; using System.Collections; using System.Collections.Generic; @@ -14,6 +15,8 @@ public class ArrowWall : MonoBehaviour private float? _triggered = null; + [SerializeField] private SerialFloat objectTimeScale; + public void Trigger() { // TODO: pressure plate 'click' sound @@ -29,7 +32,7 @@ public class ArrowWall : MonoBehaviour var elapsed = Time.time - _triggered.Value; // TODO: implications for time freeze - if (elapsed > _delay) + if (elapsed > _delay && objectTimeScale!=0) { // TODO: arrow whoosh noises From 75cf0b6b5ce8090836da5b20e3aa9c79ae12f729 Mon Sep 17 00:00:00 2001 From: Novvator Date: Tue, 6 Apr 2021 15:31:08 +0100 Subject: [PATCH 2/2] applied it to the prefab --- game/Assets/Prefabs/Traps/ArrowWall.prefab | 1 + 1 file changed, 1 insertion(+) diff --git a/game/Assets/Prefabs/Traps/ArrowWall.prefab b/game/Assets/Prefabs/Traps/ArrowWall.prefab index ec71404..7579b68 100644 --- a/game/Assets/Prefabs/Traps/ArrowWall.prefab +++ b/game/Assets/Prefabs/Traps/ArrowWall.prefab @@ -4853,6 +4853,7 @@ MonoBehaviour: _settings: {fileID: 11400000, guid: 36275776eda5c8249bf45e01721afe36, type: 2} _particles: {fileID: 2019849038189154255} _killbox: {fileID: 6149521019687114910} + objectTimeScale: {fileID: 11400000, guid: 9b68e167db44c0c42837e9a679da964e, type: 2} --- !u!1001 &7614645943771473734 PrefabInstance: m_ObjectHideFlags: 0