diff --git a/CLAUDE.md b/CLAUDE.md
index 926ba28..6ea8c5b 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -271,3 +271,75 @@ useSkill(skillId)                // Execute skill in combat
 1. Insert into `monster_types` via admin panel or database
 2. Set level range, stats, dialogues
 3. Optionally add to `monster_skills` for special abilities
+
+---
+
+## Troubleshooting
+
+### Docker: Restart vs Rebuild
+
+Most source files are **volume-mounted** in `docker-compose.yml`, so changes are reflected without rebuilding.
+
+**Action required by file type:**
+
+| File | Action | Notes |
+|------|--------|-------|
+| `index.html` | Browser refresh | Volume-mounted, served fresh |
+| `admin.html` | Browser refresh | Volume-mounted, served fresh |
+| `service-worker.js` | Browser refresh + bump cache version | Volume-mounted |
+| `server.js` | `docker restart hikemap_hikemap_1` | Volume-mounted, Node needs restart |
+| `database.js` | `docker restart hikemap_hikemap_1` | Volume-mounted, Node needs restart |
+| `mapgameimgs/*` | Browser refresh | Volume-mounted |
+| `mapgamemusic/*` | Browser refresh | Volume-mounted |
+| `sfx/*` | Browser refresh | Volume-mounted |
+| `hikemap.db` | Nothing | Volume-mounted, persists outside container |
+
+**Files requiring full rebuild** (`docker-compose up -d --build`):
+
+| File | Why Rebuild? |
+|------|--------------|
+| `package.json` | New npm dependencies need installing |
+| `Dockerfile` | Build process changes |
+| `manifest.json` | Not volume-mounted |
+| `icon-*.png` | Not volume-mounted |
+| `.env` | Not volume-mounted |
+| `.well-known/*` | Not volume-mounted |
+| `default.kml` | Not volume-mounted |
+| `docker-compose.yml` | Container config changes |
+
+**Commands:**
+```bash
+# Restart container (fast - for server.js/database.js changes)
+docker restart hikemap_hikemap_1
+
+# Full rebuild (slow - only when needed)
+docker-compose up -d --build
+
+# If rebuild fails with volume errors:
+docker ps -a | grep hike  # Find container ID
+docker rm <container_id>
+docker-compose up -d --build
+```
+
+### Cache Issues
+
+After server-side changes, users may need to clear browser cache:
+1. Increment `CACHE_NAME` version in `service-worker.js`
+2. Hard refresh in browser (Ctrl+Shift+R)
+3. Or clear site data in browser DevTools
+
+### Common Issues
+
+**"Changes not appearing after edit"**
+- Client files (html/js): Just refresh browser
+- Server files (server.js, database.js): Run `docker restart hikemap_hikemap_1`
+- Did you bump the service worker cache version?
+
+**"API returns old data"**
+- Check container is running: `docker ps | grep hike`
+- Restart container: `docker restart hikemap_hikemap_1`
+- Check container logs: `docker logs hikemap_hikemap_1`
+
+**"Database changes lost after rebuild"**
+- The `hikemap.db` file is mounted as a volume and persists
+- Schema changes are applied via migrations in `database.js` on startup
diff --git a/admin.html b/admin.html
index e5552a8..3f38dd1 100644
--- a/admin.html
+++ b/admin.html
@@ -936,6 +936,18 @@
                             <small style="color: #888; font-size: 11px;">Warning shown this many seconds before logout</small>
                         </div>
                     </div>
+
+                    <h3 style="margin: 20px 0 10px; color: #666; font-size: 14px;">Combat UI Settings</h3>
+                    <div class="form-row">
+                        <div class="form-group">
+                            <label>Combat Monster Icon Scale (Mobile)</label>
+                            <input type="number" id="setting-combatIconScale" placeholder="0.7" min="0.3" max="1.5" step="0.1">
+                            <small style="color: #888; font-size: 11px;">Scale for monster icons on mobile only (0.3 = 30px, 0.7 = 70px, 1.0 = 100px). Desktop always uses 100px.</small>
+                        </div>
+                        <div class="form-group">
+                            <!-- empty for alignment -->
+                        </div>
+                    </div>
                 </div>
                 <div class="form-actions">
                     <button class="btn btn-primary" id="saveSettingsBtn">Save Settings</button>
@@ -1185,6 +1197,17 @@
                         <input type="number" id="skillHitCount" value="1" min="1">
                     </div>
                 </div>
+                <div class="form-row-2" id="targetingModeRow">
+                    <div class="form-group">
+                        <label>Targeting Mode (Multi-Hit)</label>
+                        <select id="skillTargetingMode">
+                            <option value="same_target">Same Target (all hits on selected enemy)</option>
+                            <option value="per_hit">Per-Hit Selection (player chooses each hit)</option>
+                            <option value="random">Random (each hit targets random enemy)</option>
+                        </select>
+                        <small style="color: #666; font-size: 11px;">Only applies when Hit Count > 1 and multiple enemies present</small>
+                    </div>
+                </div>
 
                 <div class="status-effect-section">
                     <h4>Status Effect (optional)</h4>
@@ -2045,6 +2068,7 @@
             document.getElementById('skillDescription').value = skill.description || '';
             document.getElementById('skillType').value = skill.type;
             document.getElementById('skillTarget').value = skill.target;
+            document.getElementById('skillTargetingMode').value = skill.targeting_mode || 'same_target';
             document.getElementById('skillMpCost').value = skill.mp_cost;
             document.getElementById('skillBasePower').value = skill.base_power;
             document.getElementById('skillAccuracy').value = skill.accuracy;
@@ -2105,6 +2129,7 @@
             document.getElementById('skillPlayerUsable').checked = true;
             document.getElementById('skillMonsterUsable').checked = true;
             document.getElementById('skillEnabled').checked = true;
+            document.getElementById('skillTargetingMode').value = 'same_target';
             // Reset to default (damage) type and toggle visibility
             document.getElementById('skillType').value = 'damage';
             handleSkillTypeChange();
@@ -2173,6 +2198,7 @@
                 description: document.getElementById('skillDescription').value,
                 type: document.getElementById('skillType').value,
                 target: document.getElementById('skillTarget').value,
+                targeting_mode: document.getElementById('skillTargetingMode').value,
                 mp_cost: parseInt(document.getElementById('skillMpCost').value) || 0,
                 base_power: parseInt(document.getElementById('skillBasePower').value) || 100,
                 accuracy: parseInt(document.getElementById('skillAccuracy').value) || 95,
@@ -2605,11 +2631,29 @@
                         <button class="btn btn-secondary btn-small" onclick="toggleAdmin(${u.id}, ${!u.is_admin})">
                             ${u.is_admin ? 'Revoke Admin' : 'Grant Admin'}
                         </button>
+                        <button class="btn btn-danger btn-small" onclick="deleteUser(${u.id}, '${escapeHtml(u.username).replace(/'/g, "\\'")}')">Delete</button>
                     </td>
                 </tr>
             `).join('');
         }
 
+        async function deleteUser(id, username) {
+            if (!confirm(`Are you sure you want to DELETE user "${username}"?\n\nThis will permanently remove:\n- User account\n- Character data\n- Monsters\n- Buffs\n- All progress\n\nThis action cannot be undone!`)) return;
+
+            // Double confirm for safety
+            if (!confirm(`FINAL WARNING: Delete user "${username}" permanently?`)) return;
+
+            try {
+                await api(`/api/admin/users/${id}`, { method: 'DELETE' });
+                // Remove from local array immediately
+                users = users.filter(u => u.id !== id);
+                showToast(`User "${username}" deleted`);
+                renderUserTable();
+            } catch (e) {
+                showToast('Failed to delete user: ' + e.message, 'error');
+            }
+        }
+
         async function toggleAdmin(id, isAdmin) {
             const action = isAdmin ? 'grant admin to' : 'revoke admin from';
             if (!confirm(`Are you sure you want to ${action} this user?`)) return;
@@ -2747,6 +2791,8 @@
                 document.getElementById('setting-inactivityTimeout').value = Math.round(inactivityMs / 60000);
                 const warningMs = settings.inactivityWarningTime || 60000;
                 document.getElementById('setting-inactivityWarningTime').value = Math.round(warningMs / 1000);
+                // Combat UI settings
+                document.getElementById('setting-combatIconScale').value = settings.combatIconScale || 1.0;
             } catch (e) {
                 showToast('Failed to load settings: ' + e.message, 'error');
             }
@@ -2774,7 +2820,8 @@
                 homeRegenPercent: parseFloat(document.getElementById('setting-homeRegenPercent').value) || 5,
                 homeBaseRadius: parseInt(document.getElementById('setting-homeBaseRadius').value) || 20,
                 inactivityTimeout: inactivityMinutes * 60000,
-                inactivityWarningTime: warningSeconds * 1000
+                inactivityWarningTime: warningSeconds * 1000,
+                combatIconScale: parseFloat(document.getElementById('setting-combatIconScale').value) || 1.0
             };
 
             try {
diff --git a/database.js b/database.js
index 757ab3d..21a3126 100644
--- a/database.js
+++ b/database.js
@@ -258,6 +258,11 @@ class HikeMapDB {
             this.db.exec(`ALTER TABLE monster_skills ADD COLUMN custom_name TEXT`);
         } catch (e) { /* Column already exists */ }
 
+        // Migration: Add targeting_mode to skills for multi-hit targeting behavior
+        try {
+            this.db.exec(`ALTER TABLE skills ADD COLUMN targeting_mode TEXT DEFAULT 'same_target'`);
+        } catch (e) { /* Column already exists */ }
+
         // Migration: Add home base and death system columns to rpg_stats
         try {
             this.db.exec(`ALTER TABLE rpg_stats ADD COLUMN home_base_lat REAL`);
@@ -1041,8 +1046,8 @@ class HikeMapDB {
 
     createSkill(skillData) {
         const stmt = this.db.prepare(`
