Commit 67b7a759 authored by Julia Santos's avatar Julia Santos

Brodie's face now changes when you talk to him

parent 1ef837d6
...@@ -3,6 +3,7 @@ extends "res://Item.gd" ...@@ -3,6 +3,7 @@ extends "res://Item.gd"
onready var currentScene = "Intro" onready var currentScene = "Intro"
onready var sceneProgress = 0 onready var sceneProgress = 0
onready var dim = get_parent().get_node("Dim") onready var dim = get_parent().get_node("Dim")
onready var neighbor = get_parent().get_node("Neighbor")
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
...@@ -24,28 +25,35 @@ func getDialogue(sceneName): ...@@ -24,28 +25,35 @@ func getDialogue(sceneName):
0: 0:
dialogue = "Moxie: ..... Trying to help....?" dialogue = "Moxie: ..... Trying to help....?"
sceneProgress += 1 sceneProgress += 1
neighbor.set_face(1)
1: 1:
dialogue = "Then can you give me some space? This is area is a danger zone until I finish what I'm doing" dialogue = "Brodie: Then can you give me some space? This is area is a danger zone until I finish what I'm doing"
sceneProgress += 1 sceneProgress += 1
neighbor.set_face(2)
2: 2:
dialogue = "(Geez. He won't budge. I guess I'll have to distract him somehow...)" dialogue = "(Geez. He won't budge. I guess I'll have to distract him somehow...)"
sceneProgress = 0 sceneProgress = 0
hide() hide()
dim.hide() dim.hide()
inventory.enable() inventory.enable()
neighbor.set_face(1)
elif sceneName == "First Nana pass": elif sceneName == "First Nana pass":
match sceneProgress: match sceneProgress:
0: 0:
dialogue = "Brodie: OH MY GOSH IS THAT A LIZARD???" dialogue = "Brodie: OH MY GOSH IS THAT A LIZARD???"
neighbor.set_face(4)
sceneProgress += 1 sceneProgress += 1
1: 1:
dialogue = "Moxie: Yeah, and she’s very friendly." dialogue = "Moxie: Yeah, and she’s very friendly."
neighbor.set_face(3)
sceneProgress += 1 sceneProgress += 1
2: 2:
dialogue = "Brodie: She’s so cute! C-can I play with her…? Please." dialogue = "Brodie: She’s so cute! C-can I play with her…? Please."
neighbor.set_face(4)
sceneProgress += 1 sceneProgress += 1
3: 3:
dialogue = "Moxie: Sure! Just put her back in the terrarium when you’re done!" dialogue = "Moxie: Sure! Just put her back in the terrarium when you’re done!"
neighbor.set_face(3)
sceneProgress += 1 sceneProgress += 1
get_parent().get_node("Neighbor").move() get_parent().get_node("Neighbor").move()
inventory.remove_item_name("Nana") inventory.remove_item_name("Nana")
...@@ -57,7 +65,7 @@ func getDialogue(sceneName): ...@@ -57,7 +65,7 @@ func getDialogue(sceneName):
inventory.enable() inventory.enable()
elif sceneName == "Nana again": elif sceneName == "Nana again":
dialogue = "Brodie: OF COURSE, ALWAYS." dialogue = "Brodie: OF COURSE, ALWAYS."
get_parent().get_node("Neighbor").move() neighbor.move()
inventory.remove_item_name("Nana") inventory.remove_item_name("Nana")
dim.hide() dim.hide()
hide() hide()
......
...@@ -11,6 +11,7 @@ func _ready(): ...@@ -11,6 +11,7 @@ func _ready():
func mouseInteraction(): func mouseInteraction():
if !hasNana: if !hasNana:
.mouseInteraction() .mouseInteraction()
set_face(2)
dialogueArrow.setScene("Intro") dialogueArrow.setScene("Intro")
dialogueArrow.show() dialogueArrow.show()
#print("Starting scene") #print("Starting scene")
...@@ -50,3 +51,14 @@ func move(): ...@@ -50,3 +51,14 @@ func move():
position = Vector2(6.44,8.756) position = Vector2(6.44,8.756)
else: else:
position = Vector2(326.341,8.756) position = Vector2(326.341,8.756)
func set_face(face):
match face:
1:
get_node("Hitbox/Sprite").set_texture(load("res://.import/brodie1.png-237ea56a37909490cd856d61d70939a6.stex"))
2:
get_node("Hitbox/Sprite").set_texture(load("res://.import/brodie2.png-4bea1a7e740f1463b2b70e590e9c0184.stex"))
3:
get_node("Hitbox/Sprite").set_texture(load("res://.import/brodie3.png-9ec4bde67ed78de32cb1dae0cfcf4a54.stex"))
4:
get_node("Hitbox/Sprite").set_texture(load("res://.import/brodie4.png-c4b75d8e5887b0f05ec513583ecd1948.stex"))
...@@ -16,6 +16,7 @@ config/icon="res://assets/189066690_228150108704696_3850052974465333899_n.png" ...@@ -16,6 +16,7 @@ config/icon="res://assets/189066690_228150108704696_3850052974465333899_n.png"
[display] [display]
window/size/resizable=false
window/stretch/mode="2d" window/stretch/mode="2d"
window/stretch/aspect="keep" window/stretch/aspect="keep"
......
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