From 4ca4bd3381ace36173553829f71498352579f982 Mon Sep 17 00:00:00 2001 From: Scrivener07 Date: Wed, 21 Mar 2018 21:27:41 -0400 Subject: [PATCH] Changes to sample scope --- .../Source/FO4_Scopes/Weapons/44/Scope.as | 24 +++++-------------- .../Source/FO4_Scopes/Weapons/44/Scope.fla | 4 ++-- .../Source/FO4_Scopes/Fallout/Scopes/Menu.psc | 3 +-- .../Fallout/ScopesTest/SampleScope.psc | 5 ++-- 4 files changed, 11 insertions(+), 25 deletions(-) diff --git a/Data/Interface/Source/FO4_Scopes/Weapons/44/Scope.as b/Data/Interface/Source/FO4_Scopes/Weapons/44/Scope.as index 5ad6d3c..7745c84 100644 --- a/Data/Interface/Source/FO4_Scopes/Weapons/44/Scope.as +++ b/Data/Interface/Source/FO4_Scopes/Weapons/44/Scope.as @@ -4,34 +4,22 @@ public class Scope extends MovieClip { - - public function Scope() - { - super(); - trace("[Custom Scope]: "+Utility.WalkMovie(this)); - } + public var EndLoop:Boolean = false; public function Steady() : * { - addFrameScript(0, frame1); - trace("[Custom Scope] Steady()"); - } - - - public function Unsteady() : * - { - addFrameScript(0, null); + EndLoop = false; play(); - trace("[Custom Scope] Unsteady()"); + trace("[Scopes Framework][Pistol 44] Steady Invoked"); } - function frame1() : * + public function Unsteady() : * { - stop(); + EndLoop = true; + trace("[Scopes Framework][Pistol 44] Unsteady Invoked"); } - } } diff --git a/Data/Interface/Source/FO4_Scopes/Weapons/44/Scope.fla b/Data/Interface/Source/FO4_Scopes/Weapons/44/Scope.fla index a8332e9..be8039e 100644 --- a/Data/Interface/Source/FO4_Scopes/Weapons/44/Scope.fla +++ b/Data/Interface/Source/FO4_Scopes/Weapons/44/Scope.fla @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbe1247d29c44c57802e2b2c0c51b6e77ff8960859c86846f93dc93ceba88df0 -size 9883 +oid sha256:23f4c09db698331b1b74f45de752378220a7641a741784b4092e7695e69ffa9e +size 10201 diff --git a/Data/Scripts/Source/FO4_Scopes/Fallout/Scopes/Menu.psc b/Data/Scripts/Source/FO4_Scopes/Fallout/Scopes/Menu.psc index 194e135..1b6d710 100644 --- a/Data/Scripts/Source/FO4_Scopes/Fallout/Scopes/Menu.psc +++ b/Data/Scripts/Source/FO4_Scopes/Fallout/Scopes/Menu.psc @@ -10,7 +10,7 @@ string ModelPath bool BreathPressed = false bool Interrupted = false -int BipedWeapon = 41 Const +int BipedWeapon = 41 const ; Events @@ -71,7 +71,6 @@ EndEvent Event OnKeyUp(int keyCode, float time) BreathPressed = false - If (Interrupted) Interrupted = false Else diff --git a/Data/Scripts/Source/FO4_Scopes/Fallout/ScopesTest/SampleScope.psc b/Data/Scripts/Source/FO4_Scopes/Fallout/ScopesTest/SampleScope.psc index 7235bee..81dfcc3 100644 --- a/Data/Scripts/Source/FO4_Scopes/Fallout/ScopesTest/SampleScope.psc +++ b/Data/Scripts/Source/FO4_Scopes/Fallout/ScopesTest/SampleScope.psc @@ -1,4 +1,4 @@ -Scriptname Fallout:ScopesTest::SampleScope extends Quest +Scriptname Fallout:ScopesTest:SampleScope extends Quest import Fallout import Fallout:Scopes:Menu import Fallout:Scopes:Papyrus @@ -53,11 +53,10 @@ Event Fallout:Scopes:Menu.BreathEvent(Scopes:Menu sender, var[] arguments) Else WriteLine(self, "Fallout:Scopes:Menu.BreathEvent : e.Breath : Unhandled Arguments "+e.Breath) EndIf - Else - WriteLine(self, "Fallout:Scopes:Menu.BreathEvent : Event arguments are none.") EndIf EndEvent + ; Properties ;---------------------------------------------