Commit 3a26c58d authored by Julia Santos's avatar Julia Santos

Added colored Banana sprites, fixed bug where entering the plant puzzle with...

Added colored Banana sprites, fixed bug where entering the plant puzzle with the notebook open kept it locked
parent 580f5344
source_md5="e37a2dc282b2d51a255960579212688f" source_md5="3757ff51e46ed4692e17f2bf2e229a7e"
dest_md5="52c4577a4e1e279867835e6de4916df4" dest_md5="cd5729bd5ae2ef6a83f5f29dae742041"
source_md5="840db0847cb7d92548337fd325cba368" source_md5="9eef6e988d2dff8b45af82d5bee8b83b"
dest_md5="df78b0b689effe17dc4e478c763c6014" dest_md5="1c4d994ca5ae1550f1c41c161ad2e364"
...@@ -212,7 +212,7 @@ func _enter_notebook_laundry(): # trying to engage in the notebook puzzle for do ...@@ -212,7 +212,7 @@ func _enter_notebook_laundry(): # trying to engage in the notebook puzzle for do
laundryArea.hide() laundryArea.hide()
laundryNotepad.show() laundryNotepad.show()
zoom_in() zoom_in()
notepad._open_UI() notepad.force_open()
notepad.get_node("Quests").hide() notepad.get_node("Quests").hide()
notepad.get_node("Title").text = "Words" notepad.get_node("Title").text = "Words"
var notepad_words = notepad.get_node("Words") var notepad_words = notepad.get_node("Words")
...@@ -255,7 +255,7 @@ func _enter_notebook_plants(): # trying to engage in the notebook puzzle for doi ...@@ -255,7 +255,7 @@ func _enter_notebook_plants(): # trying to engage in the notebook puzzle for doi
livingRoom.hide() livingRoom.hide()
plantNotepad.show() plantNotepad.show()
zoom_in() zoom_in()
notepad._open_UI() notepad.force_open()
notepad.get_node("Quests").hide() notepad.get_node("Quests").hide()
notepad.get_node("Title").text = "Words" notepad.get_node("Title").text = "Words"
var notepad_words = notepad.get_node("Words") var notepad_words = notepad.get_node("Words")
...@@ -289,6 +289,7 @@ func _return_plant_notepad(): # exiting laundry notebook puzzle ...@@ -289,6 +289,7 @@ func _return_plant_notepad(): # exiting laundry notebook puzzle
notepad.get_node("Quests").show() notepad.get_node("Quests").show()
notepad.get_node("Title").text = "To do (click to expand):" notepad.get_node("Title").text = "To do (click to expand):"
notepad.get_node("Words").hide() notepad.get_node("Words").hide()
notepad.get_node("CollisionPolygon2D").disabled = false
movementHandle.checkRoom() movementHandle.checkRoom()
# ----------------- Movement-related events (traversing between rooms, locking/unlocking, etc) ----------------- # ----------------- Movement-related events (traversing between rooms, locking/unlocking, etc) -----------------
......
...@@ -100,7 +100,7 @@ func objInteraction(selected): # when an object is used on it ...@@ -100,7 +100,7 @@ func objInteraction(selected): # when an object is used on it
if typeof(flavor) != 0: #checks if there's coded flavor text for this interaction if typeof(flavor) != 0: #checks if there's coded flavor text for this interaction
dialogueBox.text = flavor dialogueBox.text = flavor
else: else:
dialogueBox.text = "I don't think that would help. (No flavor text)" #can replace this later! dialogueBox.text = "I don't think that would help." #can replace this later!
if inventory.get_name() == "Words": if inventory.get_name() == "Words":
inventory.unselect_all() inventory.unselect_all()
dialogueBox.playText() dialogueBox.playText()
...@@ -24,3 +24,7 @@ func _open_UI(): # expands the notepad to a larger size, and animates ...@@ -24,3 +24,7 @@ func _open_UI(): # expands the notepad to a larger size, and animates
opened = false opened = false
#x = 474.699 #x = 474.699
#y = -150 #y = -150
func force_open():
animator.play("Notepad open")
opened = true
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment