Merge pull request #399 from aaronfranke/rpg

Update 2D role playing game

Author: aaronfranke

2d/role_playing_game/Game.gd

@@ -1,7 +1,7 @@
 extends Node
 
-export (NodePath) var combat_screen
-export (NodePath) var exploration_screen
+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"
@@ -19,12 +19,6 @@ func _ready():
 			"_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)
@@ -35,6 +29,15 @@ func start_combat(combat_actors):
 	combat_screen.initialize(combat_actors)
 	$AnimationPlayer.play_backwards("fade")
 
+
+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 _on_combat_finished(winner, _loser):
 	remove_child(combat_screen)
 	$AnimationPlayer.play_backwards("fade")

2d/role_playing_game/Game.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://Game.gd" type="Script" id=1]
-[ext_resource path="res://screens/exploration/Exploration.tscn" type="PackedScene" id=2]
-[ext_resource path="res://screens/combat/Combat.tscn" type="PackedScene" id=3]
+[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
@@ -38,10 +38,10 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="Combat" parent="." instance=ExtResource( 3 )]
+[node name="Combat" parent="." instance=ExtResource( 2 )]
 visible = false
 
-[node name="Exploration" parent="." instance=ExtResource( 2 )]
+[node name="Exploration" parent="." instance=ExtResource( 3 )]
 
 [node name="Camera2D" type="Camera2D" parent="."]
 offset = Vector2( 640, 360 )

2d/role_playing_game/dialogue/dialogue_player/DialoguePlayer.gd

@@ -1,6 +1,6 @@
 extends Node
 
-export (String, FILE, "*.json") var dialogue_file
+export(String, FILE, "*.json") var dialogue_file
 var dialogue_keys = []
 var dialogue_name = ""
 var current = 0
@@ -15,21 +15,24 @@ func start_dialogue():
 	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):

2d/role_playing_game/dialogue/dialogue_player/DialoguePlayer.tscn

@@ -4,4 +4,3 @@
 
 [node name="DialoguePlayer" type="Node"]
 script = ExtResource( 1 )
-

2d/role_playing_game/dialogue/interface/Interface.gd

@@ -1,9 +1,11 @@
 extends Control
 
 var dialogue_node = null
+
 func _ready():
 	hide()
 
+
 func show_dialogue(player, dialogue):
 	show()
 	$Button.grab_focus()
@@ -21,12 +23,13 @@ func show_dialogue(player, dialogue):
 	$Name.text = dialogue_node.dialogue_name
 	$Text.text = dialogue_node.dialogue_text
 
-	
+
 func _on_Button_button_up():
 	dialogue_node.next_dialogue()
 	$Name.text = dialogue_node.dialogue_name
 	$Text.text = dialogue_node.dialogue_text
 
+
 func _on_dialogue_finished(player):
 	dialogue_node.disconnect("dialogue_started", player, "set_active")
 	dialogue_node.disconnect("dialogue_finished", player, "set_active")

2d/role_playing_game/dialogue/interface/Interface.tscn

@@ -31,5 +31,4 @@ margin_top = 32.0
 margin_right = 1264.0
 margin_bottom = 151.0
 text = "Next"
-
 [connection signal="button_up" from="Button" to="." method="_on_Button_button_up"]

2d/role_playing_game/grid_movement/grid/Grid.gd

@@ -33,4 +33,3 @@ func request_move(pawn, direction):
 			if not target_pawn.has_node("DialoguePlayer"):
 				return
 			get_node(dialogue_ui).show_dialogue(pawn, target_pawn.get_node("DialoguePlayer"))
-			

2d/role_playing_game/grid_movement/pawns/Actor.gd

@@ -4,7 +4,8 @@ onready var Grid = get_parent()
 var lost = false
 
 func _ready():
-	update_look_direction(Vector2(1, 0))
+	update_look_direction(Vector2.RIGHT)
+
 
 func _process(delta):
 	var input_direction = get_input_direction()
@@ -19,15 +20,18 @@ func _process(delta):
 	else:
 		bump()
 
+
 func get_input_direction():
 	return Vector2(
-		int(Input.is_action_pressed("ui_right")) - int(Input.is_action_pressed("ui_left")),
-		int(Input.is_action_pressed("ui_down")) - int(Input.is_action_pressed("ui_up"))
+		Input.get_action_strength("ui_right") - Input.get_action_strength("ui_left"),
+		Input.get_action_strength("ui_down") - Input.get_action_strength("ui_up")
 	)
 
+
 func update_look_direction(direction):
 	$Pivot/Sprite.rotation = direction.angle()
 
+
 func move_to(target_position):
 	set_process(false)
 	$AnimationPlayer.play("walk")
@@ -40,5 +44,6 @@ func move_to(target_position):
 
 	set_process(true)
 
+
 func bump():
 	$AnimationPlayer.play("bump")

2d/role_playing_game/grid_movement/pawns/Character.gd

@@ -1,6 +1,8 @@
 extends 'Pawn.gd'
 
+#warning-ignore:unused_class_variable
 export (PackedScene) var combat_actor
+#warning-ignore:unused_class_variable
 var lost = false
 
 func _ready():

2d/role_playing_game/grid_movement/pawns/Character.tscn

@@ -68,9 +68,6 @@ script = ExtResource( 1 )
 __meta__ = {
 "_edit_group_": true
 }
-_sections_unfolded = [ "Offset", "Transform", "Z Index" ]
-type = 0
-combat_actor = null
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 anims/bump = SubResource( 1 )
@@ -84,4 +81,3 @@ anims/walk = SubResource( 2 )
 texture = ExtResource( 2 )
 centered = false
 offset = Vector2( -32, -32 )
-