Prepared Movement behaviour. Fixed multi-tile placement bug
This commit is contained in:
Sch1nken
parent
62eef907d3
commit
397082f966
17 changed files with 395 additions and 75 deletions
108
Tile/Tile.gd
108
Tile/Tile.gd
|
|
@ -6,7 +6,6 @@ var map_reference: HexGrid
|
|||
var is_blacks_turn: bool = false
|
||||
|
||||
var coordinates: Vector4i
|
||||
var layer: int = 0
|
||||
|
||||
@export var is_black: bool = false
|
||||
@export var resource: TileResource
|
||||
|
|
@ -18,17 +17,14 @@ var hat: InsectTile = null
|
|||
var build_in_progress: bool = false
|
||||
var move_in_progress: bool = false
|
||||
|
||||
|
||||
var deactivated: bool = false
|
||||
|
||||
var hovered: bool = false
|
||||
|
||||
var selected: bool = false
|
||||
|
||||
var hover_shader: ShaderMaterial = preload("res://InsectTiles/HoverShader.tres")
|
||||
|
||||
const SELECTION_FAILED_MAT: ShaderMaterial = preload("res://InsectTiles/SelectionFailedMat.tres")
|
||||
const ACTION_SHADER = preload("res://InsectTiles/ActionShader.tres")
|
||||
var hover_shader: ShaderMaterial = preload("res://InsectTiles/HoverShader.tres")
|
||||
#const SELECTION_FAILED_MAT: ShaderMaterial = preload("res://InsectTiles/SelectionFailedMat.tres")
|
||||
#const ACTION_SHADER = preload("res://InsectTiles/ActionShader.tres")
|
||||
|
||||
var mat: StandardMaterial3D
|
||||
|
||||
|
|
@ -37,8 +33,25 @@ var tween: Tween
|
|||
var tweening: bool = false
|
||||
|
||||
var selected_for_action: bool = false
|
||||
var action_callback: Callable = Callable()
|
||||
|
||||
|
||||
var can_be_selected: bool = false
|
||||
|
||||
var move_round_penalty: int = 0
|
||||
|
||||
func is_in_stack() -> bool:
|
||||
return hat != null or coordinates.w != 0
|
||||
|
||||
func can_move() -> bool:
|
||||
# if any tile gets moved, set move_round_penalty to 2
|
||||
# on turn start subtract 1
|
||||
# we can't move if its 1, so we have to wait an additional round
|
||||
# this is ued for the pillbug ability
|
||||
# also if we move, we also set it to 2
|
||||
|
||||
return move_round_penalty == 0
|
||||
|
||||
func is_players_turn() -> bool:
|
||||
return is_blacks_turn == is_black
|
||||
|
||||
|
|
@ -69,18 +82,45 @@ func _ready() -> void:
|
|||
hexagon_small.rotation.y = PI
|
||||
|
||||
GameEvents.insect_selected.connect(_on_insect_selected)
|
||||
GameEvents.insect_tile_selecetion_failed.connect(_on_selection_failed)
|
||||
GameEvents.insect_placed.connect(_on_insect_placed)
|
||||
GameEvents.insect_placement_cancelled.connect(_on_insect_placement_cancelled, CONNECT_DEFERRED)
|
||||
GameEvents.insect_tile_selected.connect(_on_insect_tile_selected)
|
||||
GameEvents.insect_tile_deselected.connect(_on_insect_tile_deselected)
|
||||
GameEvents.insect_tile_moved.connect(_on_insect_tile_moved)
|
||||
|
||||
GameEvents.insect_tiles_selected_for_action.connect(_on_tiles_selected_for_action)
|
||||
GameEvents.insect_action_cancelled.connect(_on_action_cancelled)
|
||||
|
||||
GameEvents.turn_started.connect(_on_turn_started)
|
||||
|
||||
func _on_action_cancelled() -> void:
|
||||
selected_for_action = false
|
||||
move_in_progress = false
|
||||
selected = false
|
||||
|
||||
if hovered:
|
||||
hover()
|
||||
else:
|
||||
if tween != null:
|
||||
tween.kill()
|
||||
|
||||
tween.tween_method(tween_shader, mat.next_pass.get_shader_parameter("albedo"), Color(1, 1, 1, 0), 0.5).set_ease(Tween.EASE_IN_OUT).set_trans(Tween.TRANS_EXPO)
|
||||
|
||||
|
||||
func _on_selection_failed(tile: InsectTile) -> void:
|
||||
if tile != self:
|
||||
return
|
||||
|
||||
# Show selection failed mat
|
||||
|
||||
func _on_turn_started(turn_num: int, map: HexGrid, _is_blacks_turn: bool) -> void:
|
||||
is_blacks_turn = _is_blacks_turn
|
||||
|
||||
move_round_penalty -= 1
|
||||
if move_round_penalty < 0:
|
||||
move_round_penalty = 0
|
||||
|
||||
can_be_selected = GameData.bees_placed.has(is_black)
|
||||
#print(GameData.has_bee_been_placed)
|
||||
if turn_num >= 7 and not GameData.bees_placed.has(is_black):
|
||||
|
|
@ -89,7 +129,12 @@ func _on_turn_started(turn_num: int, map: HexGrid, _is_blacks_turn: bool) -> voi
|
|||
func _on_tiles_selected_for_action(source_pos: Vector4i, targets: Array[InsectTile]) -> void:
|
||||
if self in targets:
|
||||
selected_for_action = true
|
||||
mat.next_pass = ACTION_SHADER
|
||||
if tween != null:
|
||||
tween.kill()
|
||||
|
||||
tween = get_tree().create_tween()
|
||||
#tween.tween_property(self, "position", Vector3(0, 0, 5), 0.5).set_ease(Tween.EASE_OUT).set_trans(Tween.TRANS_SPRING)
|
||||
tween.tween_method(tween_shader, Color(0, 0.6, 0, 0), Color(0, 0.6, 0, 0.8), 0.5).set_ease(Tween.EASE_IN_OUT).set_trans(Tween.TRANS_EXPO)
|
||||
return
|
||||
|
||||
deactivated = true
|
||||
|
|
@ -98,35 +143,49 @@ func _on_tiles_selected_for_action(source_pos: Vector4i, targets: Array[InsectTi
|
|||
func _on_insect_tile_moved(tile: InsectTile, to: Vector4i) -> void:
|
||||
move_in_progress = false
|
||||
selected = false
|
||||
deactivated = false
|
||||
|
||||
if tile == self:
|
||||
hovered = false
|
||||
if not tweening:
|
||||
mat.next_pass = null
|
||||
move_round_penalty == 2
|
||||
|
||||
func _on_insect_tile_deselected(tile: InsectTile) -> void:
|
||||
move_in_progress = false
|
||||
selected = false
|
||||
deactivated = false
|
||||
|
||||
if hovered:
|
||||
hover()
|
||||
else:
|
||||
if tween != null:
|
||||
tween.kill()
|
||||
|
||||
#tween.tween_method(tween_shader, mat.next_pass.get_shader_parameter("albedo"), Color(1, 1, 1, 0), 0.5).set_ease(Tween.EASE_IN_OUT).set_trans(Tween.TRANS_EXPO)
|
||||
|
||||
func _on_insect_tile_selected(tile: InsectTile) -> void:
|
||||
deactivated = true
|
||||
if tile == self:
|
||||
selected = true
|
||||
return
|
||||
|
||||
func _on_insect_placed(resource: TileResource, is_black: bool, pos: Vector4i) -> void:
|
||||
build_in_progress = false
|
||||
deactivated = false
|
||||
|
||||
func _on_insect_placement_cancelled() -> void:
|
||||
build_in_progress = false
|
||||
deactivated = false
|
||||
|
||||
func _on_insect_selected(button: InsectButton, is_black: bool) -> void:
|
||||
build_in_progress = true
|
||||
deactivated = true
|
||||
|
||||
func _process(delta):
|
||||
#func _process(delta):
|
||||
func _input_event(camera, event, position, normal, shape_idx):
|
||||
if Input.is_action_just_pressed("place_tile"):
|
||||
if not can_be_selected:
|
||||
if deactivated:
|
||||
return
|
||||
|
||||
if deactivated:
|
||||
if not can_be_selected:
|
||||
return
|
||||
|
||||
if not hovered:
|
||||
|
|
@ -157,18 +216,19 @@ func hover() -> void:
|
|||
if is_blacks_turn != is_black:
|
||||
return
|
||||
|
||||
# mat.next_pass = hover_shader.duplicate()
|
||||
|
||||
if tween != null:
|
||||
tween.kill()
|
||||
|
||||
tween = get_tree().create_tween()
|
||||
#tween.tween_property(self, "position", Vector3(0, 0, 5), 0.5).set_ease(Tween.EASE_OUT).set_trans(Tween.TRANS_SPRING)
|
||||
tween.tween_method(tween_hover_shader, Color(0, 0, 0, 0), Color(0, 0, 0, 1), 0.1).set_ease(Tween.EASE_IN_OUT).set_trans(Tween.TRANS_EXPO)
|
||||
tween.tween_method(tween_shader, Color(0, 0, 0, 0), Color(0, 0, 0, 1), 0.1).set_ease(Tween.EASE_IN_OUT).set_trans(Tween.TRANS_EXPO)
|
||||
|
||||
|
||||
func tween_hover_shader(color: Color) -> void:
|
||||
if mat.next_pass != null:
|
||||
mat.next_pass.set_shader_parameter("albedo", color)
|
||||
mat.next_pass.set_shader_parameter("emission_color", color)
|
||||
func tween_shader(color: Color) -> void:
|
||||
mat.next_pass.set_shader_parameter("albedo", color)
|
||||
mat.next_pass.set_shader_parameter("emission_color", color)
|
||||
|
||||
func unhover() -> void:
|
||||
if is_blacks_turn != is_black:
|
||||
|
|
@ -179,16 +239,22 @@ func unhover() -> void:
|
|||
|
||||
tween = get_tree().create_tween()
|
||||
#tween.tween_property(hex, "position", Vector2(0, -16), 0.1).set_ease(Tween.EASE_OUT).set_trans(Tween.TRANS_SPRING)
|
||||
tween.tween_method(tween_hover_shader, Color(0, 0, 0, 1), Color(0, 0, 0, 0), 0.25).set_ease(Tween.EASE_IN_OUT).set_trans(Tween.TRANS_EXPO)
|
||||
tween.tween_method(tween_shader, Color(0, 0, 0, 1), Color(0, 0, 0, 0), 0.25).set_ease(Tween.EASE_IN_OUT).set_trans(Tween.TRANS_EXPO)
|
||||
|
||||
|
||||
func _on_mouse_entered():
|
||||
hovered = true
|
||||
if hat != null:
|
||||
return
|
||||
|
||||
hovered = true
|
||||
|
||||
if not deactivated and not selected_for_action:
|
||||
hover()
|
||||
|
||||
func _on_mouse_exited():
|
||||
if hat != null:
|
||||
return
|
||||
|
||||
hovered = false
|
||||
|
||||
if not selected and not selected_for_action:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue