From 6482482eebadbb7d9117bded7681c66701de581d Mon Sep 17 00:00:00 2001 From: TORISOUP Date: Wed, 17 Feb 2016 00:50:51 +0900 Subject: [PATCH 1/6] SpeedMax! --- Inferno/Inferno.csproj | 1 + .../InfernoScripts/Parupunte/Scripts/Isono.cs | 1 + .../Parupunte/Scripts/PerfectFreeze.cs | 1 + Inferno/InfernoScripts/World/SpeedMax.cs | 67 +++++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 Inferno/InfernoScripts/World/SpeedMax.cs diff --git a/Inferno/Inferno.csproj b/Inferno/Inferno.csproj index 6ab14839..fc051172 100644 --- a/Inferno/Inferno.csproj +++ b/Inferno/Inferno.csproj @@ -168,6 +168,7 @@ + diff --git a/Inferno/InfernoScripts/Parupunte/Scripts/Isono.cs b/Inferno/InfernoScripts/Parupunte/Scripts/Isono.cs index 43dad16b..381b415b 100644 --- a/Inferno/InfernoScripts/Parupunte/Scripts/Isono.cs +++ b/Inferno/InfernoScripts/Parupunte/Scripts/Isono.cs @@ -6,6 +6,7 @@ namespace Inferno.InfernoScripts.Parupunte.Scripts { + internal class Isono : ParupunteScript { public Isono(ParupunteCore core) : base(core) diff --git a/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs b/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs index 5b45ea2e..09a4f968 100644 --- a/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs +++ b/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs @@ -5,6 +5,7 @@ namespace Inferno.InfernoScripts.Parupunte.Scripts { + [ParupunteDebug(false, true)] class PerfectFreeze : ParupunteScript { public PerfectFreeze(ParupunteCore core) : base(core) diff --git a/Inferno/InfernoScripts/World/SpeedMax.cs b/Inferno/InfernoScripts/World/SpeedMax.cs new file mode 100644 index 00000000..793115b0 --- /dev/null +++ b/Inferno/InfernoScripts/World/SpeedMax.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using GTA; +using GTA.Math; +using UniRx; +namespace Inferno.InfernoScripts.World +{ + class SpeedMax : InfernoScript + { + HashSet vehicleHashSet = new HashSet(); + + protected override void Setup() + { + CreateInputKeywordAsObservable("smax") + .Subscribe(_ => IsActive = !IsActive); + + IsActiveAsObservable + .Subscribe(x => DrawText($"SpeedMax:{IsActive}")); + + OnTickAsObservable + .Where(_ => IsActive) + .Subscribe(_ => + { + foreach (var v in CachedVehicles + .Where(x => + x.IsSafeExist() + && x.IsInRangeOf(PlayerPed.Position, 100.0f) + && !vehicleHashSet.Contains(x.Handle) + )) + { + vehicleHashSet.Add(v.Handle); + StartCoroutine(VehicleSpeedMaxCorutine(v)); + } + }); + + OnTickAsObservable + .Where(_ => IsActive) + .Select(_ => PlayerPed.IsAlive) + .DistinctUntilChanged() + .Where(x => x) + .Subscribe(_ => vehicleHashSet.Clear()); + + } + + private IEnumerable VehicleSpeedMaxCorutine(Vehicle v) + { + yield return WaitForSeconds(1); + var time = 0.0f; + var maxSpeed = Random.Next(5, 10); + var duration = (float)Random.Next(3, 20); + + while (IsActive && v.IsSafeExist()) + { + if (!v.IsInRangeOf(PlayerPed.Position, 600)) yield break; + if(PlayerVehicle.Value == v) yield break; + var currentSpeed = maxSpeed * ((float)Math.Cos(2 * Math.PI * (time / duration)) + 0.5f); + v.ApplyForce(currentSpeed * v.ForwardVector); + time += 0.1f; + yield return null; + } + + } + } +} From 61e1c297cf5918d84a48d730f4acebe29aff4f04 Mon Sep 17 00:00:00 2001 From: TORISOUP Date: Fri, 19 Feb 2016 00:24:14 +0900 Subject: [PATCH 2/6] =?UTF-8?q?SpeedMax=E6=A9=9F=E8=83=BD=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Parupunte/Scripts/PerfectFreeze.cs | 18 +-- .../Player/ArmorAndHealthSupplier.cs | 88 +++++------ Inferno/InfernoScripts/World/SpeedMax.cs | 139 ++++++++++++++++-- 3 files changed, 172 insertions(+), 73 deletions(-) diff --git a/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs b/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs index 09a4f968..92059e66 100644 --- a/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs +++ b/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs @@ -1,11 +1,11 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using GTA; using UniRx; namespace Inferno.InfernoScripts.Parupunte.Scripts { - [ParupunteDebug(false, true)] class PerfectFreeze : ParupunteScript { public PerfectFreeze(ParupunteCore core) : base(core) @@ -28,6 +28,7 @@ public override void OnStart() }); this.OnUpdateAsObservable + .ThrottleFirst(TimeSpan.FromSeconds(1)) .Subscribe(_ => { var playerPos = core.PlayerPed.Position; @@ -46,19 +47,6 @@ public override void OnStart() } #endregion - #region props - var props = GTA.World.GetAllProps(); - foreach (var prop in props.Where(x => - x.IsSafeExist() - && !freezedEntities.Contains(x) - && x.IsInRangeOf(playerPos, FreezeRange) - )) - { - prop.FreezePosition = true; - freezedEntities.Add(prop); - } - #endregion - //離れていたら解除 var deleteTargets = freezedEntities.FirstOrDefault(x => x.IsSafeExist() && !x.IsInRangeOf(playerPos, FreezeRange + 5)); diff --git a/Inferno/InfernoScripts/Player/ArmorAndHealthSupplier.cs b/Inferno/InfernoScripts/Player/ArmorAndHealthSupplier.cs index 06fdc5c8..9e44fc5e 100644 --- a/Inferno/InfernoScripts/Player/ArmorAndHealthSupplier.cs +++ b/Inferno/InfernoScripts/Player/ArmorAndHealthSupplier.cs @@ -1,49 +1,49 @@ using GTA; -using UniRx; - -namespace Inferno -{ - internal class ArmorAndHealthSupplier : InfernoScript +using UniRx; + +namespace Inferno +{ + internal class ArmorAndHealthSupplier : InfernoScript { - protected override void Setup() + protected override void Setup() { - CreateInputKeywordAsObservable("armor") - .Subscribe(_ => - { - IsActive = !IsActive; - DrawText("SupplyArmorAndHealth:" + IsActive, 3.0f); - }); - - OnAllOnCommandObservable.Subscribe(_ => IsActive = true); - - //ミッションが始まった時 - OnTickAsObservable - .Where(_ => IsActive) - .Select(_ => Game.MissionFlag) - .DistinctUntilChanged() - .Where(x => x) - .Subscribe(_ => SupplyArmorAndHealth()); - - //プレイヤが復活した時 - OnTickAsObservable - .Where(_ => IsActive && PlayerPed.IsSafeExist()) - .Select(_ => PlayerPed.IsAlive) - .DistinctUntilChanged() - .Skip(1) //ONにした直後の判定結果は無視 - .Where(x => x) - .Subscribe(_ => SupplyArmorAndHealth()); + CreateInputKeywordAsObservable("armor") + .Subscribe(_ => + { + IsActive = !IsActive; + DrawText("SupplyArmorAndHealth:" + IsActive, 3.0f); + }); + + OnAllOnCommandObservable.Subscribe(_ => IsActive = true); + + //ミッションが始まった時 + OnTickAsObservable + .Where(_ => IsActive) + .Select(_ => Game.MissionFlag) + .DistinctUntilChanged() + .Where(x => x) + .Subscribe(_ => SupplyArmorAndHealth()); + + //プレイヤが復活した時 + OnTickAsObservable + .Where(_ => IsActive && PlayerPed.IsSafeExist()) + .Select(_ => PlayerPed.IsAlive) + .DistinctUntilChanged() + .Skip(1) //ONにした直後の判定結果は無視 + .Where(x => x) + .Subscribe(_ => SupplyArmorAndHealth()); } - /// - /// 体力とアーマー回復 - /// - private void SupplyArmorAndHealth() - { - var player = PlayerPed; - var maxHealth = player.MaxHealth; - var maxArmor = Game.Player.GetPlayerMaxArmor(); - player.Health = maxHealth; - player.Armor = maxArmor; - } - } -} + /// + /// 体力とアーマー回復 + /// + private void SupplyArmorAndHealth() + { + var player = PlayerPed; + var maxHealth = player.MaxHealth; + var maxArmor = Game.Player.GetPlayerMaxArmor(); + player.Health = maxHealth; + player.Armor = maxArmor; + } + } +} diff --git a/Inferno/InfernoScripts/World/SpeedMax.cs b/Inferno/InfernoScripts/World/SpeedMax.cs index 793115b0..1b517f3a 100644 --- a/Inferno/InfernoScripts/World/SpeedMax.cs +++ b/Inferno/InfernoScripts/World/SpeedMax.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Forms; using GTA; using GTA.Math; using UniRx; @@ -12,16 +13,45 @@ class SpeedMax : InfernoScript { HashSet vehicleHashSet = new HashSet(); + enum SpeedType + { + Original, + Low, + Middle, + High, + Random + } + + SpeedType currentSpeedType = SpeedType.Original; + + private bool excludeMissionVehicle = false; + protected override void Setup() { - CreateInputKeywordAsObservable("smax") + CreateInputKeywordAsObservable("snax") .Subscribe(_ => IsActive = !IsActive); IsActiveAsObservable - .Subscribe(x => DrawText($"SpeedMax:{IsActive}")); + .Where(x => x) + .Subscribe(x => + { + DrawText($"SpeedMax:{IsActive}[Type:{(currentSpeedType)}][Exclude:{excludeMissionVehicle}]"); + vehicleHashSet.Clear(); + }); + + IsActiveAsObservable + .Where(x => !x) + .Subscribe(x => + { + DrawText($"SpeedMax:{IsActive}"); + vehicleHashSet.Clear(); + }); + + //ミッション開始直後に一瞬動作を止めるフラグ + var suspednFlag = false; OnTickAsObservable - .Where(_ => IsActive) + .Where(_ => IsActive && !suspednFlag) .Subscribe(_ => { foreach (var v in CachedVehicles @@ -29,12 +59,44 @@ protected override void Setup() x.IsSafeExist() && x.IsInRangeOf(PlayerPed.Position, 100.0f) && !vehicleHashSet.Contains(x.Handle) + && !(excludeMissionVehicle && x.IsPersistent) )) { vehicleHashSet.Add(v.Handle); - StartCoroutine(VehicleSpeedMaxCorutine(v)); + if (currentSpeedType == SpeedType.Original) + { + StartCoroutine(OriginalSpeedMaxCoroutine(v)); + } + else + { + StartCoroutine(VehicleSpeedMaxCorutine(v)); + } + } }); + var nextType = currentSpeedType; + OnKeyDownAsObservable + .Where(x => IsActive && x.KeyCode == Keys.F6) + .Do(_ => + { + nextType = GetNextSpeedType(nextType); + DrawText($"SpeedMax:[Type:{nextType}]", 1.0f); + }) + .Throttle(TimeSpan.FromSeconds(1)) + .Subscribe(_ => + { + currentSpeedType = nextType; + DrawText($"SpeedMax:[Type:{(currentSpeedType)}][OK]", 2.0f); + vehicleHashSet.Clear(); + }); + + OnKeyDownAsObservable + .Where(x => IsActive && x.KeyCode == Keys.F5) + .Subscribe(_ => + { + excludeMissionVehicle = !excludeMissionVehicle; + DrawText($"SpeedMax:ExcludeMissionVehicles[{excludeMissionVehicle}]"); + }); OnTickAsObservable .Where(_ => IsActive) @@ -43,25 +105,74 @@ protected override void Setup() .Where(x => x) .Subscribe(_ => vehicleHashSet.Clear()); + //ミッションが始まった時にしばらく動作を止める + OnTickAsObservable + .Where(_ => IsActive) + .Select(_ => Game.MissionFlag) + .DistinctUntilChanged() + .Where(x => x) + .Do(_ => suspednFlag = true) + .Delay(TimeSpan.FromSeconds(3)) + .Subscribe(_ => suspednFlag = false); } + /// + /// オリジナルに近い挙動 + /// + private IEnumerable OriginalSpeedMaxCoroutine(Vehicle v) + { + var maxSpeed = Random.Next(100, 300); + var mySpeedType = currentSpeedType; + + // 有効かつスピードタイプに変更が無い間実行 + while (IsActive && v.IsSafeExist() && mySpeedType == currentSpeedType) + { + if (!v.IsInRangeOf(PlayerPed.Position, 1000)) yield break; + if (PlayerVehicle.Value == v) yield break; + v.Speed = maxSpeed; + yield return null; + } + } + + /// + /// カスタム版 + /// private IEnumerable VehicleSpeedMaxCorutine(Vehicle v) { - yield return WaitForSeconds(1); - var time = 0.0f; - var maxSpeed = Random.Next(5, 10); - var duration = (float)Random.Next(3, 20); - while (IsActive && v.IsSafeExist()) + var maxSpeed = GetVehicleSpeed() * ((v.Handle % 10 == 0) ? -1 : 1); + var mySpeedType = currentSpeedType; + + // 有効かつスピードタイプに変更が無い間実行 + while (IsActive && v.IsSafeExist() && mySpeedType == currentSpeedType) { - if (!v.IsInRangeOf(PlayerPed.Position, 600)) yield break; - if(PlayerVehicle.Value == v) yield break; - var currentSpeed = maxSpeed * ((float)Math.Cos(2 * Math.PI * (time / duration)) + 0.5f); - v.ApplyForce(currentSpeed * v.ForwardVector); - time += 0.1f; + if (!v.IsInRangeOf(PlayerPed.Position, 1000)) yield break; + if (PlayerVehicle.Value == v) yield break; + v.ApplyForce(maxSpeed * v.ForwardVector); yield return null; } + } + + private SpeedType GetNextSpeedType(SpeedType current) + { + return (SpeedType)(((int)current + 1) % Enum.GetNames(typeof(SpeedType)).Length); + } + private float GetVehicleSpeed() + { + switch (currentSpeedType) + { + case SpeedType.Low: + return Random.Next(5, 10); + case SpeedType.Middle: + return Random.Next(10, 15); + case SpeedType.High: + return Random.Next(20, 30); + case SpeedType.Random: + return Random.Next(5, 30); + default: + return 0; + } } } } From cce3cf28760598c8bf4173ffba23fa9ee6f18e18 Mon Sep 17 00:00:00 2001 From: TORISOUP Date: Fri, 19 Feb 2016 00:38:31 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=E3=82=B9=E3=83=94=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=83=9E=E3=83=83=E3=82=AF=E3=82=B9=E3=81=AE=E5=8A=B9=E6=9E=9C?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InfernoCore/CoroutineSystem.cs | 12 ++++++++++ .../InfernoCore/InfernoScript.cs | 10 +++++---- Inferno/InfernoScripts/World/SpeedMax.cs | 22 ++++++++++--------- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/Inferno/InfernoScripts/InfernoCore/CoroutineSystem.cs b/Inferno/InfernoScripts/InfernoCore/CoroutineSystem.cs index 465dd20d..e3a35e0f 100644 --- a/Inferno/InfernoScripts/InfernoCore/CoroutineSystem.cs +++ b/Inferno/InfernoScripts/InfernoCore/CoroutineSystem.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; +using System.Windows.Markup.Localizer; namespace Inferno { @@ -57,6 +58,17 @@ public void RemoveCoroutine(uint id) } } + /// + /// 全てのコルーチンを停止する + /// + public void RemoveAllCoroutine() + { + lock (_lockObject) + { + _coroutines.Clear(); + } + } + /// /// コルーチンが存在するかどうかチェックする /// diff --git a/Inferno/InfernoScripts/InfernoCore/InfernoScript.cs b/Inferno/InfernoScripts/InfernoCore/InfernoScript.cs index 95cdf7cd..42428fbf 100644 --- a/Inferno/InfernoScripts/InfernoCore/InfernoScript.cs +++ b/Inferno/InfernoScripts/InfernoCore/InfernoScript.cs @@ -158,10 +158,12 @@ protected uint StartCoroutine(IEnumerable coroutine) protected void StopCoroutine(uint id) { - if (coroutineSystem != null) - { - coroutineSystem.RemoveCoroutine(id); - } + coroutineSystem?.RemoveCoroutine(id); + } + + protected void StopAllCoroutine() + { + coroutineSystem?.RemoveAllCoroutine(); } protected bool IsCoroutineActive(uint id) diff --git a/Inferno/InfernoScripts/World/SpeedMax.cs b/Inferno/InfernoScripts/World/SpeedMax.cs index 1b517f3a..63103c57 100644 --- a/Inferno/InfernoScripts/World/SpeedMax.cs +++ b/Inferno/InfernoScripts/World/SpeedMax.cs @@ -87,6 +87,7 @@ protected override void Setup() { currentSpeedType = nextType; DrawText($"SpeedMax:[Type:{(currentSpeedType)}][OK]", 2.0f); + StopAllCoroutine(); vehicleHashSet.Clear(); }); @@ -95,6 +96,8 @@ protected override void Setup() .Subscribe(_ => { excludeMissionVehicle = !excludeMissionVehicle; + vehicleHashSet.Clear(); + StopAllCoroutine(); DrawText($"SpeedMax:ExcludeMissionVehicles[{excludeMissionVehicle}]"); }); @@ -122,10 +125,7 @@ protected override void Setup() private IEnumerable OriginalSpeedMaxCoroutine(Vehicle v) { var maxSpeed = Random.Next(100, 300); - var mySpeedType = currentSpeedType; - - // 有効かつスピードタイプに変更が無い間実行 - while (IsActive && v.IsSafeExist() && mySpeedType == currentSpeedType) + while (IsActive && v.IsSafeExist()) { if (!v.IsInRangeOf(PlayerPed.Position, 1000)) yield break; if (PlayerVehicle.Value == v) yield break; @@ -139,12 +139,14 @@ private IEnumerable OriginalSpeedMaxCoroutine(Vehicle v) /// private IEnumerable VehicleSpeedMaxCorutine(Vehicle v) { - - var maxSpeed = GetVehicleSpeed() * ((v.Handle % 10 == 0) ? -1 : 1); - var mySpeedType = currentSpeedType; - - // 有効かつスピードタイプに変更が無い間実行 - while (IsActive && v.IsSafeExist() && mySpeedType == currentSpeedType) + //たまに後ろに飛ぶ + var dir = (v.Handle % 10 == 0) ? -1 : 1; + var maxSpeed = GetVehicleSpeed() * dir; + if (currentSpeedType == SpeedType.High) + { + v.Speed = 100 * dir; + } + while (IsActive && v.IsSafeExist()) { if (!v.IsInRangeOf(PlayerPed.Position, 1000)) yield break; if (PlayerVehicle.Value == v) yield break; From aca67cf296d2206a522f35143c128191fd133a14 Mon Sep 17 00:00:00 2001 From: TORISOUP Date: Fri, 19 Feb 2016 00:39:29 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=E5=AE=9F=E8=A3=85=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Inferno/InfernoScripts/World/SpeedMax.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Inferno/InfernoScripts/World/SpeedMax.cs b/Inferno/InfernoScripts/World/SpeedMax.cs index 63103c57..374bfa54 100644 --- a/Inferno/InfernoScripts/World/SpeedMax.cs +++ b/Inferno/InfernoScripts/World/SpeedMax.cs @@ -142,7 +142,7 @@ private IEnumerable VehicleSpeedMaxCorutine(Vehicle v) //たまに後ろに飛ぶ var dir = (v.Handle % 10 == 0) ? -1 : 1; var maxSpeed = GetVehicleSpeed() * dir; - if (currentSpeedType == SpeedType.High) + if (Math.Abs(maxSpeed) > 20) { v.Speed = 100 * dir; } From 9c97294f6eb9f638dd987055271a374477b6e865 Mon Sep 17 00:00:00 2001 From: TORISOUP Date: Fri, 19 Feb 2016 00:45:44 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=E3=83=91=E3=83=BC=E3=83=95=E3=82=A7?= =?UTF-8?q?=E3=82=AF=E3=83=88=E3=83=95=E3=83=AA=E3=83=BC=E3=82=BA=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Parupunte/Scripts/PerfectFreeze.cs | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs b/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs index 92059e66..67c5eb08 100644 --- a/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs +++ b/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs @@ -6,6 +6,7 @@ namespace Inferno.InfernoScripts.Parupunte.Scripts { + [ParupunteDebug(true)] class PerfectFreeze : ParupunteScript { public PerfectFreeze(ParupunteCore core) : base(core) @@ -16,11 +17,11 @@ public PerfectFreeze(ParupunteCore core) : base(core) public override string Name { get; } = "パーフェクトフリーズ"; public override string EndMessage { get; } = "おわり"; - private readonly float FreezeRange = 30; + private readonly float FreezeRange = 60; public override void OnStart() { - ReduceCounter = new ReduceCounter(20 * 1000); + ReduceCounter = new ReduceCounter(15 * 1000); AddProgressBar(ReduceCounter); ReduceCounter.OnFinishedAsync.Subscribe(_ => { @@ -28,12 +29,25 @@ public override void OnStart() }); this.OnUpdateAsObservable - .ThrottleFirst(TimeSpan.FromSeconds(1)) .Subscribe(_ => { var playerPos = core.PlayerPed.Position; var playerVehicle = core.GetPlayerVehicle(); + + #region Ped + foreach (var p in core.CachedPeds.Where( + x => x.IsSafeExist() + && !freezedEntities.Contains(x) + && x.IsInRangeOf(playerPos, FreezeRange) + && x.IsAlive + && x != playerVehicle)) + { + p.FreezePosition = true; + freezedEntities.Add(p); + } + #endregion + #region Vehicle foreach (var v in core.CachedVehicles.Where( x => x.IsSafeExist() @@ -47,16 +61,6 @@ public override void OnStart() } #endregion - //離れていたら解除 - var deleteTargets = freezedEntities.FirstOrDefault(x => - x.IsSafeExist() && !x.IsInRangeOf(playerPos, FreezeRange + 5)); - - if (deleteTargets != null) - { - deleteTargets.FreezePosition = false; - freezedEntities.Remove(deleteTargets); - } - }); //プレイヤ車両は除外 From 8e84c31849c9dce2252a51e1b1b5953f4746e92c Mon Sep 17 00:00:00 2001 From: TORISOUP Date: Fri, 19 Feb 2016 00:46:07 +0900 Subject: [PATCH 6/6] =?UTF-8?q?Debug=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs b/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs index 67c5eb08..b7e886b3 100644 --- a/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs +++ b/Inferno/InfernoScripts/Parupunte/Scripts/PerfectFreeze.cs @@ -6,7 +6,6 @@ namespace Inferno.InfernoScripts.Parupunte.Scripts { - [ParupunteDebug(true)] class PerfectFreeze : ParupunteScript { public PerfectFreeze(ParupunteCore core) : base(core)