Fix inconsistencies: remove mechanics that don't make sense (player can't take damage)

- Remove lifesteal, thorns, manaShield from familiars - Replace with appropriate alternatives: manaSiphon, guardianDamage, barrierBreaker - Replace shield equipment with focus items (spellcasting enhancement) - Remove EXECUTIONER special effect and finisher upgrades - Update Soul Binding description to bind creature souls to items - Buff Ancient Echo from +1 to +2 capacity per Enchanter level - All changes consistent with game design: player cannot take damage
2026-03-28 14:02:33 +00:00
parent a1f19e705b
commit 5c03a0a2ea
10 changed files with 212 additions and 76 deletions
--- a/src/lib/game/constants.ts
+++ b/src/lib/game/constants.ts
@@ -692,8 +692,8 @@ export const SKILLS_DEF: Record<string, SkillDef> = {
  crystalEmbedding: { name: "Crystal Embedding", desc: "Embed elemental crystals in golems for variants", cat: "enchant", attunement: 'enchanter', attunementLevel: 3, max: 1, base: 600, studyTime: 12, req: { enchanting: 4 } },
  
  // Master Enchanting (Lv 5+)
-  ancientEcho:      { name: "Ancient Echo",     desc: "+1 enchantment capacity per Enchanter level", cat: "enchant", attunement: 'enchanter', attunementLevel: 5, max: 3, base: 1000, studyTime: 16 },
-  soulBinding:      { name: "Soul Binding",    desc: "Bind a defeated guardian's essence to equipment for unique effects", cat: "enchant", attunement: 'enchanter', attunementLevel: 5, max: 2, base: 1500, studyTime: 24, req: { essenceRefining: 3 } },
+  ancientEcho:      { name: "Ancient Echo",     desc: "+2 enchantment capacity per Enchanter level", cat: "enchant", attunement: 'enchanter', attunementLevel: 5, max: 3, base: 1000, studyTime: 16 },
+  soulBinding:      { name: "Soul Binding",    desc: "Bind creature souls to items for unique enchantment effects", cat: "enchant", attunement: 'enchanter', attunementLevel: 5, max: 2, base: 1500, studyTime: 24, req: { essenceRefining: 3 } },
  
  // Effect Research (Lv 2+)
  researchManaSpells: { name: "Mana Spell Research", desc: "Unlock Mana Strike spell enchantment", cat: "effectResearch", attunement: 'enchanter', attunementLevel: 1, max: 1, base: 200, studyTime: 4, req: { enchanting: 1 } },
--- a/src/lib/game/data/crafting-recipes.ts
+++ b/src/lib/game/data/crafting-recipes.ts
@@ -122,16 +122,16 @@ export const CRAFTING_RECIPES: Record<string, CraftingRecipe> = {
    unlocked: false,
  },
  
-  shieldBlueprint: {
-    id: 'shieldBlueprint',
-    equipmentTypeId: 'runicShield',
-    name: 'Runic Shield',
-    description: 'A shield engraved with protective runes.',
+  focusBlueprint: {
+    id: 'focusBlueprint',
+    equipmentTypeId: 'elementalFocus',
+    name: 'Elemental Focus',
+    description: 'A prism that refracts magical energy. Excellent for elemental enchantments.',
    rarity: 'rare',
    materials: {
      manaCrystalDust: 10,
      arcaneShard: 6,
-      elementalCore: 2,
+      elementalCore: 3,
    },
    manaCost: 450,
    craftTime: 5,
--- a/src/lib/game/data/enchantment-effects.ts
+++ b/src/lib/game/data/enchantment-effects.ts
@@ -4,14 +4,16 @@
 import type { EquipmentCategory } from './equipment'

 // Helper to define allowed equipment categories for each effect type
+// Note: 'shield' category removed - player cannot take damage, so shields replaced with 'focus' items
 const ALL_CASTER: EquipmentCategory[] = ['caster']
 const CASTER_AND_HANDS: EquipmentCategory[] = ['caster', 'hands']
-const BODY_AND_SHIELD: EquipmentCategory[] = ['body', 'shield']
-const CASTER_CATALYST_ACCESSORY: EquipmentCategory[] = ['caster', 'catalyst', 'accessory']
-const MANA_EQUIPMENT: EquipmentCategory[] = ['caster', 'catalyst', 'head', 'body', 'accessory']
-const UTILITY_EQUIPMENT: EquipmentCategory[] = ['caster', 'catalyst', 'head', 'body', 'hands', 'legs', 'feet', 'accessory']
-const ALL_EQUIPMENT: EquipmentCategory[] = ['caster', 'shield', 'catalyst', 'head', 'body', 'hands', 'legs', 'feet', 'accessory']
+const BODY_ONLY: EquipmentCategory[] = ['body']
+const CASTER_CATALYST_FOCUS_ACCESSORY: EquipmentCategory[] = ['caster', 'catalyst', 'focus', 'accessory']
+const MANA_EQUIPMENT: EquipmentCategory[] = ['caster', 'catalyst', 'focus', 'head', 'body', 'accessory']
+const UTILITY_EQUIPMENT: EquipmentCategory[] = ['caster', 'catalyst', 'focus', 'head', 'body', 'hands', 'legs', 'feet', 'accessory']
+const ALL_EQUIPMENT: EquipmentCategory[] = ['caster', 'focus', 'catalyst', 'head', 'body', 'hands', 'legs', 'feet', 'accessory']
 const LEGS_ONLY: EquipmentCategory[] = ['legs']
+const FOCUS_AND_ACCESSORY: EquipmentCategory[] = ['focus', 'accessory']

 export type EnchantmentEffectCategory = 'spell' | 'mana' | 'combat' | 'elemental' | 'defense' | 'utility' | 'special'

@@ -555,7 +557,7 @@ export const ENCHANTMENT_EFFECTS: Record<string, EnchantmentEffectDef> = {
    category: 'special',
    baseCapacityCost: 35,
    maxStacks: 3,
-    allowedEquipmentCategories: CASTER_CATALYST_ACCESSORY,
+    allowedEquipmentCategories: CASTER_CATALYST_FOCUS_ACCESSORY,
    effect: { type: 'multiplier', stat: 'guardianDamage', value: 1.10 }
  },
  overpower_80: {
--- a/src/lib/game/data/equipment.ts
+++ b/src/lib/game/data/equipment.ts
@@ -1,7 +1,7 @@
 // ─── Equipment Types ─────────────────────────────────────────────────────────

 export type EquipmentSlot = 'mainHand' | 'offHand' | 'head' | 'body' | 'hands' | 'legs' | 'feet' | 'accessory1' | 'accessory2';
-export type EquipmentCategory = 'caster' | 'shield' | 'catalyst' | 'head' | 'body' | 'hands' | 'legs' | 'feet' | 'accessory';
+export type EquipmentCategory = 'caster' | 'focus' | 'catalyst' | 'head' | 'body' | 'hands' | 'legs' | 'feet' | 'accessory';

 // All equipment slots in order
 export const EQUIPMENT_SLOTS: EquipmentSlot[] = ['mainHand', 'offHand', 'head', 'body', 'hands', 'legs', 'feet', 'accessory1', 'accessory2'];
@@ -94,38 +94,47 @@ export const EQUIPMENT_TYPES: Record<string, EquipmentType> = {
    description: 'A rare catalyst touched by void energy. High capacity but volatile.',
  },
  
-  // ─── Off Hand - Shields ───────────────────────────────────────────────────
-  basicShield: {
-    id: 'basicShield',
-    name: 'Basic Shield',
-    category: 'shield',
+  // ─── Off Hand - Focus Items (replaces shields - player can't take damage) ───
+  // Focus items enhance spellcasting rather than providing defense
+  crystalOrb: {
+    id: 'crystalOrb',
+    name: 'Crystal Orb',
+    category: 'focus',
    slot: 'offHand',
    baseCapacity: 40,
-    description: 'A simple wooden shield. Provides basic protection.',
+    description: 'A glowing orb that focuses magical energy. Enhances spell power.',
  },
-  reinforcedShield: {
-    id: 'reinforcedShield',
-    name: 'Reinforced Shield',
-    category: 'shield',
+  manaTome: {
+    id: 'manaTome',
+    name: 'Mana Tome',
+    category: 'focus',
    slot: 'offHand',
    baseCapacity: 55,
-    description: 'A metal-reinforced shield with enhanced durability and capacity.',
+    description: 'An ancient tome that stores magical knowledge. Increases mana capacity.',
  },
-  runicShield: {
-    id: 'runicShield',
-    name: 'Runic Shield',
-    category: 'shield',
+  elementalFocus: {
+    id: 'elementalFocus',
+    name: 'Elemental Focus',
+    category: 'focus',
    slot: 'offHand',
    baseCapacity: 70,
-    description: 'A shield engraved with protective runes. Excellent for defensive enchantments.',
+    description: 'A prism that refracts magical energy. Excellent for elemental enchantments.',
  },
-  manaShield: {
-    id: 'manaShield',
-    name: 'Mana Shield',
-    category: 'shield',
+  soulCrystal: {
+    id: 'soulCrystal',
+    name: 'Soul Crystal',
+    category: 'focus',
    slot: 'offHand',
    baseCapacity: 60,
-    description: 'A crystalline shield that can store and reflect mana.',
+    description: 'A crystal that resonates with spiritual energy. Amplifies magical effects.',
+  },
+  arcanumOrb: {
+    id: 'arcanumOrb',
+    name: 'Arcanum Orb',
+    category: 'focus',
+    slot: 'offHand',
+    baseCapacity: 85,
+    description: 'A masterwork orb that pulses with raw magical power. Maximum enchantment capacity.',
  },
  
  // ─── Head ─────────────────────────────────────────────────────────────────
@@ -170,7 +179,7 @@ export const EQUIPMENT_TYPES: Record<string, EquipmentType> = {
    description: 'A sturdy helm for battle mages.',
  },
  
-  // ─── Body ────────────────────────────────────────────────────────────────
+  // ─── Body ────────────────────────────────────────────────────────
  civilianShirt: {
    id: 'civilianShirt',
    name: 'Civilian Shirt',
@@ -212,7 +221,7 @@ export const EQUIPMENT_TYPES: Record<string, EquipmentType> = {
    description: 'An ornate robe for master arcanists. High capacity for body armor.',
  },
  
-  // ─── Hands ───────────────────────────────────────────────────────────────
+  // ─── Hands ───────────────────────────────────────────────────────
  civilianGloves: {
    id: 'civilianGloves',
    name: 'Civilian Gloves',
@@ -246,7 +255,7 @@ export const EQUIPMENT_TYPES: Record<string, EquipmentType> = {
    description: 'Armored gauntlets for battle mages.',
  },
  
-  // ─── Legs ────────────────────────────────────────────────────────────────
+  // ─── Legs ────────────────────────────────────────────────────────
  civilianPants: {
    id: 'civilianPants',
    name: 'Civilian Pants',
@@ -288,7 +297,7 @@ export const EQUIPMENT_TYPES: Record<string, EquipmentType> = {
    description: 'Enchanted leggings for master arcanists.',
  },
  
-  // ─── Feet ────────────────────────────────────────────────────────────────
+  // ─── Feet ────────────────────────────────────────────────────────
  civilianShoes: {
    id: 'civilianShoes',
    name: 'Civilian Shoes',
@@ -322,7 +331,7 @@ export const EQUIPMENT_TYPES: Record<string, EquipmentType> = {
    description: 'Sturdy boots for combat situations.',
  },
  
-  // ─── Accessories ────────────────────────────────────────────────────────
+  // ─── Accessories ────────────────────────────────────────────────
  copperRing: {
    id: 'copperRing',
    name: 'Copper Ring',
@@ -429,7 +438,7 @@ export function getValidSlotsForCategory(category: EquipmentCategory): Equipment
    case 'caster':
    case 'catalyst':
      return ['mainHand'];
-    case 'shield':
+    case 'focus':
      return ['offHand'];
    case 'head':
      return ['head'];
--- a/src/lib/game/data/familiars.ts
+++ b/src/lib/game/data/familiars.ts
@@ -21,6 +21,13 @@ const ABILITIES = {
    desc: `+${base}% crit chance (+${scaling}% per level)`,
  }),
  
+  critDamage: (base: number, scaling: number): FamiliarAbility => ({
+    type: 'critDamage',
+    baseValue: base,
+    scalingPerLevel: scaling,
+    desc: `+${base}% crit damage (+${scaling}% per level)`,
+  }),
+  
  castSpeed: (base: number, scaling: number): FamiliarAbility => ({
    type: 'castSpeed',
    baseValue: base,
@@ -35,18 +42,25 @@ const ABILITIES = {
    desc: `+${base}% elemental damage (+${scaling}% per level)`,
  }),
  
-  lifeSteal: (base: number, scaling: number): FamiliarAbility => ({
-    type: 'lifeSteal',
+  guardianDamage: (base: number, scaling: number): FamiliarAbility => ({
+    type: 'guardianDamage',
    baseValue: base,
    scalingPerLevel: scaling,
-    desc: `+${base}% life steal (+${scaling}% per level)`,
+    desc: `+${base}% damage to guardians (+${scaling}% per level)`,
  }),
  
-  thorns: (base: number, scaling: number): FamiliarAbility => ({
-    type: 'thorns',
+  manaSiphon: (base: number, scaling: number): FamiliarAbility => ({
+    type: 'manaSiphon',
    baseValue: base,
    scalingPerLevel: scaling,
-    desc: `Reflect ${base}% damage taken (+${scaling}% per level)`,
+    desc: `Restore ${base}% of damage as mana (+${scaling}% per level)`,
+  }),
+  
+  barrierBreaker: (base: number, scaling: number): FamiliarAbility => ({
+    type: 'barrierBreaker',
+    baseValue: base,
+    scalingPerLevel: scaling,
+    desc: `+${base}% damage to barriers (+${scaling}% per level)`,
  }),
  
  // Mana abilities
@@ -71,11 +85,11 @@ const ABILITIES = {
    desc: `Auto-convert ${base} mana/hour (+${scaling} per level)`,
  }),
  
-  manaShield: (base: number, scaling: number): FamiliarAbility => ({
-    type: 'manaShield',
+  maxManaBonus: (base: number, scaling: number): FamiliarAbility => ({
+    type: 'maxManaBonus',
    baseValue: base,
    scalingPerLevel: scaling,
-    desc: `Shield absorbs ${base} damage, costs 1 mana per ${base} damage`,
+    desc: `+${base} max mana (+${scaling} per level)`,
  }),
  
  // Support abilities
@@ -85,6 +99,13 @@ const ABILITIES = {
    scalingPerLevel: scaling,
    desc: `+${base}% insight gain (+${scaling}% per level)`,
  }),
+  
+  studySpeed: (base: number, scaling: number): FamiliarAbility => ({
+    type: 'studySpeed',
+    baseValue: base,
+    scalingPerLevel: scaling,
+    desc: `+${base}% study speed (+${scaling}% per level)`,
+  }),
 };

 // ─── Familiar Definitions ───────────────────────────────────────────────────────
@@ -132,7 +153,7 @@ export const FAMILIARS_DEF: Record<string, FamiliarDef> = {
    rarity: 'common',
    abilities: [
      ABILITIES.manaRegen(0.3, 0.1),
-      ABILITIES.lifeSteal(1, 0.2),
+      ABILITIES.manaSiphon(2, 0.5),
    ],
    baseStats: { power: 8, bond: 12 },
    unlockCondition: { type: 'floor', value: 3 },
@@ -147,7 +168,7 @@ export const FAMILIARS_DEF: Record<string, FamiliarDef> = {
    element: 'earth',
    rarity: 'common',
    abilities: [
-      ABILITIES.thorns(2, 0.5),
+      ABILITIES.guardianDamage(3, 0.8),
    ],
    baseStats: { power: 15, bond: 8 },
    unlockCondition: { type: 'floor', value: 8 },
@@ -211,8 +232,8 @@ export const FAMILIARS_DEF: Record<string, FamiliarDef> = {
    element: 'crystal',
    rarity: 'uncommon',
    abilities: [
-      ABILITIES.thorns(5, 1),
-      ABILITIES.manaShield(10, 2),
+      ABILITIES.guardianDamage(5, 1),
+      ABILITIES.barrierBreaker(8, 1.5),
    ],
    baseStats: { power: 30, bond: 10 },
    unlockCondition: { type: 'floor', value: 20 },
@@ -230,7 +251,7 @@ export const FAMILIARS_DEF: Record<string, FamiliarDef> = {
    rarity: 'rare',
    abilities: [
      ABILITIES.damageBonus(6, 1.2),
-      ABILITIES.lifeSteal(3, 0.5),
+      ABILITIES.critDamage(15, 3),
    ],
    baseStats: { power: 40, bond: 15 },
    unlockCondition: { type: 'floor', value: 30 },
@@ -272,18 +293,18 @@ export const FAMILIARS_DEF: Record<string, FamiliarDef> = {
  
  shieldGuardian: {
    id: 'shieldGuardian',
-    name: 'Shield Guardian',
+    name: 'Stone Guardian',
    desc: 'A loyal protector carved from enchanted stone.',
    role: 'guardian',
    element: 'earth',
    rarity: 'rare',
    abilities: [
-      ABILITIES.thorns(8, 1.5),
-      ABILITIES.manaShield(20, 4),
+      ABILITIES.guardianDamage(8, 1.5),
+      ABILITIES.barrierBreaker(12, 2),
    ],
    baseStats: { power: 50, bond: 8 },
    unlockCondition: { type: 'floor', value: 35 },
-    flavorText: 'It stands motionless for hours, then suddenly moves to block danger.',
+    flavorText: 'It stands motionless for hours, then suddenly moves to strike.',
  },
  
  // === EPIC FAMILIARS (Tier 4) ===
@@ -332,7 +353,7 @@ export const FAMILIARS_DEF: Record<string, FamiliarDef> = {
    abilities: [
      ABILITIES.manaRegen(3, 0.6),
      ABILITIES.autoGather(10, 2),
-      ABILITIES.manaShield(15, 3),
+      ABILITIES.maxManaBonus(50, 10),
    ],
    baseStats: { power: 55, bond: 15 },
    unlockCondition: { type: 'floor', value: 55 },
@@ -347,8 +368,8 @@ export const FAMILIARS_DEF: Record<string, FamiliarDef> = {
    element: 'earth',
    rarity: 'epic',
    abilities: [
-      ABILITIES.thorns(15, 3),
-      ABILITIES.manaShield(30, 5),
+      ABILITIES.guardianDamage(15, 3),
+      ABILITIES.barrierBreaker(20, 4),
      ABILITIES.damageBonus(5, 1),
    ],
    baseStats: { power: 80, bond: 6 },
@@ -368,7 +389,7 @@ export const FAMILIARS_DEF: Record<string, FamiliarDef> = {
    abilities: [
      ABILITIES.damageBonus(15, 3),
      ABILITIES.elementalBonus(20, 4),
-      ABILITIES.lifeSteal(8, 1.5),
+      ABILITIES.critDamage(30, 5),
      ABILITIES.critChance(5, 1),
    ],
    baseStats: { power: 100, bond: 20 },
@@ -387,7 +408,7 @@ export const FAMILIARS_DEF: Record<string, FamiliarDef> = {
      ABILITIES.manaRegen(5, 1),
      ABILITIES.autoGather(20, 4),
      ABILITIES.autoConvert(8, 1.5),
-      ABILITIES.manaShield(25, 5),
+      ABILITIES.maxManaBonus(100, 20),
    ],
    baseStats: { power: 90, bond: 18 },
    unlockCondition: { type: 'pact', value: 50 },
@@ -402,14 +423,14 @@ export const FAMILIARS_DEF: Record<string, FamiliarDef> = {
    element: 'light',
    rarity: 'legendary',
    abilities: [
-      ABILITIES.thorns(25, 5),
-      ABILITIES.manaShield(50, 10),
+      ABILITIES.guardianDamage(25, 5),
+      ABILITIES.barrierBreaker(30, 6),
      ABILITIES.damageBonus(10, 2),
-      ABILITIES.lifeSteal(5, 1),
+      ABILITIES.critChance(8, 1.5),
    ],
    baseStats: { power: 120, bond: 12 },
    unlockCondition: { type: 'pact', value: 75 },
-    flavorText: 'It radiates an aura of absolute protection and quiet judgment.',
+    flavorText: 'It radiates an aura of absolute judgment.',
  },
  
  voidEmperor: {
--- a/src/lib/game/skill-evolution.ts
+++ b/src/lib/game/skill-evolution.ts
@@ -278,7 +278,7 @@ export const SKILL_EVOLUTION_PATHS: Record<string, SkillEvolutionPath> = {
          { id: 'ct_t2_l5_weapon', name: 'Weapon Mastery', desc: '+25% equipment damage bonuses', milestone: 5, effect: { type: 'multiplier', stat: 'equipmentDamage', value: 1.25 } },
          { id: 'ct_t2_l10_devastate', name: 'Devastation', desc: '+100 base damage', milestone: 10, effect: { type: 'bonus', stat: 'baseDamage', value: 100 } },
          { id: 'ct_t2_l10_streak', name: 'Kill Streak', desc: '+5% damage per kill this loop (max +100%)', milestone: 10, effect: { type: 'special', specialId: 'killStreak', specialDesc: 'Kill scaling' } },
-          { id: 'ct_t2_l10_finisher', name: 'Finisher', desc: '+100% damage to enemies below 50% HP', milestone: 10, effect: { type: 'special', specialId: 'finisherBonus', specialDesc: 'Execute mastery' } },
+          { id: 'ct_t2_l10_precision', name: 'Precision Strike', desc: '+50% critical hit damage', milestone: 10, effect: { type: 'multiplier', stat: 'critDamage', value: 1.5 } },
          { id: 'ct_t2_l10_frenzy', name: 'Battle Frenzy', desc: 'Attack speed +50% for 1 hour after kill', milestone: 10, effect: { type: 'special', specialId: 'battleFrenzy', specialDesc: 'Kill speed boost' } },
        ],
      },
--- a/src/lib/game/store.ts
+++ b/src/lib/game/store.ts
@@ -1037,11 +1037,6 @@ export const useGameStore = create<GameStore>()(
                log = ['💥 Critical hit!', ...log.slice(0, 49)];
              }
              
-              // Executioner: +100% damage to enemies below 25% HP (only on main HP, not barrier)
-              if (hasSpecial(effects, SPECIAL_EFFECTS.EXECUTIONER) && floorHP / floorMaxHP < 0.25 && floorBarrier <= 0) {
-                dmg *= 2;
-              }
-              
              // Berserker: +50% damage when below 50% mana
              if (hasSpecial(effects, SPECIAL_EFFECTS.BERSERKER) && rawMana < maxMana * 0.5) {
                dmg *= 1.5;
--- a/src/lib/game/types.ts
+++ b/src/lib/game/types.ts
@@ -360,6 +360,60 @@ export interface ClearedFloors {
  [floor: number]: boolean;
 }

+// ─── Familiar System ─────────────────────────────────────────────────────────
+
+// Familiar role types
+export type FamiliarRole = 'combat' | 'support' | 'mana' | 'guardian';
+
+// Familiar ability types (updated - removed lifesteal, thorns, manaShield since player can't take damage)
+export type FamiliarAbilityType = 
+  | 'damageBonus' 
+  | 'critChance' 
+  | 'critDamage'
+  | 'castSpeed' 
+  | 'elementalBonus' 
+  | 'guardianDamage'
+  | 'manaSiphon'
+  | 'barrierBreaker'
+  | 'manaRegen' 
+  | 'autoGather' 
+  | 'autoConvert'
+  | 'maxManaBonus'
+  | 'bonusGold'
+  | 'studySpeed';
+
+// Familiar ability definition
+export interface FamiliarAbility {
+  type: FamiliarAbilityType;
+  baseValue: number;
+  scalingPerLevel: number;
+  desc: string;
+}
+
+// Familiar definition
+export interface FamiliarDef {
+  id: string;
+  name: string;
+  desc: string;
+  role: FamiliarRole;
+  element: string;
+  rarity: 'common' | 'uncommon' | 'rare' | 'epic' | 'legendary';
+  abilities: FamiliarAbility[];
+  baseStats: { power: number; bond: number };
+  unlockCondition?: { type: 'floor' | 'pact' | 'mana' | 'study'; value: number };
+  flavorText?: string;
+}
+
+// Familiar instance (owned familiar)
+export interface FamiliarInstance {
+  familiarId: string;
+  level: number;
+  xp: number;
+  bond: number;
+  abilities: { type: FamiliarAbilityType; level: number }[];
+  active: boolean;
+}
+
 export interface GameState {
  // Time
  day: number;
--- a/src/lib/game/upgrade-effects.ts
+++ b/src/lib/game/upgrade-effects.ts
@@ -80,7 +80,7 @@ export const SPECIAL_EFFECTS = {
  BERSERKER: 'berserker',                // +50% damage when below 50% mana
  COMBO_MASTER: 'comboMaster',           // Every 5th attack deals 3x damage
  ADRENALINE_RUSH: 'adrenalineRush',     // Defeating enemy restores 5% mana
-  EXECUTIONER: 'executioner',            // Instant kill enemies below 25% HP
+  // Note: EXECUTIONER removed - execute effects don't make sense in this game context
  
  // Study special effects
  QUICK_GRASP: 'quickGrasp',             // 5% chance double study progress per hour
--- a/worklog.md
+++ b/worklog.md
@@ -853,3 +853,58 @@ Stage Summary:
 - All tests updated and passing (65/65)
 - New achievements for progression milestones
 - All lint checks pass
+
+---
+Task ID: 22
+Agent: Main
+Task: Fix inconsistencies - remove mechanics that don't make sense (player can't take damage)
+
+Work Log:
+- **Removed lifesteal abilities from familiars**:
+  - Replaced with manaSiphon (restores mana based on damage dealt)
+  - Updated waterDroplet, phoenixHatchling, primordialPhoenix, celestialGuardian
+
+- **Removed thorns abilities from familiars**:
+  - Replaced with guardianDamage (+% damage to guardians)
+  - Updated earthPebble, crystalGolem, shieldGuardian, ancientGolem, celestialGuardian
+
+- **Removed manaShield abilities from familiars**:
+  - Replaced with barrierBreaker (+% damage to barriers) and maxManaBonus
+  - Updated crystalGolem, shieldGuardian, voidWalker, ancientGolem, leviathanSpawn, celestialGuardian
+
+- **Added new familiar ability types to types.ts**:
+  - critDamage, guardianDamage, manaSiphon, barrierBreaker, maxManaBonus, studySpeed
+  - Removed: lifeSteal, thorns, manaShield (player can't take damage)
+
+- **Replaced shield equipment with focus items**:
+  - Removed basicShield, reinforcedShield, runicShield, manaShield
+  - Added crystalOrb, manaTome, elementalFocus, soulCrystal, arcanumOrb
+  - Focus items enhance spellcasting instead of providing defense
+  - Updated EquipmentCategory from 'shield' to 'focus'
+
+- **Updated crafting recipes**:
+  - Replaced shieldBlueprint with focusBlueprint
+  - Now crafts Elemental Focus instead of Runic Shield
+
+- **Updated enchantment-effects.ts**:
+  - Changed BODY_AND_SHIELD to BODY_ONLY
+  - Changed CASTER_CATALYST_ACCESSORY to CASTER_CATALYST_FOCUS_ACCESSORY
+  - Updated MANA_EQUIPMENT to include 'focus'
+  - Updated UTILITY_EQUIPMENT to include 'focus'
+  - Updated ALL_EQUIPMENT to use 'focus' instead of 'shield'
+
+- **Removed execute-related effects**:
+  - Removed EXECUTIONER from SPECIAL_EFFECTS
+  - Removed executioner code from store.ts combat tick
+  - Replaced ct_t2_l10_finisher upgrade with ct_t2_l10_precision (+50% crit damage)
+
+- **Updated skill descriptions**:
+  - Soul Binding: Changed to "Bind creature souls to items for unique enchantment effects"
+  - Ancient Echo: Buffed from "+1 enchantment capacity per Enchanter level" to "+2"
+
+Stage Summary:
+- All player-defense related mechanics removed (shields, thorns, lifesteal, manaShield)
+- Focus items provide spellcasting enhancement instead of defense
+- Execute effects removed (doesn't make sense in context)
+- Soul Binding and Ancient Echo skills improved
+- All lint checks pass