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
5da32749
Commit
5da32749
authored
Nov 30, 2021
by
Julia Santos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Edited energy handler so that cook and eat methods/buttons don't have the same name
parent
8eece222
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
Energy handler.gd
Energy handler.gd
+2
-2
Quests.gd
Quests.gd
+4
-1
Food.gd
Scripts/Food.gd
+2
-2
No files found.
Energy handler.gd
View file @
5da32749
...
@@ -85,7 +85,7 @@ func clearFridge(): # clear out the consumed ingredients
...
@@ -85,7 +85,7 @@ func clearFridge(): # clear out the consumed ingredients
updateUI()
updateUI()
dialogue.text = "Delicious!"
dialogue.text = "Delicious!"
func cook():
func
_
cook():
match ingredients.size():
match ingredients.size():
1:
1:
match ingredients[0]:
match ingredients[0]:
...
@@ -105,7 +105,7 @@ func cook():
...
@@ -105,7 +105,7 @@ func cook():
clearFridge()
clearFridge()
cook.hide()
cook.hide()
func eat():
func
_
eat():
match ingredients[0]:
match ingredients[0]:
"Vienna sausage":
"Vienna sausage":
energy_bar.value += 12
energy_bar.value += 12
...
...
Quests.gd
View file @
5da32749
...
@@ -24,7 +24,10 @@ func finishQuest(q):
...
@@ -24,7 +24,10 @@ func finishQuest(q):
index += 1
index += 1
func showQuests():
func showQuests():
if quests.size() > 0:
text = "- " + quests.join("\n- ") # prints all quests on the notepad
text = "- " + quests.join("\n- ") # prints all quests on the notepad
else:
text = ""
#print(quests.join("\n- "))
#print(quests.join("\n- "))
func hasQuest(questInq): # checks if the array contains a certain quest
func hasQuest(questInq): # checks if the array contains a certain quest
...
...
Scripts/Food.gd
View file @
5da32749
...
@@ -15,8 +15,8 @@ onready var sausage
...
@@ -15,8 +15,8 @@ onready var sausage
func _ready():
func _ready():
connect("selected_ing", get_parent().get_node("Energy handler"), "_selected_ing")
connect("selected_ing", get_parent().get_node("Energy handler"), "_selected_ing")
connect("unselected_ing", get_parent().get_node("Energy handler"), "_unselected_ing")
connect("unselected_ing", get_parent().get_node("Energy handler"), "_unselected_ing")
connect("cook", get_parent().get_node("Energy handler"), "cook")
connect("cook", get_parent().get_node("Energy handler"), "
_
cook")
connect("eat", get_parent().get_node("Energy handler"), "eat")
connect("eat", get_parent().get_node("Energy handler"), "
_
eat")
func passUI(inv, dia, que):
func passUI(inv, dia, que):
.passUI(inv, dia, que)
.passUI(inv, dia, que)
...
...
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