Fraser commited on
Commit
95289a7
·
1 Parent(s): e40394b
src/lib/battle-engine/BattleEngine.ts CHANGED
@@ -74,10 +74,9 @@ export class BattleEngine {
74
  }
75
 
76
  private createBattlePiclet(definition: PicletDefinition, level: number): BattlePiclet {
77
- // Calculate stats based on level (simplified formula)
78
  const statMultiplier = 1 + (level - 50) * 0.02; // 2% per level above/below 50
79
 
80
- const hp = Math.floor(definition.baseStats.hp * statMultiplier);
81
  const attack = Math.floor(definition.baseStats.attack * statMultiplier);
82
  const defense = Math.floor(definition.baseStats.defense * statMultiplier);
83
  const speed = Math.floor(definition.baseStats.speed * statMultiplier);
 
74
  }
75
 
76
  private createBattlePiclet(definition: PicletDefinition, level: number): BattlePiclet {
 
77
  const statMultiplier = 1 + (level - 50) * 0.02; // 2% per level above/below 50
78
 
79
+ const hp = definition.baseStats.hp;
80
  const attack = Math.floor(definition.baseStats.attack * statMultiplier);
81
  const defense = Math.floor(definition.baseStats.defense * statMultiplier);
82
  const speed = Math.floor(definition.baseStats.speed * statMultiplier);
src/lib/utils/battleConversion.ts CHANGED
@@ -11,9 +11,8 @@ import { PicletType, AttackType } from '$lib/types/picletTypes';
11
  * Convert PicletInstance to PicletDefinition for battle engine use
12
  */
13
  export function picletInstanceToBattleDefinition(instance: PicletInstance): PicletDefinition {
14
- // Convert base stats from instance level to definition level
15
  const baseStats: BaseStats = {
16
- hp: Math.floor(instance.baseHp / 2 - 25), // Reverse the conversion from monsterToPicletInstance
17
  attack: Math.floor((instance.baseAttack - 30) / 1.5),
18
  defense: Math.floor((instance.baseDefense - 30) / 1.5),
19
  speed: Math.floor((instance.baseSpeed - 30) / 1.5)
@@ -95,7 +94,6 @@ export function battlePicletToInstance(battlePiclet: any, originalInstance: Picl
95
  return {
96
  ...originalInstance,
97
  currentHp: battlePiclet.currentHp,
98
- maxHp: battlePiclet.maxHp,
99
  level: battlePiclet.level,
100
  attack: battlePiclet.attack,
101
  defense: battlePiclet.defense,
 
11
  * Convert PicletInstance to PicletDefinition for battle engine use
12
  */
13
  export function picletInstanceToBattleDefinition(instance: PicletInstance): PicletDefinition {
 
14
  const baseStats: BaseStats = {
15
+ hp: instance.maxHp,
16
  attack: Math.floor((instance.baseAttack - 30) / 1.5),
17
  defense: Math.floor((instance.baseDefense - 30) / 1.5),
18
  speed: Math.floor((instance.baseSpeed - 30) / 1.5)
 
94
  return {
95
  ...originalInstance,
96
  currentHp: battlePiclet.currentHp,
 
97
  level: battlePiclet.level,
98
  attack: battlePiclet.attack,
99
  defense: battlePiclet.defense,