-            INSERT INTO skills (id, name, description, type, mp_cost, base_power, accuracy, hit_count, target, status_effect, player_usable, monster_usable, enabled)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            INSERT INTO skills (id, name, description, type, mp_cost, base_power, accuracy, hit_count, target, targeting_mode, status_effect, player_usable, monster_usable, enabled)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         `);
         const statusEffect = skillData.statusEffect
             ? (typeof skillData.statusEffect === 'string' ? skillData.statusEffect : JSON.stringify(skillData.statusEffect))
@@ -1057,6 +1062,7 @@ class HikeMapDB {
             skillData.accuracy || 100,
             skillData.hitCount || skillData.hit_count || 1,
             skillData.target || 'enemy',
+            skillData.targetingMode || skillData.targeting_mode || 'same_target',
             statusEffect,
             skillData.playerUsable !== false ? 1 : 0,
             skillData.monsterUsable !== false ? 1 : 0,
@@ -1068,7 +1074,7 @@ class HikeMapDB {
         const stmt = this.db.prepare(`
             UPDATE skills SET
                 name = ?, description = ?, type = ?, mp_cost = ?, base_power = ?,
-                accuracy = ?, hit_count = ?, target = ?, status_effect = ?,
+                accuracy = ?, hit_count = ?, target = ?, targeting_mode = ?, status_effect = ?,
                 player_usable = ?, monster_usable = ?, enabled = ?
             WHERE id = ?
         `);
@@ -1098,6 +1104,7 @@ class HikeMapDB {
             skillData.accuracy || 100,
             skillData.hitCount || skillData.hit_count || 1,
             skillData.target || 'enemy',
+            skillData.targetingMode || skillData.targeting_mode || 'same_target',
             statusEffect,
             playerUsable,
             monsterUsable,
@@ -1118,6 +1125,17 @@ class HikeMapDB {
     // CLASS SKILL NAMES METHODS
     // =====================
 
+    // Get custom names from class_skills table (primary source - what admin panel edits)
+    getAllClassSkillNamesFromClassSkills() {
+        const stmt = this.db.prepare(`
+            SELECT cs.id, cs.skill_id, cs.class_id, cs.custom_name, cs.custom_description
+            FROM class_skills cs
+            WHERE cs.custom_name IS NOT NULL AND cs.custom_name != ''
+        `);
+        return stmt.all();
+    }
+
+    // Legacy: Get from class_skill_names table (deprecated)
     getAllClassSkillNames() {
         const stmt = this.db.prepare(`SELECT * FROM class_skill_names`);
         return stmt.all();
@@ -1985,6 +2003,29 @@ class HikeMapDB {
         return stmt.run(userId);
     }
 
+    // Admin: Delete user completely
+    deleteUser(userId) {
+        const transaction = this.db.transaction(() => {
+            // Delete in order to respect foreign key constraints (if any)
+            // Delete monster entourage
+            this.db.prepare(`DELETE FROM monster_entourage WHERE user_id = ?`).run(userId);
+
+            // Delete player buffs
+            this.db.prepare(`DELETE FROM player_buffs WHERE player_id = ?`).run(userId);
+
+            // Delete refresh tokens
+            this.db.prepare(`DELETE FROM refresh_tokens WHERE user_id = ?`).run(userId);
+
+            // Delete RPG stats
+            this.db.prepare(`DELETE FROM rpg_stats WHERE user_id = ?`).run(userId);
+
+            // Delete user account
+            this.db.prepare(`DELETE FROM users WHERE id = ?`).run(userId);
+        });
+
+        return transaction();
+    }
+
     // Game settings methods
     getSetting(key) {
         const stmt = this.db.prepare(`SELECT value FROM game_settings WHERE key = ?`);
diff --git a/index.html b/index.html
index 392ce5b..3538ed8 100644
--- a/index.html
+++ b/index.html
@@ -30,6 +30,18 @@
     <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@7.4.47/css/materialdesignicons.min.css" />
     <style>
+        :root {
+            --combat-icon-scale-mobile: 0.7;
+            --combat-icon-size: 100px;
+            --combat-status-size: 100px;
+        }
+        /* Apply scaled icons only on mobile devices */
+        @media (max-width: 768px) {
+            :root {
+                --combat-icon-size: calc(100px * var(--combat-icon-scale-mobile));
+                --combat-status-size: calc(100px * var(--combat-icon-scale-mobile));
+            }
+        }
         * {
             margin: 0;
             padding: 0;
@@ -58,8 +70,12 @@
         .leaflet-container {
             z-index: 1 !important;
         }
-        .leaflet-pane {
-            z-index: auto !important;
+        /* Ensure marker pane stays above tiles during zoom */
+        .leaflet-marker-pane {
+            z-index: 600 !important;
+        }
+        .leaflet-overlay-pane {
+            z-index: 400 !important;
         }
         .controls {
             position: absolute;
@@ -1203,6 +1219,77 @@
             color: #333;
             background: #f5f5f5;
         }
+
+        /* Login Screen - Full page login before game loads */
+        #loginScreen {
+            position: fixed;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            background: linear-gradient(135deg, #1a1a2e 0%, #16213e 50%, #0f3460 100%);
+            z-index: 1000000;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            overflow-y: auto;
+        }
+        #loginScreen.hidden {
+            display: none;
+        }
+        .login-screen-content {
+            width: 90%;
+            max-width: 420px;
+            padding: 20px;
+        }
+        .login-screen-logo {
+            text-align: center;
+            margin-bottom: 30px;
+        }
+        .login-screen-logo h1 {
+            font-size: 48px;
+            color: #4CAF50;
+            text-shadow: 0 4px 20px rgba(76, 175, 80, 0.4);
+            margin: 0;
+            letter-spacing: 2px;
+        }
+        .login-screen-logo p {
+            color: #8892b0;
+            font-size: 14px;
+            margin-top: 8px;
+        }
+        .login-card {
+            background: rgba(255, 255, 255, 0.95);
+            padding: 30px;
+            border-radius: 16px;
+            box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
+        }
+        .login-card .auth-tabs {
+            margin-bottom: 20px;
+        }
+        .login-card .auth-tab {
+            background: rgba(0, 0, 0, 0.05);
+        }
+        .login-card .auth-tab.active {
+            background: #4CAF50;
+            color: white;
+        }
+        .login-version {
+            text-align: center;
+            margin-top: 20px;
+            color: #546e7a;
+            font-size: 12px;
+        }
+
+        /* Hide game container until logged in */
+        #gameContainer {
+            display: none;
+        }
+        #gameContainer.visible {
+            display: block;
+        }
+
         /* Character Creator Modal */
         .char-creator-modal {
             background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
@@ -2493,14 +2580,14 @@
             margin-bottom: 6px;
         }
         .monster-entry-icon {
-            width: 100px;
-            height: 100px;
+            width: var(--combat-icon-size);
+            height: var(--combat-icon-size);
             object-fit: contain;
         }
         .monster-entry .sprite-container {
             position: relative;
-            width: 100px;
-            height: 100px;
+            width: var(--combat-icon-size);
+            height: var(--combat-icon-size);
             margin-right: 10px;
             flex-shrink: 0;
         }
@@ -2548,6 +2635,24 @@
             color: #e94560;
             border-left: 3px solid #e94560;
         }
+        .turn-indicator.targeting-mode {
+            background: linear-gradient(90deg, rgba(255, 193, 7, 0.3), transparent);
+            color: #ffc107;
+            border-left: 3px solid #ffc107;
+            animation: pulse-targeting 1s ease-in-out infinite;
+        }
+        @keyframes pulse-targeting {
+            0%, 100% { opacity: 1; }
+            50% { opacity: 0.7; }
+        }
+        .monster-entry.targeting-selectable {
+            cursor: pointer;
+            animation: glow-selectable 1.5s ease-in-out infinite;
+        }
+        @keyframes glow-selectable {
+            0%, 100% { box-shadow: 0 0 5px rgba(255, 193, 7, 0.5); }
+            50% { box-shadow: 0 0 15px rgba(255, 193, 7, 0.8); }
+        }
         .target-arrow {
             color: #e94560;
             font-size: 14px;
@@ -2598,8 +2703,8 @@
             height: 28px;
         }
         .monster-entry .status-overlay img {
-            width: 100px;
-            height: 100px;
+            width: var(--combat-status-size);
+            height: var(--combat-status-size);
             top: 0;
             left: 0;
         }
@@ -2995,6 +3100,23 @@
             text-align: center;
             padding: 12px;
         }
+        .homebase-skill-btn.disabled-away {
+            opacity: 0.5;
+            cursor: not-allowed;
+        }
+        .homebase-skill-btn.disabled-away:hover {
+            transform: none;
+            background: rgba(255, 255, 255, 0.1);
+        }
+        .homebase-skill-warning {
+            color: #ff9800;
+            font-size: 12px;
+            text-align: center;
+            padding: 8px;
+            margin-bottom: 10px;
+            background: rgba(255, 152, 0, 0.15);
+            border-radius: 6px;
+        }
 
         /* Toast notifications */
         .toast-container {
@@ -3046,6 +3168,66 @@
     </style>
 </head>
 <body>
+    <!-- Login Screen - shown before game loads -->
+    <div id="loginScreen">
+        <div class="login-screen-content">
+            <div class="login-screen-logo">
+                <h1>HikeMap</h1>
+                <p>Trail Navigator & RPG Adventure</p>
+            </div>
+            <div class="login-card">
+                <div class="auth-tabs">
+                    <button class="auth-tab active" id="loginScreenLoginTab">Login</button>
+                    <button class="auth-tab" id="loginScreenRegisterTab">Register</button>
+                </div>
+                <div id="loginScreenError" class="auth-error"></div>
+
+                <!-- Login Form -->
+                <form id="loginScreenLoginForm" class="auth-form active">
+                    <div class="auth-input-group">
+                        <label for="loginScreenUsername">Username or Email</label>
+                        <input type="text" id="loginScreenUsername" required autocomplete="username">
+                    </div>
+                    <div class="auth-input-group">
+                        <label for="loginScreenPassword">Password</label>
+                        <input type="password" id="loginScreenPassword" required autocomplete="current-password">
+                    </div>
+                    <button type="submit" class="auth-submit-btn" id="loginScreenSubmitBtn">Login</button>
+                </form>
+
+                <!-- Register Form -->
+                <form id="loginScreenRegisterForm" class="auth-form">
+                    <div class="auth-input-group">
+                        <label for="loginScreenRegUsername">Username</label>
+                        <input type="text" id="loginScreenRegUsername" required minlength="3" maxlength="20" pattern="[a-zA-Z0-9_]+" autocomplete="username">
+                    </div>
+                    <div class="auth-input-group">
+                        <label for="loginScreenRegEmail">Email</label>
+                        <input type="email" id="loginScreenRegEmail" required autocomplete="email">
+                    </div>
+                    <div class="auth-input-group">
+                        <label for="loginScreenRegPassword">Password (min 8 characters)</label>
+                        <input type="password" id="loginScreenRegPassword" required minlength="8" autocomplete="new-password">
+                    </div>
+                    <div class="auth-input-group">
+                        <label for="loginScreenRegPasswordConfirm">Confirm Password</label>
+                        <input type="password" id="loginScreenRegPasswordConfirm" required minlength="8" autocomplete="new-password">
+                    </div>
+                    <button type="submit" class="auth-submit-btn" id="loginScreenRegSubmitBtn">Create Account</button>
+                </form>
+
+                <!-- Guest mode option -->
+                <div class="auth-guest-divider">
+                    <span>or</span>
+                </div>
+                <button type="button" class="auth-guest-btn" id="loginScreenGuestBtn">Continue as Guest</button>
+            </div>
+            <div class="login-version">v1.0</div>
+        </div>
+    </div>
+
+    <!-- Game Container - hidden until logged in -->
+    <div id="gameContainer">
     <div id="map"></div>
     <div id="compassIndicator" class="compass-indicator">N</div>
 
@@ -3558,6 +3740,8 @@
     <!-- Press and hold indicator -->
     <div id="pressHoldIndicator" class="press-hold-indicator">Hold to set destination...</div>
 
+    </div><!-- End gameContainer -->
+
     <!-- Audio element for geocache alert sound - using Web Audio API instead -->
     <script>
         // Create a simple notification sound using Web Audio API
@@ -4163,6 +4347,11 @@
                         inactivityWarningTime = settings.inactivityWarningTime;
                     }
 
+                    // Apply combat icon scale CSS variable (mobile only)
+                    if (settings.combatIconScale) {
+                        document.documentElement.style.setProperty('--combat-icon-scale-mobile', settings.combatIconScale);
+                    }
+
                     console.log('Loaded spawn settings:', spawnSettings);
                 }
             } catch (err) {
@@ -4188,6 +4377,7 @@
                             accuracy: s.accuracy,
                             hitCount: s.hitCount,
                             target: s.target,
+                            targeting_mode: s.targeting_mode || 'same_target',
                             statusEffect: s.statusEffect,
                             playerUsable: s.playerUsable,
                             monsterUsable: s.monsterUsable
@@ -4447,6 +4637,7 @@
         // MUSIC SYSTEM
         // ==========================================
         const gameMusic = {
+            login: new Audio('/mapgamemusic/login.mp3'),
             overworld: new Audio('/mapgamemusic/over_world.mp3'),
             battle: new Audio('/mapgamemusic/in_fight.mp3'),
             victory: new Audio('/mapgamemusic/victory.mp3'),
@@ -4501,6 +4692,7 @@
         // Initialize music settings
         function initMusic() {
             // Set up looping for ambient tracks
+            gameMusic.login.loop = true;
             gameMusic.overworld.loop = true;
             gameMusic.battle.loop = true;
             gameMusic.homebase.loop = true;
@@ -4508,6 +4700,7 @@
             gameMusic.death.loop = false;
 
             // Set initial volume for all tracks
+            gameMusic.login.volume = gameMusic.volume;
             gameMusic.overworld.volume = gameMusic.volume;
             gameMusic.battle.volume = gameMusic.volume;
             gameMusic.victory.volume = gameMusic.volume;
@@ -4515,7 +4708,7 @@
             gameMusic.homebase.volume = gameMusic.volume;
 
             // Preload all audio tracks and add error handling
-            const tracks = ['overworld', 'battle', 'victory', 'death', 'homebase'];
+            const tracks = ['login', 'overworld', 'battle', 'victory', 'death', 'homebase'];
             tracks.forEach(track => {
                 const audio = gameMusic[track];
                 audio.preload = 'auto';
@@ -4636,6 +4829,7 @@
         function setMusicVolume(vol) {
             gameMusic.volume = Math.max(0, Math.min(1, vol));
             localStorage.setItem('musicVolume', gameMusic.volume);
+            gameMusic.login.volume = gameMusic.volume;
             gameMusic.overworld.volume = gameMusic.volume;
             gameMusic.battle.volume = gameMusic.volume;
             gameMusic.victory.volume = gameMusic.volume;
@@ -5082,36 +5276,59 @@
         }
 
         function handleGpsTestKeydown(e) {
-            if (!gpsTestMode) return;
-
             // Don't handle if typing in an input
             if (e.target.tagName === 'INPUT' || e.target.tagName === 'TEXTAREA') return;
 
-            let moved = false;
+            // Only handle WASD keys
+            const key = e.key.toLowerCase();
+            if (!['w', 'a', 's', 'd'].includes(key)) return;
+
+            // Auto-enable GPS test mode if not already enabled (same as on-screen buttons)
+            if (!gpsTestMode) {
+                // Initialize test position to current map center or user location
+                if (userLocation) {
+                    testPosition = { lat: userLocation.lat, lng: userLocation.lng };
+                } else {
+                    const center = map.getCenter();
+                    testPosition = { lat: center.lat, lng: center.lng };
+                }
+                gpsTestMode = true;
+
+                // Stop real GPS
+                if (gpsWatchId !== null) {
+                    navigator.geolocation.clearWatch(gpsWatchId);
+                    gpsWatchId = null;
+                }
+                if (gpsBackupInterval) {
+                    clearInterval(gpsBackupInterval);
+                    gpsBackupInterval = null;
+                }
+
+                // Update admin toggle if it exists
+                const toggle = document.getElementById('gpsTestModeToggle');
+                if (toggle) toggle.checked = true;
 
-            switch (e.key.toLowerCase()) {
+                updateStatus('Test mode enabled via keyboard', 'info');
+            }
+
+            // Move in the specified direction
+            switch (key) {
                 case 'w':
                     testPosition.lat += GPS_TEST_STEP;
-                    moved = true;
                     break;
                 case 's':
                     testPosition.lat -= GPS_TEST_STEP;
-                    moved = true;
                     break;
                 case 'a':
                     testPosition.lng -= GPS_TEST_STEP;
-                    moved = true;
                     break;
                 case 'd':
                     testPosition.lng += GPS_TEST_STEP;
-                    moved = true;
                     break;
             }
 
-            if (moved) {
-                e.preventDefault();
-                simulateGpsPosition();
-            }
+            e.preventDefault();
+            simulateGpsPosition();
         }
 
         // Add keydown listener for GPS test mode
@@ -10396,11 +10613,12 @@
             localStorage.removeItem('accessToken');
             localStorage.removeItem('refreshToken');
             localStorage.removeItem('hikemap_rpg_stats'); // Clear cached RPG stats to prevent stale data
+            sessionStorage.removeItem('guestMode'); // Clear guest mode too
             stopInactivityTimer();
             updateAuthUI();
 
-            // Show login modal to force re-authentication
-            showAuthModal();
+            // Show login screen to force re-authentication
+            showLoginScreen();
         }
 
         // ==========================================
@@ -10609,13 +10827,213 @@
         document.getElementById('authCloseBtn').addEventListener('click', hideAuthModal);
         document.getElementById('logoutBtn').addEventListener('click', logout);
 
-        // Guest mode button
+        // Guest mode button (old auth modal - kept for backwards compatibility)
         document.getElementById('guestModeBtn').addEventListener('click', () => {
             sessionStorage.setItem('guestMode', 'true');
             hideAuthModal();
             updateStatus('Continuing as guest - log in to save progress!', 'info');
         });
 
+        // ==========================================
+        // LOGIN SCREEN HANDLERS
+        // ==========================================
+
+        // Track if login music has started (for autoplay restrictions)
+        let loginMusicStarted = false;
+
+        function startLoginMusic() {
+            if (!loginMusicStarted && !gameMusic.muted) {
+                loginMusicStarted = true;
+                playMusic('login');
+            }
+        }
+
+        function hideLoginScreen() {
+            document.getElementById('loginScreen').classList.add('hidden');
+            document.getElementById('gameContainer').classList.add('visible');
+            // Stop login music and transition to appropriate game music
+            stopMusic();
+            // Fix Leaflet map sizing - must recalculate after container becomes visible
+            setTimeout(() => {
+                if (map) {
+                    map.invalidateSize();
+                    // Re-center on user position if available
+                    if (gpsMarker) {
+                        map.setView(gpsMarker.getLatLng(), map.getZoom());
+                    }
+                    // Force refresh of markers that may have been added while map was hidden
+                    refreshMapMarkers();
+                }
+            }, 150);
+        }
+
+        // Refresh all map markers after map becomes visible
+        function refreshMapMarkers() {
+            // Refresh GPS marker by recreating it
+            if (gpsMarker && userLocation) {
+                const lat = userLocation.lat;
+                const lng = userLocation.lng;
+                map.removeLayer(gpsMarker);
+                gpsMarker = null;
+                // Recreate the marker
+                const myIcon = L.divIcon({
+                    html: '<i class="mdi mdi-navigation" style="color: #4285f4; font-size: 36px; transform: rotate(' + (currentHeading || 0) + 'deg);"></i>',
+                    iconSize: [36, 36],
+                    iconAnchor: [18, 18],
+                    className: 'custom-div-icon'
+                });
+                gpsMarker = L.marker([lat, lng], { icon: myIcon }).addTo(map);
+            }
+
+            // Refresh accuracy circle
+            if (gpsAccuracyCircle && userLocation) {
+                const lat = userLocation.lat;
+                const lng = userLocation.lng;
+                map.removeLayer(gpsAccuracyCircle);
+                gpsAccuracyCircle = L.circle([lat, lng], {
+                    radius: userLocation.accuracy || 10,
+                    color: '#4285f4',
+                    fillColor: '#4285f4',
+                    fillOpacity: 0.15,
+                    weight: 1,
+                    interactive: false
+                }).addTo(map);
+            }
+
+            // Refresh home base marker
+            if (typeof updateHomeBaseMarker === 'function' && playerStats && playerStats.homeBaseLat != null) {
+                if (homeBaseMarker) {
+                    map.removeLayer(homeBaseMarker);
+                    homeBaseMarker = null;
+                }
+                updateHomeBaseMarker();
+            }
+
+            // Refresh monster markers
+            if (monsterEntourage && monsterEntourage.length > 0) {
+                monsterEntourage.forEach(monster => {
+                    if (monster.marker) {
+                        map.removeLayer(monster.marker);
+                        monster.marker.addTo(map);
+                    }
+                });
+            }
+        }
+
+        function showLoginScreen() {
+            document.getElementById('loginScreen').classList.remove('hidden');
+            document.getElementById('gameContainer').classList.remove('visible');
+            stopMusic();
+        }
+
+        function showLoginScreenError(message) {
+            const errorEl = document.getElementById('loginScreenError');
+            errorEl.textContent = message;
+            errorEl.classList.add('visible');
+        }
+
+        function hideLoginScreenError() {
+            document.getElementById('loginScreenError').classList.remove('visible');
+        }
+
+        // Login screen tab switching
+        document.getElementById('loginScreenLoginTab').addEventListener('click', () => {
+            document.getElementById('loginScreenLoginTab').classList.add('active');
+            document.getElementById('loginScreenRegisterTab').classList.remove('active');
+            document.getElementById('loginScreenLoginForm').classList.add('active');
+            document.getElementById('loginScreenRegisterForm').classList.remove('active');
+            hideLoginScreenError();
+        });
+
+        document.getElementById('loginScreenRegisterTab').addEventListener('click', () => {
+            document.getElementById('loginScreenRegisterTab').classList.add('active');
+            document.getElementById('loginScreenLoginTab').classList.remove('active');
+            document.getElementById('loginScreenRegisterForm').classList.add('active');
+            document.getElementById('loginScreenLoginForm').classList.remove('active');
+            hideLoginScreenError();
+        });
+
+        // Login screen login form
+        document.getElementById('loginScreenLoginForm').addEventListener('submit', async (e) => {
+            e.preventDefault();
+            const btn = document.getElementById('loginScreenSubmitBtn');
+            btn.disabled = true;
+            btn.textContent = 'Logging in...';
+
+            const username = document.getElementById('loginScreenUsername').value;
+            const password = document.getElementById('loginScreenPassword').value;
+
+            const result = await login(username, password);
+
+            btn.disabled = false;
+            btn.textContent = 'Login';
+
+            if (result.success) {
+                hideLoginScreen();
+                updateStatus(`Welcome back, ${currentUser.username}!`, 'success');
+            } else {
+                showLoginScreenError(result.error);
+            }
+        });
+
+        // Login screen register form
+        document.getElementById('loginScreenRegisterForm').addEventListener('submit', async (e) => {
+            e.preventDefault();
+            const btn = document.getElementById('loginScreenRegSubmitBtn');
+
+            const username = document.getElementById('loginScreenRegUsername').value;
+            const email = document.getElementById('loginScreenRegEmail').value;
+            const password = document.getElementById('loginScreenRegPassword').value;
+            const confirmPassword = document.getElementById('loginScreenRegPasswordConfirm').value;
+
+            if (password !== confirmPassword) {
+                showLoginScreenError('Passwords do not match');
+                return;
+            }
+
+            btn.disabled = true;
+            btn.textContent = 'Creating account...';
+
+            const result = await register(username, email, password);
+
+            btn.disabled = false;
+            btn.textContent = 'Create Account';
+
+            if (result.success) {
+                hideLoginScreen();
+                updateStatus(`Welcome to HikeMap, ${currentUser.username}!`, 'success');
+            } else {
+                showLoginScreenError(result.error);
+            }
+        });
+
+        // Login screen guest mode button
+        document.getElementById('loginScreenGuestBtn').addEventListener('click', () => {
+            sessionStorage.setItem('guestMode', 'true');
+            hideLoginScreen();
+            updateStatus('Continuing as guest - log in to save progress!', 'info');
+        });
+
+        // Try to autostart login music immediately (works if user has interacted before)
+        // Falls back to first interaction if autoplay is blocked
+        setTimeout(() => {
+            if (!loginMusicStarted && !gameMusic.muted) {
+                const loginAudio = gameMusic.login;
+                loginAudio.play().then(() => {
+                    loginMusicStarted = true;
+                    gameMusic.current = loginAudio;
+                    gameMusic.currentTrack = 'login';
+                    console.log('Login music autostarted');
+                }).catch(() => {
+                    console.log('Autoplay blocked - waiting for user interaction');
+                });
+            }
+        }, 500);
+
+        // Fallback: Start login music on first interaction with the login screen
+        document.getElementById('loginScreen').addEventListener('click', startLoginMusic, { once: true });
+        document.getElementById('loginScreen').addEventListener('touchstart', startLoginMusic, { once: true });
+
         // ==========================================
         // CHARACTER CREATOR
         // ==========================================
@@ -11744,6 +12162,10 @@
             const container = document.getElementById('homebaseSkillLoadout');
             if (!container) return;
 
+            // Check if player is at home base
+            const distToHome = getDistanceToHome();
+            const isAtHome = distToHome !== null && distToHome <= spawnSettings.homeBaseRadius;
+
             const unlockedSkills = playerStats.unlockedSkills || ['basic_attack'];
             const activeSkills = playerStats.activeSkills || playerStats.unlockedSkills || ['basic_attack'];
             const pool = SKILL_POOLS[playerStats.class];
@@ -11779,10 +12201,16 @@
 
             // Generate HTML
             let html = '';
+
+            // Show warning if not at home base
+            if (!isAtHome) {
+                html += '<div class="homebase-skill-warning">⚠️ Return to home base to change skills</div>';
+            }
+
             const sortedTiers = Object.keys(tierSkills).map(Number).sort((a, b) => a - b);
 
             if (sortedTiers.length === 0) {
-                html = '<div class="homebase-no-skills">No skills to configure yet. Level up to unlock skills!</div>';
+                html += '<div class="homebase-no-skills">No skills to configure yet. Level up to unlock skills!</div>';
             } else {
                 sortedTiers.forEach(tier => {
                     const skills = tierSkills[tier];
@@ -11834,10 +12262,12 @@
                         const icon = SKILLS[skillId]?.icon || baseSkill.icon || '⚔️';
                         const mpCost = baseSkill.mpCost || 0;
                         const isActive = activeSkills.includes(skillId);
+                        const canSwap = isAtHome && !isActive;
 
                         html += `
-                            <button class="homebase-skill-btn ${isActive ? 'active' : ''}"
-                                    onclick="swapSkillFromHomebase(${tier}, '${skillId}')">
+                            <button class="homebase-skill-btn ${isActive ? 'active' : ''} ${!isAtHome && !isActive ? 'disabled-away' : ''}"
+                                    onclick="swapSkillFromHomebase(${tier}, '${skillId}')"
+                                    ${!canSwap && !isActive ? 'disabled' : ''}>
                                 <span class="skill-icon">${icon}</span>
                                 <div class="skill-info">
                                     <span class="skill-name">${displayName}</span>
@@ -11861,6 +12291,13 @@
 
         // Swap skill from homebase modal (with instant feedback)
         async function swapSkillFromHomebase(tier, newSkillId) {
+            // Check if player is at home base
+            const distToHome = getDistanceToHome();
+            if (distToHome === null || distToHome > spawnSettings.homeBaseRadius) {
+                showNotification('You must be at your home base to change skills!', 'warning');
+                return;
+            }
+
             const unlockedSkills = playerStats.unlockedSkills || ['basic_attack'];
             const activeSkills = playerStats.activeSkills || [...unlockedSkills];
             const pool = SKILL_POOLS[playerStats.class];
@@ -12480,7 +12917,8 @@
 
             try {
                 const response = await fetch('/api/user/monsters', {
-                    headers: { 'Authorization': `Bearer ${token}` }
+                    headers: { 'Authorization': `Bearer ${token}` },
+                    cache: 'no-store'  // Prevent browser caching - each user must get fresh data
                 });
 
                 if (response.ok) {
@@ -12945,7 +13383,12 @@
                 currentMonsterTurn: 0,
                 log: [],
                 playerStatusEffects: [],   // [{type, damage, turnsLeft}]
-                defenseBuffTurns: 0        // Turns remaining for defense buff
+                defenseBuffTurns: 0,       // Turns remaining for defense buff
+                // Multi-hit targeting state
+                targetingMode: false,      // True when selecting targets for multi-hit skill
+                pendingSkill: null,        // The skill waiting to be executed
+                pendingTargets: [],        // Array of target indices for each hit
+                totalHitsToSelect: 0       // Total number of hits to select targets for
             };
 
             showCombatUI();
@@ -13099,6 +13542,10 @@
                 if (monster.hp <= 0) {
                     entry.classList.add('dead');
                 }
+                // Add visual feedback during targeting mode for living monsters
+                if (combatState.targetingMode && monster.hp > 0) {
+                    entry.classList.add('targeting-selectable');
+                }
 
                 const hpPct = Math.max(0, (monster.hp / monster.maxHp) * 100);
                 const mpPct = Math.max(0, (monster.mp / monster.maxMp) * 100);
@@ -13137,18 +13584,197 @@
             if (!combatState || combatState.turn !== 'player') return;
             if (combatState.monsters[index].hp <= 0) return; // Can't target dead monsters
 
+            // If in targeting mode for multi-hit skill, add to pending targets
+            if (combatState.targetingMode) {
+                combatState.pendingTargets.push(index);
+                const hitNum = combatState.pendingTargets.length;
+                const targetName = combatState.monsters[index].data.name;
+                addCombatLog(`Hit ${hitNum}: targeting ${targetName}`, 'info');
+
+                // Check if all hits have been assigned
+                if (combatState.pendingTargets.length >= combatState.totalHitsToSelect) {
+                    // Execute the skill with the selected targets
+                    executeMultiHitSkill();
+                } else {
+                    // Update UI to show next hit selection
+                    updateCombatUI();
+                    renderMonsterList();
+                }
+                return;
+            }
+
+            // Normal target selection (not in targeting mode)
             combatState.selectedTargetIndex = index;
             renderMonsterList();
             addCombatLog(`Targeting ${combatState.monsters[index].data.name}!`);
         }
 
+        // Cancel multi-hit targeting mode
+        function cancelTargeting() {
+            if (!combatState || !combatState.targetingMode) return;
+
+            // Refund MP since skill wasn't executed
+            if (combatState.pendingSkill) {
+                combatState.player.mp += combatState.pendingSkill.mpCost || 0;
+            }
+
+            combatState.targetingMode = false;
+            combatState.pendingSkill = null;
+            combatState.pendingTargets = [];
+            combatState.totalHitsToSelect = 0;
+
+            addCombatLog('Targeting cancelled.', 'info');
+            updateCombatUI();
+            renderMonsterList();
+        }
+
+        // Execute multi-hit skill with selected targets
+        function executeMultiHitSkill() {
+            if (!combatState || !combatState.targetingMode || !combatState.pendingSkill) return;
+
+            const skill = combatState.pendingSkill;
+            const displayName = skill.displayName || skill.name;
+            const targetIndices = combatState.pendingTargets;
+            const rawSkill = skill.rawSkill;
+
+            // Exit targeting mode
+            combatState.targetingMode = false;
+
+            // Calculate base damage
+            let rawDamage;
+            if (rawSkill && rawSkill.calculate) {
+                rawDamage = rawSkill.calculate(combatState.player.atk);
+            } else if (rawSkill && rawSkill.basePower) {
+                rawDamage = Math.floor(combatState.player.atk * (rawSkill.basePower / 100));
+            } else {
+                rawDamage = combatState.player.atk;
+            }
+
+            const skillAccuracy = rawSkill ? (rawSkill.accuracy || 95) : 95;
+            let grandTotalDamage = 0;
+            let hitsLanded = 0;
+            let monstersKilled = 0;
+            const hitResults = []; // Track results for each hit
+
+            // Process each hit with its selected target
+            for (let hitNum = 0; hitNum < targetIndices.length; hitNum++) {
+                const targetIndex = targetIndices[hitNum];
+                const currentTarget = combatState.monsters[targetIndex];
+
+                // Skip if target is already dead (from previous hit)
+                if (currentTarget.hp <= 0) {
+                    hitResults.push({ hit: hitNum + 1, target: currentTarget.data.name, result: 'already defeated' });
+                    continue;
+                }
+
+                // Calculate hit chance
+                const hitChance = calculateHitChance(
+                    combatState.player.accuracy,
+                    currentTarget.dodge,
+                    skillAccuracy
+                );
+
+                // Roll for hit
+                if (!rollHit(hitChance)) {
+                    hitResults.push({ hit: hitNum + 1, target: currentTarget.data.name, result: 'miss', hitChance });
+                    continue;
+                }
+
+                // Calculate effective defense
+                let effectiveMonsterDef = currentTarget.def;
+                if (currentTarget.buffs && currentTarget.buffs.defense && currentTarget.buffs.defense.turnsLeft > 0) {
+                    const buffPercent = currentTarget.buffs.defense.percent || 50;
+                    effectiveMonsterDef = Math.floor(currentTarget.def * (1 + buffPercent / 100));
+                }
+
+                // Calculate and apply damage
+                const baseDamage = calculateDamage(rawDamage, effectiveMonsterDef);
+                const damage = applyDamageVariance(baseDamage);
+                currentTarget.hp -= damage;
+                grandTotalDamage += damage;
+                hitsLanded++;
+
+                hitResults.push({ hit: hitNum + 1, target: currentTarget.data.name, result: 'hit', damage });
+
+                // Check if this killed the monster
+                if (currentTarget.hp <= 0) {
+                    monstersKilled++;
+                    playSfx('monster_death');
+                    // Award XP immediately
+                    const xpReward = (currentTarget.data?.xpReward || 10) * currentTarget.level;
+                    playerStats.xp += xpReward;
+                    combatState.player.xpGained = (combatState.player.xpGained || 0) + xpReward;
+                    hitResults[hitResults.length - 1].killed = true;
+                    hitResults[hitResults.length - 1].xp = xpReward;
+                    removeMonster(currentTarget.id);
+                    checkLevelUp();
+                    savePlayerStats();
+                    updateRpgHud();
+                }
+            }
+
+            // Log results for each hit
+            hitResults.forEach(r => {
+                if (r.result === 'miss') {
+                    addCombatLog(`❌ Hit ${r.hit}: Missed ${r.target}! (${r.hitChance}% chance)`, 'miss');
+                    playSfx('missed');
+                } else if (r.result === 'already defeated') {
+                    addCombatLog(`💨 Hit ${r.hit}: ${r.target} already defeated!`, 'info');
+                } else if (r.result === 'hit') {
+                    if (r.killed) {
+                        addCombatLog(`⚔️ Hit ${r.hit}: ${r.damage} damage to ${r.target}!`, 'damage');
+                        addCombatLog(`💀 ${r.target} defeated! +${r.xp} XP`, 'victory');
+                    } else {
+                        addCombatLog(`⚔️ Hit ${r.hit}: ${r.damage} damage to ${r.target}!`, 'damage');
+                    }
+                    playSfx('player_attack');
+                }
+            });
+
+            // Summary
+            if (hitsLanded > 0) {
+                addCombatLog(`✨ ${displayName} complete: ${hitsLanded} hits, ${grandTotalDamage} total damage!`, 'damage');
+            } else {
+                addCombatLog(`❌ ${displayName}: All hits missed!`, 'miss');
+            }
+
+            // Clear pending state
+            combatState.pendingSkill = null;
+            combatState.pendingTargets = [];
+            combatState.totalHitsToSelect = 0;
+
+            // Auto-retarget if current target died
+            const currentTarget = combatState.monsters[combatState.selectedTargetIndex];
+            if (currentTarget && currentTarget.hp <= 0) {
+                autoRetarget();
+            }
+
+            updateCombatUI();
+
+            // Check if ALL monsters are defeated
+            const livingMonsters = combatState.monsters.filter(m => m.hp > 0);
+            if (livingMonsters.length === 0) {
+                handleCombatVictory();
+                return;
+            }
+
+            endPlayerTurn();
+        }
+
         // Update combat UI bars and text
         function updateCombatUI() {
             if (!combatState) return;
 
             // Update turn indicator
             const turnIndicator = document.getElementById('turnIndicator');
-            if (combatState.turn === 'player') {
+            if (combatState.targetingMode) {
+                // Show targeting mode indicator
+                const currentHit = combatState.pendingTargets.length + 1;
+                const totalHits = combatState.totalHitsToSelect;
+                const skillName = combatState.pendingSkill?.displayName || 'Attack';
+                turnIndicator.className = 'turn-indicator targeting-mode';
+                turnIndicator.innerHTML = `🎯 ${skillName}: Select target for hit ${currentHit}/${totalHits} <button onclick="cancelTargeting()" style="margin-left: 10px; padding: 2px 8px; font-size: 12px; cursor: pointer;">Cancel</button>`;
+            } else if (combatState.turn === 'player') {
                 turnIndicator.className = 'turn-indicator player-turn';
                 turnIndicator.textContent = '⚡ Your Turn';
             } else {
@@ -13185,13 +13811,14 @@
                     btn.disabled = true;
                     return;
                 }
-                btn.disabled = combatState.player.mp < (skill.mpCost || 0) || combatState.turn !== 'player';
+                // Disable all skills during targeting mode or monster turns
+                btn.disabled = combatState.targetingMode || combatState.player.mp < (skill.mpCost || 0) || combatState.turn !== 'player';
             });
 
-            // Disable flee button during monster turns
+            // Disable flee button during monster turns or targeting mode
             const fleeBtn = document.getElementById('combatFleeBtn');
             if (fleeBtn) {
-                fleeBtn.disabled = combatState.turn !== 'player';
+                fleeBtn.disabled = combatState.targetingMode || combatState.turn !== 'player';
             }
         }
 
@@ -13272,9 +13899,13 @@
                 return;
             }
 
+            // Get class-specific display name early so it's available for all messages
+            const skillDisplay = getSkillForClass(skillId, playerStats.class) || skill;
+            const displayName = skillDisplay.displayName || skill.name;
+
             const levelReq = skill.levelReq || 1;
             if (playerStats.level < levelReq) {
-                addCombatLog(`You need to be level ${levelReq} to use ${skill.name}!`);
+                addCombatLog(`You need to be level ${levelReq} to use ${displayName}!`);
                 return;
             }
             if (combatState.player.mp < skill.mpCost) {
@@ -13282,11 +13913,53 @@
                 return;
             }
 
-            // Get class-specific display name
-            const skillDisplay = getSkillForClass(skillId, playerStats.class) || skill;
-            const displayName = skillDisplay.displayName || skill.name;
+            // Check for multi-hit targeting mode
+            const hitCount = skill.hitCount || skill.hits || 1;
+            const livingMonsters = combatState.monsters.filter(m => m.hp > 0);
+            const skillTarget = dbSkill ? dbSkill.target : (skill.target || 'enemy');
+            const targetingMode = dbSkill ? (dbSkill.targeting_mode || 'same_target') : 'same_target';
+
+            // For multi-hit single-target damage skills with per_hit targeting and multiple living enemies
+            if (skill.type === 'damage' && hitCount > 1 && skillTarget !== 'all_enemies' && livingMonsters.length > 1 && targetingMode === 'per_hit') {
+                // Deduct MP now (will be refunded if cancelled)
+                combatState.player.mp -= skill.mpCost;
+
+                // Enter targeting mode
+                combatState.targetingMode = true;
+                combatState.pendingSkill = { ...skill, displayName, rawSkill: dbSkill || hardcodedSkill };
+                combatState.pendingTargets = [];
+                combatState.totalHitsToSelect = hitCount;
+
+                addCombatLog(`🎯 ${displayName}: Select target for hit 1/${hitCount}`, 'info');
+                updateCombatUI();
+                renderMonsterList();
+                return;
+            }
 
