Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
To Do Break Down
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
breakdown
To Do Break Down
Commits
4f4d1d7c
Commit
4f4d1d7c
authored
Mar 20, 2022
by
Julia Santos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug where the flavor text thinks Banana is still missing when trying to repot plants
parent
3a26c58d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
Event Handler.gd
Event Handler.gd
+1
-0
Multi.tscn
Multi.tscn
+1
-0
Plants.gd
Scripts/Plants.gd
+1
-2
No files found.
Event Handler.gd
View file @
4f4d1d7c
...
@@ -438,6 +438,7 @@ func _in_desk(): # looking at desk
...
@@ -438,6 +438,7 @@ func _in_desk(): # looking at desk
if !lockedNotepad: # only if notepad has been retrieved
if !lockedNotepad: # only if notepad has been retrieved
zoom_in()
zoom_in()
inventoryUI.show()
inventoryUI.show()
deselect.show()
desk.show()
desk.show()
bedroom.hide()
bedroom.hide()
...
...
Multi.tscn
View file @
4f4d1d7c
...
@@ -613,6 +613,7 @@ __meta__ = {
...
@@ -613,6 +613,7 @@ __meta__ = {
}
}
[node name="Cutscenes" type="Node2D" parent="."]
[node name="Cutscenes" type="Node2D" parent="."]
visible = false
z_index = 2
z_index = 2
[node name="0" parent="Cutscenes" instance=ExtResource( 42 )]
[node name="0" parent="Cutscenes" instance=ExtResource( 42 )]
...
...
Scripts/Plants.gd
View file @
4f4d1d7c
...
@@ -10,12 +10,11 @@ func passEvent(handler):
...
@@ -10,12 +10,11 @@ func passEvent(handler):
connect("notebook_puzzle", handler,"_enter_notebook_plants")
connect("notebook_puzzle", handler,"_enter_notebook_plants")
func mouseInteraction():
func mouseInteraction():
.mouseInteraction()
if !quests.hasQuest("Feed Banana"):
if !quests.hasQuest("Feed Banana"):
flavorText = "I need to water and repot these plants, but I don't know where to start.."
flavorText = "I need to water and repot these plants, but I don't know where to start.."
else:
else:
flavorText = "Plants later. Banana first. I don't even wanna know how long she's been trapped out here, poor thing..."
flavorText = "Plants later. Banana first. I don't even wanna know how long she's been trapped out here, poor thing..."
.mouseInteraction()
func objInteraction(selected): # when an object is used on it
func objInteraction(selected): # when an object is used on it
var flavor = control.interaction(inventory.get_item_text(selected), self.get_name())
var flavor = control.interaction(inventory.get_item_text(selected), self.get_name())
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment