Add additional setWeaponProperty customizations

Client/game_sa/CWeaponStatManagerSA.h

@@ -100,4 +100,5 @@ class CWeaponStatManagerSA : public CWeaponStatManager
     static sWeaponInfo      OriginalPoorWeaponData[WEAPONTYPE_MAX + 1];
     static sWeaponInfo      OriginalNormalWeaponData[WEAPONTYPE_MAX + 1];
     static sWeaponInfo      OriginalHitmanWeaponData[WEAPONTYPE_MAX + 1];
+    static sWeaponInfo      OriginalSpecialWeaponData[WEAPONTYPE_MAX + 1];
 };

Client/mods/deathmatch/logic/CPacketHandler.cpp

@@ -2603,6 +2603,8 @@ void CPacketHandler::Packet_MapInfo(NetBitStreamInterface& bitStream)
             pWeaponInfo->SetWeaponAnim2LoopFireTime(weaponProperty.data.anim2_loop_bullet_fire);
 
             pWeaponInfo->SetAnimBreakoutTime(weaponProperty.data.anim_breakout_time);
+
+            pWeaponInfo->SetAnimGroup(weaponProperty.data.anim_group);
         }
 
         bool bEnabled;
@@ -2617,7 +2619,7 @@ void CPacketHandler::Packet_MapInfo(NetBitStreamInterface& bitStream)
         bitStream.ReadBit(bReadWeaponInfo);
         if (bReadWeaponInfo)
         {
-            for (int j = 0; j <= 2; j++)
+            for (int j = 0; j <= 3; j++)
             {
                 bitStream.Read(&weaponProperty);
                 CWeaponStat* pWeaponInfo = g_pGame->GetWeaponStatManager()->GetWeaponStats((eWeaponType)weaponProperty.data.weaponType, (eWeaponSkill)j);
@@ -2638,6 +2640,23 @@ void CPacketHandler::Packet_MapInfo(NetBitStreamInterface& bitStream)
                 pWeaponInfo->SetWeaponAnim2LoopFireTime(weaponProperty.data.anim2_loop_bullet_fire);
 
                 pWeaponInfo->SetAnimBreakoutTime(weaponProperty.data.anim_breakout_time);
+
+                pWeaponInfo->SetAnimGroup(weaponProperty.data.anim_group);
+                pWeaponInfo->SetAnimGroup(weaponProperty.data.anim_group);
+                pWeaponInfo->SetFireType((eFireType)weaponProperty.data.fire_type);
+                pWeaponInfo->SetModel(weaponProperty.data.model);
+                pWeaponInfo->SetModel2( weaponProperty.data.model2);
+                pWeaponInfo->SetSlot((eWeaponSlot)weaponProperty.data.weapon_slot);
+                pWeaponInfo->SetFireOffset(&weaponProperty.data.fire_offset);
+                pWeaponInfo->SetSkill((eWeaponSkill)weaponProperty.data.skill_level);
+                pWeaponInfo->SetRequiredStatLevel(weaponProperty.data.required_skill_level);
+                pWeaponInfo->SetFiringSpeed(weaponProperty.data.firing_speed);
+                pWeaponInfo->SetRadius(weaponProperty.data.radius);
+                pWeaponInfo->SetLifeSpan(weaponProperty.data.life_span);
+                pWeaponInfo->SetSpread(weaponProperty.data.spread);
+                pWeaponInfo->SetAimOffsetIndex(weaponProperty.data.aim_offset);
+                pWeaponInfo->SetDefaultCombo(weaponProperty.data.default_combo);
+                pWeaponInfo->SetCombosAvailable(weaponProperty.data.combos_available);
             }
         }
 

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

@@ -314,6 +314,7 @@ IMPLEMENT_ENUM_BEGIN(eWeaponSkill)
 ADD_ENUM(WEAPONSKILL_POOR, "poor")
 ADD_ENUM(WEAPONSKILL_STD, "std")
 ADD_ENUM(WEAPONSKILL_PRO, "pro")
+ADD_ENUM(WEAPONSKILL_SPECIAL, "special")
 IMPLEMENT_ENUM_END("weapon-skill")
 
 IMPLEMENT_ENUM_BEGIN(ERenderFormat)

Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp

@@ -2119,8 +2119,22 @@ int CLuaPedDefs::SetPedStat(lua_State* luaVM)
     if (!argStream.HasErrors())
     {
         // Check the stat and value
-        if (usStat > NUM_PLAYER_STATS - 1 || fValue < 0.0f || fValue > 1000.0f)
-            argStream.SetCustomError("Stat must be 0 to 342 and value must be 0 to 1000.");
+        if (usStat > NUM_PLAYER_STATS - 1)
+        {
+            argStream.SetCustomError("Stat must be 0 to 342 and value must be 0 to 5000.");
+        }
+        else if (fValue < 0.0f)
+        {
+            argStream.SetCustomError("Value must be greater than 0.");
+        }
+        else if ((usStat >= WEAPONTYPE_PISTOL_SKILL && usStat <= WEAPONTYPE_SNIPERRIFLE_SKILL) && fValue > 5000.0f)
+        {
+            argStream.SetCustomError("Value must be at most 5000 (for weapon stats).");
+        }
+        else if ((usStat < WEAPONTYPE_PISTOL_SKILL || usStat > WEAPONTYPE_SNIPERRIFLE_SKILL) && fValue > 1000.0f)
+        {
+            argStream.SetCustomError("Value must be at most 1000 (for non-weapon stats).");
+        }
         else if (CStaticFunctionDefinitions::SetPedStat(*pEntity, usStat, fValue))
         {
             lua_pushboolean(luaVM, true);

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -6120,40 +6120,54 @@ eWeaponType      weaponSkillWeapon;
 BYTE             weaponSkill;
 bool             CPed_GetWeaponSkill()
 {
+    if (weaponSkillWeapon < WEAPONTYPE_PISTOL || weaponSkillWeapon > WEAPONTYPE_TEC9)
+    {
+        return false;
+    }
+
     SClientEntity<CPedSA>* pPedClientEntity = pGameInterface->GetPools()->GetPed((DWORD*)weaponSkillPed);
     CPed*                  pPed = pPedClientEntity ? pPedClientEntity->pEntity : nullptr;
-    if (pPed)
+    if (!pPed)
+    {
+        return false;
+    }
+
+    CPlayerPed* playerPed = dynamic_cast<CPlayerPed*>(pPed);
+    if (!playerPed)
+    {
+        return false;
+    }
+
+    unsigned short skillStatIdx = pGameInterface->GetStats()->GetSkillStatIndex(weaponSkillWeapon);
+    float stat;
+    CPed* pLocalPlayerPed = pGameInterface->GetPools()->GetPedFromRef((DWORD)1);
+    if (pPed == pLocalPlayerPed)
     {
-        CPed* pLocalPlayerPed = pGameInterface->GetPools()->GetPedFromRef((DWORD)1);
-        if (pPed != pLocalPlayerPed)
+        stat = pGameInterface->GetStats()->GetStatValue(skillStatIdx);
+    }
+    else
+    {
+        CRemoteDataStorageSA* data = CRemoteDataSA::GetRemoteDataStorage(playerPed);
+        if (!data)
         {
-            if (weaponSkillWeapon >= WEAPONTYPE_PISTOL && weaponSkillWeapon <= WEAPONTYPE_TEC9)
-            {
-                CPlayerPed* playerPed = dynamic_cast<CPlayerPed*>(pPed);
-                if (playerPed)
-                {
-                    CRemoteDataStorageSA* data = CRemoteDataSA::GetRemoteDataStorage(playerPed);
-                    if (data)
-                    {
-                        float stat = data->m_stats.StatTypesFloat[pGameInterface->GetStats()->GetSkillStatIndex(weaponSkillWeapon)];
-
-                        CWeaponInfo* pPoor = pGameInterface->GetWeaponInfo(weaponSkillWeapon, WEAPONSKILL_POOR);
-                        CWeaponInfo* pStd = pGameInterface->GetWeaponInfo(weaponSkillWeapon, WEAPONSKILL_STD);
-                        CWeaponInfo* pPro = pGameInterface->GetWeaponInfo(weaponSkillWeapon, WEAPONSKILL_PRO);
-
-                        if (stat >= pPro->GetRequiredStatLevel())
-                            weaponSkill = WEAPONSKILL_PRO;
-                        else if (stat >= pStd->GetRequiredStatLevel())
-                            weaponSkill = WEAPONSKILL_STD;
-                        else
-                            weaponSkill = WEAPONSKILL_POOR;
-                        return true;
-                    }
-                }
-            }
+            return false;
         }
-    }
-    return false;
+        stat = data->m_stats.StatTypesFloat[skillStatIdx];
+    }
+
+    CWeaponInfo* pPoor = pGameInterface->GetWeaponInfo(weaponSkillWeapon, WEAPONSKILL_POOR);
+    CWeaponInfo* pStd = pGameInterface->GetWeaponInfo(weaponSkillWeapon, WEAPONSKILL_STD);
+    CWeaponInfo* pPro = pGameInterface->GetWeaponInfo(weaponSkillWeapon, WEAPONSKILL_PRO);
+    CWeaponInfo* pSpec = pGameInterface->GetWeaponInfo(weaponSkillWeapon, WEAPONSKILL_SPECIAL);
+    if (stat >= pSpec->GetRequiredStatLevel())
+        weaponSkill = WEAPONSKILL_SPECIAL;
+    else if (stat >= pPro->GetRequiredStatLevel())
+        weaponSkill = WEAPONSKILL_PRO;
+    else if (stat >= pStd->GetRequiredStatLevel())
+        weaponSkill = WEAPONSKILL_STD;
+    else
+        weaponSkill = WEAPONSKILL_POOR;
+    return true;
 }
 
 static void __declspec(naked) HOOK_CPed_GetWeaponSkill()

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -2498,6 +2498,11 @@ bool CStaticFunctionDefinitions::SetWeaponProperty(eWeaponProperty eProperty, eW
                 pWeaponInfo->ToggleFlagBits(sData);
                 break;
             }
+            case WEAPON_ANIM_GROUP:
+            {
+                pWeaponInfo->SetAnimGroup(sData);
+                break;
+            }
             default:
                 return false;
         }