-            // Deduct MP
+            // For multi-hit skills with random targeting
+            if (skill.type === 'damage' && hitCount > 1 && skillTarget !== 'all_enemies' && livingMonsters.length > 1 && targetingMode === 'random') {
+                // Auto-generate random targets
+                combatState.player.mp -= skill.mpCost;
+
+                const randomTargets = [];
+                for (let i = 0; i < hitCount; i++) {
+                    const aliveMonsters = combatState.monsters.filter(m => m.hp > 0);
+                    if (aliveMonsters.length > 0) {
+                        const randomIndex = combatState.monsters.indexOf(aliveMonsters[Math.floor(Math.random() * aliveMonsters.length)]);
+                        randomTargets.push(randomIndex);
+                    }
+                }
+
+                // Execute with random targets
+                combatState.targetingMode = true;
+                combatState.pendingSkill = { ...skill, displayName, rawSkill: dbSkill || hardcodedSkill };
+                combatState.pendingTargets = randomTargets;
+                combatState.totalHitsToSelect = hitCount;
+                executeMultiHitSkill();
+                return;
+            }
+
+            // Deduct MP for non-multi-hit skills
             combatState.player.mp -= skill.mpCost;
 
             // Get the targeted monster
@@ -13315,9 +13988,7 @@
                 }, 1000);
                 return;
             } else if (skill.type === 'damage') {
-                // Determine targets based on skill.target
-                const skillTarget = dbSkill ? dbSkill.target : (skill.target || 'enemy');
-                const livingMonsters = combatState.monsters.filter(m => m.hp > 0);
+                // Determine targets based on skill.target (reuse variables from above)
                 const targets = skillTarget === 'all_enemies' ? livingMonsters : [target];
 
                 // Calculate base damage - support both old calculate() and new basePower
@@ -13451,10 +14122,10 @@
 
             updateCombatUI();
 
-            // Check if ALL monsters are defeated
-            const livingMonsters = combatState.monsters.filter(m => m.hp > 0);
-            console.log('[DEBUG] Victory check - livingMonsters:', livingMonsters.length, 'monsters:', combatState.monsters.map(m => ({type: m.type, hp: m.hp})));
-            if (livingMonsters.length === 0) {
+            // Check if ALL monsters are defeated (recalculate to account for kills)
+            const remainingMonsters = combatState.monsters.filter(m => m.hp > 0);
+            console.log('[DEBUG] Victory check - remainingMonsters:', remainingMonsters.length, 'monsters:', combatState.monsters.map(m => ({type: m.type, hp: m.hp})));
+            if (remainingMonsters.length === 0) {
                 console.log('[DEBUG] All monsters defeated, calling handleCombatVictory');
                 handleCombatVictory();
                 return;
@@ -13820,15 +14491,46 @@
                 }
             }
         }
