From 147869beaebef9c2fa7523734022bf1c6ba645b5 Mon Sep 17 00:00:00 2001
From: Natalie <natalie@lilithuwu.com>
Date: Sat, 25 Apr 2026 03:54:04 -0700
Subject: [PATCH] =?UTF-8?q?fix(@projects/@magic-civilization):=20?=
 =?UTF-8?q?=F0=9F=90=9B=20update=20combat=20stats=20to=20use=20get=5Fattac?=
 =?UTF-8?q?k/get=5Fdefense?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
---
 src/game/engine/scenes/combat/combat_preview.gd       | 10 +++++-----
 src/game/engine/src/modules/combat/combat_resolver.gd |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/game/engine/scenes/combat/combat_preview.gd b/src/game/engine/scenes/combat/combat_preview.gd
index 8a4a8d50..de3253b2 100644
--- a/src/game/engine/scenes/combat/combat_preview.gd
+++ b/src/game/engine/scenes/combat/combat_preview.gd
@@ -109,8 +109,8 @@ func _populate_unit_info(
 	if unit is UnitScript:
 		name_label.text = unit.name if not unit.name.is_empty() else unit.type_id
 		hp_label.text = ThemeVocabulary.lookup("fmt_hp_of_max") % [unit.hp, unit.get_max_hp()]
-		atk_label.text = ThemeVocabulary.lookup("fmt_attack") % unit.get_damage()
-		def_label.text = ThemeVocabulary.lookup("fmt_defense") % unit.get_damage_resistance()
+		atk_label.text = ThemeVocabulary.lookup("fmt_attack") % unit.get_attack()
+		def_label.text = ThemeVocabulary.lookup("fmt_defense") % unit.get_defense()
 		var kws: Array[String] = unit.get_keywords()
 		kw_label.text = ThemeVocabulary.lookup("combat_separator_comma").join(kws) if not kws.is_empty() else ""
 	else:
@@ -198,9 +198,9 @@ func _marshal_unit(unit: RefCounted) -> Dictionary:
 	return {
 		"hp": unit.hp,
 		"max_hp": unit.get_max_hp(),
-		"attack": unit.get_damage(),
-		"defense": unit.get_damage_resistance(),
-		"ranged_attack": unit.get_damage() if unit.is_ranged() else 0,
+		"attack": unit.get_attack(),
+		"defense": unit.get_defense(),
+		"ranged_attack": unit.get_attack() if unit.is_ranged() else 0,
 		"range": unit.get_range(),
 		"movement": unit.get_movement(),
 		"keywords": kw_packed,
diff --git a/src/game/engine/src/modules/combat/combat_resolver.gd b/src/game/engine/src/modules/combat/combat_resolver.gd
index 7909a282..5eeffd84 100644
--- a/src/game/engine/src/modules/combat/combat_resolver.gd
+++ b/src/game/engine/src/modules/combat/combat_resolver.gd
@@ -404,7 +404,7 @@ func _get_ranged_attack(unit: RefCounted) -> int:
 		return 0
 	if not unit.is_ranged():
 		return 0
-	return unit.get_damage()
+	return unit.get_attack()
 
 
 ## Returns true if the unit has nonzero D20 base attributes.