summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2020-07-20 12:36:27 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2020-07-20 12:36:27 +0200
commitc0924bec8e498187256d5dff0b3d0e8a6f40f36c (patch)
treeb790029446758affa7486bf14b0cd3b3f5447cfa
parent89723ca94bd21f1ae14592a682e9c0e5c5f04a74 (diff)
downloadgodot-hexgrid-c0924bec8e498187256d5dff0b3d0e8a6f40f36c.zip
godot-hexgrid-c0924bec8e498187256d5dff0b3d0e8a6f40f36c.tar.gz
Tile.on_board -> Tile.on_map
-rw-r--r--HexBoard.gd10
-rw-r--r--Tile.gd4
2 files changed, 7 insertions, 7 deletions
diff --git a/HexBoard.gd b/HexBoard.gd
index ab52dd6..c883061 100644
--- a/HexBoard.gd
+++ b/HexBoard.gd
@@ -316,7 +316,7 @@ func _diagonal_los(p0 : Vector2, p1 : Vector2, flat : bool, q13 : bool, tiles :
else: x += dx # right
var q : Vector2 = Vector2(x, y)
var t : Tile = get_tile(q)
- if t.on_board:
+ if t.on_map:
tiles.append(t)
t.blocked = los_blocked
if t.block_los(from, to, d, distance(p0, q)):
@@ -331,7 +331,7 @@ func _diagonal_los(p0 : Vector2, p1 : Vector2, flat : bool, q13 : bool, tiles :
if not q13: x -= dx
q = Vector2(x, y)
t = get_tile(q)
- if t.on_board:
+ if t.on_map:
tiles.append(t)
t.blocked = los_blocked
if t.block_los(from, to, d, distance(p0, q)):
@@ -423,7 +423,7 @@ func possible_moves(piece : Piece, from : Tile, tiles : Array) -> int:
# warning-ignore:return_value_discarded
build_adjacents(src.coords)
for dst in adjacents:
- if not dst.on_board: continue
+ if not dst.on_map: continue
var o : int = to_orientation(angle(src, dst))
var cost : int = piece.move_cost(src, dst, o)
if (cost == -1): continue # impracticable
@@ -463,7 +463,7 @@ func shortest_path(piece : Piece, from : Tile, to : Tile, tiles : Array) -> int
# warning-ignore:return_value_discarded
build_adjacents(src.coords)
for dst in adjacents:
- if not dst.on_board: continue
+ if not dst.on_map: continue
var o : int = to_orientation(angle(src, dst))
var cost : int = piece.move_cost(src, dst, o)
if (cost == -1): continue # impracticable
@@ -512,7 +512,7 @@ func range_of_influence(piece : Piece, from : Tile, category : int, tiles : Arra
# warning-ignore:return_value_discarded
build_adjacents(src.coords)
for dst in adjacents:
- if not dst.on_board: continue
+ if not dst.on_map: continue
if dst.search_count == search_count: continue
dst.search_count = search_count
var d : int = int(distance(from.coords, dst.coords, false))
diff --git a/Tile.gd b/Tile.gd
index a3285e5..68627f4 100644
--- a/Tile.gd
+++ b/Tile.gd
@@ -5,7 +5,7 @@ class_name Tile, "res://godot/Tile.png"
var coords : Vector2
var blocked : bool
-var on_board : bool = false
+var on_map : bool = false
var acc : int
var f : float
@@ -16,7 +16,7 @@ var search_count : int
func configure(p : Vector2, c: Vector2, o :Array) -> void:
position = p
coords = c
- on_board = true
+ on_map = true
for t in o:
var s :Sprite = Sprite.new()
s.texture = load(t)