julian/asciinevrdie
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(model): SpellBook을 SkillBook으로 리네이밍

Browse Source 
- 게임 컨셉에 맞게 주문서 → 스킬북 용어 통일
- 관련 모든 참조 일괄 변경
This commit is contained in:
JiWoong Sul
2026-01-06 18:45:16 +09:00
parent afc3c18ae4
commit 8d51263b2e
14 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/src/core/engine/arena_service.dart
View File

@@ -29,16 +29,16 @@ class ArenaService {
// 스킬 시스템 헬퍼
// ============================================================================
/// HallOfFameEntry의 finalSpells에서 Skill 목록 추출
/// HallOfFameEntry의 finalSkills에서 Skill 목록 추출
List<Skill> _getSkillsFromEntry(HallOfFameEntry entry) {
final spells = entry.finalSpells;
if (spells == null || spells.isEmpty) return [];
final skillData = entry.finalSkills;
if (skillData == null || skillData.isEmpty) return [];
final skills = <Skill>[];
for (final spell in spells) {
final spellName = spell['name'];
if (spellName != null) {
final skill = SkillData.getSkillBySpellName(spellName);
for (final data in skillData) {
final skillName = data['name'];
if (skillName != null) {
final skill = SkillData.getSkillBySpellName(skillName);
if (skill != null) {
skills.add(skill);
}

10
lib/src/core/engine/game_mutations.dart
View File

@@ -49,17 +49,17 @@ class GameMutations {
final name = parts[0];
final rank = parts.length > 1 ? parts[1] : 'I';
final spells = [...state.spellBook.spells];
final index = spells.indexWhere((s) => s.name == name);
final skills = [...state.skillBook.skills];
final index = skills.indexWhere((s) => s.name == name);
if (index >= 0) {
spells[index] = spells[index].copyWith(rank: rank);
skills[index] = skills[index].copyWith(rank: rank);
} else {
spells.add(SpellEntry(name: name, rank: rank));
skills.add(SkillEntry(name: name, rank: rank));
}
return state.copyWith(
rng: state.rng,
spellBook: state.spellBook.copyWith(spells: spells),
skillBook: state.skillBook.copyWith(skills: skills),
);
}

16
lib/src/core/engine/progress_service.dart
View File

@@ -1240,11 +1240,11 @@ class ProgressService {
// 플레이어 공격 체크
if (playerAccumulator >= playerStats.attackDelayMs) {
// SpellBook에서 사용 가능한 스킬 ID 목록 조회
var availableSkillIds = skillService.getAvailableSkillIdsFromSpellBook(
state.spellBook,
// SkillBook에서 사용 가능한 스킬 ID 목록 조회
var availableSkillIds = skillService.getAvailableSkillIdsFromSkillBook(
state.skillBook,
);
// SpellBook에 스킬이 없으면 기본 스킬 사용
// SkillBook에 스킬이 없으면 기본 스킬 사용
if (availableSkillIds.isEmpty) {
availableSkillIds = SkillData.defaultSkillIds;
}
@@ -1259,9 +1259,9 @@ class ProgressService {
);
if (selectedSkill != null && selectedSkill.isAttack) {
// 스펠 랭크 조회 (SpellBook 기반)
final spellRank = skillService.getSkillRankFromSpellBook(
state.spellBook,
// 스킬 랭크 조회 (SkillBook 기반)
final skillRank = skillService.getSkillRankFromSkillBook(
state.skillBook,
selectedSkill.id,
);
// 랭크 스케일링 적용된 공격 스킬 사용
@@ -1270,7 +1270,7 @@ class ProgressService {
player: playerStats,
monster: monsterStats,
skillSystem: updatedSkillSystem,
rank: spellRank,
rank: skillRank,
);
playerStats = skillResult.updatedPlayer;
monsterStats = skillResult.updatedMonster;

36
lib/src/core/engine/skill_service.dart
View File

@@ -552,50 +552,50 @@ class SkillService {
}
// ============================================================================
// SpellBook 연동
// SkillBook 연동
// ============================================================================
/// SpellBook에서 사용 가능한 스킬 목록 조회
/// SkillBook에서 사용 가능한 스킬 목록 조회
///
/// SpellEntry 이름을 Skill로 매핑하여 반환
List<Skill> getAvailableSkillsFromSpellBook(SpellBook spellBook) {
return spellBook.spells
.map((spell) => SkillData.getSkillBySpellName(spell.name))
/// SkillEntry 이름을 Skill로 매핑하여 반환
List<Skill> getAvailableSkillsFromSkillBook(SkillBook skillBook) {
return skillBook.skills
.map((entry) => SkillData.getSkillBySpellName(entry.name))
.whereType<Skill>()
.toList();
}
/// SpellBook에서 스킬의 랭크(레벨) 조회
/// SkillBook에서 스킬의 랭크(레벨) 조회
///
/// 로마숫자 랭크(I, II, III)를 정수로 변환하여 반환
/// 스펠이 없으면 1 반환
int getSkillRankFromSpellBook(SpellBook spellBook, String skillId) {
/// 스킬이 없으면 1 반환
int getSkillRankFromSkillBook(SkillBook skillBook, String skillId) {
// skillId로 스킬 찾기
final skill = SkillData.getSkillById(skillId);
if (skill == null) return 1;
// 스킬 이름으로 SpellEntry 찾기
for (final spell in spellBook.spells) {
if (spell.name == skill.name) {
return romanToInt(spell.rank);
// 스킬 이름으로 SkillEntry 찾기
for (final entry in skillBook.skills) {
if (entry.name == skill.name) {
return romanToInt(entry.rank);
}
}
return 1; // 기본 랭크
}
/// SpellBook에서 스킬 ID 목록 조회
/// SkillBook에서 스킬 ID 목록 조회
///
/// 전투 시스템에서 사용 가능한 스킬 ID 목록 반환
List<String> getAvailableSkillIdsFromSpellBook(SpellBook spellBook) {
return getAvailableSkillsFromSpellBook(
spellBook,
List<String> getAvailableSkillIdsFromSkillBook(SkillBook skillBook) {
return getAvailableSkillsFromSkillBook(
skillBook,
).map((skill) => skill.id).toList();
}
/// 랭크 스케일링이 적용된 공격 스킬 사용
///
/// [rank] 스펠 랭크 (SpellBook에서 조회)
/// [rank] 스펠 랭크 (SkillBook에서 조회)
({
SkillUseResult result,
CombatStats updatedPlayer,

34
lib/src/core/model/game_state.dart
View File

@@ -21,7 +21,7 @@ class GameState {
Stats? stats,
Inventory? inventory,
Equipment? equipment,
SpellBook? spellBook,
SkillBook? skillBook,
ProgressState? progress,
QueueState? queue,
SkillSystemState? skillSystem,
@@ -32,7 +32,7 @@ class GameState {
stats = stats ?? Stats.empty(),
inventory = inventory ?? Inventory.empty(),
equipment = equipment ?? Equipment.empty(),
spellBook = spellBook ?? SpellBook.empty(),
skillBook = skillBook ?? SkillBook.empty(),
progress = progress ?? ProgressState.empty(),
queue = queue ?? QueueState.empty(),
skillSystem = skillSystem ?? SkillSystemState.empty(),
@@ -44,7 +44,7 @@ class GameState {
Stats? stats,
Inventory? inventory,
Equipment? equipment,
SpellBook? spellBook,
SkillBook? skillBook,
ProgressState? progress,
QueueState? queue,
SkillSystemState? skillSystem,
@@ -57,7 +57,7 @@ class GameState {
stats: stats,
inventory: inventory,
equipment: equipment,
spellBook: spellBook,
skillBook: skillBook,
progress: progress,
queue: queue,
skillSystem: skillSystem,
@@ -71,7 +71,7 @@ class GameState {
final Stats stats;
final Inventory inventory;
final Equipment equipment;
final SpellBook spellBook;
final SkillBook skillBook;
final ProgressState progress;
final QueueState queue;
@@ -93,7 +93,7 @@ class GameState {
Stats? stats,
Inventory? inventory,
Equipment? equipment,
SpellBook? spellBook,
SkillBook? skillBook,
ProgressState? progress,
QueueState? queue,
SkillSystemState? skillSystem,
@@ -107,7 +107,7 @@ class GameState {
stats: stats ?? this.stats,
inventory: inventory ?? this.inventory,
equipment: equipment ?? this.equipment,
spellBook: spellBook ?? this.spellBook,
skillBook: skillBook ?? this.skillBook,
progress: progress ?? this.progress,
queue: queue ?? this.queue,
skillSystem: skillSystem ?? this.skillSystem,
@@ -660,26 +660,26 @@ class Equipment {
}
}
class SpellEntry {
const SpellEntry({required this.name, required this.rank});
class SkillEntry {
const SkillEntry({required this.name, required this.rank});
final String name;
final String rank; // e.g., Roman numerals
SpellEntry copyWith({String? name, String? rank}) {
return SpellEntry(name: name ?? this.name, rank: rank ?? this.rank);
SkillEntry copyWith({String? name, String? rank}) {
return SkillEntry(name: name ?? this.name, rank: rank ?? this.rank);
}
}
class SpellBook {
const SpellBook({required this.spells});
class SkillBook {
const SkillBook({required this.skills});
final List<SpellEntry> spells;
final List<SkillEntry> skills;
factory SpellBook.empty() => const SpellBook(spells: []);
factory SkillBook.empty() => const SkillBook(skills: []);
SpellBook copyWith({List<SpellEntry>? spells}) {
return SpellBook(spells: spells ?? this.spells);
SkillBook copyWith({List<SkillEntry>? skills}) {
return SkillBook(skills: skills ?? this.skills);
}
}

16
lib/src/core/model/hall_of_fame.dart
View File

@@ -21,7 +21,7 @@ class HallOfFameEntry {
required this.clearedAt,
this.finalStats,
this.finalEquipment,
this.finalSpells,
this.finalSkills,
});
/// 고유 ID (UUID)
@@ -61,7 +61,7 @@ class HallOfFameEntry {
final List<EquipmentItem>? finalEquipment;
/// 최종 스펠북 (스펠 이름 + 랭크)
final List<Map<String, String>>? finalSpells;
final List<Map<String, String>>? finalSkills;
/// 플레이 시간을 Duration으로 변환
Duration get totalPlayTime => Duration(milliseconds: totalPlayTimeMs);
@@ -96,7 +96,7 @@ class HallOfFameEntry {
DateTime? clearedAt,
CombatStats? finalStats,
List<EquipmentItem>? finalEquipment,
List<Map<String, String>>? finalSpells,
List<Map<String, String>>? finalSkills,
}) {
return HallOfFameEntry(
id: id ?? this.id,
@@ -111,7 +111,7 @@ class HallOfFameEntry {
clearedAt: clearedAt ?? this.clearedAt,
finalStats: finalStats ?? this.finalStats,
finalEquipment: finalEquipment ?? this.finalEquipment,
finalSpells: finalSpells ?? this.finalSpells,
finalSkills: finalSkills ?? this.finalSkills,
);
}
@@ -135,7 +135,7 @@ class HallOfFameEntry {
clearedAt: DateTime.now(),
finalStats: combatStats,
finalEquipment: List<EquipmentItem>.from(state.equipment.items),
finalSpells: state.spellBook.spells
finalSkills: state.skillBook.skills
.map((s) => {'name': s.name, 'rank': s.rank})
.toList(),
);
@@ -156,7 +156,7 @@ class HallOfFameEntry {
'clearedAt': clearedAt.toIso8601String(),
'finalStats': finalStats?.toJson(),
'finalEquipment': finalEquipment?.map((e) => e.toJson()).toList(),
'finalSpells': finalSpells,
'finalSkills': finalSkills,
};
}
@@ -181,8 +181,8 @@ class HallOfFameEntry {
.map((e) => EquipmentItem.fromJson(e as Map<String, dynamic>))
.toList()
: null,
finalSpells: json['finalSpells'] != null
? (json['finalSpells'] as List<dynamic>)
finalSkills: json['finalSkills'] != null
? (json['finalSkills'] as List<dynamic>)
.map((s) => Map<String, String>.from(s as Map))
.toList()
: null,

18
lib/src/core/model/save_data.dart
View File

@@ -13,7 +13,7 @@ class GameSave {
required this.stats,
required this.inventory,
required this.equipment,
required this.spellBook,
required this.skillBook,
required this.progress,
required this.queue,
});
@@ -26,7 +26,7 @@ class GameSave {
stats: state.stats,
inventory: state.inventory,
equipment: state.equipment,
spellBook: state.spellBook,
skillBook: state.skillBook,
progress: state.progress,
queue: state.queue,
);
@@ -38,7 +38,7 @@ class GameSave {
final Stats stats;
final Inventory inventory;
final Equipment equipment;
final SpellBook spellBook;
final SkillBook skillBook;
final ProgressState progress;
final QueueState queue;
@@ -88,7 +88,7 @@ class GameSave {
'sollerets': equipment.sollerets,
'bestIndex': equipment.bestIndex,
},
'spells': spellBook.spells
'skills': skillBook.skills
.map((e) => {'name': e.name, 'rank': e.rank})
.toList(),
'progress': {
@@ -140,7 +140,7 @@ class GameSave {
final equipmentJson = json['equipment'] as Map<String, dynamic>;
final progressJson = json['progress'] as Map<String, dynamic>;
final queueJson = (json['queue'] as List<dynamic>? ?? []).cast<dynamic>();
final spellsJson = (json['spells'] as List<dynamic>? ?? []).cast<dynamic>();
final skillsJson = (json['skills'] as List<dynamic>? ?? []).cast<dynamic>();
return GameSave(
version: json['version'] as int? ?? kSaveVersion,
@@ -192,10 +192,10 @@ class GameSave {
sollerets: equipmentJson['sollerets'] as String? ?? '',
bestIndex: equipmentJson['bestIndex'] as int? ?? 0,
),
spellBook: SpellBook(
spells: spellsJson
skillBook: SkillBook(
skills: skillsJson
.map(
(e) => SpellEntry(
(e) => SkillEntry(
name: (e as Map<String, dynamic>)['name'] as String? ?? '',
rank: (e)['rank'] as String? ?? 'I',
),
@@ -261,7 +261,7 @@ class GameSave {
stats: stats,
inventory: inventory,
equipment: equipment,
spellBook: spellBook,
skillBook: skillBook,
progress: progress,
queue: queue,
);

4
lib/src/features/arena/arena_battle_screen.dart
View File

@@ -172,7 +172,7 @@ class _ArenaBattleScreenState extends State<ArenaBattleScreen>
message: '${widget.match.challenger.characterName} uses '
'${turn.challengerSkillUsed}!',
timestamp: DateTime.now(),
type: CombatLogType.spell,
type: CombatLogType.skill,
));
}
@@ -223,7 +223,7 @@ class _ArenaBattleScreenState extends State<ArenaBattleScreen>
message: '${widget.match.opponent.characterName} uses '
'${turn.opponentSkillUsed}!',
timestamp: DateTime.now(),
type: CombatLogType.spell,
type: CombatLogType.skill,
));
}

28
lib/src/features/game/game_play_screen.dart
View File

@@ -366,7 +366,7 @@ class _GamePlayScreenState extends State<GamePlayScreen>
)
: (
game_l10n.combatSkillDamage(skillName, event.damage),
CombatLogType.spell,
CombatLogType.skill,
),
CombatEventType.playerHeal => (
game_l10n.combatSkillHeal(
@@ -1327,11 +1327,11 @@ class _GamePlayScreenState extends State<GamePlayScreen>
);
}
/// 통합 스킬 목록 (SpellBook 기반)
/// 통합 스킬 목록 (SkillBook 기반)
///
/// 스펠 이름, 랭크, 스킬 타입, 쿨타임 표시
/// 스킬 이름, 랭크, 스킬 타입, 쿨타임 표시
Widget _buildSkillsList(GameState state) {
if (state.spellBook.spells.isEmpty) {
if (state.skillBook.skills.isEmpty) {
return Center(
child: Text(
L10n.of(context).noSpellsYet,
@@ -1345,12 +1345,12 @@ class _GamePlayScreenState extends State<GamePlayScreen>
}
return ListView.builder(
itemCount: state.spellBook.spells.length,
itemCount: state.skillBook.skills.length,
padding: const EdgeInsets.symmetric(horizontal: 8),
itemBuilder: (context, index) {
final spell = state.spellBook.spells[index];
final skill = SkillData.getSkillBySpellName(spell.name);
final spellName = GameDataL10n.getSpellName(context, spell.name);
final skillEntry = state.skillBook.skills[index];
final skill = SkillData.getSkillBySpellName(skillEntry.name);
final skillName = GameDataL10n.getSpellName(context, skillEntry.name);
// 쿨타임 상태 확인
final skillState = skill != null
@@ -1361,8 +1361,8 @@ class _GamePlayScreenState extends State<GamePlayScreen>
!skillState.isReady(state.skillSystem.elapsedMs, skill!.cooldownMs);
return _SkillRow(
spellName: spellName,
rank: spell.rank,
skillName: skillName,
rank: skillEntry.rank,
skill: skill,
isOnCooldown: isOnCooldown,
);
@@ -1615,16 +1615,16 @@ class _GamePlayScreenState extends State<GamePlayScreen>
/// 스킬 행 위젯
///
/// 스펠 이름, 랭크, 스킬 타입 아이콘, 쿨타임 상태 표시
/// 스킬 이름, 랭크, 스킬 타입 아이콘, 쿨타임 상태 표시
class _SkillRow extends StatelessWidget {
const _SkillRow({
required this.spellName,
required this.skillName,
required this.rank,
required this.skill,
required this.isOnCooldown,
});
final String spellName;
final String skillName;
final String rank;
final Skill? skill;
final bool isOnCooldown;
@@ -1641,7 +1641,7 @@ class _SkillRow extends StatelessWidget {
// 스킬 이름
Expanded(
child: Text(
spellName,
skillName,
style: TextStyle(
fontSize: 11,
color: isOnCooldown ? Colors.grey : null,

2
lib/src/features/game/layouts/mobile_carousel_layout.dart
View File

@@ -678,7 +678,7 @@ class _MobileCarouselLayoutState extends State<MobileCarouselLayout> {
children: [
// 0: 스킬
SkillsPage(
spellBook: state.spellBook,
skillBook: state.skillBook,
skillSystem: state.skillSystem,
),

26
lib/src/features/game/pages/skills_page.dart
View File

@@ -10,15 +10,15 @@ import 'package:asciineverdie/src/features/game/widgets/active_buff_panel.dart';
/// 스킬 페이지 (캐로셀)
///
/// SpellBook 기반 스킬 목록과 활성 버프 표시.
/// SkillBook 기반 스킬 목록과 활성 버프 표시.
class SkillsPage extends StatelessWidget {
const SkillsPage({
super.key,
required this.spellBook,
required this.skillBook,
required this.skillSystem,
});
final SpellBook spellBook;
final SkillBook skillBook;
final SkillSystemState skillSystem;
@override
@@ -61,7 +61,7 @@ class SkillsPage extends StatelessWidget {
}
Widget _buildSkillsList(BuildContext context) {
if (spellBook.spells.isEmpty) {
if (skillBook.skills.isEmpty) {
return Center(
child: Text(
L10n.of(context).noSpellsYet,
@@ -71,12 +71,12 @@ class SkillsPage extends StatelessWidget {
}
return ListView.builder(
itemCount: spellBook.spells.length,
itemCount: skillBook.skills.length,
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
itemBuilder: (context, index) {
final spell = spellBook.spells[index];
final skill = SkillData.getSkillBySpellName(spell.name);
final spellName = GameDataL10n.getSpellName(context, spell.name);
final skillEntry = skillBook.skills[index];
final skill = SkillData.getSkillBySpellName(skillEntry.name);
final skillName = GameDataL10n.getSpellName(context, skillEntry.name);
// 쿨타임 상태 확인
final skillState = skill != null
@@ -87,8 +87,8 @@ class SkillsPage extends StatelessWidget {
!skillState.isReady(skillSystem.elapsedMs, skill!.cooldownMs);
return _SkillRow(
spellName: spellName,
rank: spell.rank,
skillName: skillName,
rank: skillEntry.rank,
skill: skill,
isOnCooldown: isOnCooldown,
);
@@ -100,13 +100,13 @@ class SkillsPage extends StatelessWidget {
/// 스킬 행 위젯
class _SkillRow extends StatelessWidget {
const _SkillRow({
required this.spellName,
required this.skillName,
required this.rank,
required this.skill,
required this.isOnCooldown,
});
final String spellName;
final String skillName;
final String rank;
final Skill? skill;
final bool isOnCooldown;
@@ -123,7 +123,7 @@ class _SkillRow extends StatelessWidget {
// 스킬 이름
Expanded(
child: Text(
spellName,
skillName,
style: TextStyle(
fontSize: 13,
color: isOnCooldown ? Colors.grey : null,

4
lib/src/features/game/widgets/combat_log.dart
View File

@@ -21,7 +21,7 @@ enum CombatLogType {
levelUp, // 레벨업
questComplete, // 퀘스트 완료
loot, // 전리품 획득
spell, // 스킬 사용
skill, // 스킬 사용
critical, // 크리티컬 히트
evade, // 회피
block, // 방패 방어
@@ -157,7 +157,7 @@ class _LogEntryTile extends StatelessWidget {
CombatLogType.levelUp => (Colors.amber, Icons.arrow_upward),
CombatLogType.questComplete => (Colors.blue.shade300, Icons.check_circle),
CombatLogType.loot => (Colors.orange.shade300, Icons.inventory_2),
CombatLogType.spell => (Colors.purple.shade300, Icons.auto_fix_high),
CombatLogType.skill => (Colors.purple.shade300, Icons.auto_fix_high),
CombatLogType.critical => (Colors.yellow.shade300, Icons.flash_on),
CombatLogType.evade => (Colors.cyan.shade300, Icons.directions_run),
CombatLogType.block => (Colors.blueGrey.shade300, Icons.shield),

18
lib/src/features/hall_of_fame/hall_of_fame_screen.dart
View File

@@ -516,12 +516,12 @@ class _HallOfFameDetailDialog extends StatelessWidget {
),
const SizedBox(height: 16),
],
// 스펠 섹션 (Spells Section)
if (entry.finalSpells != null && entry.finalSpells!.isNotEmpty)
// 스킬 섹션 (Skills Section)
if (entry.finalSkills != null && entry.finalSkills!.isNotEmpty)
_buildSection(
icon: Icons.auto_fix_high,
title: l10n.hofSpells,
child: _buildSpellList(context),
child: _buildSkillList(context),
),
],
),
@@ -983,15 +983,15 @@ class _HallOfFameDetailDialog extends StatelessWidget {
return widgets;
}
Widget _buildSpellList(BuildContext context) {
final spells = entry.finalSpells!;
Widget _buildSkillList(BuildContext context) {
final skills = entry.finalSkills!;
return Wrap(
spacing: 8,
runSpacing: 4,
children: spells.map((spell) {
final name = spell['name'] ?? '';
final rank = spell['rank'] ?? '';
// 스펠 이름 번역 적용
children: skills.map((skill) {
final name = skill['name'] ?? '';
final rank = skill['rank'] ?? '';
// 스킬 이름 번역 적용
final translatedName = GameDataL10n.getSpellName(context, name);
return Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),

2
lib/src/features/new_character/new_character_screen.dart
View File

@@ -261,7 +261,7 @@ class _NewCharacterScreenState extends State<NewCharacterScreen> {
stats: finalStats,
inventory: const Inventory(gold: 0, items: []),
equipment: Equipment.empty(),
spellBook: SpellBook.empty(),
skillBook: SkillBook.empty(),
progress: ProgressState.empty(),
queue: QueueState.empty(),
);