Building on alex's work

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

Hide file tree

Showing 7 changed files with 42 additions and 58 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()

diff --git a/2d/role_playing_game/dialogue/dialogue_player/DialoguePlayer.gd b/2d/role_playing_game/dialogue/dialogue_player/DialoguePlayer.gd
@@ -11,7 +11,6 @@ var dialogue_text = ""
 signal dialogue_started
 signal dialogue_finished
 
-
 func start_dialogue():
 	emit_signal("dialogue_started")
 	current = 0

diff --git a/2d/role_playing_game/grid_movement/Exploration.tscn b/2d/role_playing_game/grid_movement/Exploration.tscn
diff --git a/2d/role_playing_game/grid_movement/grid/Grid.gd b/2d/role_playing_game/grid_movement/grid/Grid.gd
@@ -5,13 +5,7 @@ enum CellType { ACTOR, OBSTACLE, OBJECT }
 
 func _ready():
 	for child in get_children():
-		#TODO
-		#set_cellv(local_to_map(child.position), child.type)
-		print(get_layers_count())
-		# set_cell? (int layer, Vector2i coords, int source_id=-1, Vector2i atlas_coords=Vector2i(-1, -1), int alternative_tile=0)
-		# https://docs.godotengine.org/en/latest/classes/class_tilemap.html#class-tilemap-method-set-cell
-		#set_cell(local_to_map(child.position), child.type)
-
+		set_cell(0, local_to_map(child.position), child.type)
 
 func get_cell_pawn(cell, type = CellType.ACTOR):
 	for node in get_children():
@@ -25,17 +19,16 @@ func request_move(pawn, direction):
 	var cell_start = local_to_map(pawn.position)
 	var cell_target = cell_start + direction
 
-	#TODO
-#	var cell_tile_id = get_cellv(cell_target)
-#	match cell_tile_id:
-#		-1:
-#			set_cellv(cell_target, CellType.ACTOR)
-#			set_cellv(cell_start, -1)
-#			return map_to_local(cell_target) + cell_size / 2
-#		CellType.OBJECT, CellType.ACTOR:
-#			var target_pawn = get_cell_pawn(cell_target, cell_tile_id)
-#			print("Cell %s contains %s" % [cell_target, target_pawn.name])
-#
-#			if not target_pawn.has_node("DialoguePlayer"):
-#				return
-#			get_node(dialogue_ui).show_dialogue(pawn, target_pawn.get_node(^"DialoguePlayer"))
+	var cell_tile_id = get_cell_source_id(0, cell_target)
+	match cell_tile_id:
+		-1:
+			set_cell(0, cell_target, CellType.ACTOR)
+			set_cell(0, cell_start, -1)
+			return map_to_local(cell_target) + Vector2(tile_set.tile_size.x / 2, tile_set.tile_size.y / 2)
+		CellType.OBJECT, CellType.ACTOR:
+			var target_pawn = get_cell_pawn(cell_target, cell_tile_id)
+			print("Cell %s contains %s" % [cell_target, target_pawn.name])
+
+			if not target_pawn.has_node("DialoguePlayer"):
+				return
+			get_node(dialogue_ui).show_dialogue(pawn, target_pawn.get_node(^"DialoguePlayer"))
diff --git a/2d/role_playing_game/project.godot b/2d/role_playing_game/project.godot
@@ -16,7 +16,7 @@ and GDScript. It also includes a simple JRPG-style dialogue and
 battle system on top of it."
 config/tags=PackedStringArray("2d", "demo", "gui", "official", "tilemap")
 run/main_scene="res://Game.tscn"
-config/features=PackedStringArray("4.1")
+config/features=PackedStringArray("4.2")
 config/icon="res://icon.webp"
 
 [display]