Merge pull request #67 from Hedgefog/master

Update 6.4.1

Author: hedgefog

README.md

@@ -1,23 +1,29 @@
 ![Alt Text](./images/demo.gif)
-### Halloween Mod for Counter-Strike 1.6
-__Version:__ 6.4.0
+## 🎃 Halloween Mod 🇺🇦
+![GitHub package.json version](https://img.shields.io/github/package-json/v/hedgefog/cs-halloween-mod)
+![GitHub Workflow Status](https://img.shields.io/github/workflow/status/hedgefog/cs-halloween-mod/CI)
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/hedgefog/cs-halloween-mod)
+![GitHub all releases](https://img.shields.io/github/downloads/hedgefog/cs-halloween-mod/total)
 
-### What is Halloween Mod?
-Halloween mod is a powerful Halloween-themed core for your server with completely new game modes, NPCs, bosses, spells, cosmetics, and more.
+### 📄 About
+__Halloween Mod__ is a powerful Halloween-themed core for your __Counter-Strike__ server with completely new game modes, NPCs, bosses, spells, cosmetics, and more.
 
-### Download latest:
+### 🔽 Download latest:
 - [Releases](./releases)
 
-### Documentation
+### 🔄 Requirements
+- Amx Mod X 1.8.2+
+- RegameDLL + ReAPI or RoundControl
+- Metamod-R or Metamod-P (for windows)
+
+### 📖 Documentation
 - [Index](./doc/pages/index.md)
 
-### Special Thanks:
+### 🙏 Special Thanks:
 - [Credits](./CREDITS.md)
 
-### Deployment
+### 🔧 Deployment
 - Clone repository.
-- Extract compiler executable and includes to _"compiler"_ folder of project.
-- Extract ReAPI module to _"thirdparty/reapi"_ folder of project (example: _"thirdparty/reapi/addons"_).
 - Install dependencies `npm i`
 
 #### Customize builder

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "halloween-mod",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "description": "Halloween Mod",
   "scripts": {
     "build": "npm run build:vanilla && npm run build:reapi",

package.json

@@ -1,4 +1,9 @@
 /*
+    6.4.1
+        Fixes:
+            Fixed HHH NPC pathfinding
+            Pumpkin no longer drops on suicide
+
     6.4.0
         Additions and improvements:
             Added Skeletons Horde spell
@@ -336,7 +341,7 @@
 #define HWN_COLOR_SECONDARY             HWN_COLOR_GREEN_DARK
 
 #define HWN_TITLE "Halloween Mod"
-#define HWN_VERSION "6.4.0"
+#define HWN_VERSION "6.4.1"
 
 enum _:Hwn_PumpkinType
 {

src/include/hwn.inc

@@ -286,7 +286,7 @@ stock bool:NPC_TestStep(ent, const Float:vOrigin[3], const Float:vStep[3], Float
 
 stock bool:NPC_GetTarget(ent, Float:fSpeed, Float:vTarget[3], bool:reachableOnly = true, bool:visibleOnly = true)
 {
-    new enemy = pev(ent, pev_enemy);
+    new enemy = NPC_GetEnemy(ent);
     if (!enemy) {
         return false;
     }
@@ -418,6 +418,17 @@ stock bool:NPC_MoveToTarget(ent, const Float:vTarget[3], Float:fSpeed, Float:fMa
     return turnResult;
 }
 
+stock NPC_StopMovement(ent)
+{
+    static Float:vVelocity[3];
+    pev(ent, pev_velocity, vVelocity);
+
+    vVelocity[0] = 0.0;
+    vVelocity[1] = 0.0;
+
+    set_pev(ent, pev_velocity, vVelocity);
+}
+
 stock NPC_MoveForward(ent, Float:fSpeed)
 {
     static Float:vDirection[3];
@@ -487,6 +498,16 @@ stock NPC_IsVisible(ent, const Float:vTarget[3])
     return UTIL_IsOpen(vOrigin, vTarget, ent);
 }
 
+stock NPC_GetEnemy(ent) {
+    new enemy = pev(ent, pev_enemy);
+
+    if (!NPC_IsValidEnemy(enemy)) {
+        enemy = 0;
+    }
+
+    return enemy;
+}
+
 stock NPC_SetEnemy(ent, enemy)
 {
     set_pev(ent, pev_enemy, enemy);

src/include/hwn_npc_stocks.inc

@@ -259,8 +259,8 @@ public OnKill(ent)
         NPC_EmitVoice(ent, g_szSndDying, .supercede = true);
         NPC_PlayAction(ent, g_actions[Action_Shake], .supercede = true);
 
+        NPC_StopMovement(ent);
         set_pev(ent, pev_takedamage, DAMAGE_NO);
-        set_pev(ent, pev_velocity, Float:{0.0, 0.0, 0.0});
         set_pev(ent, pev_deadflag, DEAD_DYING);
 
         remove_task(ent);
@@ -299,24 +299,29 @@ public OnThink(ent)
         set_pev(ent, pev_takedamage, DAMAGE_AIM);
     }
 
-    new enemy = pev(ent, pev_enemy);
+    new enemy = NPC_GetEnemy(ent);
     new Action:action = Action_Idle;
-    new bool:isValidEnemy = NPC_IsValidEnemy(enemy);
 
     static Float:fLastUpdate;
     pev(ent, pev_fuser1, fLastUpdate);
     new bool:shouldUpdate = get_gametime() - fLastUpdate >= g_fThinkDelay;
 
-    if (isValidEnemy) {
+    if (enemy) {
         Attack(ent, enemy, action, shouldUpdate);
+        enemy = NPC_GetEnemy(ent);
+    }
+
+    if (enemy && shouldUpdate) {
+        AStar_Reset(ent);
     }
 
     if (shouldUpdate) {
-        if (!isValidEnemy) {
-            isValidEnemy = NPC_FindEnemy(ent, g_maxPlayers, NPC_ViewRange);
+        if (!enemy) {
+            NPC_FindEnemy(ent, g_maxPlayers, NPC_ViewRange);
+            enemy = NPC_GetEnemy(ent);
         }
 
-        if (!isValidEnemy && get_pcvar_num(g_cvarUseAstar) > 0) {
+        if (!enemy && get_pcvar_num(g_cvarUseAstar) > 0) {
             AStar_Attack(ent, action);
         }
 
@@ -454,7 +459,7 @@ bool:Attack(ent, target, &Action:action, bool:checkTarget = false)
     if (checkTarget) {
         if (!NPC_GetTarget(ent, NPC_Speed, vTarget)) {
             NPC_SetEnemy(ent, 0);
-            set_pev(ent, pev_velocity, Float:{0.0, 0.0, 0.0});
+            NPC_StopMovement(ent);
             set_pev(ent, pev_vuser1, vOrigin);
             return false;
         }
@@ -488,11 +493,9 @@ bool:Attack(ent, target, &Action:action, bool:checkTarget = false)
         action = (action == Action_Attack) ? Action_RunAttack : Action_Run;
         NPC_MoveToTarget(ent, vTarget, NPC_Speed);
     } else {
-        set_pev(ent, pev_velocity, Float:{0.0, 0.0, 0.0});
+        NPC_StopMovement(ent);
     }
 
-    AStar_Reset(ent);
-
     return true;
 }
 

src/scripts/entities/entity_hwn_npc_hhh.sma

@@ -188,13 +188,17 @@ public OnMessageStatusIcon(msg, dest, id)
     return PLUGIN_CONTINUE;
 }
 
-public OnPlayerKilled(id)
+public OnPlayerKilled(id, killer)
 {
     if (g_hGamemode != Hwn_Gamemode_GetCurrent()) {
         return;
     }
 
-    ExtractPlayerPoints(id);
+    new points = GetPlayerPoints(id);
+
+    if (points || (killer != id && !Hwn_Gamemode_IsPlayerOnSpawn(id))) {
+        ExtractPlayerPoints(id);
+    }
 }
 
 public OnTargetKilled(ent)
@@ -332,10 +336,6 @@ bool:ExtractPlayerPoints(id)
     static Float:vOrigin[3];
     pev(id, pev_origin, vOrigin);
 
-    if (Hwn_Gamemode_IsPlayerOnSpawn(id) && !points) {
-        return false;
-    }
-
     new bool:isBackpack = points > 1;
     new bpEnt = CE_Create(isBackpack ? BACKPACK_ENTITY_CLASSNAME : LOOT_ENTITY_CLASSNAME, vOrigin);
     if (!bpEnt) {