Skip to content

Some minor changes #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Some minor changes #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2836b67
Added PT translation and a Keybind possibility
sergio-atilano Apr 8, 2020
c6fd90c
Added Emotes and Arm Crossing Keybind
sergio-atilano Apr 8, 2020
9680cdb
Removed file from wrong folder
sergio-atilano Apr 9, 2020
8a026bf
Removed file from wrong folder
sergio-atilano Apr 9, 2020
ff42251
Corrected files
sergio-atilano Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 54 additions & 1 deletion Client/AnimationList.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,16 @@ DP.Shared = {
EmoteMoving = true,
EmoteLoop = true,
}},
["sexodepef"] = {"misscarsteal2pimpsex", "shagloop_hooker", "Sexo de Pé F", "sexodepem", AnimationOptions =
{
EmoteMoving = true,
EmoteLoop = true,
}},
["sexodepem"] = {"misscarsteal2pimpsex", "shagloop_pimp", "Sexo de Pé M", "sexodepef", AnimationOptions =
{
EmoteMoving = true,
EmoteLoop = true,
}},
["punch"] = {"melee@unarmed@streamed_variations", "plyr_takedown_rear_lefthook", "Punch", "punched"},
["punched"] = {"melee@unarmed@streamed_variations", "victim_takedown_front_cross_r", "Punched", "punch"},
["headbutt"] = {"melee@unarmed@streamed_variations", "plyr_takedown_front_headbutt", "Headbutt", "headbutted"},
Expand Down Expand Up @@ -659,6 +669,11 @@ DP.Emotes = {
EmoteLoop = true,
EmoteMoving = true,
}},
["grabcrotch"] = {"mp_player_int_uppergrab_crotch", "mp_player_int_grab_crotch", "Grab Crotch", AnimationOptions =
{
EmoteLoop = true,
EmoteMoving = true,
}},
["hiking"] = {"move_m@hiking", "idle", "Hiking", AnimationOptions =
{
EmoteLoop = true,
Expand Down Expand Up @@ -810,6 +825,21 @@ DP.Emotes = {
EmoteLoop = true,
EmoteMoving = true,
}},
["fix1"] = {"amb@prop_human_bum_bin@base", "base", "Mechanic 5", AnimationOptions =
{
EmoteLoop = true,
EmoteMoving = true,
}},
["fix2"] = {"amb@prop_human_movie_bulb@base", "base", "Mechanic 6", AnimationOptions =
{
EmoteLoop = true,
EmoteMoving = true,
}},
["fix3"] = {"amb@prop_human_bum_bin@idle_a", "idle_a", "Mechanic 7", AnimationOptions =
{
EmoteLoop = true,
EmoteMoving = true,
}},
["medic2"] = {"amb@medic@standing@tendtodead@base", "base", "Medic 2", AnimationOptions =
{
EmoteLoop = true,
Expand Down Expand Up @@ -862,6 +892,11 @@ DP.Emotes = {
EmoteMoving = true,
}},
["pickup"] = {"random@domestic", "pickup_low", "Pickup"},
["pickbutt"] = {"mp_player_int_upperarse_pick", "mp_player_int_arse_pick", "Pick Butt", AnimationOptions =
{
EmoteLoop = true,
EmoteMoving = true,
}},
["push"] = {"missfinale_c2ig_11", "pushcar_offcliff_f", "Push", AnimationOptions =
{
EmoteLoop = true,
Expand Down Expand Up @@ -919,6 +954,16 @@ DP.Emotes = {
EmoteLoop = true,
EmoteMoving = true,
}},
["sexodepef"] = {"misscarsteal2pimpsex", "shagloop_hooker", "Sexo de Pé F", AnimationOptions =
{
EmoteLoop = true,
EmoteMoving = true,
}},
["sexodepem"] = {"misscarsteal2pimpsex", "shagloop_pimp", "Sexo de Pé M", AnimationOptions =
{
EmoteLoop = true,
EmoteMoving = true,
}},
["shakeoff"] = {"move_m@_idles@shake_off", "shakeoff_1", "Shake Off", AnimationOptions =
{
EmoteMoving = true,
Expand Down Expand Up @@ -1730,7 +1775,15 @@ DP.PropEmotes = {
{
Prop = "prop_security_case_01",
PropBone = 57005,
PropPlacement = {0.10, 0.0, 0.0, 0.0, 280.0, 53.0},
PropPlacement = {0.15, 0.005, -0.02, 0.0, -100.0, 50.0},
EmoteLoop = true,
EmoteMoving = true,
}},
["suitcase3"] = {"anim@heists@box_carry@", "idle", "Suitcase 3", AnimationOptions =
{
Prop = "prop_cash_case_02",
PropBone = 60309,
PropPlacement = {0.025, -0.03, 0.255, 445.0, 290.0, 170.0},
EmoteLoop = true,
EmoteMoving = true,
}},
Expand Down
27 changes: 27 additions & 0 deletions Client/Ragdoll.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,30 @@ Citizen.CreateThread(function()
end
end)

Citizen.CreateThread( function()

while true do
Citizen.Wait(5)
if (IsControlJustPressed(0,Config.CrossArmsKeyBind) and Config.CrossArmsEnabled) then
local player = PlayerPedId()

if ( DoesEntityExist( player ) and not IsEntityDead( player ) ) then

if IsEntityPlayingAnim(player, "missfbi_s4mop", "guard_idle_a", 3) then
ClearPedSecondaryTask(player)
else
loadAnimDict( "missfbi_s4mop" )
TaskPlayAnim(player, "missfbi_s4mop", "guard_idle_a", 2.0, 2.5, -1, 49, 0, 0, 0, 0 )
RemoveAnimDict("missfbi_s4mop")
end
end
end
end
end)

function loadAnimDict(dict)
RequestAnimDict(dict)
while not HasAnimDictLoaded(dict) do
Citizen.Wait(500)
end
end
62 changes: 56 additions & 6 deletions Config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ Config = {
-- Change the language of the menu here!.
-- Note fr and de are google translated, if you would like to help out with translation / just fix it for your server check below and change translations yourself
-- try en, fr, de or sv.
MenuLanguage = 'en',
MenuLanguage = 'pt',
-- Set this to true to enable some extra prints
DebugDisplay = false,
DebugDisplay = true,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good PR 👍
Just recommend moving debug back to false before it is merged

-- Set this to false if you have something else on X, and then just use /e c to cancel emotes.
EnableXtoCancel = true,
-- Set this to true if you want to disarm the player when they play an emote.
Expand All @@ -25,8 +25,11 @@ Config = {
-- You can change the menu position here
MenuPosition = "right", -- (left, right)
-- You can disable the Ragdoll keybinding here.
RagdollEnabled = true,
RagdollKeybind = 303, -- Get the button number here https://docs.fivem.net/game-references/controls/
RagdollEnabled = false,
RagdollKeybind = 303, -- Get the button number here https://docs.fivem.net/game-references/controls/
-- You can disable the Cross Arms keybinding here.
CrossArmsEnabled = true,
CrossArmsKeyBind = 244,
-- You can disable the Facial Expressions menu here.
ExpressionsEnabled = true,
-- You can disable the Walking Styles menu here.
Expand All @@ -48,7 +51,7 @@ Config.KeybindKeys = {
}

Config.Languages = {
['en'] = {
['en'] = {
['emotes'] = 'Emotes',
['danceemotes'] = "🕺 Dance Emotes",
['propemotes'] = "📦 Prop Emotes",
Expand Down Expand Up @@ -282,5 +285,52 @@ Config.Languages = {
['notvalidkey'] = "no es una clave válida.",
['keybinds'] = "🔢 Keybinds",
['keybindsinfo'] = "Utilizar"
}
},
['pt'] = {
['emotes'] = 'Animações',
['danceemotes'] = "🕺 Animações de Dança",
['propemotes'] = "📦 Animações com Objectos",
['favoriteemotes'] = "🌟 Favoritos",
['favoriteinfo'] = "Selecciona uma animação aqui para a definires como Favorita.",
['rfavorite'] = "Reset Favoritos",
['prop2info'] = "❓ Animações com objectos estão localizadas no final",
['set'] = "Definir (",
['setboundemote'] = ") para ser a animação atribuida ao teu atalho?",
['newsetemote'] = "~w~ é o teu emote atribuido, pressiona ~g~CapsLock~w~ para o utilizar.",
['cancelemote'] = "Cancelar Animação",
['cancelemoteinfo'] = "~r~X~w~ Cancela a animação",
['walkingstyles'] = "Estilos de Caminhar",
['resetdef'] = "Reset para predefinido",
['normalreset'] = "Normal (Reset)",
['moods'] = "Humores",
['infoupdate'] = "Informação",
['infoupdateav'] = "Informação (Actualização Disponível)",
['infoupdateavtext'] = "Uma actualização está disponível, obtém em ~y~https://github.com/andristum/dpemotes~w~",
['suggestions'] = "Sugestões?",
['suggestionsinfo'] = "'dullpear_dev' no forum FiveM para sugerir alguma funcionalidade/animação nova! ✉️",
['notvaliddance'] = "não é uma dança válida.",
['notvalidemote'] = "não é uma animação válida.",
['nocancel'] = "Não há nenhuma animação para cancelar.",
['maleonly'] = "Esta animação é apenas para homens, desculpa!",
['emotemenucmd'] = "Faz /emotemenu para um menu.",
['shareemotes'] = "👫 Animações Partilhadas",
['shareemotesinfo'] = "Convida uma pessoa por perto para uma animação",
['sharedanceemotes'] = "🕺 Danças Partilhadas",
['notvalidsharedemote'] = "não é uma animação partilhada válida.",
['sentrequestto'] = "Pedido enviado a ~y~",
['nobodyclose'] = "Ninguém está suficientemente ~r~perto~w~.",
['doyouwanna'] = "~y~Y~w~ para aceitar, ~r~L~w~ para recusar (~g~",
['refuseemote'] = "Animação Recusada.",
['makenearby'] = "faz o jogador que está perto fazer animação",
['camera'] = "Pressiona ~y~E~w~ para usar o flash da câmara.",
['makeitrain'] = "Pressiona ~y~E~w~ para fazer chover.",
['pee'] = "Pressiona ~y~E~w~ para mijar.",
['spraychamp'] = "Mantém premido ~y~E~w~ para mandar champanhe",
['bound'] = "Limite ",
['to'] = "para",
['currentlyboundemotes'] = " Emotes atribuidos a atalhos:",
['notvalidkey'] = "não é uma tecla válida.",
['keybinds'] = "🔢 Keybinds",
['keybindsinfo'] = "Utilizar"
},
}