From 2e0321f6e7deb89c5d78952214c65b18b23b636f Mon Sep 17 00:00:00 2001
From: BenCat07 <BenCat07@gmail.com>
Date: Fri, 1 May 2020 21:54:05 +0200
Subject: [PATCH] Add Demoknight mode

---
 data/menu/nullifiedcat/movement.xml |  1 +
 src/hacks/Warp.cpp                  | 44 +++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/data/menu/nullifiedcat/movement.xml b/data/menu/nullifiedcat/movement.xml
index c3ff4160..6f3ac2f9 100755
--- a/data/menu/nullifiedcat/movement.xml
+++ b/data/menu/nullifiedcat/movement.xml
@@ -68,6 +68,7 @@
             <AutoVariable width="fill" target="warp.charge-passively.jump" label="Charge in Jump" tooltip="Charge passively in jump, This will make you fall slower"/>
             <AutoVariable width="fill" target="warp.charge-passively.no-inputs" label="Charge When keys released" tooltip="Charge passively before full stop after releasing movement keys"/>
             <AutoVariable width="fill" target="warp.movement-ratio" label="Movement Ratio" tooltip="Every Xth movement tick is passively converted to warp"/>
+            <AutoVariable width="fill" target="warp.demoknight" label="Demoknight Mode" tooltip="This will make you do a Swing charge with warp, (Attack, charge, warp)"/>
             <AutoVariable width="fill" target="warp.peek" label="Peek Mode" tooltip="This will teleport you for a tick and then teleport you back"/>
             <AutoVariable width="fill" target="warp.on-hit" label="Warp When hit" tooltip="Whenever Someone Melees you or shoots you with hitscan, Warp"/>
             <AutoVariable width="fill" target="warp.on-hit.forward" label="Warp Forwards" tooltip="Warp When hit option"/>
diff --git a/src/hacks/Warp.cpp b/src/hacks/Warp.cpp
index 859b71d1..d04b0123 100644
--- a/src/hacks/Warp.cpp
+++ b/src/hacks/Warp.cpp
@@ -19,6 +19,7 @@ static settings::Boolean charge_passively{ "warp.charge-passively", "true" };
 static settings::Boolean charge_in_jump{ "warp.charge-passively.jump", "true" };
 static settings::Boolean charge_no_input{ "warp.charge-passively.no-inputs", "false" };
 static settings::Int warp_movement_ratio{ "warp.movement-ratio", "6" };
+static settings::Boolean warp_demoknight{ "warp.demoknight", "false" };
 static settings::Boolean warp_peek{ "warp.peek", "false" };
 static settings::Boolean warp_on_damage{ "warp.on-hit", "false" };
 static settings::Boolean warp_forward{ "warp.on-hit.forward", "false" };
@@ -141,6 +142,15 @@ static int ground_ticks           = 0;
 // Left and right by default
 static std::vector<float> yaw_selections{ 90.0f, -90.0f };
 
+enum charge_state
+{
+    ATTACK = 0,
+    CHARGE,
+    WARP,
+    DONE
+};
+
+charge_state current_state = ATTACK;
 void CreateMove()
 {
     if (!enabled)
@@ -149,6 +159,8 @@ void CreateMove()
     if (!warp_key.isKeyDown() && !was_hurt)
     {
         warp_last_tick = false;
+        current_state  = ATTACK;
+
         Vector velocity{};
         velocity::EstimateAbsVelocity(RAW_ENT(LOCAL_E), velocity);
 
@@ -200,6 +212,35 @@ void CreateMove()
         current_user_cmd->forwardmove = cos(actual_yaw) * 450.0f;
         current_user_cmd->sidemove    = -sin(actual_yaw) * 450.0f;
     }
+    // Demoknight Warp
+    else if (warp_demoknight)
+    {
+        switch (current_state)
+        {
+        case ATTACK:
+        {
+            current_user_cmd->buttons |= IN_ATTACK;
+            current_state = CHARGE;
+            should_warp   = false;
+            break;
+        }
+        case CHARGE:
+        {
+            current_user_cmd->buttons |= IN_ATTACK2;
+            current_state = WARP;
+            should_warp   = false;
+            break;
+        }
+        case WARP:
+        {
+            should_warp   = true;
+            current_state = DONE;
+            break;
+        }
+        default:
+            break;
+        }
+    }
     // Warp peaking
     else if (warp_peek)
     {
@@ -271,8 +312,7 @@ class WarpHurtListener : public IGameEventListener2
 {
 public:
     virtual void FireGameEvent(IGameEvent *event)
-    {
-        // Not enabled
+    { // Not enabled
         if (!enabled || !warp_on_damage)
             return;
         // We have no warp