+
+        // Try to autostart game music (works if user has interacted before)
+        function tryAutostartGameMusic() {
+            if (musicStarted || !playerStats || gameMusic.muted) return;
+
+            let track = 'overworld';
+            if (playerStats.isDead) {
+                track = 'death';
+            } else {
+                const distToHome = getDistanceToHome();
+                if (distToHome !== null && distToHome <= spawnSettings.homeBaseRadius) {
+                    track = 'homebase';
+                }
+            }
+
+            const audio = gameMusic[track];
+            audio.volume = gameMusic.volume;
+            audio.loop = true;
+            audio.play().then(() => {
+                musicStarted = true;
+                gameMusic.current = audio;
+                gameMusic.currentTrack = track;
+                console.log('Game music autostarted:', track);
+            }).catch(() => {
+                console.log('Game music autoplay blocked - waiting for interaction');
+            });
+        }
+
+        // Try autostart after a short delay (to allow playerStats to load)
+        setTimeout(tryAutostartGameMusic, 1500);
+
         document.addEventListener('click', startMusicOnInteraction, { once: false });
         document.addEventListener('touchstart', startMusicOnInteraction, { once: false });
 
-        // Show auth modal if not logged in (guest mode available)
-        if (!localStorage.getItem('accessToken') && !sessionStorage.getItem('guestMode')) {
-            setTimeout(() => {
-                showAuthModal();
-            }, 500);
+        // Handle login screen visibility on page load
+        if (localStorage.getItem('accessToken') || sessionStorage.getItem('guestMode')) {
+            // Already logged in or guest mode - hide login screen, show game
+            hideLoginScreen();
         }
+        // Otherwise, login screen is visible by default (no need to show it)
 
     </script>
 
diff --git a/package-lock.json b/package-lock.json
index 371f0a6..8aea443 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,8 +10,11 @@
       "dependencies": {
         "@bubblewrap/cli": "^1.24.1",
         "@pwabuilder/cli": "^0.0.17",
+        "bcrypt": "^5.1.1",
+        "better-sqlite3": "^9.4.0",
         "dotenv": "^16.3.1",
         "express": "^4.18.2",
+        "jsonwebtoken": "^9.0.2",
         "web-push": "^3.6.6",
         "ws": "^8.14.2"
       },
@@ -786,6 +789,98 @@
         "regenerator-runtime": "^0.13.3"
       }
     },
