Add DeployTime param for weapons

Author: ArKaNeMaN

amxmodx/configs/plugins/CustomWeaponsAPI/Weapons/TestWeapon.json

@@ -4,6 +4,7 @@
     "DamageMult": 5.0,
     "MaxClip": 42,
     "MaxAmmo": 84,
+    "DeployTime": 0.1,
 
     "Models": {
         "View": "models/v_p228.mdl",

amxmodx/scripting/Cwapi/Core/CWeapons/Hooks.inc

@@ -37,9 +37,9 @@ static CWeapons_Hooks__RegReapi() {
     RegisterHookChain(RG_CWeaponBox_SetModel, "Hook_WeaponBoxSetModel_Pre", false);
     RegisterHookChain(RG_CBasePlayer_AddPlayerItem, "Hook_AddPlayerItem_Pre", false);
     RegisterHookChain(RG_CBasePlayerWeapon_DefaultDeploy, "Hook_DefaultDeploy_Pre", false);
+    RegisterHookChain(RG_CBasePlayerWeapon_DefaultDeploy, "Hook_DefaultDeploy_Post", true);
     // RegisterHookChain(RG_CBasePlayer_TakeDamage, "Hook_PlayerTakeDamage", false);
     // RegisterHookChain(RG_CSGameRules_PlayerKilled, "Hook_PlayerKilled", true);
-    // RegisterHookChain(RG_CBasePlayerWeapon_DefaultDeploy, "Hook_DefaultDeploy_Post", true);
     // RegisterHookChain(RG_CBasePlayerWeapon_DefaultReload, "Hook_DefaultReload_Pre", false);
     // RegisterHookChain(RG_CBasePlayerWeapon_DefaultReload, "Hook_DefaultReload_Post", true);
     // RegisterHookChain(RG_CBasePlayerWeapon_DefaultShotgunReload, "Hook_DefaultShotgunReload", false);
@@ -137,11 +137,6 @@ public Hook_AddPlayerItem_Pre(const UserId, const ItemId) {
 
     CWeapons_Call(Weapon, CWeapon_OnAddPlayerItem, [iWeapon, ItemId, UserId]);
 
-    // Так и не понял, чё с этим будет... Пусть пока так.
-    // if (Events_IsRet(CWAPI_STOP_MAIN)) {
-    //     return HC_BREAK;
-    // }
-
     return HC_CONTINUE;
 }
 
@@ -170,7 +165,7 @@ public Hook_WeaponBoxSetModel_Pre(const iWeaponBox, const szModelName[]) {
     return HC_CONTINUE;
 }
 
-public Hook_DefaultDeploy_Pre(const ItemId, szViewModel[], szWeaponModel[], iAnim, szAnimExt[], skiplocal) {
+public Hook_DefaultDeploy_Pre(const ItemId, szViewModel[], szWeaponModel[]) {
     new Weapon[S_CustomWeapon], T_CustomWeapon:iWeapon;
     if (!CWeapons_GetByItem(ItemId, Weapon, iWeapon)) {
         return HC_CONTINUE;
@@ -188,15 +183,27 @@ public Hook_DefaultDeploy_Pre(const ItemId, szViewModel[], szWeaponModel[], iAni
         Dbg_PrintServer("Hook_DefaultDeploy_Pre(%d): Set '%s' as player model.", ItemId, Weapon[CWeapon_Models][CWeapon_Model_Player]);
     }
 
-    // if (Data[CWAPI_WD_DeployTime] >= 0.0) {
-    //     SetWeaponNextAttack(ItemId, Data[CWAPI_WD_DeployTime]);
-    // }
+    return HC_CONTINUE;
+}
+
+public Hook_DefaultDeploy_Post(const ItemId) {
+    new Weapon[S_CustomWeapon], T_CustomWeapon:iWeapon;
+    if (!CWeapons_GetByItem(ItemId, Weapon, iWeapon)) {
+        return HC_CONTINUE;
+    }
+
+    Dbg_PrintServer("Hook_DefaultDeploy_Post(%d): For weapon '%s'.", ItemId, Weapon[CWeapon_Name]);
+    
+    if (Weapon[CWeapon_DeployTime] >= 0.0) {
+        SetWeaponNextAttack(ItemId, Weapon[CWeapon_DeployTime]);
+        Dbg_PrintServer("Hook_DefaultDeploy_Post(%d): Set next attack after %.2f seconds.", ItemId, Weapon[CWeapon_DeployTime]);
+    }
 
     // if (Data[CWAPI_WD_Accuracy] >= 0.0) {
     //     set_member(ItemId, m_Weapon_flAccuracy, Data[CWAPI_WD_Accuracy]);
     // }
 
-    // CallWeaponEvent(GetWeapId(ItemId), CWAPI_WE_Deploy, ItemId);
+    CWeapons_Call(Weapon, CWeapon_OnDeploy, [iWeapon, ItemId]);
 
     return HC_CONTINUE;
 }
@@ -279,22 +286,6 @@ public Hook_DefaultDeploy_Pre(const ItemId, szViewModel[], szWeaponModel[], iAni
 //     return HC_CONTINUE;
 // }
 
-// public Hook_DefaultDeploy_Post(const ItemId, szViewModel[], szWeaponModel[], iAnim, szAnimExt[], skiplocal) {
-//     new WeaponId = GetWeapId(ItemId);
-//     if (!IsCustomWeapon(WeaponId)) {
-//         return;
-//     }
-    
-//     new Data[CWAPI_WeaponData];
-//     ArrayGetArray(CustomWeapons, WeaponId, Data);
-
-//     if (Data[CWAPI_WD_Accuracy] >= 0.0) {
-//         set_member(ItemId, m_Weapon_flAccuracy, Data[CWAPI_WD_Accuracy]);
-//     }
-
-//     CallWeaponEvent(WeaponId, CWAPI_WE_Deploy, ItemId);
-// }
-
 // public Hook_DefaultReload_Post(const ItemId, iClipSize, iAnim, Float:fDelay) {
 //     new WeaponId = GetWeapId(ItemId);
 //     if (!IsCustomWeapon(WeaponId)) {

amxmodx/scripting/Cwapi/Core/CustomWeapons.inc

@@ -23,9 +23,9 @@ enum _:S_CustomWeapon {
     CWeapon_Weight,
     CWeapon_MaxClip,
     CWeapon_MaxAmmo,
+    Float:CWeapon_DeployTime,
 
     // Float:CWeapon_MaxWalkSpeed,
-    // Float:CWeapon_DeployTime,
     // Float:CWeapon_ReloadTime,
     // Float:CWeapon_PrimaryAttackRate,
     // Float:CWeapon_SecondaryAttackRate,
@@ -162,7 +162,7 @@ CWeapons_AddEventListener(
 
     new iListener = -1;
     switch (iEvent) {
-        case CWeapon_OnSpawn:
+        case CWeapon_OnSpawn, CWeapon_OnDeploy:
             // (const T_CustomWeapon:iWeapon, const ItemId)
             iListener = CreateOneForward(iPlugin, sCallback, FP_CELL, FP_CELL);
         case CWeapon_OnSetWeaponBoxModel:
@@ -266,6 +266,7 @@ T_CustomWeapon:CWeapons_LoadFromCfg(const sFile[], const bool:bAbsolutePath = fa
     WeaponData[CWeapon_MaxAmmo] = JsonObject_ReadInt(jWeapon, "MaxAmmo", -1);
     WeaponData[CWeapon_Weight] = JsonObject_ReadInt(jWeapon, "Weight", -1);
     WeaponData[CWeapon_DamageMult] = JsonObject_ReadFloat(jWeapon, "DamageMult", 1.0);
+    WeaponData[CWeapon_DeployTime] = JsonObject_ReadFloat(jWeapon, "DeployTime", -1.0);
 
     new Models[S_CWeapon_Models];
     JsonObject_ReadAndPrecacheModel(

amxmodx/scripting/Cwapi/Utils.inc

@@ -66,9 +66,10 @@ stock GetItemFromWeaponBox(const WeaponBox) {
 }
 
 // Установка времени до следующего выстрела
-stock SetWeaponNextAttack(ItemId, Float:Rate) {
-    set_member(ItemId, m_Weapon_flNextPrimaryAttack, Rate);
-    set_member(ItemId, m_Weapon_flNextSecondaryAttack, Rate);
+stock SetWeaponNextAttack(const ItemId, const Float:fTime) {
+    set_member(get_member(ItemId, m_pPlayer), m_flNextAttack, fTime);
+    set_member(ItemId, m_Weapon_flNextPrimaryAttack, fTime);
+    set_member(ItemId, m_Weapon_flNextSecondaryAttack, fTime);
 }
 
 stock SetWeaponIdleAnim(const UserId, const ItemId) {

amxmodx/scripting/include/cwapi.inc

@@ -22,6 +22,7 @@ enum E_CWeapon_Event {
     CWeapon_OnSpawn,
     CWeapon_OnSetWeaponBoxModel,
     CWeapon_OnAddPlayerItem,
+    CWeapon_OnDeploy,
 }
 
 /**