Skip to content

Commit

Permalink
Some fixes
Browse files Browse the repository at this point in the history
* Fixed a crash with the calm spell item cost
* Fixed music not stopping when lothar talks
* Fixed stuck tumblebot
* Fixed incorrect subtitle
* Fixed Shrine of Earth boss battle music loop
  • Loading branch information
JappaWakka committed Jan 18, 2025
1 parent 5a06c9c commit 454980e
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
Binary file not shown.
Binary file modified Audio/Music/Shrines/Music_Shrine_Earth_Boss.ogg
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

if IsPlayerOnSameTile() = true
if IsPlayerOnSameTile() = true and global.CameraIsFading = false
{
if Register_Registered("LotharTheInnKeeper_Intro") = false
{
Expand Down
8 changes: 4 additions & 4 deletions ZeldasAdventure/objects/Entity_Pickup_Calm/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ if IsPlayerOnSameTile() = true
else
{
visible = false
if variable_instance_exists(id, "ItemCost")
{
instance_destroy(ItemCost)
}
if Item_FindIndex(Spells.Calm,1) <> -1
{
if variable_instance_exists(id, "ItemCost")
{
instance_destroy(ItemCost)
}
instance_destroy()
}
}
2 changes: 1 addition & 1 deletion ZeldasAdventure/rooms/Room_Overworld/Room_Overworld.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function Audio_Init_Soundtrack()
Twinkle_Normal : {Asset : Music_Twinkle_Normal, IntroLength : 1.774, LoopLength : 20.053},
Twinkle_Dad : {Asset : Music_Twinkle_Dad, IntroLength : 1.753, LoopLength : 20.053},
Shrine_Earth_Ambient : {Asset : Music_Shrine_Earth_Ambient, IntroLength : 2.232, LoopLength : 39.467},
Shrine_Earth_Boss : {Asset : Music_Shrine_Earth_Boss, IntroLength : 1.751, LoopLength : 20.043},
Shrine_Earth_Boss : {Asset : Music_Shrine_Earth_Boss, IntroLength : 1.751, LoopLength : 19.992},
Shrine_Earth_Regular : {Asset : Music_Shrine_Earth_Regular, IntroLength : 1.751, LoopLength : 332.011},
Shrine_Earth_Sign : {Asset : Music_Shrine_Earth_Sign, IntroLength : 1.751, LoopLength : 19.705},
Shrine_Illusion : {Asset : Music_Shrine_Illusion_Regular, IntroLength : 2.041, LoopLength : 59.904},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
{
case "en":
if AudioPosition >= 0.000 and AudioPosition <= 3.007 {return "Krebb the Weary: Why spend a whole lifetime being defeated like me?"}
else if AudioPosition >= 3.032 and AudioPosition <= 6.940 {return "Get it over with quick. Go home, give up."}
else if AudioPosition >= 3.032 and AudioPosition <= 6.940 {return "Get it over with. Quit, go home, give up."}
else if AudioPosition >= 7.207 and AudioPosition <= 11.207 {return "You're patient. I can see you're not one to surrender."}
else if AudioPosition >= 11.400 and AudioPosition <= 13.413 {return "All right, take this dagger from me."}
else if AudioPosition >= 13.673 and AudioPosition <= 16.566 {return "It may do you more service than it ever did me."}
Expand All @@ -126,10 +126,10 @@

case "nl":
if AudioPosition >= 0.000 and AudioPosition <= 3.007 {return "Krebb de Vermoeide: Waarom een heel leven lang verslagen worden zoals ik?"}
else if AudioPosition >= 3.032 and AudioPosition <= 6.940 {return "Maak er snel een eind aan. Ga naar huis, geef het op."}
else if AudioPosition >= 3.032 and AudioPosition <= 6.940 {return "Maak er een einde aan. Stop, ga naar huis, geef het op."}
else if AudioPosition >= 7.207 and AudioPosition <= 11.207 {return "Je bent geduldig. Ik zie dat je je niet zomaar overgeeft."}
else if AudioPosition >= 11.400 and AudioPosition <= 13.413 {return "Oké, neem deze dolk van me af."}
else if AudioPosition >= 13.673 and AudioPosition <= 16.566 {return "Het zal je vast meer helpen dan het mij ooit heeft gedaan."}
else if AudioPosition >= 13.673 and AudioPosition <= 16.566 {return "Die zal je vast meer helpen dan het mij ooit heeft gedaan."}
else return ""
break;
}
Expand Down
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 454980e

Please sign in to comment.