style(client): gdformat all 52 GDScript files — zero format warnings
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -84,6 +84,7 @@ func _process(delta: float) -> void:
|
||||
|
||||
# --- Hover detection (automatic, from GameState.visible_entities) ---
|
||||
|
||||
|
||||
func _detect_hover() -> void:
|
||||
var prev_id := hovered_entity_id
|
||||
|
||||
@@ -115,7 +116,7 @@ func _find_nearest_entity() -> Dictionary:
|
||||
var mouse_world: Vector2 = xform.affine_inverse() * mouse_screen
|
||||
|
||||
var best_dist := INF
|
||||
var result := { id = -1, kind = "", color = COLOR_DEFAULT, offset = Vector2.ZERO }
|
||||
var result := {id = -1, kind = "", color = COLOR_DEFAULT, offset = Vector2.ZERO}
|
||||
|
||||
for entity in GameState.visible_entities:
|
||||
if not entity.has("entity_id") or not entity.has("x") or not entity.has("y"):
|
||||
@@ -138,6 +139,7 @@ func _find_nearest_entity() -> Dictionary:
|
||||
|
||||
# --- State transitions ---
|
||||
|
||||
|
||||
func _set_target(new_state: State) -> void:
|
||||
if new_state == _target:
|
||||
return
|
||||
@@ -154,29 +156,75 @@ func _set_target(new_state: State) -> void:
|
||||
|
||||
|
||||
func _snapshot() -> Dictionary:
|
||||
return { gap = _gap, len = _len, rot = _rot, thick = _thick,
|
||||
color = _color, bloom = _bloom, bracket_a = _bracket_a, alpha = _alpha }
|
||||
return {
|
||||
gap = _gap,
|
||||
len = _len,
|
||||
rot = _rot,
|
||||
thick = _thick,
|
||||
color = _color,
|
||||
bloom = _bloom,
|
||||
bracket_a = _bracket_a,
|
||||
alpha = _alpha
|
||||
}
|
||||
|
||||
|
||||
func _params_for(state: State) -> Dictionary:
|
||||
match state:
|
||||
State.ENTITY_HOVER:
|
||||
return { gap = 10.0, len = 6.0, rot = 0.0, thick = 1.0,
|
||||
color = _hover_color, bloom = 0.5, bracket_a = 1.0, alpha = 1.0 }
|
||||
return {
|
||||
gap = 10.0,
|
||||
len = 6.0,
|
||||
rot = 0.0,
|
||||
thick = 1.0,
|
||||
color = _hover_color,
|
||||
bloom = 0.5,
|
||||
bracket_a = 1.0,
|
||||
alpha = 1.0
|
||||
}
|
||||
State.OBJECT_HOVER:
|
||||
return { gap = 4.0, len = 6.0, rot = PI / 4.0, thick = 1.0,
|
||||
color = _hover_color, bloom = 0.3, bracket_a = 0.0, alpha = 0.8 }
|
||||
return {
|
||||
gap = 4.0,
|
||||
len = 6.0,
|
||||
rot = PI / 4.0,
|
||||
thick = 1.0,
|
||||
color = _hover_color,
|
||||
bloom = 0.3,
|
||||
bracket_a = 0.0,
|
||||
alpha = 0.8
|
||||
}
|
||||
State.WEAPON_AIM:
|
||||
return { gap = 12.0, len = 9.0, rot = 0.0, thick = 2.0,
|
||||
color = COLOR_WEAPON, bloom = 0.0, bracket_a = 0.0, alpha = 1.0 }
|
||||
return {
|
||||
gap = 12.0,
|
||||
len = 9.0,
|
||||
rot = 0.0,
|
||||
thick = 2.0,
|
||||
color = COLOR_WEAPON,
|
||||
bloom = 0.0,
|
||||
bracket_a = 0.0,
|
||||
alpha = 1.0
|
||||
}
|
||||
_:
|
||||
return { gap = 4.0, len = 6.0, rot = 0.0, thick = 1.0,
|
||||
color = COLOR_DEFAULT, bloom = 0.4, bracket_a = 0.0, alpha = 0.45 }
|
||||
return {
|
||||
gap = 4.0,
|
||||
len = 6.0,
|
||||
rot = 0.0,
|
||||
thick = 1.0,
|
||||
color = COLOR_DEFAULT,
|
||||
bloom = 0.4,
|
||||
bracket_a = 0.0,
|
||||
alpha = 0.45
|
||||
}
|
||||
|
||||
|
||||
func _apply_params(p: Dictionary) -> void:
|
||||
_gap = p.gap; _len = p.len; _rot = p.rot; _thick = p.thick
|
||||
_color = p.color; _bloom = p.bloom; _bracket_a = p.bracket_a; _alpha = p.alpha
|
||||
_gap = p.gap
|
||||
_len = p.len
|
||||
_rot = p.rot
|
||||
_thick = p.thick
|
||||
_color = p.color
|
||||
_bloom = p.bloom
|
||||
_bracket_a = p.bracket_a
|
||||
_alpha = p.alpha
|
||||
|
||||
|
||||
func _interpolate() -> void:
|
||||
@@ -193,6 +241,7 @@ func _interpolate() -> void:
|
||||
|
||||
# --- Drawing ---
|
||||
|
||||
|
||||
func _draw() -> void:
|
||||
# _hover_offset is computed in _detect_hover() during _process(), not recalculated
|
||||
# here. This is safe because Camera2D (tree sibling, earlier in scene order) applies
|
||||
@@ -233,13 +282,19 @@ func _draw_brackets(offset: Vector2, color: Color) -> void:
|
||||
|
||||
# --- Test-friendly API (expected by test_cursor_states.gd) ---
|
||||
|
||||
|
||||
func get_state() -> String:
|
||||
match current_state:
|
||||
State.DEFAULT: return "Default"
|
||||
State.ENTITY_HOVER: return "EntityHover"
|
||||
State.OBJECT_HOVER: return "ObjectHover"
|
||||
State.WEAPON_AIM: return "WeaponAim"
|
||||
_: return "Default"
|
||||
State.DEFAULT:
|
||||
return "Default"
|
||||
State.ENTITY_HOVER:
|
||||
return "EntityHover"
|
||||
State.OBJECT_HOVER:
|
||||
return "ObjectHover"
|
||||
State.WEAPON_AIM:
|
||||
return "WeaponAim"
|
||||
_:
|
||||
return "Default"
|
||||
|
||||
|
||||
func set_hover_target(data: Dictionary) -> void:
|
||||
@@ -252,10 +307,14 @@ func set_hover_target(data: Dictionary) -> void:
|
||||
if kind == "Npc":
|
||||
var rel: String = data.get("relationship", "Unknown")
|
||||
match rel:
|
||||
"Friendly": _hover_color = Constants.ENTITY_COLOR_FRIENDLY
|
||||
"PersonOfInterest": _hover_color = Constants.ENTITY_COLOR_POI
|
||||
"Hostile": _hover_color = Constants.ENTITY_COLOR_HOSTILE
|
||||
_: _hover_color = Constants.ENTITY_COLOR_UNKNOWN
|
||||
"Friendly":
|
||||
_hover_color = Constants.ENTITY_COLOR_FRIENDLY
|
||||
"PersonOfInterest":
|
||||
_hover_color = Constants.ENTITY_COLOR_POI
|
||||
"Hostile":
|
||||
_hover_color = Constants.ENTITY_COLOR_HOSTILE
|
||||
_:
|
||||
_hover_color = Constants.ENTITY_COLOR_UNKNOWN
|
||||
_target = State.ENTITY_HOVER
|
||||
_t = 1.0
|
||||
_apply_params(_params_for(State.ENTITY_HOVER))
|
||||
|
||||
Reference in New Issue
Block a user