Clean & debug

sources/gardens/gardens.gd

@@ -112,7 +112,7 @@ func _ready() -> void:
 	var is_look_and_learn_completed: bool = transition_data.has("look_and_learn_completed") and transition_data.look_and_learn_completed
 	
 	# Defines if a minigame was just completed
-	var is_minigame_completed: bool = transition_data.has("look_and_learn_completed") and transition_data.look_and_learn_completed
+	var is_minigame_completed: bool = transition_data.has("minigame_completed") and transition_data.minigame_completed
 	
 	# Defines if the minigame or lookandlearn cleared is for the first time
 	var is_first_clear: bool = transition_data and transition_data.has("first_clear") and transition_data.first_clear

sources/language_tool/lessons_list.gd

@@ -78,7 +78,7 @@ func _on_lesson_dropped(before: bool, number: int, dropped_number: int) -> void:
 		index += 1
 	lessons_container.move_child(dropped_lesson, index)
 	var children: Array[Node] = lessons_container.get_children()
-	for ind: int in children.size():
+	for ind: int in range(children.size()):
 		var child: LessonContainer = children[ind]
 		child.number = ind + 1
 		lessons[child.number] = child
@@ -87,7 +87,7 @@ func _on_lesson_dropped(before: bool, number: int, dropped_number: int) -> void:
 func _on_save_button_pressed() -> void:
 	Database.db.query("DELETE FROM GPsInLessons")
 	var children: Array[Node] = lessons_container.get_children()
-	for index: int in children.size():
+	for index: int in range(children.size()):
 		var child: LessonContainer = children[index]
 		Database.db.query_with_bindings("SELECT * FROM Lessons WHERE LessonNb = ?", [index + 1])
 		var lesson_id: int = -1

sources/language_tool/prof_tool_menu.gd

@@ -103,7 +103,7 @@ func _on_export_filename_selected(filename: String) -> void:
 	
 	var summary_file: FileAccess = FileAccess.open(BASE_PATH.path_join(Database.language).path_join("summary.txt"), FileAccess.WRITE)
 	var sentences_by_lesson: Dictionary = Database.get_sentences_by_lessons()
-	for index: int in Database.get_lessons_count():
+	for index: int in range(Database.get_lessons_count()):
 		
 		var lesson: int = index +1
 		
@@ -159,7 +159,7 @@ func _check_db_integrity() -> void:
 	var known_words_list: Dictionary = {}
 	var known_gps_list: Array[Dictionary] = []
 	var gp_known: bool = false
-	for index: int in Database.get_lessons_count():
+	for index: int in range(Database.get_lessons_count()):
 		lesson_id = index +1
 		error_label.text = "Database integrity checks lesson " + str(lesson_id)
 		await get_tree().process_frame
@@ -389,7 +389,7 @@ func _word_list_file_selected(file_path: String) -> void:
 			if master_gplist.size() != graphemes.size():
 				same = false
 			else:
-				for index: int in master_gplist.size():
+				for index: int in range(master_gplist.size()):
 					same = same and (graphemes[index] + "-" + phonemes[index] == master_gplist[index])
 			if not same:
 				Database.db.delete_rows("Words", "ID=%s" % result.WordId)
@@ -467,7 +467,7 @@ func _create_words_csv() -> void:
 		var gpmatch: String = "("
 		var graphemes: PackedStringArray = (element.Graphemes as String).split(" ")
 		var phonemes: PackedStringArray = (element.Phonemes as String).split(" ")
-		for index: int in graphemes.size() - 1:
+		for index: int in range(graphemes.size() - 1):
 			gpmatch += graphemes[index] + "-" + phonemes[index] + "."
 		var index: int = graphemes.size() - 1
 		gpmatch += graphemes[index] + "-" + phonemes[index] + ")"
@@ -496,7 +496,7 @@ func _create_syllable_csv() -> void:
 		var gpmatch: String = "("
 		var graphemes: PackedStringArray = (element.Graphemes as String).split(" ")
 		var phonemes: PackedStringArray = (element.Phonemes as String).split(" ")
