Release 1.4.2

dronelektron · Dec 27, 2022 · c9f6535 · c9f6535
2 parents ec22cfc + 85748c2
commit c9f6535
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 19 deletions.
diff --git a/scripting/gravity-gun.sp b/scripting/gravity-gun.sp
@@ -16,7 +16,7 @@ public Plugin myinfo = {
     name = "Gravity gun",
     author = "Dron-elektron",
     description = "Allows you to grab, move and throw players",
-    version = "1.4.1",
+    version = "1.4.2",
     url = "https://github.com/dronelektron/gravity-gun"
 };
 

diff --git a/scripting/include/gg/use-case.inc b/scripting/include/gg/use-case.inc
@@ -7,7 +7,7 @@
 #define CLIENT_NOT_FOUND -1
 #define INVALID_CLIENT 0
 #define DISTANCE_MIN 64.0
-#define OBSERVER_MODE_FIRST_PERSON 4
+#define OBSERVER_MODE_FREE_CAMERA 7
 #define CAPTURE_MODE_FIXED 0
 #define TRACE_MODE_LINE 0
 

diff --git a/scripting/modules/use-case.sp b/scripting/modules/use-case.sp
@@ -5,48 +5,56 @@ void UseCase_CapturePlayer(int client) {
 
     int target = UseCase_TraceTarget(client);
 
+    if (!UseCase_IsTargetCapturable(client, target)) {
+        return;
+    }
+
+    int clientId = GetClientUserId(client);
+    float distance = UseCase_GetInitialDistance(client, target);
+
+    Client_SetTarget(client, target);
+    Client_SetDistance(client, distance);
+    UseCase_RemoveClientSpeedLimit(target);
+    CreateTimer(RETENTION_TIMER_INTERVAL, UseCaseTimer_PlayerRetention, clientId, RETENTION_TIMER_FLAGS);
+    Message_PlayerCaptured(client, target);
+}
+
+bool UseCase_IsTargetCapturable(int client, int target) {
     if (target == CLIENT_NOT_FOUND) {
         MessagePrint_PlayerNotFound(client);
 
-        return;
+        return false;
     }
 
     if (UseCase_IsInvalidObserverMode(client)) {
         MessagePrint_InvalidObserverMode(client);
 
-        return;
+        return false;
     }
 
     int owner = Client_GetOwner(target);
 
     if (owner != CLIENT_NOT_FOUND) {
         MessagePrint_PlayerAlreadyCaptured(client, target, owner);
 
-        return;
+        return false;
     }
 
     bool isClientCapturedByTarget = Client_GetTarget(target) == client;
 
     if (isClientCapturedByTarget) {
         MessagePrint_YouCannotCaptureOwner(client, target);
 
-        return;
+        return false;
     }
 
     if (!CanUserTarget(client, target)) {
         MessagePrint_TargetHasImmunity(client, target);
 
-        return;
+        return false;
     }
 
-    int clientId = GetClientUserId(client);
-    float distance = UseCase_GetInitialDistance(client, target);
-
-    Client_SetTarget(client, target);
-    Client_SetDistance(client, distance);
-    UseCase_RemoveClientSpeedLimit(target);
-    CreateTimer(RETENTION_TIMER_INTERVAL, UseCaseTimer_PlayerRetention, clientId, RETENTION_TIMER_FLAGS);
-    Message_PlayerCaptured(client, target);
+    return true;
 }
 
 int UseCase_TraceTarget(int client) {
@@ -70,8 +78,10 @@ int UseCase_FindNearestTargetInCone(int client) {
 
         float angle = Math_CalculateAngleToCone(client, i);
         float distance = Math_CalculateDistance(client, i);
+        bool isTargetInCone = angle < coneAngle && distance < coneDistance;
+        bool isTargetAngleSmaller = angle < targetAngle;
 
-        if (angle <= coneAngle && distance < coneDistance && angle < targetAngle) {
+        if (isTargetInCone && isTargetAngleSmaller) {
             target = i;
             targetAngle = angle;
         }
@@ -223,7 +233,7 @@ void UseCase_DecreaseDistance(int client, float step) {
 bool UseCase_IsInvalidObserverMode(int client) {
     int observerMode = GetEntProp(client, Prop_Send, "m_iObserverMode");
 
-    return IsClientObserver(client) && observerMode == OBSERVER_MODE_FIRST_PERSON;
+    return IsClientObserver(client) && observerMode != OBSERVER_MODE_FREE_CAMERA;
 }
 
 void UseCase_RemoveClientSpeedLimit(int client) {

diff --git a/translations/gravity-gun.phrases.txt b/translations/gravity-gun.phrases.txt
@@ -7,7 +7,7 @@
 
     "Invalid observer mode"
     {
-        "en"    "You cannot grab a player in first person"
+        "en"    "You can only capture a player in freecam mode"
     }
 
     "Player already captured"

diff --git a/translations/ru/gravity-gun.phrases.txt b/translations/ru/gravity-gun.phrases.txt
@@ -7,7 +7,7 @@
 
     "Invalid observer mode"
     {
-        "ru"    "Вы не можете схватить игрока от вида первого лица"
+        "ru"    "Вы можете схватить игрока только в режиме свободной камеры"
     }
 
     "Player already captured"