starred/rpemotes
1
0
Fork 0
mirror of https://github.com/jimathy/rpemotes.git synced 2026-07-28 16:22:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove Movement Toggle & Add Moods chat command (#148)

Browse Source 
* Revert most Movement On/Off Code (#146)

* Revert Native UI

* Revert Emote.lua

* Revert AnimationList.lua

* fix: returns wrong movement flag

* fix: MovementType issues

* feat: add persistent expression (#145)

* Add 2 new moods/expression

* feat: add persistent expression

Add persistent expression, get's loaded just like the walks.

As a sidenote: maybe this should be in it's own file? But the again it's pretty small, so there would't be a "need" for it.

* dev: remove comment

* Delete stream/[Custom Emotes]/Prue颜 directory

* refactor: mood commands (#147)

* refactor: mood commands

* fix: mood menu names

---------

Co-authored-by: Mads <madsleander@outlook.com>
This commit is contained in:
TayMcKenzieNZ
2023-02-02 12:30:57 +13:00
committed by GitHub
parent e04ef958b6
commit 41bd1f3f5e
7 changed files with 1420 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
NativeUI.lua
View File

@@ -2423,9 +2423,6 @@ function UIMenu.New(Title, Subtitle, X, Y, TxtDictionary, TxtName)
},
Down = {
Enabled = true,
},
Switch = {
Enabled = true,
}
},
ParentMenu = nil,
@@ -2885,10 +2882,6 @@ function UIMenu:ProcessControl()
self:GoBack()
end
if self.Controls.Switch.Enabled and (IsDisabledControlJustReleased(0, 37) or IsDisabledControlJustReleased(1, 37) or IsDisabledControlJustReleased(2, 37)) then
self:SwitchMove()
end
if #self.Items == 0 then
return
end
@@ -3177,12 +3170,6 @@ function UIMenu:GoBack()
self.OnMenuClosed(self)
end
function UIMenu:SwitchMove()
PlaySoundFrontend(-1, self.Settings.Audio.Back, self.Settings.Audio.Library, true)
ToggleEmoteMovement = not ToggleEmoteMovement
self:Visible(true)
end
function UIMenu:BindMenuToItem(Menu, Item)
if Menu() == "UIMenu" and Item() == "UIMenuItem" then
Menu.ParentMenu = self
@@ -3597,24 +3584,15 @@ function UIMenu:UpdateScaleform()
PopScaleformMovieFunction()
end
if self.Controls.Switch.Enabled then
PushScaleformMovieFunction(self.InstructionalScaleform, "SET_DATA_SLOT")
PushScaleformMovieFunctionParameterInt(2)
PushScaleformMovieFunctionParameterString(GetControlInstructionalButton(2, 37, 0))
PushScaleformMovieFunctionParameterString(Config.Languages[lang]['btn_switch']..(ToggleEmoteMovement and ": <C>ON </C>" or ": <C>OFF</C>"))
PopScaleformMovieFunction()
end
local count = 2
for i = 1, #self.InstructionalButtons do
if self.InstructionalButtons[i] then
if #self.InstructionalButtons[i] == 3 then
if #self.InstructionalButtons[i] == 2 then
PushScaleformMovieFunction(self.InstructionalScaleform, "SET_DATA_SLOT")
PushScaleformMovieFunctionParameterInt(count)
PushScaleformMovieFunctionParameterString(self.InstructionalButtons[i][1])
PushScaleformMovieFunctionParameterString(self.InstructionalButtons[i][2])
PushScaleformMovieFunctionParameterString(self.InstructionalButtons[i][3])
PopScaleformMovieFunction()
count = count + 1
end