rewrite

Author: AlaMonocake

events.js

@@ -3,42 +3,62 @@
 // Event pool array to store all events
 const events = [
     //Event 1: Master Death
-    {
-        id: "event_kill_master",
-        description: "{master} walks into a landmine and dies.",
-        type: "kill-master",
-        targets: ["master"], // Needs one master as the target
-        effect: (participants, master) => {
-            master.status = "dead"; // Mark master as dead
-            const servant = participants.find(p => p.type === "servant" && p.masterId === master.id);
-            if (servant && !servant.hasIndependentAction) {
-                servant.status = "dead"; // If the servant doesn't have Independent Action, they die too
+        {
+            id: "event_kill_master",
+            description: "{master.name} walks into a landmine and dies.",
+            valid: (participants) => {
+                return participants.filter(p => p.type === "master" && p.status === "alive");
+            },
+            effects: (master, servant, participants) => {
+                master.status = "dead";
+                const linkedServant = participants.find(p => p.type === "servant" && p.masterId === master.id);
+                if (linkedServant && !linkedServant.hasIndependentAction) {
+                    linkedServant.status = "dead";
+                }
             }
-        }
-    },
-    // Event 2: Duel
-    {
-        id: "event_duel",
-        description: "{servant1} fights with {servant2} to the death.",
-        type: "duel",
-        targets: ["servant", "servant"], // Needs two servants as the targets
-        effect: (participants, servant1, servant2) => {
-            const loser = Math.random() < 0.5 ? servant1 : servant2;
-            loser.status = "dead"; // Randomly pick a servant to die
-        }
-    },
-    {
-        id: "event_betrayal",
-        description: "{servant1} betrays {master}. The master is left defenseless and killed.",
-        type: "betrayal",
-        targets: ["servant", "master"],
-        effect: (participants, servant1, master) => {
-            if (servant1 && master) {
-                servant1.status = "alive"; // Servant survives
-                master.status = "dead"; // Master is dead
+        },
+    
+        {
+            id: "event_duel",
+            description: "{servant1.name} fights with {servant2.name} to the death.",
+            valid: (participants) => {
+                const aliveServants = participants.filter(p => p.type === "servant" && p.status === "alive");
+                if (aliveServants.length < 2) return [];
+                // Generate all possible pairs
+                const pairs = [];
+                for (let i = 0; i < aliveServants.length; i++) {
+                    for (let j = i + 1; j < aliveServants.length; j++) {
+                        pairs.push([aliveServants[i], aliveServants[j]]);
+                    }
+                }
+                return pairs;
+            },
+            effects: (servant1, servant2, participants) => {
+                const loser = Math.random() < 0.5 ? servant1 : servant2;
+                loser.status = "dead";
             }
-        }
-    },
+        },
+    
+        {
+            id: "event_betrayal",
+            description: "{servant1.name} betrays {master.name}. The master is left defenseless and killed.",
+            valid: (participants) => {
+                const betrayers = [];
+                const aliveServants = participants.filter(p => p.type === "servant" && p.status === "alive");
+                aliveServants.forEach(servant => {
+                    const master = participants.find(p => p.id === servant.masterId && p.status === "alive");
+                    if (master) {
+                        betrayers.push([servant, master]);
+                    }
+                });
+                return betrayers;
+            },
+            effects: (servant1, master, participants) => {
+                master.status = "dead";
+                // Servant survives (no change)
+            }
+        },
+    
     {
         id: "poison_mushroom",
         description: "{master.name} eats a poisonous mushroom!",

script.js

@@ -32,7 +32,11 @@ console.log(document.querySelectorAll(".master-img"));
 }); //this was the code for updating the master pictures
 window.onload = function() {
     console.log("Page fully loaded! Fetching Servant data...");
-    fetchServantData();};
+    fetchServantData();
+
+    console.log("Starting Day 1 events...");
+    runDayEvents();
+};
 // now the code for the servant data:
 async function fetchServantData() {
     const url = 'https://api.atlasacademy.io/export/NA/basic_servant.json';
@@ -252,57 +256,55 @@ let currentDay = 1;
 let pastEvents = [];  // store event IDs
 let participants = JSON.parse(localStorage.getItem("participants")) || [];
 
-function processEventTemplate(template, master, servant) {
-    return template
-        .replace(/{master.name}/g, master.name)
-        .replace(/{master.pronouns.subject}/g, master.pronouns.subject)
-        .replace(/{master.pronouns.object}/g, master.pronouns.object)
-        .replace(/{master.pronouns.possessive}/g, master.pronouns.possessive)
-        .replace(/{servant.name}/g, servant ? servant.name : "no servant");
-}
 
 function runDayEvents() {
-    const aliveMasters = participants.filter(p => p.type === "master" && p.status === "alive");
-    const aliveServants = participants.filter(p => p.type === "servant" && p.status === "alive");
-
     console.log(`===== DAY ${currentDay} =====`);
 
-    aliveMasters.forEach(master => {
-        const servant = aliveServants.find(s => s.id === master.servantId);
+    // Loop over each event
+    events.forEach(event => {
+        const validPools = event.valid(participants);
 
-        const validEvents = events.filter(event => {
-            const validPool = event.valid(participants, pastEvents);
-            return validPool.includes(master);
-        });
-
-        if (validEvents.length === 0) {
-            console.log(`No valid events for ${master.name}`);
+        if (validPools.length === 0) {
+            console.log(`No valid targets for event ${event.id}`);
             return;
         }
 
-        const selectedEvent = validEvents[Math.floor(Math.random() * validEvents.length)];
+        // Pick one random target or pair
+        const chosen = validPools[Math.floor(Math.random() * validPools.length)];
 
-        // Apply effects
-        selectedEvent.effects(master, servant, participants);
+        if (Array.isArray(chosen)) {
+            // Multi-target event (like servant vs servant or servant-master betrayal)
+            event.effects(...chosen, participants);
 
-        // Save event id
-        pastEvents.push(selectedEvent.id);
+            // Generate event text using provided names
+            const eventText = processEventTemplate(event.description, {
+                servant1: chosen[0],
+                servant2: chosen[1],
+                master: chosen[1], // if second is master, works for betrayal template
+            });
 
-        // Display event text
-        const eventText = processEventTemplate(selectedEvent.description, master, servant);
-        console.log(eventText);
+            console.log(eventText);
+            appendEventLog(`Day ${currentDay}: ${eventText}`);
+        } else {
+            // Single-target event (just a master)
+            const master = chosen;
+            const servant = participants.find(p => p.type === "servant" && p.masterId === master.id);
+
+            event.effects(master, servant, participants);
+
+            const eventText = processEventTemplate(event.description, {
+                master,
+                servant,
+            });
 
-        const logDiv = document.getElementById("event-log");
-        logDiv.innerHTML += `<p>Day ${currentDay}: ${eventText}</p>`;
+            console.log(eventText);
+            appendEventLog(`Day ${currentDay}: ${eventText}`);
+        }
     });
 
     currentDay++;
 }
 
-// Run day 1 immediately after load
-window.onload = () => {
-    runDayEvents();  // runs once for each master
-};
 
 // Button for next days
 document.getElementById("next-day").addEventListener("click", () => {
@@ -327,34 +329,7 @@ function processEventTemplate(template, context) {
         return value;
     });
 }
-
- function runRandomEvent(participants) {
-    const aliveMasters = participants.filter(p => p.type === "master" && p.status === "alive");
-    const aliveServants = participants.filter(p => p.type === "servant" && p.status === "alive");
-
-    const randomMaster = aliveMasters[Math.floor(Math.random() * aliveMasters.length)];
-    const randomServant = participants.find(p => p.id === randomMaster.servantId);
-
-    const validEvents = events.filter(event => {
-        const validPool = event.valid(participants);
-        return validPool.includes(randomMaster);
-    });
-
-    if (validEvents.length === 0) {
-        console.warn("No valid events available.");
-        return;
-    }
-
-    const event = validEvents[Math.floor(Math.random() * validEvents.length)];
-
-    // Run effects
-    event.effects(randomMaster, randomServant, participants);
-
-    // Generate event text
-    const eventText = processEventTemplate(event.description, {
-        master: randomMaster,
-        servant: randomServant
-    });
-
-    console.log(eventText);
-}
+const eventText = processEventTemplate(selectedEvent.description, {
+    master: master,
+    servant: servant
+});