horoli/game
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source 
- consumable items
This commit is contained in:
horoli
2025-12-10 16:05:42 +09:00
parent 8f72b9a812
commit 09d8fdcfe9
24 changed files with 859 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/widgets/battle/battle_animation_widget.dart
+7
View File
@@ -1,4 +1,6 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../providers/settings_provider.dart';
import '../../game/enums.dart';
class BattleAnimationWidget extends StatefulWidget {
@@ -77,6 +79,11 @@ class BattleAnimationWidgetState extends State<BattleAnimationWidget>
await _translateController.reverse();
} else {
// Risky: Scale + Heavy Dash
final attackScale = context.read<SettingsProvider>().attackAnimScale;
_scaleAnimation = Tween<double>(begin: 1.0, end: attackScale).animate(
CurvedAnimation(parent: _scaleController, curve: Curves.easeOut),
);
_scaleController.duration = const Duration(milliseconds: 600);
_translateController.duration = const Duration(milliseconds: 500);
lib/widgets/battle/battle_controls.dart
+16 -11
View File
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import '../../game/enums.dart';
import '../../game/config.dart';
class BattleControls extends StatelessWidget {
@@ -7,6 +7,7 @@ class BattleControls extends StatelessWidget {
final bool isDefendEnabled;
final VoidCallback onAttackPressed;
final VoidCallback onDefendPressed;
final VoidCallback onItemPressed; // New
const BattleControls({
super.key,
@@ -14,22 +15,16 @@ class BattleControls extends StatelessWidget {
required this.isDefendEnabled,
required this.onAttackPressed,
required this.onDefendPressed,
required this.onItemPressed, // New
});
Widget _buildFloatingActionButton({
required String label,
required Color color,
required ActionType actionType,
required String iconPath, // Changed from ActionType to String
required bool isEnabled,
required VoidCallback onPressed,
}) {
String iconPath;
if (actionType == ActionType.attack) {
iconPath = 'assets/data/icon/icon_weapon.png';
} else {
iconPath = 'assets/data/icon/icon_shield.png';
}
return FloatingActionButton(
heroTag: label,
onPressed: isEnabled ? onPressed : null,
@@ -53,7 +48,7 @@ class BattleControls extends StatelessWidget {
_buildFloatingActionButton(
label: "ATK",
color: ThemeConfig.btnActionActive,
actionType: ActionType.attack,
iconPath: 'assets/data/icon/icon_weapon.png',
isEnabled: isAttackEnabled,
onPressed: onAttackPressed,
),
@@ -61,10 +56,20 @@ class BattleControls extends StatelessWidget {
_buildFloatingActionButton(
label: "DEF",
color: ThemeConfig.btnDefendActive,
actionType: ActionType.defend,
iconPath: 'assets/data/icon/icon_shield.png',
isEnabled: isDefendEnabled,
onPressed: onDefendPressed,
),
const SizedBox(height: 16),
_buildFloatingActionButton(
label: "ITEM",
color: Colors.indigoAccent, // Distinct color for Item
iconPath:
'assets/data/icon/icon_accessory.png', // Placeholder for Bag
isEnabled:
isAttackEnabled, // Enabled when it's player turn (same as attack)
onPressed: onItemPressed,
),
],
);
}
lib/widgets/battle/character_status_card.dart
+4 -1
View File
@@ -68,13 +68,16 @@ class CharacterStatusCard extends StatelessWidget {
child: Wrap(
spacing: 4.0,
children: character.statusEffects.map((effect) {
final isBuff = effect.type == StatusEffectType.attackUp;
return Container(
padding: const EdgeInsets.symmetric(
horizontal: 6,
vertical: 2,
),
decoration: BoxDecoration(
color: ThemeConfig.effectBg,
color: isBuff
? ThemeConfig.effectBuffBg
: ThemeConfig.effectDebuffBg,
borderRadius: BorderRadius.circular(4),
),
child: Text(
lib/widgets/battle/risk_selection_dialog.dart
+1 -1
View File
@@ -79,7 +79,7 @@ class RiskSelectionDialog extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
risk.name,
risk.name.toUpperCase(),
style: const TextStyle(fontWeight: FontWeight.bold),
),
Text(infoText, style: TextStyle(fontSize: 12, color: infoColor)),
lib/widgets/inventory.dart
+1
View File
@@ -1,2 +1,3 @@
export 'inventory/character_stats_widget.dart';
export 'inventory/inventory_grid_widget.dart';
export 'inventory/equipped_items_widget.dart';
lib/widgets/inventory/equipped_items_widget.dart
+289
View File
@@ -0,0 +1,289 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../providers.dart';
import '../../game/models.dart';
import '../../game/enums.dart';
import '../../utils.dart';
import '../../game/config.dart';
class EquippedItemsWidget extends StatelessWidget {
const EquippedItemsWidget({super.key});
@override
Widget build(BuildContext context) {
return Consumer<BattleProvider>(
builder: (context, battleProvider, child) {
final player = battleProvider.player;
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
"Equipped Items",
style: TextStyle(
fontSize: ThemeConfig.fontSizeHeader,
fontWeight: ThemeConfig.fontWeightBold,
),
),
const SizedBox(height: 8),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: EquipmentSlot.values
.where((slot) => slot != EquipmentSlot.consumable)
.map((slot) {
final item = player.equipment[slot];
return Expanded(
child: InkWell(
onTap: item != null
? () => _showUnequipConfirmationDialog(
context,
battleProvider,
item,
)
: null,
child: Card(
color: item != null
? ThemeConfig.equipmentCardBg
: ThemeConfig.emptySlotBg,
shape:
item != null && item.rarity != ItemRarity.magic
? RoundedRectangleBorder(
side: BorderSide(
color: ItemUtils.getRarityColor(
item.rarity,
),
width: 2.0,
),
borderRadius: BorderRadius.circular(4.0),
)
: null,
child: Stack(
children: [
// Slot Name
Positioned(
right: 4,
top: 4,
child: Text(
slot.name.toUpperCase(),
style: const TextStyle(
fontSize: ThemeConfig.fontSizeTiny,
fontWeight: ThemeConfig.fontWeightBold,
color: Colors.white30,
),
),
),
// Faded Icon
Positioned(
left: 4,
top: 4,
child: Opacity(
opacity: item != null ? 0.5 : 0.2,
child: Image.asset(
ItemUtils.getIconPath(slot),
width: 40,
height: 40,
fit: BoxFit.contain,
filterQuality: FilterQuality.high,
),
),
),
// Content
Center(
child: Padding(
padding: const EdgeInsets.all(4.0),
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
const SizedBox(height: 12),
FittedBox(
fit: BoxFit.scaleDown,
child: Text(
item?.name ?? AppStrings.emptySlot,
textAlign: TextAlign.center,
style: TextStyle(
fontSize:
ThemeConfig.fontSizeSmall,
fontWeight:
ThemeConfig.fontWeightBold,
color: item != null
? ItemUtils.getRarityColor(
item.rarity,
)
: ThemeConfig.textColorGrey,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
),
if (item != null)
FittedBox(
fit: BoxFit.scaleDown,
child: _buildItemStatText(item),
),
],
),
),
),
],
),
),
),
);
})
.toList(),
),
],
),
);
},
);
}
void _showUnequipConfirmationDialog(
BuildContext context,
BattleProvider provider,
Item itemToUnequip,
) {
final player = provider.player;
// Calculate predicted stats
final currentMaxHp = player.totalMaxHp;
final currentAtk = player.totalAtk;
final currentDef = player.totalDefense;
final currentHp = player.hp;
// Predict new stats (Subtract item bonuses)
int newMaxHp = currentMaxHp - itemToUnequip.hpBonus;
int newAtk = currentAtk - itemToUnequip.atkBonus;
int newDef = currentDef - itemToUnequip.armorBonus;
// Predict HP (Percentage Logic)
double ratio = currentMaxHp > 0 ? currentHp / currentMaxHp : 0.0;
int newHp = (newMaxHp * ratio).toInt();
if (newHp < 0) newHp = 0;
if (newHp > newMaxHp) newHp = newMaxHp;
showDialog(
context: context,
builder: (ctx) => AlertDialog(
title: const Text("Unequip Item"),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(
"${AppStrings.unequip} ${itemToUnequip.name}?",
style: const TextStyle(fontWeight: ThemeConfig.fontWeightBold),
),
const SizedBox(height: 16),
_buildStatChangeRow("Max HP", currentMaxHp, newMaxHp),
_buildStatChangeRow("Current HP", currentHp, newHp),
_buildStatChangeRow(AppStrings.atk, currentAtk, newAtk),
_buildStatChangeRow(AppStrings.def, currentDef, newDef),
],
),
actions: [
TextButton(
onPressed: () => Navigator.pop(ctx),
child: const Text(AppStrings.cancel),
),
ElevatedButton(
onPressed: () {
provider.unequipItem(itemToUnequip);
Navigator.pop(ctx);
},
child: const Text(AppStrings.confirm),
),
],
),
);
}
Widget _buildStatChangeRow(String label, int oldVal, int newVal) {
int diff = newVal - oldVal;
Color color = diff > 0
? ThemeConfig.statDiffPositive
: (diff < 0
? ThemeConfig.statDiffNegative
: ThemeConfig.statDiffNeutral);
String diffText = diff > 0 ? "(+$diff)" : (diff < 0 ? "($diff)" : "");
return Padding(
padding: const EdgeInsets.symmetric(vertical: 4.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(label),
Row(
children: [
Text(
"$oldVal",
style: const TextStyle(color: ThemeConfig.textColorGrey),
),
const Icon(
Icons.arrow_right,
size: 16,
color: ThemeConfig.textColorGrey,
),
Text(
"$newVal",
style: const TextStyle(fontWeight: ThemeConfig.fontWeightBold),
),
const SizedBox(width: 4),
Text(
diffText,
style: TextStyle(
color: color,
fontSize: 12,
fontWeight: ThemeConfig.fontWeightBold,
),
),
],
),
],
),
);
}
Widget _buildItemStatText(Item item) {
List<String> stats = [];
if (item.atkBonus > 0) stats.add("+${item.atkBonus} ${AppStrings.atk}");
if (item.hpBonus > 0) stats.add("+${item.hpBonus} ${AppStrings.hp}");
if (item.armorBonus > 0) stats.add("+${item.armorBonus} ${AppStrings.def}");
if (item.luck > 0) stats.add("+${item.luck} ${AppStrings.luck}");
// Include effects
List<String> effectTexts = item.effects.map((e) => e.description).toList();
if (stats.isEmpty && effectTexts.isEmpty) return const SizedBox.shrink();
return Column(
children: [
if (stats.isNotEmpty)
Padding(
padding: const EdgeInsets.only(top: 2.0, bottom: 2.0),
child: Text(
stats.join(", "),
style: const TextStyle(
fontSize: ThemeConfig.fontSizeSmall,
color: ThemeConfig.statAtkColor,
),
textAlign: TextAlign.center,
),
),
if (effectTexts.isNotEmpty)
Padding(
padding: const EdgeInsets.only(bottom: 2.0),
child: Text(
effectTexts.join("\n"),
style: const TextStyle(
fontSize: ThemeConfig.fontSizeTiny,
color: ThemeConfig.rarityLegendary,
),
),
),
],
);
}
}
lib/widgets/inventory/inventory_grid_widget.dart
+32 -14
View File
@@ -92,22 +92,40 @@ class InventoryGridWidget extends StatelessWidget {
builder: (ctx) => SimpleDialog(
title: Text("${item.name} Actions"),
children: [
SimpleDialogOption(
onPressed: () {
Navigator.pop(ctx);
_showEquipConfirmationDialog(context, provider, item);
},
child: const Padding(
padding: EdgeInsets.symmetric(vertical: 8.0),
child: Row(
children: [
Icon(Icons.shield, color: ThemeConfig.btnDefendActive),
SizedBox(width: 10),
Text(AppStrings.equip),
],
if (item.slot == EquipmentSlot.consumable)
SimpleDialogOption(
onPressed: () {
Navigator.pop(ctx);
provider.useConsumable(item);
},
child: const Padding(
padding: EdgeInsets.symmetric(vertical: 8.0),
child: Row(
children: [
Icon(Icons.science, color: ThemeConfig.btnActionActive),
SizedBox(width: 10),
Text("Use"),
],
),
),
)
else
SimpleDialogOption(
onPressed: () {
Navigator.pop(ctx);
_showEquipConfirmationDialog(context, provider, item);
},
child: const Padding(
padding: EdgeInsets.symmetric(vertical: 8.0),
child: Row(
children: [
Icon(Icons.shield, color: ThemeConfig.btnDefendActive),
SizedBox(width: 10),
Text(AppStrings.equip),
],
),
),
),
),
if (isShop)
SimpleDialogOption(
onPressed: () {