feat(scripting/player/weapons): GetSilencerType

Author: skuzzis

docgen/data/data.json

@@ -1408,7 +1408,7 @@
 				"position": 1,
 				"description": "To use the Swiftly Logging system you need the following code in your plugin.",
 				"content": {
-					"cpp": "```cpp\n#include <swiftly/logger.h>\n\nLogger *logger = nullptr;\n\nvoid OnProgramLoad(const char *pluginName, const char *mainFilePath)\n{\n    ...\n    logger = new Logger(mainFilePath, pluginName);\n    ...\n}\n```"
+					"cpp": "```cpp\n#include <swiftly/menus.h>\n\nMenus *menus = nullptr;\n\nvoid OnProgramLoad(const char *pluginName, const char *mainFilePath)\n{\n    ...\n    menus = new Menus(pluginName);\n    ...\n}\n```"
 				}
 			},
 			"register": {
@@ -2635,6 +2635,19 @@
 								},
 								"additional": {}
 							},
+							"getsilencertype": {
+								"title": "GetSilencerType",
+								"template": "function-syntax",
+								"language": "both",
+								"description": "Returns the silencer type of the weapon.",
+								"variable": {
+									"cpp": "weapon->GetSilencerType",
+									"lua": "weapon:GetSilencerType"
+								},
+								"return": "WeaponSilencerType",
+								"params": {},
+								"additional": {}
+							},
 							"getnextprimaryattacktick": {
 								"title": "GetNextPrimaryAttackTick",
 								"template": "function-syntax",

docgen/data/static/cpp/types/weaponsilencertype.md

@@ -0,0 +1,10 @@
+# WeaponSilencerType
+
+```cpp
+enum WeaponSilencerType : uint32_t
+{
+    NONE = 0x0,
+    DETACHABLE = 0x1,
+    INTEGRATED = 0x2,
+};
+```

docgen/data/static/lua/types/weaponsilencertype.md

@@ -0,0 +1,9 @@
+# WeaponSilencerType
+
+```lua
+WeaponSilencerType = {
+    None = 0,
+    Detachable = 1,
+    Integrated = 2
+}
+```

docgen/src/index.js

@@ -33,6 +33,7 @@ const GenerateLuaType = (param) => {
     else if (param == "HudDestination") return "HudDestination";
     else if (param == "PlayerStat") return "PlayerStat";
     else if (param == "WeaponSlot") return "WeaponSlot";
+    else if (param == "WeaponSilencerType") return "WeaponSilencerType";
     else throw `${param} not implemented`;
 }
 

plugin_files/scripting/includes/swiftly/player/weapon.h

@@ -39,6 +39,8 @@ typedef void (*Player_Weapon_SetAttackTick)(uint32_t, uint32_t, int32_t);
 typedef float (*Player_Weapon_GetAttackTickRatio)(uint32_t, uint32_t);
 typedef void (*Player_Weapon_SetAttackTickRatio)(uint32_t, uint32_t, float);
 
+typedef WeaponSilencerType (*Player_Weapon_GetSilencerType)(uint32_t, uint32_t);
+
 class Weapon
 {
 private:
@@ -308,6 +310,18 @@ class Weapon
             NOT_SUPPORTED("scripting_Player_Weapon_SetNextSecondaryAttackTickRatio");
     }
 
+    WeaponSilencerType GetSilencerType()
+    {
+        void *player_WeaponGetSilencerType = FetchFunctionPtr(nullptr, "scripting_Player_Weapon_GetSilencerType");
+        if (player_WeaponGetSilencerType)
+            return reinterpret_cast<Player_Weapon_GetSilencerType>(player_WeaponGetSilencerType)(this->m_playerSlot, this->m_weaponID);
+        else
+        {
+            NOT_SUPPORTED("scripting_Player_Weapon_GetSilencerType");
+            return WeaponSilencerType::NONE;
+        }
+    }
+
     uint32_t GetID()
     {
         return this->m_weaponID;

plugin_files/scripting/includes/swiftly/types.h

@@ -150,4 +150,11 @@ enum WeaponSlot : uint32_t
     LAST = 0xC,
 };
 
+enum WeaponSilencerType : uint32_t
+{
+    NONE = 0x0,
+    DETACHABLE = 0x1,
+    INTEGRATED = 0x2,
+};
+
 #endif

src/components/Plugins/inc/Scripting.h

@@ -204,7 +204,7 @@ SMM_API void scripting_Player_Weapon_Drop(uint32 playerId, uint32 slot);
 SMM_API void scripting_Player_Weapon_SetClipAmmo(uint32 playerId, uint32 slot, int ammo);
 SMM_API void scripting_Player_Weapon_SetClip2Ammo(uint32 playerId, uint32 slot, int ammo);
 SMM_API void scripting_Player_Weapon_SetReserveAmmo(uint32 playerId, uint32 slot, int ammo);
-
+SMM_API uint32_t scripting_Player_Weapon_GetSilencerType(uint32 playerId, uint32 slot);
 SMM_API int32_t scripting_Player_Weapon_GetNextPrimaryAttackTick(uint32 playerId, uint32 slot);
 SMM_API int32_t scripting_Player_Weapon_GetNextSecondaryAttackTick(uint32 playerId, uint32 slot);
 SMM_API void scripting_Player_Weapon_SetNextPrimaryAttackTick(uint32 playerId, uint32 slot, int32_t tick);

src/components/Plugins/src/language/lua/player.cpp

@@ -317,6 +317,8 @@ void SetupLuaPlayer(luacpp::LuaState *state, Plugin *plugin)
                    { return base->slot; })
         .DefMember("SetNametag", [](LuaPlayerTwoArgsClass *base, const char *text) -> void
                    { scripting_Player_Weapon_SetNametag(base->playerSlot, base->slot, text); })
