From a31098b4bffaedd25b095af57dddbc0d55d3ecc3 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Thu, 23 Jan 2020 18:23:15 +0900
Subject: [PATCH] Implement heavy shot, straight shot.

---
 src/common/Common.h                          |  1 +
 src/scripts/action/brd/ActionHeavyShot97.cpp | 33 ++++++++++++++++++++
 src/scripts/action/whm/ActionCure120.cpp     |  4 +--
 src/scripts/action/whm/ActionCureII135.cpp   | 10 +++---
 src/world/Action/Action.cpp                  | 13 ++++++++
 src/world/Action/ActionLutData.cpp           |  7 ++---
 6 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 src/scripts/action/brd/ActionHeavyShot97.cpp

diff --git a/src/common/Common.h b/src/common/Common.h
index 3f967d51..75cb5e82 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -581,6 +581,7 @@ namespace Sapphire::Common
     None = 0, // ?
     MagicPoints = 3,
     TacticsPoints = 5,
+    StatusEffect = 10,
 //    WARGauge = 22,
 //    DRKGauge = 25,
 //    AetherflowStack = 30,
diff --git a/src/scripts/action/brd/ActionHeavyShot97.cpp b/src/scripts/action/brd/ActionHeavyShot97.cpp
new file mode 100644
index 00000000..bc4f289f
--- /dev/null
+++ b/src/scripts/action/brd/ActionHeavyShot97.cpp
@@ -0,0 +1,33 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+#include <Action/Action.h>
+#include <Math/CalcStats.h>
+
+#include "StatusEffect/StatusEffect.h"
+
+using namespace Sapphire;
+using namespace Sapphire::StatusEffect;
+
+const uint16_t STATUS_ID_STRAIGHT_SHOT_READY = 122;
+
+class ActionHeavyShot97 :
+  public ScriptAPI::ActionScript
+{
+public:
+  ActionHeavyShot97() :
+    ScriptAPI::ActionScript( 97 )
+  {
+  }
+
+  void onExecute( Sapphire::World::Action::Action& action ) override
+  {
+    if( action.getSourceChara()->getLevel() >= 2 && Math::CalcStats::getRandomNumber0To99() < 20 )
+    {
+      auto pEffect = action.createStatusEffect( STATUS_ID_STRAIGHT_SHOT_READY, action.getSourceChara(), action.getSourceChara(), 10000, 3000 );
+      action.getEffectbuilder()->applyStatusEffect( action.getSourceChara(), action.getSourceChara(), pEffect );
+    }
+  }
+};
+
+EXPOSE_SCRIPT( ActionHeavyShot97 );
\ No newline at end of file
diff --git a/src/scripts/action/whm/ActionCure120.cpp b/src/scripts/action/whm/ActionCure120.cpp
index 0e5845ec..3f2e5f20 100644
--- a/src/scripts/action/whm/ActionCure120.cpp
+++ b/src/scripts/action/whm/ActionCure120.cpp
@@ -24,8 +24,8 @@ public:
   {
     if( action.getSourceChara()->getLevel() >= 30 && Math::CalcStats::getRandomNumber0To99() < 15 )
     {
-      auto pFreeCure = action.createStatusEffect( STATUS_ID_FREECURE, action.getSourceChara(), action.getSourceChara(), 15000, 3000 );
-      action.getEffectbuilder()->applyStatusEffect( action.getSourceChara(), action.getSourceChara(), pFreeCure );
+      auto pEffect = action.createStatusEffect( STATUS_ID_FREECURE, action.getSourceChara(), action.getSourceChara(), 15000, 3000 );
+      action.getEffectbuilder()->applyStatusEffect( action.getSourceChara(), action.getSourceChara(), pEffect );
     }
   }
 };
diff --git a/src/scripts/action/whm/ActionCureII135.cpp b/src/scripts/action/whm/ActionCureII135.cpp
index 68b325f4..12b6603d 100644
--- a/src/scripts/action/whm/ActionCureII135.cpp
+++ b/src/scripts/action/whm/ActionCureII135.cpp
@@ -22,17 +22,17 @@ public:
 
   void onExecute( Sapphire::World::Action::Action& action ) override
   {
-    auto freecure = action.getSourceChara()->getStatusEffectById( STATUS_ID_FREECURE );
-    if( freecure.second )
+    auto effectEntry = action.getSourceChara()->getStatusEffectById( STATUS_ID_FREECURE );
+    if( effectEntry.second )
     {
-      action.getSourceChara()->removeStatusEffect( freecure.first );
+      action.getSourceChara()->removeStatusEffect( effectEntry.first );
     }
   }
 
   void onStart( Sapphire::World::Action::Action& action ) override
   {
-    auto freecure = action.getSourceChara()->getStatusEffectById( STATUS_ID_FREECURE );
-    if( freecure.second )
+    auto effectEntry = action.getSourceChara()->getStatusEffectById( STATUS_ID_FREECURE );
+    if( effectEntry.second )
     {
       action.setPrimaryCost( Common::ActionPrimaryCostType::None, 0 );
     }
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 53529af1..8bb9bde8 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -683,6 +683,19 @@ bool Action::Action::primaryCostCheck( bool subtractCosts )
       return true;
     }
 
+    case Common::ActionPrimaryCostType::StatusEffect:
+    {
+      auto statusEntry = m_pSource->getStatusEffectById( m_primaryCost );
+
+      if( !statusEntry.second )
+        return false;
+
+      if( subtractCosts )
+        m_pSource->removeStatusEffect( statusEntry.first );
+
+      return true;
+    }
+
     // free casts, likely just pure ogcds
     case Common::ActionPrimaryCostType::None:
     {
diff --git a/src/world/Action/ActionLutData.cpp b/src/world/Action/ActionLutData.cpp
index 10b1569a..069d5b6a 100644
--- a/src/world/Action/ActionLutData.cpp
+++ b/src/world/Action/ActionLutData.cpp
@@ -948,8 +948,8 @@ ActionLut::Lut ActionLut::m_actionLut =
 
   //Heavy Shot, ヘヴィショット
   //has damage: potency 180, combo potency 0, directional potency 0
-  //applies to self: Straight Shot Ready, ストレートショット実行可, duration 10000, param 0
-  { 97, { 180, 0, 0, 0, 0, 122, 10000, 0, 0, 0, 0, 0 } },
+  //comment: status removed need script
+  { 97, { 180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
 
   //Straight Shot, ストレートショット
   //has damage: potency 200, combo potency 0, directional potency 0
@@ -1417,8 +1417,7 @@ ActionLut::Lut ActionLut::m_actionLut =
 
   //Energy Drain, エナジードレイン
   //has damage: potency 100, combo potency 0, directional potency 0
-  //restores mp: 5%
-  { 16508, { 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5 } },
+  { 16508, { 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
 
   //Bio II, バイオラ
   //applies to targets: Bio II, バイオラ, duration 30000, param 0