Skip to content

Commit 4fe8525

Browse files
committed
mother dialog face direction fix + quiz controller hotfixes
1 parent e3c93fb commit 4fe8525

File tree

2 files changed

+29
-8
lines changed

2 files changed

+29
-8
lines changed

src/mother.gd

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,27 @@ func update_anims(delta: float) -> void:
2020
elif velocity.x < 0:
2121
chosenAnimDir = "left";
2222

23+
func anim_look_at(where: Vector2):
24+
if where.y > where.x + diagonalConstant:
25+
if where.y > 0:
26+
chosenAnimDir = "front";
27+
elif where.y < 0:
28+
chosenAnimDir = "back";
29+
elif where.x + diagonalConstant > where.y:
30+
if where.x > 0:
31+
chosenAnimDir = "right";
32+
elif where.x < 0:
33+
chosenAnimDir = "left";
34+
2335
func _quest_update(rizal: CharacterController):
2436
if isTalking:
2537
return
2638
isTalking = true;
2739
data.canMove = false;
40+
41+
var to_rizal = (rizal.global_position - global_position).normalized();
42+
anim_look_at(to_rizal);
43+
2844
if rizal.data.questState == 0:
2945
var dialog_array: Array[Array] = [
3046
[data.displayName, "Pepe, you’ve been reading all morning.", 1],
@@ -78,6 +94,8 @@ func _quest_update(rizal: CharacterController):
7894
var quiz_data: QuizData = load("res://quizzes/level1.tres");
7995
await QuizController.start_quiz(quiz_data);
8096

97+
HintsController.make_hint("You have completed Level #1", 3, true);
98+
8199
PlayerController.currentScene.can_exit = true;
82100

83101
isTalking = false;

src/quiz_controller.gd

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,19 @@ extends Node;
1313

1414
var quiz_answered: bool = false;
1515

16-
func check_if_right(quiz_data: QuizData, quiz_button: Button, letter: String):
16+
var letters: Array[String] = ["A", "B", "C", "D"];
17+
18+
func check_if_right(quiz_data: QuizData):
1719
if quiz_answered:
1820
return
1921

20-
quiz_button.release_focus();
21-
if letter == quiz_data.correctOption:
22-
quiz_button.add_theme_color_override("font_color", Color(0.0, 0.392, 0.0, 1.0));
23-
else:
24-
quiz_button.add_theme_color_override("font_color", Color(122.958, 0.0, 0.0, 1.0));
22+
for letter in letters:
23+
var quiz_button: Button = quiz_options_box.get_node(letter);
24+
quiz_button.release_focus();
25+
if letter == quiz_data.correctOption:
26+
quiz_button.add_theme_color_override("font_color", Color(0.0, 0.392, 0.0, 1.0));
27+
else:
28+
quiz_button.add_theme_color_override("font_color", Color(122.958, 0.0, 0.0, 1.0));
2529

2630
quiz_question.visible = false;
2731
quiz_answer.visible = true;
@@ -46,12 +50,11 @@ func start_quiz(quiz_data: QuizData):
4650
quiz_question.visible = true;
4751
quiz_answer.visible = false;
4852

49-
var letters = ["A", "B", "C", "D"];
5053
for letter in letters:
5154
var quiz_button: Button = quiz_options_box.get_node(letter);
5255
quiz_button.text = letter + ". " + quiz_data.get("option" + letter);
5356
quiz_button.pressed.connect(func():
54-
check_if_right(quiz_data, quiz_button, letter);
57+
check_if_right(quiz_data);
5558
);
5659

5760
while not quiz_answered:

0 commit comments

Comments
 (0)