+        .DefMember("GetSilencerType", [](LuaPlayerTwoArgsClass *base) -> uint32_t
+                   { return scripting_Player_Weapon_GetSilencerType(base->playerSlot, base->slot); })
         .DefMember("SetClipAmmo", [](LuaPlayerTwoArgsClass *base, int ammo) -> void
                    { scripting_Player_Weapon_SetClipAmmo(base->playerSlot, base->slot, ammo); })
         .DefMember("SetClip2Ammo", [](LuaPlayerTwoArgsClass *base, int ammo) -> void

src/components/Plugins/src/language/lua/types.cpp

@@ -158,6 +158,12 @@ void SetupLuaTypes(luacpp::LuaState *state, Plugin *plugin)
     WeaponSlotTable.SetInteger("First", 0x0);
     WeaponSlotTable.SetInteger("Last", 0xC);
 
+    auto WeaponSilencerTypeTable = state->CreateTable("WeaponSilencerType");
+
+    WeaponSilencerTypeTable.SetInteger("None", 0x0);
+    WeaponSilencerTypeTable.SetInteger("Detachable", 0x1);
+    WeaponSilencerTypeTable.SetInteger("Integrated", 0x2);
+
     state->CreateInteger(0, "TEAM_NONE");
     state->CreateInteger(1, "TEAM_SPECTATOR");
     state->CreateInteger(2, "TEAM_T");

src/components/Plugins/src/scripting/Player.cpp

@@ -739,6 +739,23 @@ SMM_API void scripting_Player_Weapon_SetNextSecondaryAttackTickRatio(uint32 play
     weapon->m_flNextSecondaryAttackTickRatio = ratio;
 }
 
+SMM_API uint32_t scripting_Player_Weapon_GetSilencerType(uint32 playerId, uint32 slot)
+{
+    Player *player = g_playerManager->GetPlayer(playerId);
+    if (!player)
+        return CSWeaponSilencerType::WEAPONSILENCER_NONE;
+
+    CBasePlayerWeapon *weapon = player->GetPlayerWeaponFromID(slot);
+    if (!weapon)
+        return CSWeaponSilencerType::WEAPONSILENCER_NONE;
+
+    CCSWeaponBaseVData *vData = weapon->GetWeaponVData();
+    if (!vData)
+        return CSWeaponSilencerType::WEAPONSILENCER_NONE;
+
+    return vData->m_eSilencerType();
+}
+
 SMM_API void scripting_Player_Weapon_SetReserveAmmo(uint32 playerId, uint32 slot, int ammo)
 {
     Player *player = g_playerManager->GetPlayer(playerId);