-		for index: int in graphemes.size() - 1:
+		for index: int in range(graphemes.size() - 1):
 			gpmatch += graphemes[index] + "-" + phonemes[index] + "."
 		var last_index: int = graphemes.size() - 1
 		gpmatch += graphemes[last_index] + "-" + phonemes[last_index] + ")"

sources/language_tool/sentence_list_element.gd

@@ -60,7 +60,7 @@ func _add_from_additional_word_list(new_text: String) -> int:
 			Sentence = new_text,
 		})
 		id = Database.db.last_insert_rowid
-		for index: int in word_ids.size():
+		for index: int in range(word_ids.size()):
 			var word_id: int = word_ids[index]
 			Database.db.insert_row("WordsInSentences", {
 				WordID = word_id,

sources/minigames/caterpillar/branch.gd

@@ -16,7 +16,7 @@ var velocity: float = 0.0
 var is_highlighting: bool = false:
 	set = _set_highlighting
 
-var is_running: float = true
+var is_running: bool = true
 
 func _set_highlighting(value: bool) -> void:
 	is_highlighting = value

sources/utils/autoloads/database.gd

@@ -73,7 +73,7 @@ func load_additional_word_list() -> String:
 			if line.size() != title_line.size():
 				return "Formatting error on: %s" % line
 			var data: Dictionary = {}
-			for index: int in line.size():
+			for index: int in range(line.size()):
 				data[title_line[index]] = line[index]
 			additional_word_list[line[ortho_index]] = data
 		file.close()
@@ -311,7 +311,7 @@ func get_sentences(p_lesson_nb: int, only_new: bool = false, sentences_by_lesson
 		return sentences_by_lesson.get(p_lesson_nb, [])
 	
 	var ret: Array = []
-	for index: int in p_lesson_nb:
+	for index: int in range(p_lesson_nb):
 		ret.append_array(sentences_by_lesson.get(index, []) as Array)
 	return ret
 
@@ -628,7 +628,7 @@ func _import_word_from_csv(ortho: String, gpmatch: String, is_word: bool = true)
 				Syllable = ortho,
 			})
 			word_id = db.last_insert_rowid
-			for index: int in gp_ids.size():
+			for index: int in range(gp_ids.size()):
 				var gp_id: int = gp_ids[index]
 				db.insert_row("GPsInSyllables", {
 					SyllableID = word_id,

sources/utils/autoloads/user_data_manager.gd

@@ -138,7 +138,7 @@ func safe_load_and_fix_resource(path: String, old_texts: Array[String], new_text
 
 	var content: String = FileAccess.get_file_as_string(path)
 
-	for index: int in old_texts.size():
+	for index: int in range(old_texts.size()):
 		if content.find(old_texts[index]) != -1:
 			Logger.info("UserDataManager: Fix resource:" + path)
 			content = content.replace(old_texts[index], new_texts[index])

sources/utils/autoloads/user_database_synchronizer.gd

@@ -386,7 +386,7 @@ func _apply_server_response(response_body: Dictionary) -> void:
 				# TODO ADD SECURITY
 				var new_array: Array = JSON.parse_string(response_student_data.remediation_gp.score_remediation as String) as Array
 				var new_gp_scores: Dictionary[int, int] = {}
-				for index: int in new_array.size():
+				for index: int in range(new_array.size()):
 					# TODO ADD SECURITY
 					new_gp_scores[int(new_array[index][0] as float)] = int(new_array[index][1] as float)
 				UserDataManager.set_student_remediation_gp_data(int(response_student_code), new_gp_scores, response_student_data.remediation_gp.updated_at as String)
@@ -405,7 +405,7 @@ func _apply_server_response(response_body: Dictionary) -> void:
 				# TODO ADD SECURITY
 				var new_array: Array = JSON.parse_string(response_student_data.remediation_words.score_remediation as String) as Array
 				var new_words_scores: Dictionary[int, int] = {}
-				for index: int in new_array.size():
+				for index: int in range(new_array.size()):
 					# TODO ADD SECURITY
 					new_words_scores[int(new_array[index][0] as float)] = int(new_array[index][1] as float)
 				UserDataManager.set_student_remediation_words_data(int(response_student_code), new_words_scores, response_student_data.remediation_words.updated_at as String)