@@ -3949,47 +3954,61 @@ bool CStaticFunctionDefinitions::SetPedStat(CElement* pElement, unsigned short u
     assert(pElement);
 
     // Check the stat
-    if (usStat < NUM_PLAYER_STATS && fValue >= 0.0f && fValue <= 1000.0f)
+    if (usStat > NUM_PLAYER_STATS - 1)
+    {
+        return false;
+    }
+    if (fValue < 0.0f)
+    {
+        return false;
+    }
+    if ((usStat >= 69 /* WEAPONTYPE_PISTOL_SKILL */ && usStat <= 79 /* WEAPONTYPE_SNIPERRIFLE_SKILL */) && fValue > 5000.0f)
+    {
+        return false;
+    }
+    if ((usStat < 69 /* WEAPONTYPE_PISTOL_SKILL */ || usStat > 79 /* WEAPONTYPE_SNIPERRIFLE_SKILL */) && fValue > 1000.0f)
     {
-        RUN_CHILDREN(SetPedStat(*iter, usStat, fValue))
+        return false;
+    }
 
-        if (IS_PLAYER(pElement))
-        {
-            CPlayer* pPlayer = static_cast<CPlayer*>(pElement);
+    RUN_CHILDREN(SetPedStat(*iter, usStat, fValue))
 
-            // Dont let them set visual stats if they dont have the CJ model
-            if ((usStat != 21 /* FAT */ && usStat != 23 /* BODY_MUSCLE */) || pPlayer->GetModel() == 0)
-            {
-                // Save the stat
-                pPlayer->SetPlayerStat(usStat, fValue);
+    if (IS_PLAYER(pElement))
+    {
+        CPlayer* pPlayer = static_cast<CPlayer*>(pElement);
 
-                // Notify everyone
-                CPlayerStatsPacket Packet;
-                Packet.SetSourceElement(pPlayer);
-                Packet.Add(usStat, fValue);
-                m_pPlayerManager->BroadcastOnlyJoined(Packet);
+        // Dont let them set visual stats if they dont have the CJ model
+        if ((usStat != 21 /* FAT */ && usStat != 23 /* BODY_MUSCLE */) || pPlayer->GetModel() == 0)
+        {
+            // Save the stat
+            pPlayer->SetPlayerStat(usStat, fValue);
 
-                return true;
-            }
+            // Notify everyone
+            CPlayerStatsPacket Packet;
+            Packet.SetSourceElement(pPlayer);
+            Packet.Add(usStat, fValue);
+            m_pPlayerManager->BroadcastOnlyJoined(Packet);
+
+            return true;
         }
-        else if (IS_PED(pElement))
-        {
-            CPed* pPed = static_cast<CPed*>(pElement);
+    }
+    else if (IS_PED(pElement))
+    {
+        CPed* pPed = static_cast<CPed*>(pElement);
 
-            // Dont let them set visual stats if they dont have the CJ model
-            if ((usStat != 21 /* FAT */ && usStat != 23 /* BODY_MUSCLE */) || pPed->GetModel() == 0)
-            {
-                // Save the stat
-                pPed->SetPlayerStat(usStat, fValue);
+        // Dont let them set visual stats if they dont have the CJ model
+        if ((usStat != 21 /* FAT */ && usStat != 23 /* BODY_MUSCLE */) || pPed->GetModel() == 0)
+        {
+            // Save the stat
+            pPed->SetPlayerStat(usStat, fValue);
 
-                // Notify everyone
-                CPlayerStatsPacket Packet;
-                Packet.SetSourceElement(pPed);
-                Packet.Add(usStat, fValue);
-                m_pPlayerManager->BroadcastOnlyJoined(Packet);
+            // Notify everyone
+            CPlayerStatsPacket Packet;
+            Packet.SetSourceElement(pPed);
+            Packet.Add(usStat, fValue);
+            m_pPlayerManager->BroadcastOnlyJoined(Packet);
 
-                return true;
-            }
+            return true;
         }
     }