Refactor RPG Demo

closes #263 

- Rename dialog to dialogue
- Give meaningful name to generic actors
- Move combat screen content to turn_combat folder
- Add new icon.png and .svg
- Change combat UI to not emit a signal from its parent, instead pass parameters to a function and let the combat work on them there
- Remove UI accessing deep layers on the hierarchy (get_parent().get_node("../etc/etc../etc...")
- Fix defend() stacking, making the player invulnerable, now evey turn the Health.armor resets to a base_armor value
- Remove useless Inventory button (maybe added again in the future when an inventory is added to the demo)

Author: henriiquecampos

2d/role_playing_game/Game.gd

@@ -0,0 +1,52 @@
+extends Node
+
+export (NodePath) var combat_screen
+export (NodePath) var exploration_screen
+
+const PLAYER_WIN = "res://dialogue/dialogue_data/player_won.json"
+const PLAYER_LOSE = "res://dialogue/dialogue_data/player_lose.json"
+
+func _ready():
+	exploration_screen = get_node(exploration_screen)
+	combat_screen = get_node(combat_screen)
+	combat_screen.connect("combat_finished", self, "_on_combat_finished")
+	for n in $Exploration/Grid.get_children():
+		if not n.type == n.ACTOR:
+			continue
+		if not n.has_node("DialoguePlayer"):
+			continue
+		n.get_node("DialoguePlayer").connect("dialogue_finished", self, 
+			"_on_opponent_dialogue_finished", [n])
+	remove_child(combat_screen)
+
+func _on_opponent_dialogue_finished(opponent):
+	if opponent.lost:
+		return
+	var player = $Exploration/Grid/Player
+	var combatents = [player.combat_actor, opponent.combat_actor]
+	start_combat(combatents)
+	
+func start_combat(combat_actors):
+	remove_child($Exploration)
+	$AnimationPlayer.play("fade")
+	yield($AnimationPlayer, "animation_finished")
+	add_child(combat_screen)
+	combat_screen.show()
+	combat_screen.initialize(combat_actors)
+	$AnimationPlayer.play_backwards("fade")
+	
+func _on_combat_finished(winner, loser):
+	remove_child(combat_screen)
+	$AnimationPlayer.play_backwards("fade")
+	add_child(exploration_screen)
+	var dialogue = load("res://dialogue/dialogue_player/DialoguePlayer.tscn").instance()
+	if winner.name == "Player":
+		dialogue.dialogue_file = PLAYER_WIN
+	else:
+		dialogue.dialogue_file = PLAYER_LOSE
+	yield($AnimationPlayer, "animation_finished")
+	var player = $Exploration/Grid/Player
+	exploration_screen.get_node("DialogueUI").show_dialogue(player, dialogue)
+	combat_screen.clear_combat()
+	yield(dialogue, "dialogue_finished")
+	dialogue.queue_free()

2d/role_playing_game/Game.tscn

@@ -1,65 +1,10 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://screens/combat/Combat.tscn" type="PackedScene" id=1]
-[ext_resource path="res://screens/exploration/Exploration.tscn" type="PackedScene" id=2]
-
-[sub_resource type="GDScript" id=1]
-
-script/source = "extends Node
-
-export (NodePath) var combat_screen
-export (NodePath) var exploration_screen
-
-const PLAYER_WIN = \"res://dialog_system/dialogs/player_won.json\"
-const PLAYER_LOSE = \"res://dialog_system/dialogs/player_lose.json\"
-
-func _ready():
-	exploration_screen = get_node(exploration_screen)
-	combat_screen = get_node(combat_screen)
-	combat_screen.connect(\"combat_finished\", self, \"_on_combat_finished\")
-	for n in $Exploration/Grid.get_children():
-		if not n.type == n.ACTOR:
-			continue
-		if not n.has_node(\"DialogPlayer\"):
-			continue
-		n.get_node(\"DialogPlayer\").connect(\"dialog_finished\", self, 
-			\"_on_opponent_dialog_finished\", [n])
-	remove_child(combat_screen)
-
-func _on_opponent_dialog_finished(opponent):
-	if opponent.lost:
-		return
-	var player = $Exploration/Grid/Player
-	var combatents = [player.combat_actor, opponent.combat_actor]
-	start_combat(combatents)
-	
-func start_combat(combat_actors):
-	remove_child($Exploration)
-	$AnimationPlayer.play(\"fade\")
-	yield($AnimationPlayer, \"animation_finished\")
-	add_child(combat_screen)
-	combat_screen.show()
-	combat_screen.initialize(combat_actors)
-	$AnimationPlayer.play_backwards(\"fade\")
-	
-func _on_combat_finished(winner, loser):
-	remove_child(combat_screen)
-	$AnimationPlayer.play_backwards(\"fade\")
-	add_child(exploration_screen)
-	var dialog = load(\"res://dialog_system/dialog_player/DialogPlayer.tscn\").instance()
-	if winner.name == \"Player\":
-		dialog.dialog_file = PLAYER_WIN
-	else:
-		dialog.dialog_file = PLAYER_LOSE
-	yield($AnimationPlayer, \"animation_finished\")
-	var player = $Exploration/Grid/Player
-	exploration_screen.get_node(\"DialogUI\").show_dialog(player, dialog)
-	combat_screen.clear_combat()
-	yield(dialog, \"dialog_finished\")
-	dialog.queue_free()
-"
-
-[sub_resource type="Animation" id=2]
+[ext_resource path="res://Game.gd" type="Script" id=1]
+[ext_resource path="res://screens/combat/Combat.tscn" type="PackedScene" id=2]
+[ext_resource path="res://screens/exploration/Exploration.tscn" type="PackedScene" id=3]
+
+[sub_resource type="Animation" id=1]
 
 length = 0.5
 loop = false
@@ -77,9 +22,10 @@ tracks/0/keys = {
 "values": [ Color( 0.0703125, 0.0703125, 0.0703125, 0 ), Color( 0.0703125, 0.0703125, 0.0703125, 1 ) ]
 }
 
-[node name="Game" type="Node"]
+[node name="Game" type="Node" index="0"]
 
-script = SubResource( 1 )
+script = ExtResource( 1 )
+_sections_unfolded = [ "Pause" ]
 combat_screen = NodePath("Combat")
 exploration_screen = NodePath("Exploration")
 
@@ -90,7 +36,7 @@ autoplay = ""
 playback_process_mode = 1
 playback_default_blend_time = 0.0
 playback_speed = 1.0
-anims/fade = SubResource( 2 )
+anims/fade = SubResource( 1 )
 blend_times = [  ]
 
 [node name="Transition" type="CanvasLayer" parent="." index="1"]
@@ -118,10 +64,10 @@ size_flags_vertical = 1
 color = Color( 0.0703125, 0.0703125, 0.0703125, 0 )
 _sections_unfolded = [ "Focus", "Mouse", "Visibility" ]
 
-[node name="Combat" parent="." index="2" instance=ExtResource( 1 )]
+[node name="Combat" parent="." index="2" instance=ExtResource( 2 )]
 
 visible = false
 
-[node name="Exploration" parent="." index="3" instance=ExtResource( 2 )]
+[node name="Exploration" parent="." index="3" instance=ExtResource( 3 )]
 
 

2d/role_playing_game/dialog_system/dialog_player/DialogPlayer.gd

@@ -1,3 +1,3 @@
 {
-  "dialog_1" : {"name": "Opponent", "text": "Aha! I won, maybe you can try again next time"},
+  "dialog_1" : {"name": "Opponent", "text": "Aha! I won, maybe you can try again next time"}
 }

2d/role_playing_game/dialog_system/dialog_player/DialogPlayer.tscn

@@ -1,3 +1,3 @@
 {
-  "dialog_1" : {"name": "Opponent", "text": "Congratulations, you won!"},
+  "dialog_1" : {"name": "Opponent", "text": "Congratulations, you won!"}
 }

2d/role_playing_game/dialog_system/dialogs/npc_01.json renamed to 2d/role_playing_game/dialogue/dialogue_data/npc.json

@@ -0,0 +1,38 @@
+extends Node
+
+export (String, FILE, "*.json") var dialogue_file
+var dialogue_keys = []
+var dialogue_name = ""
+var current = 0
+var dialogue_text = ""
+
+signal dialogue_started
+signal dialogue_finished
+
+func start_dialogue():
+	emit_signal("dialogue_started")
+	current = 0
+	index_dialogue()
+	dialogue_text = dialogue_keys[current].text
+	dialogue_name = dialogue_keys[current].name
+	
+func next_dialogue():
+	current += 1
+	if current == dialogue_keys.size():
+		emit_signal("dialogue_finished")
+		return
+	dialogue_text = dialogue_keys[current].text
+	dialogue_name = dialogue_keys[current].name
+		
+func index_dialogue():
+	var dialogue = load_dialogue(dialogue_file)
+	dialogue_keys.clear()
+	for key in dialogue:
+		dialogue_keys.append(dialogue[key])
+		
+func load_dialogue(file_path):
+	var file = File.new()
+	if file.file_exists(file_path):
+		file.open(file_path, file.READ)
+		var dialogue = parse_json(file.get_as_text())
+		return dialogue

2d/role_playing_game/dialog_system/dialogs/object.json renamed to 2d/role_playing_game/dialogue/dialogue_data/object.json

@@ -0,0 +1,10 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://dialogue/dialogue_player/DialoguePlayer.gd" type="Script" id=1]
+
+[node name="DialoguePlayer" type="Node"]
+
+script = ExtResource( 1 )
+dialogue_file = null
+
+