Building on alex's work

godotengine · Jan 8, 2024 · a1fe53a · a1fe53a
1 parent cdef190
commit a1fe53a
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 57 deletions.
diff --git a/2d/role_playing_game/Game.gd b/2d/role_playing_game/Game.gd
@@ -1,6 +1,5 @@
 extends Node
 
-
 @export var combat_screen: NodePath
 @export var exploration_screen: NodePath
 

diff --git a/2d/role_playing_game/Game.tscn b/2d/role_playing_game/Game.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://Game.gd" id="1"]
 [ext_resource type="PackedScene" uid="uid://1a847rc1yude" path="res://combat/Combat.tscn" id="2"]
-[ext_resource type="PackedScene" path="res://grid_movement/Exploration.tscn" id="3"]
+[ext_resource type="PackedScene" uid="uid://343t45ghceqo" path="res://grid_movement/Exploration.tscn" id="3"]
 
 [sub_resource type="Animation" id="1"]
 length = 0.5

diff --git a/2d/role_playing_game/combat/Combat.gd b/2d/role_playing_game/combat/Combat.gd
@@ -1,9 +1,7 @@
 extends Node
 
-
 signal combat_finished(winner, loser)
 
-
 func initialize(combat_combatants):
 	for combatant in combat_combatants:
 		combatant = combatant.instantiate()