Skip to content

Commit

Permalink
RTLGeno fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
RhenaudTheLukark committed Feb 16, 2024
1 parent f2cc3ae commit 4716480
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions Assets/Mods/RTLGeno/Lua/Monsters/Lukark.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ comments = { "Lukark is vengeful.", "Lukark prepares his next move.", "Lukark fr
commands = { "Pardon" }
randomdialogue = { "[effect:none][func:SetFace,angry]Come back here!",
"[effect:none][func:SetFace,angry]You can't escape me now!",
"[effect:none][func:SetFace,angry]I'll get you no matter what.",
"[effect:none][func:SetFace,angry]I'll get you no matter what!",
"[effect:none][func:SetFace,angry]Take this!" }

sprite = "Lukark/full" --Always PNG. Extension is added automatically.
Expand All @@ -25,13 +25,13 @@ anim = "normal"
SetActive(false)
effect = "none"

-- Happens after the slash animation but before
-- Happens after the slash animation but before
function HandleAttack(attackstatus)
if attackstatus > 0 then
SetFace("hurt")
end
end

-- This handles the commands; all-caps versions of the commands list you have above.
function HandleCustomCommand(command)
if command == "PARDON" then
Expand All @@ -45,7 +45,7 @@ function HandleCustomCommand(command)
BattleDialog({ "A tear roll down your cheek as you bow in front of Lukark, pleading him to stop this nonsense." })
currentdialogue = { "[effect:none]......[noskip][w:20][func:SetFace,happy][noskip:off]Please stop. We both know this has gone too far by now.", "[next]" }
else
BattleDialog({ "You ask for Lukark's forgiveness once more...", "But he ignores you." })
BattleDialog({ "You ask for Lukark's forgiveness once more, but he ignores you." })
end
pardonCount = pardonCount + 1
end
Expand Down
10 changes: 5 additions & 5 deletions Assets/Mods/RTLGeno/Lua/Monsters/RTL.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function BeforeDamageCalculation()
Encounter.Call("SetRTLAnimation", "attacked")
end

-- Happens after the slash animation but before
-- Happens after the slash animation but before
function HandleAttack(attackstatus)
if attackstatus == -1 then
-- player pressed fight but didn't press Z afterwards
Expand All @@ -31,7 +31,7 @@ function HandleAttack(attackstatus)
Encounter.Call("SetRTLAnimation", "hurt")
end
end

-- This handles the commands; all-caps versions of the commands list you have above.
function HandleCustomCommand(command)
if command == "CHECK" then
Expand All @@ -53,9 +53,9 @@ function OnDeath()
if not GetAlMightyGlobal("RTLGenoIntro") then
SetAlMightyGlobal("RTLGenoIntro", true)
currentdialogue = { "[noskip][effect:none]Heh... [w:15][func:SetAnimRTL,happy]Hahahaha![w:20][next]",
"[noskip][effect:none][func:SetAnimRTL,angry]You're pathetic. [w:15]Did you REALLY think I would just keel over and die against you?[w:20][next]",
"[noskip][effect:none][func:SetAnimRTL,angry]You're pathetic. [w:15]Did you REALLY think I would just keel over and die like that?[w:20][next]",
"[noskip][effect:none][func:SetAnimRTL,angryhurt]Well you're [effect:shake][voice:v_floweymad][waitall:2]wrong,[waitall:1] [voice:monsterfont][effect:none][w:20]buckaroo.[w:20][next]",
"[noskip][effect:none]Now, I'll send you right where you belong, [w:10]and I'll do it by force if I have to!",
"[noskip][effect:none]Now, I'll send you right where you belong, [w:10]and I'll do it by force if I have to![w:20][next]",
"[noskip][func:PlaySE,Asriel TF][func:StartTransformation][w:80][next]",
"[noskip][effect:shake][voice:v_floweymad][func:SetLukarkFace,mad]Your rampage will stop right now![w:20][func:SetLukark][func:State,ACTIONSELECT]" }
--"[noskip][effect:none][func:SetAnimRTL,happy][func:PlaySE,mus_dogsong_tf]" .. "What were you expecting, seriously?\n[w:20]Well there's nothing here, I'll just die and that's it.[w:20][func:Unpause][func:Kill][next]"}
Expand All @@ -73,7 +73,7 @@ function OnDeath()
"Oh lawd he comin!",
"Hey am I like at least 20% Sans if I can remember stuff? [w:15]Neat...?"
}
currentdialogue = { "[effect:none]Gah, what's the point. [w:15]Let's just get it over with already.",
currentdialogue = { "[effect:none]Bah, what's the point. [w:15]Let's just get it over with already.",
"[noskip][func:PlaySE,Asriel TF][func:StartTransformation][w:80][next]",
"[noskip][effect:shake][voice:v_floweymad][func:SetLukarkFace,mad]" .. (math.random() < 0.04 and sillyShouts[math.random(#sillyShouts)] or shouts[math.random(#shouts)]) .. "[w:20][func:SetLukark][func:State,ACTIONSELECT]" }

Expand Down

0 comments on commit 4716480

Please sign in to comment.