diff --git a/README.md b/README.md index f604465..0dff63d 100644 --- a/README.md +++ b/README.md @@ -515,7 +515,9 @@ A huge thank you to the following people for their amazing contributions made t - Thank you to Chocoholic Animations for the custom animations -- Thank you to [CrunchyCat](https://www.gta5-mods.com/users/crunchycat) for the custom animations +- Thank you to [CrunchyCat](https://www.gta5-mods.com/users/crunchycat) for the custom animations + +- Thank you [KayKayMods](https://discord.gg/5bYQVWVaxG) for the custom props - Thank you to you, the community for being patient, showing love and appreciation, and for providing translations. diff --git a/client/AnimationList.lua b/client/AnimationList.lua index e560417..86dc7c0 100644 --- a/client/AnimationList.lua +++ b/client/AnimationList.lua @@ -11109,6 +11109,25 @@ RP.PropEmotes = { EmoteMoving = true } }, + ["frappe2"] = { + "amb@code_human_wander_drinking@female@base", + "static", + "Frappe 2 ", + AnimationOptions = { + Prop = 'starbuckscup', + PropBone = 28422, + PropPlacement = { + -0.0060, + 0.0150, + -0.0780, + 0.0, + 0.0, + 0.0, + }, + EmoteLoop = true, + EmoteMoving = true + } + }, ["edrink"] = { "mp_player_intdrink", "loop_bottle", @@ -11992,6 +12011,25 @@ RP.PropEmotes = { EmoteLoop = true } }, + ["teddy2"] = { + "impexp_int-0", + "mp_m_waremech_01_dual-0", + "Teddy 2 - Gremlin", + AnimationOptions = { + Prop = 'gremlin_plush', + PropBone = 57005, + PropPlacement = { + 0.2610, + -0.1220, + -0.0290, + -96.2588, + 62.8313, + 9.2446 + }, + EmoteMoving = true, + EmoteLoop = true + } + }, ["backpack"] = { "move_p_m_zero_rucksack", "nill", diff --git a/client/EmoteMenu.lua b/client/EmoteMenu.lua index 456ffd9..a9c3e4a 100644 --- a/client/EmoteMenu.lua +++ b/client/EmoteMenu.lua @@ -542,7 +542,9 @@ function AddInfoMenu(menu) infomenu:AddItem(NativeUI.CreateItem("Thanks Chocoholic Animations 🍫", "Chocoholic Animations for the custom emotes 🍫")) infomenu:AddItem(NativeUI.CreateItem("Thanks CrunchyCat 🐱", - "CrunchyCat for the custom emotes 🐱")) + "CrunchyCat 🐱 for the custom emotes 🐱")) + infomenu:AddItem(NativeUI.CreateItem("Thanks KayKayMods", + "KayKayMods for the custom props 🧋")) infomenu:AddItem(NativeUI.CreateItem("Thanks to the community", "Translations, bug reports and moral support 🌐")) end diff --git a/fxmanifest.lua b/fxmanifest.lua index df40bd4..39d62c9 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -3,7 +3,7 @@ fx_version 'cerulean' game 'gta5' -version '1.1.6' +version '1.1.7' lua54 'yes' dependencies { @@ -51,6 +51,8 @@ client_scripts { ---- Loads all ytyp files for custom props to stream --- +data_file 'DLC_ITYP_REQUEST' 'stream/taymckenzienz_rpemotes.ytyp' + data_file 'DLC_ITYP_REQUEST' 'badge1.ytyp' data_file 'DLC_ITYP_REQUEST' 'copbadge.ytyp' @@ -93,5 +95,4 @@ data_file 'DLC_ITYP_REQUEST' 'stream/brum_heart.ytyp' data_file 'DLC_ITYP_REQUEST' 'stream/brum_heartfrappe.ytyp' -data_file 'DLC_ITYP_REQUEST' 'stream/taymckenzienz_rpemotes.ytyp' - +data_file 'DLC_ITYP_REQUEST' 'stream/kaykaymods_props.ytyp' diff --git a/stream/[Props]/KayKayMods/gremlin_plush.ydr b/stream/[Props]/KayKayMods/gremlin_plush.ydr new file mode 100644 index 0000000..e98c270 Binary files /dev/null and b/stream/[Props]/KayKayMods/gremlin_plush.ydr differ diff --git a/stream/[Props]/KayKayMods/kaykaymods_props.ytyp b/stream/[Props]/KayKayMods/kaykaymods_props.ytyp new file mode 100644 index 0000000..500ba3f Binary files /dev/null and b/stream/[Props]/KayKayMods/kaykaymods_props.ytyp differ diff --git a/stream/[Props]/KayKayMods/starbuckscup.ydr b/stream/[Props]/KayKayMods/starbuckscup.ydr new file mode 100644 index 0000000..219a869 Binary files /dev/null and b/stream/[Props]/KayKayMods/starbuckscup.ydr differ diff --git a/version.txt b/version.txt index ab67981..a5ba932 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.1.6 \ No newline at end of file +1.1.7 \ No newline at end of file