Update index.html

index.html

@@ -338,13 +338,11 @@
         const achievementModal = document.getElementById('achievement-modal');
         const achievementModalText = document.getElementById('achievement-modal-text');
         const achievementModalCloseButton = achievementModal.querySelector('.modal-close-button');
-
         document.getElementById('start-button').addEventListener('click', () => startGame(false));
         loadButton.addEventListener('click', () => startGame(true));
         document.getElementById('restart-button').addEventListener('click', () => startGame(false));
         saveButton.addEventListener('click', saveGame);
         achievementModalCloseButton.addEventListener('click', () => achievementModal.style.display = 'none');
-
         function initGameDataEvents() {
             gameData.events = [
                 { id: 'birth', text: "당신은 태어났습니다! 🍼 세상에 온 것을 환영해요. 무엇을 먼저 해볼까요?", ageMin: 0, ageMax: 0, choices: [ { text: "응애! 울기 😭", effects: { happiness: -2, health: +1 }, nextEvent: 'infant_cry', ageUp: 1 }, { text: "가만히 있기 🤔", effects: { intelligence: +1 }, nextEvent: 'infant_observe', ageUp: 1 } ] },
@@ -483,7 +481,6 @@
             ];
         }
         initGameDataEvents();
-
         function startGame(loadSave) {
             if (loadSave && localStorage.getItem(GAME_SAVE_KEY)) {
                 const savedData = JSON.parse(localStorage.getItem(GAME_SAVE_KEY));
@@ -512,7 +509,6 @@
             checkAllAchievements();
             loadEvent(gameData.currentEventId || 'birth');
         }
-
         function saveGame() {
             const saveData = {
                 stats: currentStats, flags: currentFlags, lifeLog: lifeEventsLog,
@@ -521,7 +517,6 @@
             localStorage.setItem(GAME_SAVE_KEY, JSON.stringify(saveData));
             alert("💾 인생이 저장되었습니다!");
         }
-
         function checkLoadButtonVisibility() {
             if (localStorage.getItem(GAME_SAVE_KEY)) {
                 loadButton.classList.remove('hidden');
@@ -530,7 +525,6 @@
             }
         }
         checkLoadButtonVisibility();
-
         function updateStatsDisplay() {
             const statsToUpdate = {
                 'age-stat': currentStats.age, 'health-stat': Math.max(0, currentStats.health),
@@ -561,7 +555,6 @@
             ageBar.style.width = agePercentage + '%';
             ageBar.textContent = currentStats.age > 0 ? `${currentStats.age}세` : "";
         }
-
         function applyEffects(effects) {
             for (const stat in effects) {
                 if (typeof effects[stat] === 'function') {
@@ -576,7 +569,6 @@
                 currentStats.relationshipWithSpouse = Math.min(100, Math.max(-50, currentStats.relationshipWithSpouse));
             }
         }
-
         function setEventFlags(flagsToSet) {
             if (flagsToSet) {
                 for (const flag in flagsToSet) { currentFlags[flag] = flagsToSet[flag]; }
@@ -587,12 +579,15 @@
                 setFlagFunction(currentStats, currentFlags);
             }
         }
-
         function loadEvent(eventId) {
             let event = gameData.events.find(e => e.id === eventId);
             if (!event) {
                 event = findRandomAvailableEvent();
-                if (!event) { loadEvent('death_accident'); return; }
+                if (!event) { 
+                    console.error("No valid event found, defaulting to death_accident."); // Added for debugging
+                    loadEvent('death_accident'); 
+                    return; 
+                }
                 eventId = event.id;
             }
             gameData.currentEventId = eventId;
@@ -601,19 +596,40 @@
             if (lifeEventsLog.length === 0 || lifeEventsLog[lifeEventsLog.length -1].event !== eventTextDisplay.textContent) {
                  lifeEventsLog.push({age: currentStats.age, event: eventTextDisplay.textContent, choice: null });
             }
+            
             choicesContainer.innerHTML = '';
-            event.choices.forEach((choice, index) => {
-                if (choice.condition && !choice.condition(currentStats, currentFlags)) { return; }
-                const button = document.createElement('button');
-                button.innerHTML = typeof choice.text === 'function' ? choice.text(currentStats, currentFlags) : choice.text;
-                button.addEventListener('click', () => processChoice(choice));
-                choicesContainer.appendChild(button);
-            });
+            let choicesAvailable = false;
+            // MODIFIED PART: Check if event.choices exists and is an array before iterating
+            if (event.choices && Array.isArray(event.choices)) {
+                event.choices.forEach((choice, index) => {
+                    if (choice.condition && !choice.condition(currentStats, currentFlags)) { return; }
+                    const button = document.createElement('button');
+                    button.innerHTML = typeof choice.text === 'function' ? choice.text(currentStats, currentFlags) : choice.text;
+                    button.addEventListener('click', () => processChoice(choice));
+                    choicesContainer.appendChild(button);
+                    choicesAvailable = true; 
+                });
+            }
+
             updateStatsDisplay();
             checkAllAchievements();
-            if (event.isEnding) { endGame(event); }
-        }
 
+            if (event.isEnding) { 
+                endGame(event); 
+            } else if (!choicesAvailable && !event.isEndingSegment) { // isEndingSegment events might have choices but lead to ending
+                 // If it's not an ending event and no choices were rendered (e.g., all conditions false, or empty choices array)
+                 // This indicates a potential dead-end in the game logic for this event.
+                 console.warn(`Event "${eventId}" is non-ending but rendered no choices. Attempting to auto-advance.`);
+                 lifeEventsLog.push({age: currentStats.age, event: `(시스템: '${eventId}' 이벤트에서 선택지가 없어 자동으로 진행합니다.)`, choice: "자동 진행"});
+                 currentStats.age += 1; // Slightly advance age to help break potential loops
+                 const nextEventAfterStuck = findRandomAvailableEvent();
+                 if (nextEventAfterStuck) {
+                     loadEvent(nextEventAfterStuck.id);
+                 } else {
+                     loadEvent('death_accident'); // Fallback if still no event can be found
+                 }
+            }
+        }
         function processChoice(choice) {
             if (choice.effects) { applyEffects(choice.effects); }
             if (choice.setFlag) { setEventFlags(choice.setFlag); }
@@ -633,61 +649,82 @@
                     currentFlags.childTraits.forEach(child => { child.age = (child.age || 0) + ageIncrement; });
                 }
             }
-            updateStatsDisplay();
+            updateStatsDisplay(); // Update stats after age increment and effects
+            // Check for game-ending conditions first
             if (choice.checkHealthDeath && currentStats.health <= 0) { loadEvent('death_health'); return; }
-            if (currentStats.health <= 0) { loadEvent('death_health'); return; }
+            if (currentStats.health <= 0) { loadEvent('death_health'); return; } // General health check
             if (currentStats.age >= gameData.maxAge) {
                 if (currentStats.happiness > 70 && currentStats.health > 50) loadEvent('death_peaceful');
                 else if (currentStats.happiness < 20 && currentStats.health < 30) loadEvent('death_lonely');
-                else loadEvent('reflect_on_life');
+                else loadEvent('reflect_on_life'); // reflect_on_life has choices leading to final ending
                 return;
             }
             const povertyEnding = gameData.events.find(e => e.id === 'death_wealth_extreme_poverty');
             if (povertyEnding && povertyEnding.condition && povertyEnding.condition(currentStats, currentFlags)) { loadEvent('death_wealth_extreme_poverty'); return; }
             const brokenHeartEnding = gameData.events.find(e => e.id === 'death_broken_heart');
             if (brokenHeartEnding && brokenHeartEnding.condition && brokenHeartEnding.condition(currentStats, currentFlags)) { loadEvent('death_broken_heart'); return; }
-
+            
+            // Determine next event
             let nextEventId;
             if (typeof choice.nextEvent === 'function') { nextEventId = choice.nextEvent(currentStats, currentFlags); }
             else { nextEventId = choice.nextEvent; }
-            if (choice.nextEventRandom) { nextEventId = findRandomAvailableEvent(true)?.id; } // nextEventRandom시 isStrictlyRandom true로 전달
+            
+            if (choice.nextEventRandom) { 
+                const randomEv = findRandomAvailableEvent(true);
+                nextEventId = randomEv ? randomEv.id : null; 
+            }
 
-            if (nextEventId) { loadEvent(nextEventId); }
-            else {
+            if (nextEventId) { 
+                loadEvent(nextEventId); 
+            } else {
                 const randomEvent = findRandomAvailableEvent();
-                if (randomEvent) { loadEvent(randomEvent.id); }
-                else {
+                if (randomEvent) { 
+                    loadEvent(randomEvent.id); 
+                } else {
+                    // Fallback logic if no specific next event and no random event found
+                    console.warn("No specific or random event found, attempting fallback progression.");
                     if(currentStats.age > 75 && gameData.currentEventId !== 'reflect_on_life') loadEvent('reflect_on_life');
-                    else if(currentStats.age > 58 && !currentFlags.retired && gameData.currentEventId !== 'retirement_decision') loadEvent('retirement_decision');
+                    else if(currentStats.age > 58 && !currentFlags.retired && currentFlags.employed && gameData.currentEventId !== 'retirement_decision') loadEvent('retirement_decision');
                     else if(currentStats.age > 40 && gameData.currentEventId !== 'generic_mid_life' && (currentFlags.employed || currentFlags.isMarried)) loadEvent('generic_mid_life');
-                    else if(currentStats.age > 25 && currentFlags.employed && !currentFlags.isMarried && gameData.currentEventId !== 'generic_early_career') loadEvent('generic_early_career');
-                    else { currentStats.age +=1; loadEvent(findRandomAvailableEvent()?.id || 'death_accident'); }
+                    else if(currentStats.age > 23 && currentFlags.employed && !currentFlags.isMarried && gameData.currentEventId !== 'generic_early_career') loadEvent('generic_early_career');
+                    else { 
+                        currentStats.age +=1; 
+                        const finalAttemptEvent = findRandomAvailableEvent();
+                        loadEvent(finalAttemptEvent ? finalAttemptEvent.id : 'death_accident'); 
+                    }
                 }
             }
         }
-
         function findRandomAvailableEvent(isStrictlyRandom = false) {
             let potentialEvents = gameData.events.filter(event => {
-                if (event.isEnding) return false;
+                if (event.isEnding && !event.isEndingSegment) return false; // Allow ending segments that might have choices
                 if (event.id === gameData.currentEventId && !event.isRandomEvent) return false;
                 const ageOk = (!event.ageMin || currentStats.age >= event.ageMin) && (!event.ageMax || currentStats.age <= event.ageMax);
                 const conditionOk = !event.condition || event.condition(currentStats, currentFlags);
                 let flagDependencyOk = true;
                 if (event.requiresFlag) { for (const flag in event.requiresFlag) { if (currentFlags[flag] !== event.requiresFlag[flag]) { flagDependencyOk = false; break; } } }
                 if (event.avoidsFlag) { for (const flag in event.avoidsFlag) { if (currentFlags[flag] === event.avoidsFlag[flag]) { flagDependencyOk = false; break; } } }
-                return (isStrictlyRandom ? event.isRandomEvent : true) && ageOk && conditionOk && flagDependencyOk;
+                
+                if (isStrictlyRandom) return event.isRandomEvent && ageOk && conditionOk && flagDependencyOk;
+                return ageOk && conditionOk && flagDependencyOk;
             });
+
             let randomEventsWithProbability = potentialEvents.filter(e => e.isRandomEvent && Math.random() < (e.probability || 0.05));
             if (randomEventsWithProbability.length > 0) { return randomEventsWithProbability[Math.floor(Math.random() * randomEventsWithProbability.length)]; }
+            
             if (!isStrictlyRandom) {
-                let generalEvents = potentialEvents.filter(e => !e.isRandomEvent);
+                let generalEvents = potentialEvents.filter(e => !e.isRandomEvent && !e.isEndingSegment); // Prefer non-ending general events
+                 if (generalEvents.length === 0) { // If no general non-ending, consider ending segments too
+                    generalEvents = potentialEvents.filter(e => !e.isRandomEvent);
+                }
                 if (generalEvents.length > 0) { return generalEvents[Math.floor(Math.random() * generalEvents.length)]; }
             }
+            
             let fallbackRandomEvents = potentialEvents.filter(e => e.isRandomEvent);
             if (fallbackRandomEvents.length > 0) { return fallbackRandomEvents[Math.floor(Math.random() * fallbackRandomEvents.length)]; }
+            
             return null;
         }
-
         function checkAllAchievements() {
             for (const key in currentAchievements) {
                 const achievement = currentAchievements[key];
@@ -697,12 +734,10 @@
                 }
             }
         }
-
         function showAchievementModal(name, description) {
             achievementModalText.innerHTML = `<strong>${name}</strong><br>${description}`;
             achievementModal.style.display = 'flex';
         }
-
         function endGame(endingEvent) {
             gameContent.classList.add('hidden');
             endScreen.classList.remove('hidden');
@@ -713,7 +748,7 @@
             lifeEventsLog.forEach(logEntry => {
                 const p = document.createElement('p');
                 let entryText = `<strong>[${logEntry.age}세]</strong> ${logEntry.event}`;
-                if(logEntry.choice && logEntry.choice !== "결과") { entryText += ` <small>(선택: ${logEntry.choice})</small>`; }
+                if(logEntry.choice && logEntry.choice !== "결과" && logEntry.choice !== "자동 진행") { entryText += ` <small>(선택: ${logEntry.choice})</small>`; }
                 p.innerHTML = entryText;
                 lifeSummaryDisplay.appendChild(p);
             });