From b44b5444bd7dcd32c76ec4c11577d41ea5f4a327 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Fri, 15 Jul 2022 16:28:01 -0400 Subject: [PATCH] Flag fix Reset flag velocity on pickup --- Classic/scripts/CTFGame.cs | 1 + Classic/scripts/LakRabbitGame.cs | 1 + Classic/scripts/SCtFGame.cs | 1 + 3 files changed, 3 insertions(+) diff --git a/Classic/scripts/CTFGame.cs b/Classic/scripts/CTFGame.cs index f04aef8..98fc47f 100755 --- a/Classic/scripts/CTFGame.cs +++ b/Classic/scripts/CTFGame.cs @@ -495,6 +495,7 @@ function CTFGame::playerTouchEnemyFlag(%game, %player, %flag) %flag.hide(true); %flag.startFade(0, 0, false); %flag.isHome = false; + %flag.setVelocity("0 0 0"); if(%flag.stand) %flag.stand.getDataBlock().onFlagTaken(%flag.stand);//animate, if exterior stand diff --git a/Classic/scripts/LakRabbitGame.cs b/Classic/scripts/LakRabbitGame.cs index 43be16b..b5057a6 100755 --- a/Classic/scripts/LakRabbitGame.cs +++ b/Classic/scripts/LakRabbitGame.cs @@ -1915,6 +1915,7 @@ function LakRabbitGame::playerTouchFlag(%game, %player, %flag) setTargetAlwaysVisMask(%target, 0x7); } %flag.isHome = false; + %flag.setVelocity("0 0 0"); $flagStatus = %client.name; // borlak -- points for MA flag grabs diff --git a/Classic/scripts/SCtFGame.cs b/Classic/scripts/SCtFGame.cs index cae0b93..221db34 100755 --- a/Classic/scripts/SCtFGame.cs +++ b/Classic/scripts/SCtFGame.cs @@ -722,6 +722,7 @@ function SCtFGame::playerTouchEnemyFlag(%game, %player, %flag) %flag.hide(true); %flag.startFade(0, 0, false); %flag.isHome = false; + %flag.setVelocity("0 0 0"); if(%flag.stand) %flag.stand.getDataBlock().onFlagTaken(%flag.stand);//animate, if exterior stand