+    "node_modules/@mapbox/node-pre-gyp": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
     "node_modules/@maxim_mazurok/gapi.client.androidpublisher-v3": {
       "version": "0.1.20251216",
       "resolved": "https://registry.npmjs.org/@maxim_mazurok/gapi.client.androidpublisher-v3/-/gapi.client.androidpublisher-v3-0.1.20251216.tgz",
@@ -1419,6 +1514,12 @@
         "node": ">=20.0.0"
       }
     },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "license": "ISC"
+    },
     "node_modules/abort-controller": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
@@ -1587,6 +1688,40 @@
         }
       }
     },
+    "node_modules/aproba": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz",
+      "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==",
+      "license": "ISC"
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/are-we-there-yet/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
@@ -1822,6 +1957,31 @@
       ],
       "license": "MIT"
     },
+    "node_modules/bcrypt": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.1.tgz",
+      "integrity": "sha512-AGBHOG5hPYZ5Xl9KXzU5iKq9516yEmvCKDg3ecP5kX2aB6UqTeXZxk2ELnDgDm6BQSMlLt9rDB4LoSMx0rYwww==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "@mapbox/node-pre-gyp": "^1.0.11",
+        "node-addon-api": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/better-sqlite3": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-9.6.0.tgz",
+      "integrity": "sha512-yR5HATnqeYNVnkaUTf4bOP2dJSnyhP4puJN/QPRyx4YkBEEUxib422n2XzPqDEHjQQqazoYoADdAm5vE15+dAQ==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "prebuild-install": "^7.1.1"
+      }
+    },
     "node_modules/bignumber.js": {
       "version": "9.3.1",
       "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz",
@@ -1845,7 +2005,6 @@
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "file-uri-to-path": "1.0.0"
       }
@@ -2388,6 +2547,15 @@
         "simple-swizzle": "^0.2.2"
       }
     },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "license": "ISC",
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
     "node_modules/colors": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
@@ -2445,6 +2613,12 @@
         "typedarray": "^0.0.6"
       }
     },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "license": "ISC"
+    },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -2573,6 +2747,21 @@
         "node": ">=4"
       }
     },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/decompress-tar": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
@@ -2708,6 +2897,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/defaults": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
@@ -2768,6 +2966,12 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "license": "MIT"
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -2787,6 +2991,15 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/diagnostic-channel": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-1.1.1.tgz",
@@ -3015,6 +3228,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/expand-template": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+      "license": "(MIT OR WTFPL)",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/express": {
       "version": "4.22.1",
       "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz",
@@ -3188,8 +3410,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/filename-regex": {
       "version": "2.0.1",
@@ -3406,6 +3627,27 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gaxios": {
       "version": "4.3.3",
       "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.3.3.tgz",
@@ -3560,6 +3802,12 @@
         "omggif": "^1.0.10"
       }
     },
+    "node_modules/github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
+      "license": "MIT"
+    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -3770,6 +4018,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "license": "ISC"
+    },
     "node_modules/has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -4031,6 +4285,12 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "license": "ISC"
     },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "license": "ISC"
+    },
     "node_modules/inquirer": {
       "version": "8.2.7",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.7.tgz",
@@ -4437,6 +4697,34 @@
         "bignumber.js": "^9.0.0"
       }
     },
+    "node_modules/jsonwebtoken": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz",
+      "integrity": "sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==",
+      "license": "MIT",
+      "dependencies": {
+        "jws": "^4.0.1",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/jsonwebtoken/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
     "node_modules/jwa": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
@@ -4492,6 +4780,48 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "license": "MIT"
     },
+    "node_modules/lodash.includes": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isinteger": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isnumber": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+      "license": "MIT"
+    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -4670,6 +5000,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/min-document": {
       "version": "2.19.2",
       "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.2.tgz",
@@ -4777,6 +5119,12 @@
         "mkdirp": "bin/cmd.js"
       }
     },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "license": "MIT"
+    },
     "node_modules/module-details-from-path": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.4.tgz",
@@ -4851,6 +5199,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/napi-build-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz",
+      "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
+      "license": "MIT"
+    },
     "node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -4860,6 +5214,24 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/node-abi": {
+      "version": "3.85.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.85.0.tgz",
+      "integrity": "sha512-zsFhmbkAzwhTft6nd3VxcG0cvJsT70rL+BIGHWVq5fi6MwGrHwzqKaxXE+Hl2GmnGItnDKPPkO5/LQqjVkIdFg==",
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-addon-api": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
+      "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==",
+      "license": "MIT"
+    },
     "node_modules/node-fetch": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
@@ -4889,6 +5261,21 @@
         "node": ">= 6.13.0"
       }
     },
+    "node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "license": "ISC",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/normalize-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -4901,6 +5288,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "dependencies": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -5291,6 +5691,32 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/prebuild-install": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
+      "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
+      "license": "MIT",
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^2.0.0",
+        "node-abi": "^3.3.0",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^4.0.0",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0"
+      },
+      "bin": {
+        "prebuild-install": "bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/preserve": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
@@ -5340,6 +5766,16 @@
         "url": "https://github.com/sponsors/lupomontero"
       }
     },
+    "node_modules/pump": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -5435,6 +5871,21 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
     "node_modules/readable-stream": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
@@ -5942,6 +6393,22 @@
         "node": ">= 0.8.15"
       }
     },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/run-async": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
@@ -6071,6 +6538,12 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "license": "ISC"
+    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -6217,6 +6690,51 @@
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "license": "ISC"
     },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/simple-get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
     "node_modules/simple-swizzle": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.4.tgz",
@@ -6489,6 +7007,15 @@
         "is-natural-number": "^4.0.1"
       }
     },
+    "node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/strtok3": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
@@ -6565,6 +7092,54 @@
         "node": ">=10"
       }
     },
+    "node_modules/tar-fs": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
+      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-fs/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "license": "ISC"
+    },
+    "node_modules/tar-fs/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/tar-fs/node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/tar-stream": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
@@ -6783,6 +7358,18 @@
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/type-fest": {
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
@@ -7086,6 +7673,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
diff --git a/server.js b/server.js
index bbb092d..b58f3c0 100644
--- a/server.js
+++ b/server.js
@@ -865,6 +865,11 @@ app.post('/api/user/character', authenticateToken, (req, res) => {
         }
 
         db.createCharacter(req.user.userId, characterData);
+
+        // Clear any existing monsters when creating a new character
+        // This ensures new characters start fresh without monsters from previous playthroughs
+        db.clearMonsterEntourage(req.user.userId);
+
         res.json({ success: true });
     } catch (err) {
         console.error('Create character error:', err);
@@ -1078,7 +1083,8 @@ app.get('/api/spawn-settings', (req, res) => {
             homeRegenPercent: JSON.parse(db.getSetting('homeRegenPercent') || '5'),
             homeBaseRadius: JSON.parse(db.getSetting('homeBaseRadius') || '20'),
             inactivityTimeout: JSON.parse(db.getSetting('inactivityTimeout') || '600000'), // 10 minutes default
-            inactivityWarningTime: JSON.parse(db.getSetting('inactivityWarningTime') || '60000') // 60 seconds default
+            inactivityWarningTime: JSON.parse(db.getSetting('inactivityWarningTime') || '60000'), // 60 seconds default
+            combatIconScale: JSON.parse(db.getSetting('combatIconScale') || '0.7') // Scale for combat monster icons (0.3 - 1.5), default 70% for mobile
         };
         res.json(settings);
     } catch (err) {
@@ -1331,6 +1337,7 @@ app.get('/api/skills', (req, res) => {
             accuracy: s.accuracy,
             hitCount: s.hit_count,
             target: s.target,
+            targeting_mode: s.targeting_mode || 'same_target',
             statusEffect: s.status_effect ? JSON.parse(s.status_effect) : null,
             playerUsable: !!s.player_usable,
             monsterUsable: !!s.monster_usable
@@ -1343,9 +1350,10 @@ app.get('/api/skills', (req, res) => {
 });
 
 // Get all class skill names (public endpoint)
+// Now reads from class_skills table (what admin panel edits) instead of legacy class_skill_names table
 app.get('/api/class-skill-names', (req, res) => {
     try {
-        const names = db.getAllClassSkillNames();
+        const names = db.getAllClassSkillNamesFromClassSkills();
         // Convert snake_case to camelCase
         const formatted = names.map(n => ({
             id: n.id,
@@ -1395,7 +1403,14 @@ app.get('/api/monster-types/:id/skills', (req, res) => {
 // Get monster entourage for current user
 app.get('/api/user/monsters', authenticateToken, (req, res) => {
     try {
+        // Prevent caching - user-specific data must always be fresh
+        res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private');
+        res.set('Pragma', 'no-cache');
+        res.set('Expires', '0');
+
+        console.log(`Loading monsters for user ${req.user.userId} (${req.user.username})`);
         const monsters = db.getMonsterEntourage(req.user.userId);
+        console.log(`Found ${monsters.length} monsters for user ${req.user.userId}`);
         // Convert snake_case to camelCase for client
         const formatted = monsters.map(m => ({
             id: m.id,
@@ -1662,6 +1677,30 @@ app.delete('/api/admin/users/:id/home-base', adminOnly, (req, res) => {
     }
 });
 
+// Delete user completely
+app.delete('/api/admin/users/:id', adminOnly, (req, res) => {
+    try {
+        const targetUserId = parseInt(req.params.id);
+
+        // Prevent deleting yourself
+        if (targetUserId === req.user.userId) {
+            return res.status(400).json({ error: 'Cannot delete your own account' });
+        }
+
+        // Force logout the user if they're connected
+        sendToAuthUser(targetUserId, { type: 'force_logout', reason: 'Account deleted by admin' });
+
+        // Delete the user and all their data
+        db.deleteUser(targetUserId);
+
+        console.log(`Admin ${req.user.username} deleted user ${targetUserId}`);
+        res.json({ success: true });
+    } catch (err) {
+        console.error('Admin delete user error:', err);
+        res.status(500).json({ error: 'Failed to delete user' });
+    }
+});
+
 // Get game settings
 app.get('/api/admin/settings', adminOnly, (req, res) => {
     try {
@@ -1717,6 +1756,7 @@ app.get('/api/admin/skills', adminOnly, (req, res) => {
             accuracy: s.accuracy,
             hit_count: s.hit_count,
             target: s.target,
+            targeting_mode: s.targeting_mode || 'same_target',
             status_effect: s.status_effect,
             player_usable: !!s.player_usable,
             monster_usable: !!s.monster_usable,
diff --git a/service-worker.js b/service-worker.js
index d0ac4ef..d2b2668 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -1,6 +1,6 @@
 // HikeMap Service Worker
 // Increment version to force cache refresh
-const CACHE_NAME = 'hikemap-v1.0.2';
+const CACHE_NAME = 'hikemap-v1.0.8';
 const urlsToCache = [
   '/',
   '/index.html',