End Cycle
+
+
+
+
STAT
INV
@@ -1611,7 +1682,8 @@ button:active {
+1 Launch Code
Trigger Radstorm
- ADD RANDOM BOBBLEHEAD
+ ADD RANDOM BOBBLEHEAD
+ Force Creature Encounter
@@ -1809,6 +1881,201 @@ button:active {
return true; // Prevents the browser's default error handling
};
+const FACTIONS = {
+ // --- Fallout 3 Factions ---
+ "Brotherhood of Steel": {
+ leader: "Elder Lyons",
+ color: "#3a8dcb",
+ perk: {
+ id: "power_armor_infantry",
+ name: "Power Armor Infantry",
+ description: "Grants a permanent +5% bonus to your win chance in all combat, both when attacking and defending."
+ },
+ affinity: { "The Enclave": -30, "Vault 87 Mutants": -15, "Wasteland Raiders": -10, "BOS Outcasts": -15 }
+ },
+
+ "The Enclave": {
+ leader: "President Eden",
+ color: "#b74545",
+ perk: {
+ id: "vertibird_assault",
+ name: "Vertibird Assault",
+ description: "During the Maneuver phase, you can move troops between any two territories you own, regardless of whether they are connected."
+ },
+ affinity: { "Brotherhood of Steel": -30, "BOS Outcasts": -30 }
+ },
+ "Vault 87 Mutants": {
+ leader: "Overlord",
+ color: "#d19a4f",
+ perk: {
+ id: "fev_infection",
+ name: "F.E.V. Infection",
+ description: "When you conquer a territory, 25% of the defeated enemy army (rounded down) is immediately converted into your own troops."
+ },
+ affinity: { "Brotherhood of Steel": -15, "The Enclave": -15 }
+ },
+ "Wasteland Raiders": {
+ leader: "Flak",
+ color: "#8e6aa5",
+ perk: {
+ id: "chem_frenzy",
+ name: "Chem Frenzy",
+ description: "Once per turn, before attacking, you can sacrifice 1 troop to gain a +10% win chance for that single battle."
+ },
+ affinity: { "Brotherhood of Steel": -10, "New California Republic": -10, "The Minutemen": -10, "Reilly's Rangers": -10 }
+ },
+ "BOS Outcasts": {
+ leader: "Protector Casdin",
+ color: "#5a8b5c",
+ perk: {
+ id: "tech_hoarders",
+ name: "Tech Hoarders",
+ description: "Trading in Bottle Cap cards always yields +2 additional troops on top of the standard trade value."
+ },
+ affinity: { "Brotherhood of Steel": -15, "The Enclave": -30 }
+ },
+ "Reilly's Rangers": {
+ leader: "Reilly",
+ color: "#bdb862",
+ perk: {
+ id: "geomapper_module",
+ name: "Geomapper Module",
+ description: "Once per turn, you can spend 1 Bottle Cap to reveal the exact troop count of any single territory on the map."
+ },
+ affinity: { "Wasteland Raiders": -10 }
+ },
+
+ // --- Fallout: New Vegas Factions ---
+ "New California Republic": {
+ leader: "General Oliver",
+ color: "#c9a46a", // Assigned a representative color
+ perk: {
+ id: "logistical_superiority",
+ name: "Logistical Superiority",
+ description: "Receive +1 bonus troop during deployment for every Continent you fully control."
+ },
+ affinity: { "Caesar's Legion": -30, "Great Khans": -15, "Mojave Brotherhood": -5 }
+ },
+ "Caesar's Legion": {
+ leader: "Caesar",
+ color: "#e04f4f", // Assigned a representative color
+ perk: {
+ id: "scourge_of_the_east",
+ name: "Scourge of the East",
+ description: "You are exempt from the rule requiring you to leave at least one troop behind after conquering a territory."
+ },
+ affinity: { "New California Republic": -30 }
+ },
+ "New Vegas Securitrons": {
+ leader: "Mr. House",
+ color: "#7aabac", // Assigned a representative color
+ perk: {
+ id: "the_house_always_wins",
+ name: "The House Always Wins",
+ description: "Gain +1 Bottle Cap for every 3 Bottle Cap cards an opponent turns in."
+ },
+ affinity: { "New California Republic": 5, "Caesar's Legion": 5 }
+ },
+ "Mojave Brotherhood": {
+ leader: "Elder McNamara",
+ color: "#556b2f", // Assigned a representative color
+ perk: {
+ id: "elders_edict",
+ name: "Elder's Edict",
+ description: "Once per turn, 'lock down' one territory. It cannot be attacked for one full round, but its troops also cannot move or attack."
+ },
+ affinity: { "New California Republic": -5 }
+ },
+ "Great Khans": {
+ leader: "Papa Khan",
+ color: "#6b4a3a", // Assigned a representative color
+ perk: {
+ id: "guerrilla_tactics",
+ name: "Guerrilla Tactics",
+ description: "During Maneuver, your troops can pass through exactly one enemy territory, inflicting 1 casualty on that territory as they pass."
+ },
+ affinity: { "New California Republic": -15 }
+ },
+ "The Fiends": {
+ leader: "Motor-Runner",
+ color: "#a0522d", // Assigned a representative color
+ perk: {
+ id: "psycho_rush",
+ name: "Psycho Rush",
+ description: "Your Commander unit provides an attack bonus of +2 to the highest attack die, instead of the standard +1."
+ },
+ affinity: { "New California Republic": -10, "Caesar's Legion": -10 }
+ },
+
+ // --- Fallout 4 Factions ---
+ "The Minutemen": {
+ leader: "Preston Garvey",
+ color: "#0077b6", // Assigned a representative color
+ perk: {
+ id: "another_settlement",
+ name: "Another Settlement...",
+ description: "If an enemy attacks one of your territories, you may instantly move up to 3 troops from an adjacent friendly territory to reinforce it before the battle begins."
+ },
+ affinity: { "The Railroad": 15, "The Institute": -10, "The Gunners": -10 }
+ },
+ "The Institute": {
+ leader: "Father",
+ color: "#e0e0e0", // Assigned a representative color
+ perk: {
+ id: "synth_replacements",
+ name: "Synth Replacements",
+ description: "When you lose a battle while defending, each lost defender has a 50% chance to be a 'Synth' and is not removed."
+ },
+ affinity: { "Brotherhood of Steel": -20, "The Railroad": -20 }
+ },
+ "The Railroad": {
+ leader: "Desdemona",
+ color: "#888888", // Assigned a representative color
+ perk: {
+ id: "rapid_relocation",
+ name: "Rapid Relocation",
+ description: "Receive 5 maneuver points at the start of the Maneuver phase, allowing for up to five separate troop movements."
+ },
+ affinity: { "The Institute": -20, "Brotherhood of Steel": -10, "The Minutemen": 15 }
+ },
+ "The Gunners": {
+ leader: "Captain Wes",
+ color: "#4b5320", // Assigned a representative color
+ perk: {
+ id: "mercenary_contracts",
+ name: "Mercenary Contracts",
+ description: "You can spend 2 Bottle Caps at any time during your turn to instantly spawn 3 troops on your Commander's location."
+ },
+ affinity: { "The Minutemen": -10 }
+ },
+ "Nuka-World Raiders": {
+ leader: "Colter",
+ color: "#d22b2b", // Assigned a representative color
+ perk: {
+ id: "tribute_chest",
+ name: "Tribute Chest",
+ description: "At the start of your turn, you gain +1 Bottle Cap for every continent you fully control."
+ },
+ affinity: {}
+ },
+ // Note: I had to merge "Brotherhood of Steel" (FO4) with the FO3 version.
+ // If you want Maxson's BoS to be a separate faction from Lyons', we will need to add a new entry.
+ // For now, I've kept them as one BoS with the "Technology Salvage" perk. Let me know if you want to change this.
+};
+
+// This is the data for any custom faction a player creates.
+const CUSTOM_FACTION = {
+ leader: "Mysterious Stranger", // Placeholder
+ color: "#cccccc", // Default color
+ perk: {
+ id: "mysterious_stranger",
+ name: "Mysterious Stranger",
+ description: "Triggers on a losing battle roll after a 1-4 round cooldown. Negates opponent's highest die. If your roll had no successes, you automatically re-roll your dice."
+ },
+ affinity: {} // Starts neutral with everyone
+};
+
+
// --- DYNAMIC CURSOR FUNCTION ---
function updateDynamicCursor(hexColor) {
const encodedColor = hexColor.replace('#', '%23');
@@ -1828,9 +2095,61 @@ function updateDynamicCursor(hexColor) {
}
-/*===============================
- ROBCO RISK
-===============================*/
+document.addEventListener('DOMContentLoaded', () => {
+ const factionInput = document.getElementById('chosen-country');
+ const tooltip = document.getElementById('vats-tooltip'); // WE ARE USING YOUR EXISTING TOOLTIP ELEMENT
+
+ if (!factionInput || !tooltip) {
+ console.error("Tooltip or Faction Input not found!");
+ return;
+ }
+
+ // This function will show and position the tooltip
+ const showPerkTooltip = (e) => {
+ const factionName = factionInput.value;
+ let factionData;
+
+ // Determine which faction data to show (canon or custom)
+ if (FACTIONS && FACTIONS[factionName]) {
+ factionData = FACTIONS[factionName];
+ } else if (CUSTOM_FACTION) {
+ factionData = CUSTOM_FACTION;
+ }
+
+ // If we have valid data, build and show the tooltip
+ if (factionData && factionData.perk) {
+ tooltip.innerHTML = `
${factionData.perk.name}: ${factionData.perk.description}`;
+ tooltip.style.display = 'block';
+ tooltip.style.left = (e.pageX + 15) + 'px';
+ tooltip.style.top = (e.pageY + 15) + 'px';
+ }
+ };
+
+ // This function will hide the tooltip
+ const hidePerkTooltip = () => {
+ tooltip.style.display = 'none';
+ };
+
+ // This function will move the tooltip with the mouse
+ const movePerkTooltip = (e) => {
+ if (tooltip.style.display === 'block') {
+ tooltip.style.left = (e.pageX + 15) + 'px';
+ tooltip.style.top = (e.pageY + 15) + 'px';
+ }
+ };
+
+ // --- Assign events to the faction input box ---
+ // When the mouse enters the input box...
+ factionInput.addEventListener('mouseenter', showPerkTooltip);
+ // When the mouse leaves the input box...
+ factionInput.addEventListener('mouseleave', hidePerkTooltip);
+ // As the mouse moves over the input box...
+ factionInput.addEventListener('mousemove', movePerkTooltip);
+ // When the text inside changes (e.g. user types or selects from dropdown)...
+ factionInput.addEventListener('input', showPerkTooltip);
+
+});
+
if (!document.getElementById('radstorm-styles')) {
let style = document.createElement('style');
@@ -1991,35 +2310,50 @@ const combatFlavors = [
"walking in the front door because the guards were asleep on Mentats."
];
-const basePlayers = [
- { name: "Elder Lyons", country: "Brotherhood of Steel", color: "#3a8dcb", army: 10, reserve: 10, areas: [], bonus: 2, alive: true, cards: [], conqueredThisTurn: false, isNeutral: false, codes: 0 },
- { name: "President Eden", country: "Enclave", color: "#b74545", army: 20, reserve: 20, areas: [], bonus: 2, alive: true, cards: [], conqueredThisTurn: false, isNeutral: false, codes: 0 },
- { name: "Overlord", country: "Super Mutants", color: "#d19a4f", army: 20, reserve: 20, areas: [], bonus: 2, alive: true, cards: [], conqueredThisTurn: false, isNeutral: false, codes: 0 },
- { name: "Boss", country: "Raiders", color: "#8e6aa5", army: 20, reserve: 20, areas: [], bonus: 2, alive: true, cards: [], conqueredThisTurn: false, isNeutral: false, codes: 0 },
- { name: "Protector Casdin", country: "Outcasts", color: "#5a8b5c", army: 20, reserve: 20, areas: [], bonus: 2, alive: true, cards: [], conqueredThisTurn: false, isNeutral: false, codes: 0 },
- { name: "Sonora Cruz", country: "Regulators", color: "#bdb862", army: 20, reserve: 20, areas: [], bonus: 2, alive: true, cards: [], conqueredThisTurn: false, isNeutral: false, codes: 0 }
-];
-
-
-const themeFactions = {
- "fo3": [
- { name: "Elder Lyons", country: "Brotherhood of Steel" }, { name: "President Eden", country: "The Enclave" },
- { name: "Overlord", country: "Vault 87 Mutants" }, { name: "Flak", country: "Wasteland Raiders" },
- { name: "Protector Casdin", country: "BOS Outcasts" }, { name: "Reilly", country: "Reilly's Rangers" }
+const encounterData = {
+ creatures: [
+ { name: "Savage Dog", threat: 0.1 }, { name: "Mole Rat", threat: 0.3 }, { name: "Bloatfly", threat: 0.4 },
+ { name: "Radroach", threat: 0.5 }, { name: "Yao Guai", threat: 1.0 }, { name: "Feral Ghoul", threat: 1.2 },
+ { name: "Giant Ant", threat: 1.5 }, { name: "Scavenger's Dog", threat: 1.8 }, { name: "Giant Worker Ant", threat: 2.0 },
+ { name: "Radscorpion", threat: 2.5 }, { name: "Giant Soldier Ant", threat: 3.0 }, { name: "Fire Ant Soldier", threat: 3.5 },
+ { name: "Guard Dog", threat: 4.0 }, { name: "Fire Ant Warrior", threat: 4.5 }, { name: "Mirelurk", threat: 5.0 },
+ { name: "Feral Ghoul Roamer", threat: 6.0 }, { name: "Giant Radscorpion", threat: 7.0 }, { name: "Mirelurk Hunter", threat: 8.0 },
+ { name: "Vicious Dog", threat: 9.0 }, { name: "Centaur", threat: 10.0 }, { name: "Feral Ghoul Reaver", threat: 12.0 },
+ { name: "Deathclaw", threat: 15.0 }, { name: "Enclave Deathclaw", threat: 20.0 }, { name: "Super Mutant", threat: 25.0 },
+ { name: "Super Mutant Master", threat: 30.0 }, { name: "Super Mutant Overlord", threat: 40.0 }, { name: "Super Mutant Behemoth", threat: 50.0 }
],
- "fnv": [
- { name: "General Oliver", country: "New California Republic" }, { name: "Caesar", country: "Caesar's Legion" },
- { name: "Mr. House", country: "New Vegas Securitrons" }, { name: "Elder McNamara", country: "Mojave Brotherhood" },
- { name: "Papa Khan", country: "Great Khans" }, { name: "Motor-Runner", country: "The Fiends" }
+ genericLocations: ["a crashed Vertibird", "a ruined highway overpass", "an abandoned Red Rocket station", "a Pre-War police station", "a collapsed metro tunnel", "a flooded sewer system", "a ruined church", "an abandoned drive-in theater", "a Broadcasting Tower", "an Abandoned Shack"],
+ subLocations: ["the manager's office", "the pharmacy counter", "the main server room", "the evidence locker", "the cockpit", "the projection booth", "the sacristy", "the underground pump station", "a hidden Refrigerator", "a locked Safe"],
+ people: ["a Wasteland Doctor", "a scared Settler", "a shifty-eyed Mercenary", "a Ghoul scavenger", "a Brotherhood of Steel scribe", "a Fugitive Slave", "a Wounded Sheriff", "a Merchant", "Talon Company Mercs", "a Drunken Drifter", "a Lost Farmer", "a Mister Handy"],
+ containers: ["a weapons locker", "a footlocker", "a first aid box", "a locked safe", "a steamer trunk", "a doctor's bag", "an ammo box"],
+ namedLocations: [
+ { name: "Super Duper Mart", subLocations: ["the pharmacy counter", "the manager's office", "a locked safe"] },
+ { name: "Slave Camp", people: ["Fugitive Slave", "shifty-eyed Mercenary"] },
+ { name: "Gas Station", subLocations: ["abandoned Red Rocket station", "a hidden Refrigerator"] },
+ { name: "Diner", people: ["a Mister Handy", "a Drunken Drifter"] },
+ { name: "C.I.T. Ruins", people: ["an escaped Synth"], subLocations: ["the main server room"] },
+ { name: "Water Treatment Plant", subLocations: ["the underground pump station", "a locked safe"] },
+ { name: "Hubris Comics Store", people: ["a Ghoul scavenger"] },
+ { name: "Gwinnett Brewery", people: ["a Mister Handy", "a Drunken Drifter"] },
+ { name: "Robot Factory", people: ["an escaped Synth"], subLocations: ["the main server room"] }
],
- "fo4": [
- { name: "Preston Garvey", country: "The Minutemen" }, { name: "Father", country: "The Institute" },
- { name: "Elder Maxson", country: "Brotherhood of Steel" }, { name: "Desdemona", country: "The Railroad" },
- { name: "Captain Wes", country: "The Gunners" }, { name: "Colter", country: "Nuka-World Raiders" }
+ vaults: [
+ { territory: "eastern_us", name: "Vault 101" }, { territory: "western_us", name: "Vault 13" },
+ { territory: "alberta", name: "Vault 15" }, { territory: "ontario", name: "Vault 112" },
+ { territory: "china", name: "Vault 118" }, { territory: "quebec", name: "Vault 81" },
+ { territory: "quebec", name: "Vault 111" }, { territory: "quebec", name: "Vault 114" },
+ { territory: "quebec", name: "Vault 95" }, { territory: "central_america", name: "Vault 3" },
+ { territory: "central_america", name: "Vault 21" }, { territory: "central_america", name: "Vault 34" },
+ { territory: "ural", name: "Vault 77" }
]
};
+
+// This new constant replaces both basePlayers and themeFactions.
+// It contains all faction data, including perks and affinities, in one place.
+
+
const cardTypes = ["Nuka-Cola Cap", "Sunset Sarsaparilla Cap", "Quantum Cap"];
let deck = [];
let tradeCount = 0;
@@ -2063,49 +2397,47 @@ document.body.appendChild(vatsTooltip);
map.addEventListener('mousemove', (e) => {
let targetId = e.target.id;
-
- if (!Gamestate.countries) return;
-
+ if (!Gamestate.countries) return;
let targetCountry = Gamestate.countries.find(c => c.name === targetId);
- if (!targetCountry) { vatsTooltip.style.display = "none"; return; }
-
+ if (!targetCountry) {
+ vatsTooltip.style.display = "none";
+ return;
+ }
let tooltipHTML = "";
-
- // --- FOG OF WAR TOOLTIP CHECK (NEW) ---
- // First, check if the territory is shrouded.
const isShrouded = e.target.classList.contains('fog-shroud');
-
if (isShrouded) {
- // If it's shrouded, only show "UNKNOWN".
tooltipHTML = "TERRITORY: UNKNOWN";
-
} else {
- // If it's VISIBLE, proceed with the normal detailed tooltip logic.
- let isBattleHover = (Gamestate.stage === "Battle" || Gamestate.stage === "Commander Phase") &&
- Gamestate.prevCountry && Gamestate.prevCountry.neighbours.includes(targetCountry.name) &&
- targetCountry.owner !== Gamestate.player.name && Gamestate.prevCountry.army > 1 &&
- !targetCountry.isCrater && !Gamestate.aiTurn;
-
+ let isBattleHover = (Gamestate.stage === "Battle" || Gamestate.stage === "Commander Phase") &&
+ Gamestate.prevCountry && Gamestate.prevCountry.neighbours.includes(targetCountry.name) &&
+ targetCountry.owner !== Gamestate.player.name && Gamestate.prevCountry.army > 1 &&
+ !targetCountry.isCrater && !Gamestate.aiTurn;
if (isBattleHover) {
- // --- This is your original, unchanged V.A.T.S. logic ---
+ // --- V.A.T.S. Calculation Logic ---
let baseChance = 0.50;
if (Gamestate.difficulty === "Easy") baseChance = 0.60;
if (Gamestate.difficulty === "Hard") baseChance = 0.40;
let owner = Gamestate.players.find(p => p.name === targetCountry.owner);
if (owner && owner.isNeutral) baseChance -= 0.15;
+
+ // --- THIS IS THE NEWLY ADDED PERK LOGIC FOR THE TOOLTIP ---
+ if (Gamestate.perksEnabled) {
+ if (Gamestate.player.perk && Gamestate.player.perk.id === 'power_armor_infantry') {
+ baseChance += 0.05;
+ }
+ if (owner && owner.perk && owner.perk.id === 'power_armor_infantry') {
+ baseChance -= 0.05;
+ }
+ }
+
if (Gamestate.nukesEnabled && targetCountry.isSilo) {
let buff = Math.min(0.80, targetCountry.siloTurns * 0.20);
- if(Gamestate.activeNuke && Gamestate.activeNuke.launcher === targetCountry.owner) buff = 0;
- if(targetCountry.owner === "Wasteland Horrors") buff = 0;
+ if (Gamestate.activeNuke && Gamestate.activeNuke.launcher === targetCountry.owner) buff = 0;
+ if (targetCountry.owner === "Wasteland Horrors") buff = 0;
baseChance = baseChance * (1 - buff);
}
if (Gamestate.commandersEnabled && owner && owner.commander && owner.commander.loc === targetCountry.name) {
- baseChance = baseChance * 0.80;
- }
- if(Gamestate.nukesEnabled && targetCountry.isSilo) {
- let cont = continents.find(c => c.name === targetCountry.continent);
- let ownsCont = cont.areas.every(area => owner && owner.areas.includes(area));
- if(ownsCont) baseChance = baseChance * 0.85;
+ baseChance = baseChance * 0.80;
}
if (baseChance < 0.11) baseChance = 0.11;
if (Gamestate.devWinOverride !== undefined && Gamestate.devWinOverride >= 0) {
@@ -2114,15 +2446,18 @@ map.addEventListener('mousemove', (e) => {
let a = Gamestate.prevCountry.army - 1;
let d = targetCountry.army;
let winProb = 0;
- if (baseChance === 0.5) { winProb = a / (a + d); }
- else {
- let q = 1 - baseChance; let ratio = q / baseChance; winProb = (1 - Math.pow(ratio, a)) / (1 - Math.pow(ratio, a + d));
+ if (baseChance === 0.5) {
+ winProb = a / (a + d);
+ } else {
+ let q = 1 - baseChance;
+ let ratio = q / baseChance;
+ winProb = (1 - Math.pow(ratio, a)) / (1 - Math.pow(ratio, a + d));
}
let chancePercent = Math.round(winProb * 100);
if (chancePercent > 95) chancePercent = 95;
if (chancePercent < 1) chancePercent = 1;
- if(Gamestate.nukesEnabled && targetCountry.isSilo && targetCountry.siloTurns >= 4 && (!Gamestate.activeNuke || Gamestate.activeNuke.launcher !== targetCountry.owner)) {
- if(chancePercent > 20) chancePercent = 20;
+ if (Gamestate.nukesEnabled && targetCountry.isSilo && targetCountry.siloTurns >= 4 && (!Gamestate.activeNuke || Gamestate.activeNuke.launcher !== targetCountry.owner)) {
+ if (chancePercent > 20) chancePercent = 20;
}
let diplomacyWarning = "";
if (Gamestate.areAllies(Gamestate.player.name, targetCountry.owner)) {
@@ -2137,9 +2472,11 @@ map.addEventListener('mousemove', (e) => {
DEFENDERS: ${targetCountry.army}
WIN CHANCE: ${chancePercent}${chancePercent !== "N/A" ? '%' : ''}${diplomacyWarning}${cmdrWarning}`;
} else {
- // --- This is your original, unchanged passive info hover logic ---
let infoLines = [];
let owner = Gamestate.players.find(p => p.name === targetCountry.owner);
+ if (targetCountry.isLockedDown) {
+ infoLines.push(`
TERRITORY LOCKED DOWN `);
+ }
infoLines.push(`TERRITORY: ${formatTerritoryName(targetCountry.name)}`);
if (targetCountry.isCrater) {
infoLines.push(`
IRRADIATED CRATER (IMPASSABLE) `);
@@ -2152,7 +2489,7 @@ map.addEventListener('mousemove', (e) => {
}
if (Gamestate.nukesEnabled && targetCountry.isSilo) {
let defBuff = targetCountry.siloTurns > 0 ? Math.min(80, targetCountry.siloTurns * 20) : 0;
- if (targetCountry.owner === "Wasteland Horrors") defBuff = 0;
+ if (targetCountry.owner === "Wasteland Horrors") defBuff = 0;
infoLines.push(`
COMMAND SILO (+${defBuff}% DEFENSE) `);
}
if (Gamestate.commandersEnabled) {
@@ -2167,14 +2504,13 @@ map.addEventListener('mousemove', (e) => {
tooltipHTML = infoLines.join('
');
}
}
-
- // This part remains the same, it just displays whatever HTML we built.
vatsTooltip.innerHTML = tooltipHTML;
vatsTooltip.style.left = (e.clientX + 20) + "px";
vatsTooltip.style.top = (e.clientY + 20) + "px";
vatsTooltip.style.display = "block";
});
+
map.addEventListener('mouseleave', () => { vatsTooltip.style.display = "none"; });
const modal = document.querySelector('#start-modal');
@@ -2208,40 +2544,150 @@ const themeSelector = document.getElementById('chosen-theme');
const leaderInput = document.getElementById('chosen-leader');
const factionInput = document.getElementById('chosen-country');
-if (themeSelector) {
- themeSelector.addEventListener('change', function(e) {
- let theme = e.target.value;
-
- // --- ADD THIS BLOCK to update the cursor color ---
- if (theme === 'fnv') {
- updateDynamicCursor('#ffb642'); // Amber
- } else if (theme === 'fo4') {
- updateDynamicCursor('#22ccff'); // Blue
- } else {
- updateDynamicCursor('#18ff62'); // Default Green
- }
- // --- END OF ADDED BLOCK ---
+// =================================================================
+// NEW CUSTOM DROPDOWN & TOOLTIP LOGIC
+// =================================================================
+document.addEventListener('DOMContentLoaded', () => {
+ const factionInput = document.getElementById('chosen-country-input');
+ const optionsContainer = document.getElementById('custom-faction-options');
+ const tooltip = document.getElementById('vats-tooltip');
- // 1. Swap CSS
- document.body.classList.remove('theme-fo3', 'theme-fnv', 'theme-fo4');
- if (theme !== 'fo3') document.body.classList.add('theme-' + theme);
-
- // 2. Auto-fill names and adjust input width
- if (theme === 'fo3') {
- if(leaderInput) { leaderInput.value = "Lone Wanderer"; }
- if(factionInput) { factionInput.value = "Brotherhood of Steel"; }
- } else if (theme === 'fnv') {
- if(leaderInput) { leaderInput.value = "Courier Six"; }
- if(factionInput) { factionInput.value = "New California Republic"; }
- } else if (theme === 'fo4') {
- if(leaderInput) { leaderInput.value = "Sole Survivor"; }
- if(factionInput) { factionInput.value = "The Minutemen"; }
+ const perksEnabledCheckbox = document.getElementById('opt-perks');
+
+ // Function to enable or disable the custom dropdown based on the checkbox
+ const toggleFactionInput = () => {
+ const perksAreOn = perksEnabledCheckbox.checked;
+ if (perksAreOn) {
+ factionInput.disabled = false;
+ factionInput.style.pointerEvents = 'auto';
+ factionInput.style.opacity = '1';
+ } else {
+ factionInput.disabled = true;
+ factionInput.style.pointerEvents = 'none';
+ factionInput.style.opacity = '0.5';
+ tooltip.style.display = 'none'; // Also hide the tooltip
+ }
+ };
+
+ // Add an event listener to the checkbox itself
+ perksEnabledCheckbox.addEventListener('change', toggleFactionInput);
+
+ // Call it once on load to set the initial state
+ toggleFactionInput();
+
+ if (!factionInput || !optionsContainer || !tooltip) return;
+
+ // --- Function to populate the options ---
+ const populateCustomDropdown = () => {
+ const themeDropdown = document.getElementById('chosen-theme');
+ const selectedTheme = themeDropdown ? themeDropdown.value : "fo3";
+ optionsContainer.innerHTML = ''; // Clear old options
+
+ const factionThemes = {
+ "fo3": ["Brotherhood of Steel", "The Enclave", "Vault 87 Mutants", "Wasteland Raiders", "BOS Outcasts", "Reilly's Rangers"],
+ "fnv": ["New California Republic", "Caesar's Legion", "New Vegas Securitrons", "Mojave Brotherhood", "Great Khans", "The Fiends"],
+ "fo4": ["The Minutemen", "The Institute", "The Railroad", "The Gunners", "Nuka-World Raiders", "Brotherhood of Steel"]
+ };
+ const factions = factionThemes[selectedTheme] || [];
+
+ factions.forEach(factionName => {
+ const optionDiv = document.createElement('div');
+ optionDiv.textContent = factionName;
+ optionDiv.style.padding = '8px 12px';
+ optionDiv.style.cursor = 'pointer';
+
+ // THIS IS THE KEY: We attach mouse events to each custom option DIV
+ optionDiv.addEventListener('mouseenter', (e) => {
+ optionDiv.style.background = 'var(--pip-color)';
+ optionDiv.style.color = 'var(--pip-dark)';
+ const factionData = FACTIONS[factionName];
+ if (factionData && factionData.perk) {
+ tooltip.innerHTML = `
${factionData.perk.name}: ${factionData.perk.description}`;
+ tooltip.style.display = 'block';
+ }
+ });
+ optionDiv.addEventListener('mouseleave', () => {
+ optionDiv.style.background = '';
+ optionDiv.style.color = '';
+ tooltip.style.display = 'none';
+ });
+ optionDiv.addEventListener('mousemove', (e) => {
+ tooltip.style.left = (e.pageX + 15) + 'px';
+ tooltip.style.top = (e.pageY + 15) + 'px';
+ });
+ optionDiv.addEventListener('mousedown', () => {
+ factionInput.value = factionName;
+ optionsContainer.style.display = 'none';
+ });
+
+ optionsContainer.appendChild(optionDiv);
+ });
+ };
+
+ // --- Event Listeners to control the dropdown ---
+ factionInput.addEventListener('focus', () => {
+ populateCustomDropdown();
+ optionsContainer.style.display = 'block';
+ });
+
+ // Hide dropdown if you click anywhere else
+ document.addEventListener('click', (e) => {
+ if (!factionInput.contains(e.target) && !optionsContainer.contains(e.target)) {
+ optionsContainer.style.display = 'none';
}
});
- // Trigger on boot to apply the default theme immediately
- themeSelector.dispatchEvent(new Event('change'));
-}
+ // Also attach populate AND theme-switching logic to theme selector
+ const themeSelector = document.getElementById('chosen-theme');
+ if (themeSelector) {
+ themeSelector.addEventListener('change', (e) => {
+ // First, populate the faction list for the new theme
+ populateCustomDropdown();
+
+ // Now, perform all the theme-switching actions
+ const theme = e.target.value;
+ const leaderInput = document.getElementById('chosen-leader');
+ const factionInput = document.getElementById('chosen-country-input');
+
+ // 1. Update cursor color
+ if (typeof updateDynamicCursor === 'function') {
+ if (theme === 'fnv') {
+ updateDynamicCursor('#ffb642');
+ } else if (theme === 'fo4') {
+ updateDynamicCursor('#22ccff');
+ } else {
+ updateDynamicCursor('#18ff62');
+ }
+ }
+
+ // 2. Swap CSS body class
+ document.body.classList.remove('theme-fo3', 'theme-fnv', 'theme-fo4');
+ if (theme !== 'fo3') {
+ document.body.classList.add('theme-' + theme);
+ }
+
+ // 3. Auto-fill default names
+ if (theme === 'fo3') {
+ if (leaderInput) { leaderInput.value = "Lone Wanderer"; }
+ if (factionInput) { factionInput.value = "Brotherhood of Steel"; }
+ } else if (theme === 'fnv') {
+ if (leaderInput) { leaderInput.value = "Courier Six"; }
+ if (factionInput) { factionInput.value = "New California Republic"; }
+ } else if (theme === 'fo4') {
+ if (leaderInput) { leaderInput.value = "Sole Survivor"; }
+ if (factionInput) { factionInput.value = "The Minutemen"; }
+ }
+ });
+
+ // Trigger on boot to apply the default theme immediately
+ themeSelector.dispatchEvent(new Event('change'));
+ }
+
+
+ // Initial population
+ populateCustomDropdown();
+});
+
Gamestate.logQueue = [];
Gamestate.isLogging = false;
@@ -2511,7 +2957,34 @@ Gamestate.renderInventory = function() {
}
};
+Gamestate.populateFactionDropdown = function() {
+ const themeDropdown = document.getElementById('chosen-theme');
+ const selectedTheme = themeDropdown ? themeDropdown.value : "fo3";
+ const dataList = document.getElementById('faction-list');
+
+ if (!dataList) return; // Exit if the element doesn't exist
+ // Clear any old options from a previous selection
+ dataList.innerHTML = "";
+
+ // This object defines which factions belong to which theme
+ const factionThemes = {
+ "fo3": ["Brotherhood of Steel", "The Enclave", "Vault 87 Mutants", "Wasteland Raiders", "BOS Outcasts", "Reilly's Rangers"],
+ "fnv": ["New California Republic", "Caesar's Legion", "New Vegas Securitrons", "Mojave Brotherhood", "Great Khans", "The Fiends"],
+ "fo4": ["The Minutemen", "The Institute", "The Railroad", "The Gunners", "Nuka-World Raiders", "Brotherhood of Steel"]
+ };
+
+ const factionsForTheme = factionThemes[selectedTheme];
+
+ // Create a new
element for each faction and add it to the datalist
+ if (factionsForTheme) {
+ factionsForTheme.forEach(factionName => {
+ const option = document.createElement('option');
+ option.value = factionName;
+ dataList.appendChild(option);
+ });
+ }
+};
Gamestate.init = function(){
@@ -2566,6 +3039,7 @@ document.getElementById('secret-dev-key')?.addEventListener('click', (e) => {
if (helpModal) helpModal.style.display = 'block';
});
+
// --- FIX: RESTORES THE PATCH NOTES BUTTONS ---
document.getElementById('open-updates-btn')?.addEventListener('click', (e) => { e.preventDefault(); document.getElementById('updates-modal').style.display = 'block'; });
document.getElementById('close-updates-btn')?.addEventListener('click', () => { document.getElementById('updates-modal').style.display = 'none'; });
@@ -2619,6 +3093,12 @@ document.getElementById('secret-dev-key')?.addEventListener('click', (e) => {
document.getElementById('dev-modal').style.display = 'none';
});
+document.getElementById('dev-encounter')?.addEventListener('click', () => {
+ this.resolveCreatureEncounter();
+ document.getElementById('dev-modal').style.display = 'none';
+});
+
+
// --- NEW DEV PERK BUTTON ---
document.getElementById('dev-perk')?.addEventListener('click', () => {
if (!Gamestate.bobbleheads) return;
@@ -2669,270 +3149,493 @@ document.getElementById('secret-dev-key')?.addEventListener('click', (e) => {
}
+// Paste this entire new function into your JavaScript file.
+// A good spot is right after your Gamestate.init function.
+
Gamestate.updateButtonText = function() {
if (!end) return;
- if (this.stage === "Fortify") {
- end.textContent = "Deploy Troops"; end.style.opacity = "0.5"; end.style.pointerEvents = "none";
- }
- else if (this.stage === "Battle") {
- end.textContent = "End Attack Phase"; end.style.opacity = "1"; end.style.pointerEvents = "auto";
- }
- else if (this.stage === "Maneuver") {
- if(this.commandersEnabled && this.player.alive && this.player.commander) {
+ if (this.stage === "Fortify") {
+ end.textContent = "Deploy Troops";
+ end.style.opacity = "0.5";
+ end.style.pointerEvents = "none";
+ } else if (this.stage === "Battle") {
+ end.textContent = "End Attack Phase";
+ end.style.opacity = "1";
+ end.style.pointerEvents = "auto";
+ } else if (this.stage === "Maneuver") {
+ // --- THIS IS THE NEW PERK LOGIC ---
+ // For The Railroad, the button should always say "End Turn" during their special maneuver phase.
+ if (this.perksEnabled && this.player.perk && this.player.perk.id === 'rapid_relocation') {
+ end.textContent = "End Turn";
+ } else if (this.commandersEnabled && this.player.alive && this.player.commander) {
end.textContent = this.maneuverSource ? "Next Phase" : "Skip Move";
} else {
end.textContent = "End Turn";
}
- end.style.opacity = "1"; end.style.pointerEvents = "auto";
- }
- else if (this.stage === "Commander Phase") {
- end.textContent = "End Turn"; end.style.opacity = "1"; end.style.pointerEvents = "auto";
- }
- else if (this.stage === "AI Turn") {
- end.textContent = "AI is thinking..."; end.style.opacity = "0.5"; end.style.pointerEvents = "none";
+ end.style.opacity = "1";
+ end.style.pointerEvents = "auto";
+ } else if (this.stage === "Commander Phase") {
+ end.textContent = "End Turn";
+ end.style.opacity = "1";
+ end.style.pointerEvents = "auto";
+ } else if (this.stage === "AI Turn") {
+ end.textContent = "AI is thinking...";
+ end.style.opacity = "0.5";
+ end.style.pointerEvents = "none";
}
}
-Gamestate.start = async function(){
- if(combatLog) combatLog.innerHTML = "";
- this.logQueue = []; this.isLogging = false;
- this.diplomacy = { truces: [], betrayalTax: {}, grudges: {}, spiteTarget: null, spiteTurns: 0, reputation: {} };
- // --- RESET INVENTORY ON REBOOT ---
- if (this.bobbleheads) {
- this.bobbleheads.forEach(b => {
- b.found = false;
- b.cooldown = 0;
- b.active = false;
- });
- }
+Gamestate.start = async function() {
+// --- Read Game Options from UI First ---
+this.perksEnabled = document.getElementById('opt-perks')?.checked;
+this.nukesEnabled = document.getElementById('opt-nukes')?.checked;
+this.commandersEnabled = document.getElementById('opt-commander')?.checked;
+this.hazardsEnabled = document.getElementById('opt-radstorms')?.checked;
+this.encountersEnabled = document.getElementById('opt-encounters')?.checked;
+
+// If any major gameplay modifier is active, enable Wasteland Economy.
+this.wastelandEconomyActive = this.perksEnabled || this.nukesEnabled || this.commandersEnabled || this.hazardsEnabled || this.encountersEnabled;
+
+
+ if (combatLog) combatLog.innerHTML = "";
+ this.logQueue = [];
+ this.isLogging = false;
+ // --- Core Game State Initialization ---
+ this.diplomacy = {
+ truces: [],
+ betrayalTax: {},
+ grudges: {},
+ spiteTarget: null,
+ spiteTurns: 0,
+ reputation: {}
+ };
+ if (this.bobbleheads) this.bobbleheads.forEach(b => {
+ b.found = false;
+ b.cooldown = 0;
+ b.active = false;
+ });
let navInv = document.getElementById('nav-inv');
if (navInv) navInv.classList.remove('inv-pulse');
-
if (end) end.style.pointerEvents = "auto";
if (map) map.style.pointerEvents = "auto";
if (modal) modal.style.display = "none";
if (playerPanel) playerPanel.style.display = "flex";
if (infoPanel) infoPanel.style.display = "flex";
-
- let optRadstorms = document.getElementById('opt-radstorms') && document.getElementById('opt-radstorms').checked;
- let optHorrors = document.getElementById('opt-horrors') && document.getElementById('opt-horrors').checked;
- this.nukesEnabled = document.getElementById('opt-nukes') && document.getElementById('opt-nukes').checked;
- this.commandersEnabled = document.getElementById('opt-commander') && document.getElementById('opt-commander').checked;
- this.flatTrade = document.getElementById('opt-flat-trade') && document.getElementById('opt-flat-trade').checked;
-
- this.hazardsEnabled = optRadstorms;
- this.radstorm = { state: 'none', timer: 0, cooldown: Math.floor(Math.random() * 11) + 5, areas: [] };
-
- this.globalCodes = 10;
- this.activeNuke = null;
-this.devWinOverride = -1;
-
+ // --- Read Game Options from UI ---
+ this.perksEnabled = document.getElementById('opt-perks')?.checked;
+ this.nukesEnabled = document.getElementById('opt-nukes')?.checked;
+ this.commandersEnabled = document.getElementById('opt-commander')?.checked;
+ this.flatTrade = document.getElementById('opt-flat-trade')?.checked;
+ this.hazardsEnabled = document.getElementById('opt-radstorms')?.checked;
+ // --- THIS IS THE NEW LINE FOR ENCOUNTERS ---
+ this.encountersEnabled = document.getElementById('opt-encounters')?.checked;
+ this.radstorm = {
+ state: 'none',
+ timer: 0,
+ cooldown: Math.floor(Math.random() * 11) + 5,
+ areas: []
+ };
+ // Initialize map
this.countries = JSON.parse(JSON.stringify(countries));
this.countries.forEach(c => {
let el = document.getElementById(c.name);
- if (el) { el.classList.remove('radstorm-warning', 'radstorm-active', 'allied-territory', 'crater', 'glowing-sea'); c.isCrater = false; c.radDecay = 0; c.isSilo = false; c.siloTurns = 0; }
+ if (el) {
+ el.classList.remove('radstorm-warning', 'radstorm-active', 'allied-territory', 'crater', 'glowing-sea');
+ c.isCrater = false;
+ c.radDecay = 0;
+ c.isSilo = false;
+ c.siloTurns = 0;
+ }
});
+ // --- PLAYER SETUP LOGIC (with Perks checkbox) ---
+ this.players = [];
+ if (this.perksEnabled) {
+ // --- ADVANCED SETUP: Faction Perks Enabled ---
+ const themeDropdown = document.getElementById('chosen-theme');
+ const selectedTheme = themeDropdown ? themeDropdown.value : "fo3";
+ const factionThemes = {
+ "fo3": ["Brotherhood of Steel", "The Enclave", "Vault 87 Mutants", "Wasteland Raiders", "BOS Outcasts", "Reilly's Rangers"],
+ "fnv": ["New California Republic", "Caesar's Legion", "New Vegas Securitrons", "Mojave Brotherhood", "Great Khans", "The Fiends"],
+ "fo4": ["The Minutemen", "The Institute", "The Railroad", "The Gunners", "Nuka-World Raiders", "Brotherhood of Steel"]
+ };
+ const selectedFactionNames = [...factionThemes[selectedTheme]];
+ const playerCountryInput = document.getElementById('chosen-country-input');
+ const playerCountryChoice = sanitizeInput(playerCountryInput.value) || selectedFactionNames[0];
+ const playerLeaderChoice = sanitizeInput(chosenLeader.value) || "Player";
+ const playerColorChoice = chosenColor.value || "#3a8dcb";
+ const isCustomFaction = !FACTIONS[playerCountryChoice];
+ const playerFactionData = isCustomFaction ? CUSTOM_FACTION : FACTIONS[playerCountryChoice];
+ this.players.push({
+ name: playerLeaderChoice,
+ country: playerCountryChoice,
+ color: playerColorChoice,
+ perk: playerFactionData.perk,
+ army: 0,
+ reserve: 20,
+ areas: [],
+ bonus: 2,
+ alive: true,
+ cards: [],
+ conqueredThisTurn: false,
+ isNeutral: false,
+ isPlayer: true,
+ caps: 20
- let themeDropdown = document.getElementById('chosen-theme');
- let selectedTheme = themeDropdown ? themeDropdown.value : "fo3";
- document.body.classList.remove('theme-fnv');
- if (selectedTheme === "fnv") document.body.classList.add('theme-fnv');
-
- this.players = JSON.parse(JSON.stringify(basePlayers));
-
- let factionList = themeFactions[selectedTheme];
- for(let i = 0; i < 6; i++) {
- // Preserve existing properties and only update name and country
- this.players[i].name = factionList[i].name;
- this.players[i].country = factionList[i].country;
- // This ensures .codes and other properties are not erased
- }
-
-
- let horrors = this.players.find(p => p.isNeutral && p.name === "Wasteland Horrors");
- if ((optHorrors || this.nukesEnabled) && !horrors) {
- this.players.push({ "name": "Wasteland Horrors", "country": "Feral Ghouls & Deathclaws", "color": "#333333", "army": 0, "reserve": 0, "areas": [], "bonus": 0, "alive": true, "cards": [], "conqueredThisTurn": false, "isNeutral": true });
- horrors = this.players[this.players.length - 1];
- }
-
- // Set up standard diplomacy trackers AND the new Reputation Matrix
- this.players.forEach(p1 => {
- this.diplomacy.betrayalTax[p1.name] = 0;
- this.diplomacy.grudges[p1.name] = [];
- this.diplomacy.reputation[p1.name] = {};
-
- // Initialize everyone at Neutral (0) with everyone else
- this.players.forEach(p2 => {
- if (p1.name !== p2.name) {
- this.diplomacy.reputation[p1.name][p2.name] = 0;
- }
});
- });
+ const playerFactionIndex = selectedFactionNames.indexOf(playerCountryChoice);
+ if (playerFactionIndex > -1) {
+ selectedFactionNames.splice(playerFactionIndex, 1);
+ } else {
+ selectedFactionNames.pop();
+ }
+ selectedFactionNames.forEach(factionName => {
+ let factionData = FACTIONS[factionName];
+ let aiColor = (factionData.color === playerColorChoice) ? "#CCCCCC" : factionData.color;
+ this.players.push({
+ name: factionData.leader,
+ country: factionName,
+ color: aiColor,
+ perk: factionData.perk,
+ army: 0,
+ reserve: 20,
+ areas: [],
+ bonus: 2,
+ alive: true,
+ cards: [],
+ conqueredThisTurn: false,
+ isNeutral: false,
+ caps: 20
+ });
+ });
+ } else {
+ // --- CLASSIC SETUP: Faction Perks Disabled (Corrected) ---
+ const playerLeaderInput = document.getElementById('chosen-leader');
+ const playerCountryInput = document.getElementById('chosen-country-input');
+ const playerColorInput = document.getElementById('chosen-color');
+ const playerLeaderChoice = sanitizeInput(playerLeaderInput.value) || "Player 1";
+ const playerCountryChoice = sanitizeInput(playerCountryInput.value) || "Wastelanders";
+ const playerColorChoice = playerColorInput.value || "#0088CC";
+ this.players.push({
+ name: playerLeaderChoice,
+ country: playerCountryChoice,
+ color: playerColorChoice,
+ perk: {
+ id: "none"
+ },
+ army: 0,
+ reserve: 20,
+ areas: [],
+ bonus: 2,
+ alive: true,
+ cards: [],
+ conqueredThisTurn: false,
+ isNeutral: false,
+ isPlayer: true,
+ caps: 20
- this.aiTurn = false; this.gameOver = false; this.prevCountry = null; this.prevTarget = null; this.turn = 1; this.stage = "Fortify"; this.playerTroopsPlaced = 0; this.player = this.players[0];
-
- let diffSelect = document.getElementById('chosen-difficulty'); this.difficulty = diffSelect ? diffSelect.value : "Normal";
+ });
+ const defaultColors = ["#CC0000", "#00CC00", "#CCCC00", "#CC00CC", "#00CCCC"];
+ for (let i = 1; i < 6; i++) {
+ let aiColor = (defaultColors[i - 1] === playerColorChoice) ? "#888888" : defaultColors[i - 1];
+ this.players.push({
+ name: `AI Player ${i}`,
+ country: `Faction ${i}`,
+ color: aiColor,
+ perk: {
+ id: "none"
+ },
+ army: 0,
+ reserve: 20,
+ areas: [],
+ bonus: 2,
+ alive: true,
+ cards: [],
+ conqueredThisTurn: false,
+ isNeutral: false,
+ caps: 20
- if (chosenLeader && chosenCountry) {
- let safeLeader = sanitizeInput(chosenLeader.value); let safeCountry = sanitizeInput(chosenCountry.value);
- this.players[0].name = safeLeader; this.players[0].country = safeCountry;
- if (playerName) playerName.textContent = safeLeader; if (playerCountry) playerCountry.textContent = safeCountry;
+ });
+ }
}
-
-// --- OVERSEER KEY REVEAL ---
+ // Finalize player UI text
+ if (playerName) playerName.textContent = this.players.find(p => p.isPlayer).name;
+ if (playerCountry) playerCountry.textContent = this.players.find(p => p.isPlayer).country;
+ // --- CORRECTED OVERSEER KEY REVEAL ---
let devKey = document.getElementById('secret-dev-key');
if (devKey) {
- if (this.players[0].name.toLowerCase() === "overseer") devKey.style.display = "block";
- else devKey.style.display = "none";
+ // Check the name property of the human player object.
+ const humanPlayer = this.players.find(p => p.isPlayer);
+ if (humanPlayer && humanPlayer.name.toLowerCase() === "overseer") {
+ devKey.style.display = "block";
+ } else {
+ devKey.style.display = "none";
+ }
}
+ // Add neutral Horrors faction if needed
+ if (document.getElementById('opt-horrors')?.checked || this.nukesEnabled) {
+ this.players.push({
+ "name": "Wasteland Horrors",
+ "country": "Feral Ghouls & Deathclaws",
+ "color": "#333333",
+ perk: {
+ id: "none"
+ },
+ army: 0,
+ reserve: 0,
+ areas: [],
+ "bonus": 0,
+ "alive": true,
+ "cards": [],
+ "conqueredThisTurn": false,
+ "isNeutral": true,
+ caps: 20
- if (chosenColor) {
- let selectedHex = chosenColor.value; let defaultPlayerColor = this.players[0].color;
- let colorConflictAI = this.players.find((p, index) => index !== 0 && p.color === selectedHex);
- if (colorConflictAI) colorConflictAI.color = defaultPlayerColor;
- this.players[0].color = selectedHex;
+ });
}
-
- generateDeck(); tradeCount = 0; this.players.forEach(p => { p.cards = []; p.conqueredThisTurn = false; });
- let cardCount = document.getElementById('card-count'); if (cardCount) cardCount.textContent = "0"; if(this.prevTarget) this.prevTarget.classList.remove('flash');
-
- for(let j = 0; j < this.players.length; j++){
- if(infoName[j]) infoName[j].innerHTML = this.players[j].country; if(infoLeader[j]) infoLeader[j].innerHTML = this.players[j].name;
- if(infoName[j]) infoName[j].parentElement.classList.remove('defeated'); if(bar[j]) bar[j].style.background = this.players[j].color;
+ // --- REPUTATION SETUP ---
+ this.players.forEach(p1 => {
+ this.diplomacy.betrayalTax[p1.name] = 0;
+ this.diplomacy.grudges[p1.name] = [];
+ this.diplomacy.reputation[p1.name] = {};
+ this.players.forEach(p2 => {
+ this.diplomacy.reputation[p1.name][p2.name] = 0;
+ });
+ });
+ if (this.perksEnabled) {
+ setInitialReputations();
}
+// --- Initialize Core Game Variables ---
+this.aiTurn = false;
+this.gameOver = false;
+this.turn = 1;
- this.stage = "Fortify"; this.updateButtonText(); if (turnInfoMessage) turnInfoMessage.textContent = "Click on your own areas to place reinforcements";
-
- // --- MAP DISTRIBUTION ---
+if (this.wastelandEconomyActive) {
+ this.stage = "Income";
+} else {
+ this.stage = "Fortify";
+}
+
+ this.player = this.players.find(p => p.isPlayer);
+// --- FULL MAP & UI POPULATION LOGIC (from your working code) ---
+if (!this.wastelandEconomyActive) {
+ generateDeck();
+ tradeCount = 0;
+ this.players.forEach(p => { p.cards = []; });
+}
+this.players.forEach(p => { p.conqueredThisTurn = false; });
+
+ let cardCount = document.getElementById('card-count');
+ if (cardCount) cardCount.textContent = "0";
+ if (this.prevTarget) this.prevTarget.classList.remove('flash');
+ for (let j = 0; j < this.players.length; j++) {
+ if (infoName[j]) infoName[j].innerHTML = this.players[j].country;
+ if (infoLeader[j]) infoLeader[j].innerHTML = this.players[j].name;
+ if (infoName[j]) infoName[j].parentElement.classList.remove('defeated');
+ if (bar[j]) bar[j].style.background = this.players[j].color;
+ }
+ this.updateButtonText();
+ if (turnInfoMessage) turnInfoMessage.textContent = "Click on your own areas to place reinforcements";
+ let horrors = this.players.find(p => p.isNeutral);
let siloAreas = [];
- if(this.nukesEnabled) {
+ if (this.nukesEnabled && horrors) {
continents.forEach(cont => {
let randArea = cont.areas[Math.floor(Math.random() * cont.areas.length)];
let c = this.countries.find(x => x.name === randArea);
- c.isSilo = true; c.owner = "Wasteland Horrors"; c.color = "#333333"; c.army = 15;
- siloAreas.push(c.name); horrors.areas.push(c.name); horrors.army += 15;
+ c.isSilo = true;
+ c.owner = "Wasteland Horrors";
+ c.color = "#333333";
+ c.army = 15;
+ siloAreas.push(c.name);
+ horrors.areas.push(c.name);
+ horrors.army += 15;
});
document.getElementById('nuke-ui-container').style.display = "block";
- } else { document.getElementById('nuke-ui-container').style.display = "none"; }
-
- this.players.forEach(p => { p.reserve = p.isNeutral ? 0 : 20; if(p.name !== "Wasteland Horrors") { p.army = 0; p.areas = []; }});
-
-let validAreasForPlayers = areas.filter(a => !siloAreas.includes(a.id));
+ } else {
+ document.getElementById('nuke-ui-container').style.display = "none";
+ }
+ this.players.forEach(p => {
+ if (p !== horrors) {
+ p.army = 0;
+ p.areas = [];
+ p.reserve = 20;
+ }
+ });
+ let validAreasForPlayers = areas.filter(a => !siloAreas.includes(a.id));
let shuffledAreas = shuffle([...validAreasForPlayers]);
-
- // --- WILD GHOULS STARTING SPAWN ---
- if (optHorrors && horrors) {
- let ghoulStartCount = 4; // Give them 4 random territories to start
+ if (document.getElementById('opt-horrors')?.checked && horrors) {
+ let ghoulStartCount = 4;
for (let g = 0; g < ghoulStartCount; g++) {
- let area = shuffledAreas.pop(); // Remove it from the available player pool
+ let area = shuffledAreas.pop();
let country = this.countries.find(c => c.name === area.id);
- country.owner = horrors.name;
- country.color = horrors.color;
- country.army = Math.floor(Math.random() * 3) + 3; // Start with 3 to 5 ghouls
- horrors.areas.push(country.name);
- horrors.army += country.army;
+ if (country) {
+ country.owner = horrors.name;
+ country.color = horrors.color;
+ country.army = Math.floor(Math.random() * 3) + 3;
+ horrors.areas.push(country.name);
+ horrors.army += country.army;
+ }
}
}
-
let activePlayers = this.players.filter(p => !p.isNeutral);
-
shuffledAreas.forEach((area, i) => {
- let player = activePlayers[i % activePlayers.length];
+ let player = activePlayers[i % activePlayers.length];
let country = this.countries.find(c => c.name === area.id);
- country.owner = player.name; country.color = player.color; country.army = 1;
- player.areas.push(country.name); player.army += country.army; player.reserve -= 1;
+ if (country) {
+ country.owner = player.name;
+ country.color = player.color;
+ country.army = 1;
+ player.areas.push(country.name);
+ player.army++;
+ player.reserve--;
+ }
});
-
this.players.forEach(player => {
- while(player.reserve > 0 && !player.isNeutral && player.areas.length > 0) {
+ while (player.reserve > 0 && !player.isNeutral && player.areas.length > 0) {
let randomArea = player.areas[Math.floor(Math.random() * player.areas.length)];
let country = this.countries.find(c => c.name === randomArea);
- country.army += 1; player.army += 1; player.reserve -= 1;
+ if (country) {
+ country.army++;
+ player.army++;
+ player.reserve--;
+ }
+ }
+ });
+ if (this.commandersEnabled) {
+ this.players.forEach(p => {
+ if (p.alive && !p.isNeutral && p.areas.length > 0) {
+ p.commander = {
+ hp: 100,
+ ap: 2,
+ loc: p.areas[Math.floor(Math.random() * p.areas.length)],
+ stimpaks: 0,
+ siegeTurns: 0,
+ wasAttacked: false
+ };
+ }
+ });
+ document.getElementById('cmdr-ui-container').style.display = "block";
+ } else {
+ document.getElementById('cmdr-ui-container').style.display = "none";
+ }
+ this.countries.forEach(country => {
+ let areaOnMap = document.getElementById(country.name);
+ if (areaOnMap) areaOnMap.style.fill = country.color;
+ });
+if (!this.wastelandEconomyActive) {
+ this.player.reserve = this.unitBonus(this.player, 0);
+ this.player.army += this.player.reserve;
+}
+
+this.drawMapText();
+this.updateInfo();
+this.startIntelAnimation();
+await this.logAction("RobCo OS Booted. Wasteland Simulation Online.", true);
+if (this.wastelandEconomyActive) await this.logAction(">>> SYSTEM: WASTELAND ECONOMY ENGAGED. CAPS ARE KING.", true);
+
+ if (document.getElementById('opt-horrors')?.checked) await this.logAction(">>> SYSTEM: NEUTRAL THREAT SCANNER ACTIVE.");
+ if (this.nukesEnabled) await this.logAction(">>> DEFCON ALERT: 6 Pre-War Command Silos detected. Arms race initiated.", true);
+ if (this.commandersEnabled) await this.logAction(">>> COMMANDER PROTOCOL: VIPs deployed to the field. Protect them at all costs.", true);
+ if (this.perksEnabled) await this.logAction(">>> WARNING: Faction-specific combat doctrines are active. Expect asymmetrical warfare.", true);
+ await this.logAction("--- DAY 1 BEGINS ---", true);
+};
+
+
+
+Gamestate.toggleLockdown = async function(countryName) {
+ const clickedCountry = this.countries.find(c => c.name === countryName);
+ if (!clickedCountry || clickedCountry.owner !== this.player.name) return;
+
+ // Check if the perk is on cooldown for the player.
+ if (this.player.lockdownCooldown > 0) {
+ if(this.showToast) this.showToast(`Edict is on cooldown for ${this.player.lockdownCooldown} more turn(s).`, "red");
+ return;
+ }
+
+ const isAlreadyLocked = clickedCountry.isLockedDown;
+
+ // First, clear any existing lockdown from all other territories.
+ this.countries.forEach(c => {
+ if (c.name !== countryName) {
+ c.isLockedDown = false;
+ let el = document.getElementById(c.name);
+ if (el) el.classList.remove('lockdown-territory');
}
});
- if(this.commandersEnabled) {
-this.players.forEach(p => { if(p.alive && !p.isNeutral && p.areas.length > 0) { p.commander = { hp: 100, ap: 2, loc: p.areas[Math.floor(Math.random() * p.areas.length)], stimpaks: 0, siegeTurns: 0, wasAttacked: false }; }});
- document.getElementById('cmdr-ui-container').style.display = "block";
- } else { document.getElementById('cmdr-ui-container').style.display = "none"; }
+ // Now, toggle the state of the clicked country.
+ clickedCountry.isLockedDown = !isAlreadyLocked;
+ let clickedEl = document.getElementById(clickedCountry.name);
+ if (clickedCountry.isLockedDown) {
+ // If we are ADDING the lockdown
+ if (clickedEl) clickedEl.classList.add('lockdown-territory');
+ clickedCountry.lockdownTimer = 3; // Set the 3-turn timer
+ await this.logAction(`LOCKDOWN ENACTED: ${formatTerritoryName(clickedCountry.name)} is now under Elder's Edict for 3 turns.`);
+ } else {
+ // If we are REMOVING the lockdown
+ if (clickedEl) clickedEl.classList.remove('lockdown-territory');
+ clickedCountry.lockdownTimer = 0; // Clear the timer
+ this.player.lockdownCooldown = 4; // Start the cooldown (3 turns + current turn)
+ await this.logAction(`LOCKDOWN LIFTED: The edict has been lifted from ${formatTerritoryName(clickedCountry.name)}.`);
+ }
+
+ this.updateInfo();
+};
- this.countries.forEach(country => { let areaOnMap = document.getElementById(country.name); if (areaOnMap) areaOnMap.style.fill = country.color; });
-
- this.player.reserve = this.unitBonus(this.player, 0); this.player.army += this.player.reserve;
- this.drawMapText(); this.updateInfo();
-
- this.startIntelAnimation();
- await this.logAction("RobCo OS Booted. Wasteland Simulation Online.", true);
- if (optRadstorms) await this.logAction(">>> SYSTEM: METEOROLOGICAL HAZARD SUBSYSTEM LOADED.");
- if (optHorrors) await this.logAction(">>> SYSTEM: NEUTRAL THREAT SCANNER ACTIVE.");
- if (this.nukesEnabled) await this.logAction(">>> DEFCON ALERT: 6 Pre-War Command Silos detected. Arms race initiated.", true);
- if (this.commandersEnabled) await this.logAction(">>> COMMANDER PROTOCOL: VIPs deployed to the field. Protect them at all costs.", true);
-await this.logAction("--- DAY 1 BEGINS ---", true);
-}
Gamestate.drawMapText = function() {
this.countries.forEach(country => {
let areaOnMap = document.getElementById(country.name);
let textNode = country.textNode || (areaOnMap ? areaOnMap.nextElementSibling : null);
-
if (areaOnMap && textNode) {
-
- if(country.isCrater) {
- textNode.innerHTML = "";
- return;
+ if (country.isCrater) {
+ textNode.innerHTML = "";
+ return;
}
-
// --- FOG OF WAR CHECK ---
const isShrouded = areaOnMap.classList.contains('fog-shroud');
-
let finalHtml;
-
if (!isShrouded) {
// --- VISIBLE TERRITORY ---
- // Your original, working logic for visible territories.
let text = `${country.army}`;
let iconHtml = "";
- if(this.nukesEnabled && country.isSilo) {
+ // --- THIS IS THE NEW LOGIC FOR THE LOCKDOWN ICON ---
+ if (country.isLockedDown) {
+ iconHtml += `🔒 `;
+ }
+
+ if (this.nukesEnabled && country.isSilo) {
let isLaunchSite = (this.activeNuke && this.activeNuke.launchSilo === country.name);
let siloColor = isLaunchSite ? "#ff3333" : "#ffcc00";
let pulse = isLaunchSite ? `filter="drop-shadow(0 0 8px #ff3333)"` : ``;
iconHtml += `☢ `;
}
-
- if(this.commandersEnabled) {
+ if (this.commandersEnabled) {
this.players.forEach(p => {
if (p.alive && !p.isNeutral && p.commander && p.commander.loc === country.name) {
iconHtml += `★ `;
}
});
}
-
- if (iconHtml !== "") {
- text += `${iconHtml} `;
+ if (iconHtml !== "") {
+ text += `${iconHtml} `;
}
finalHtml = text;
-
} else {
// --- SHROUDED TERRITORY ---
- // Show a question mark.
let text = '?';
-
// SILO MEMORY: If we know a silo is here, show the icon.
if (this.nukesEnabled && country.isSilo && country.knownSilo) {
- // CORRECTED LINE: This creates a valid icon without the problematic 'dy' attribute.
- // The icon will appear next to the question mark.
text += ` ☢ `;
}
finalHtml = text;
}
-
// Update the map text.
textNode.innerHTML = finalHtml;
}
@@ -3195,6 +3898,33 @@ Gamestate.showEnvoyModal = function(factionName, caps, turns, color, isRequestin
});
}
+Gamestate.showFrenzyModal = function(targetName) {
+ return new Promise(resolve => {
+ const modal = document.getElementById('frenzy-modal');
+ const targetNameSpan = document.getElementById('frenzy-target-name');
+ const yesBtn = document.getElementById('frenzy-yes');
+ const noBtn = document.getElementById('frenzy-no');
+
+ if (!modal || !targetNameSpan || !yesBtn || !noBtn) {
+ resolve(false); // Failsafe if elements don't exist
+ return;
+ }
+
+ targetNameSpan.textContent = targetName;
+ modal.style.display = 'flex';
+
+ const close = (decision) => {
+ modal.style.display = 'none';
+ yesBtn.onclick = null; // Clean up listeners
+ noBtn.onclick = null;
+ resolve(decision);
+ };
+
+ yesBtn.onclick = () => close(true);
+ noBtn.onclick = () => close(false);
+ });
+};
+
Gamestate.showBetrayalModal = function(targetName) {
return new Promise((resolve) => {
@@ -3560,15 +4290,25 @@ Gamestate.updateInfo = function(){
combinedStats += ` | Codes: ${nukesVal}`;
}
- // The rest of your code, which correctly puts the stats in the container
- if (incomeContainer) {
- incomeContainer.innerHTML = combinedStats;
- incomeContainer.style.display = "block";
- }
-
- if (capsEl) {
- capsEl.style.display = "none";
- }
+// --- THIS IS THE NEW ECONOMY/CLASSIC DISPLAY LOGIC ---
+if (this.wastelandEconomyActive) {
+ let capsDisplay = hasIntel ? `${player.caps} Caps ` : `?? `;
+ if (incomeContainer) {
+ incomeContainer.innerHTML = `Treasury: ${capsDisplay}`;
+ incomeContainer.style.display = "block";
+ }
+ if (capsEl) capsEl.style.display = "none";
+} else {
+ // Original logic for classic mode
+ if (incomeContainer) {
+ incomeContainer.innerHTML = combinedStats;
+ incomeContainer.style.display = "block";
+ }
+ if (capsEl) {
+ capsEl.style.display = "none";
+ }
+}
+
}
@@ -3622,13 +4362,39 @@ Gamestate.updateInfo = function(){
if (this.players.length === 6 && infoName[6] && infoName[6].parentElement) infoName[6].parentElement.style.display = "none";
let helpBtnEl = document.getElementById('help-btn'); if (helpBtnEl) helpBtnEl.style.order = "998";
let restartBtn = document.getElementById('restart'); if (restartBtn) restartBtn.style.order = "999";
- let cardCount = document.getElementById('card-count'); if (cardCount) cardCount.textContent = this.player.cards.length;
- if (reserveDisplay) reserveDisplay.innerHTML = this.player.reserve;
- let viewCardsBtn = document.getElementById('view-cards-btn');
- if (viewCardsBtn) {
- if (this.getBestTrade(this.player.cards)) { viewCardsBtn.textContent = "OPEN STASH"; viewCardsBtn.style.opacity = "1"; viewCardsBtn.style.pointerEvents = "auto"; viewCardsBtn.classList.add('ready-to-trade'); }
- else { viewCardsBtn.textContent = this.player.cards.length > 0 ? "NO ELIGIBLE SETS" : "STASH EMPTY"; viewCardsBtn.style.opacity = "0.5"; viewCardsBtn.style.pointerEvents = "none"; viewCardsBtn.classList.remove('ready-to-trade'); }
+ let cardCount = document.getElementById('card-count');
+if (cardCount) {
+ if (this.wastelandEconomyActive) {
+ cardCount.textContent = this.player.caps; // Show currency
+ } else {
+ cardCount.textContent = this.player.cards.length; // Show card count
}
+}
+
+ if (reserveDisplay) reserveDisplay.innerHTML = this.player.reserve;
+let viewCardsBtn = document.getElementById('view-cards-btn');
+if (viewCardsBtn) {
+ if (this.wastelandEconomyActive) {
+ viewCardsBtn.textContent = "VIEW STASH";
+ viewCardsBtn.style.opacity = "1";
+ viewCardsBtn.style.pointerEvents = "auto";
+ viewCardsBtn.classList.remove('ready-to-trade');
+ } else {
+ // Original logic for classic mode
+ if (this.getBestTrade(this.player.cards)) {
+ viewCardsBtn.textContent = "OPEN STASH";
+ viewCardsBtn.style.opacity = "1";
+ viewCardsBtn.style.pointerEvents = "auto";
+ viewCardsBtn.classList.add('ready-to-trade');
+ } else {
+ viewCardsBtn.textContent = this.player.cards.length > 0 ? "NO ELIGIBLE SETS" : "STASH EMPTY";
+ viewCardsBtn.style.opacity = "0.5";
+ viewCardsBtn.style.pointerEvents = "none";
+ viewCardsBtn.classList.remove('ready-to-trade');
+ }
+ }
+}
+
let hpFill = document.getElementById('hp-fill'); let apFill = document.getElementById('ap-fill');
if (hpFill && apFill && totalArmy > 0 && this.player.alive) {
let hpPercentage = Math.min(100, (this.player.areas.length / 24) * 100); hpFill.style.width = hpPercentage + "%";
@@ -3693,6 +4459,8 @@ Gamestate.updateInfo = function(){
if (this.nukesEnabled && country.isSilo) { country.knownSilo = true; }
if (country.radDecay > 0) areaOnMap.classList.add('glowing-sea'); else areaOnMap.classList.remove('glowing-sea');
if (this.areAllies(this.player.name, country.owner)) areaOnMap.classList.add('allied-territory'); else areaOnMap.classList.remove('allied-territory');
+ if (country.isLockedDown) areaOnMap.classList.add('lockdown-territory');
+
} else {
areaOnMap.classList.add('fog-shroud');
areaOnMap.style.fill = '';
@@ -3736,6 +4504,79 @@ Gamestate.updateInfo = function(){
document.getElementById('cmdr-hp-fill').style.width = `${this.player.commander.hp}%`;
}
this.drawMapText(); this.lastStage = this.stage;
+
+// --- ACTIONABLE PERK BUTTON LOGIC (v5 - Final) ---
+const perkButtonWrapper = document.getElementById('perk-button-wrapper');
+const perkButton = document.getElementById('btn-perk-action');
+const tooltip = document.getElementById('vats-tooltip');
+if (perkButtonWrapper && perkButton && tooltip) {
+ let showButton = false;
+ let tooltipText = "";
+ if (this.perksEnabled && this.player && this.player.perk && !this.aiTurn) {
+
+ // PERK 1: The Gunners
+ if (this.player.perk.id === 'mercenary_contracts') {
+ showButton = true;
+ perkButton.textContent = "Mercenary Contract (2 Caps)";
+ perkButton.onclick = () => this.useMercenaryContract();
+ perkButton.disabled = this.player.cards.length < 2;
+ tooltipText = perkButton.disabled ? "Requires at least 2 Bottle Caps." : "Spend 2 Caps to deploy troops to your reserves, scaling with territory owned.";
+ }
+ // PERK 2: Mojave Brotherhood (Corrected v3)
+ else if (this.player.perk.id === 'elders_edict') {
+ showButton = true;
+ const isAnyTerritoryLocked = this.countries.some(c => c.isLockedDown);
+ perkButton.textContent = isAnyTerritoryLocked ? "Lift Lockdown" : "Enact Lockdown";
+ perkButton.onclick = () => {
+ // Check if a territory has been selected
+ if (this.prevCountry && this.prevCountry.owner === this.player.name) {
+ this.toggleLockdown(this.prevCountry.name);
+ } else {
+ if (this.showToast) this.showToast("Select one of your territories first to use the Edict.", "grey");
+ }
+ };
+ // --- NEW Disabling Logic ---
+ // Disable the button if it's the Fortify phase AND there are troops to place.
+ if (this.stage === "Fortify" && this.player.reserve > 0) {
+ perkButton.disabled = true;
+ tooltipText = "Deploy all reserve troops to enable the Elder's Edict.";
+ }
+ // Disable if the perk is on cooldown
+ else if (this.player.lockdownCooldown > 0) {
+ perkButton.disabled = true;
+ tooltipText = `Edict is on cooldown for ${this.player.lockdownCooldown} more turn(s).`;
+ }
+ // Otherwise, enable the button
+ else {
+ perkButton.disabled = false;
+ tooltipText = "Select one of your territories and then click this button to apply or remove the Elder's Edict.";
+ }
+ }
+ // PERK 3: The Railroad (No button needed for this passive perk)
+ // The logic for 'rapid_relocation' is handled in the maneuver and end turn functions.
+ // We no longer show a button here.
+ }
+ // Final visibility decision
+ perkButtonWrapper.style.display = showButton ? 'block' : 'none';
+
+ // --- Event Listeners for the Custom Tooltip ---
+ perkButtonWrapper.onmouseenter = (e) => {
+ if (tooltipText && perkButtonWrapper.style.display === 'block') {
+ tooltip.innerHTML = tooltipText;
+ tooltip.style.display = 'block';
+ tooltip.style.left = (e.pageX + 15) + 'px';
+ tooltip.style.top = (e.pageY + 15) + 'px';
+ }
+ };
+ perkButtonWrapper.onmousemove = (e) => {
+ tooltip.style.left = (e.pageX + 15) + 'px';
+ tooltip.style.top = (e.pageY + 15) + 'px';
+ };
+ perkButtonWrapper.onmouseleave = () => {
+ tooltip.style.display = 'none';
+ };
+}
+
}
@@ -3822,6 +4663,12 @@ Gamestate.executeTrade = async function() {
if (this.aiTurn) return;
if (this.isValidTrade()) {
let bonus = getTradeBonus();
+ // --- PERK LOGIC: BOS Outcasts ('tech_hoarders') ---
+ if (this.perksEnabled && this.player.perk && this.player.perk.id === 'tech_hoarders') {
+ bonus += 2;
+ await this.logAction("⚙️ Tech Hoarders perk yielded +2 additional troops from the trade.");
+ }
+
this.selectedCards.sort((a,b) => b-a).forEach(index => { deck.unshift(this.player.cards[index]); this.player.cards.splice(index, 1); });
this.player.reserve += bonus; this.player.army += bonus;
@@ -3908,68 +4755,75 @@ Gamestate.processRadstorm = async function() {
});
}
-Gamestate.handleEndTurn = async function(){
- if(this.aiTurn || this.player.reserve > 0){ return; }
-
-// --- BATTLE -> MANEUVER BRIDGE ---
+Gamestate.handleEndTurn = async function() {
+ if (this.aiTurn || this.player.reserve > 0) {
+ return;
+ }
+ // --- BATTLE -> MANEUVER BRIDGE ---
if (this.stage === "Battle") {
let canManeuver = false;
let owned = this.countries.filter(c => c.owner === this.player.name);
for (let t of owned) {
- if (t.army > 1 && t.neighbours.some(n => {
- let nc = this.countries.find(x=>x.name===n);
- return nc && nc.owner === this.player.name && !nc.isCrater;
- })) { canManeuver = true; break; }
+ if (t.army > 1 && t.neighbours.some(n => {
+ let nc = this.countries.find(x => x.name === n);
+ return nc && nc.owner === this.player.name && !nc.isCrater;
+ })) {
+ canManeuver = true;
+ break;
+ }
}
-
- if(this.prevTarget) this.prevTarget.classList.remove('flash');
- this.prevCountry = null; this.prevTarget = null;
-
+ if (this.prevTarget) this.prevTarget.classList.remove('flash');
+ this.prevCountry = null;
+ this.prevTarget = null;
if (canManeuver) {
- this.stage = "Maneuver";
- this.maneuverSource = null; this.maneuverDest = null;
- this.updateButtonText();
- if (turnInfo) turnInfo.textContent = "Maneuver Phase";
- if (turnInfoMessage) turnInfoMessage.textContent = "Move troops between adjacent territories. [SHIFT] moves all.";
- this.updateInfo();
- return;
+ this.stage = "Maneuver";
+ this.maneuverSource = null;
+ this.maneuverDest = null;
+
+ // --- THIS IS THE NEW PERK LOGIC ---
+ // Grant maneuver points to The Railroad player
+ if (this.perksEnabled && this.player.perk && this.player.perk.id === 'rapid_relocation') {
+ this.player.maneuverPoints = 5;
+ if (turnInfoMessage) turnInfoMessage.textContent = `Move troops. You have ${this.player.maneuverPoints} moves remaining.`;
+ } else {
+ this.player.maneuverPoints = 1; // Standard players get 1 point
+ if (turnInfoMessage) turnInfoMessage.textContent = "Move troops between adjacent territories. [SHIFT] moves all.";
+ }
+
+ this.updateButtonText();
+ if (turnInfo) turnInfo.textContent = "Maneuver Phase";
+ this.updateInfo();
+ return;
} else {
// No maneuvers possible? Jump straight to Commander Phase instead of ending turn!
this.stage = "Maneuver"; // Set to maneuver temporarily so the next block catches it
}
}
-
// --- MANEUVER -> COMMANDER BRIDGE ---
if (this.stage === "Maneuver" && this.commandersEnabled && this.player.alive && this.player.commander) {
- if(this.prevTarget) this.prevTarget.classList.remove('flash');
- this.prevCountry = null; this.prevTarget = null;
-
- this.stage = "Commander Phase";
+ if (this.prevTarget) this.prevTarget.classList.remove('flash');
+ this.prevCountry = null;
+ this.prevTarget = null;
+ this.stage = "Commander Phase";
this.player.commander.ap = 2;
this.player.commander.hasFought = false; // Reset attack limit
this.aiTurn = false; // Guard against AI hijacking
-
- this.updateButtonText();
- if(turnInfo) turnInfo.textContent = "Commander Phase";
- if(turnInfoMessage) turnInfoMessage.textContent = "Move your Commander or use a Stimpak. (Costs 1 AP)";
- this.updateInfo();
+ this.updateButtonText();
+ if (turnInfo) turnInfo.textContent = "Commander Phase";
+ if (turnInfoMessage) turnInfoMessage.textContent = "Move your Commander or use a Stimpak. (Costs 1 AP)";
+ this.updateInfo();
return;
}
-
// FIX: Lock the AI Turn and Map IMMEDIATELY before any 'await' delays to prevent multi-click cloning!
- this.aiTurn = true;
+ this.aiTurn = true;
if (map) map.style.pointerEvents = "none";
-
if (this.player.conqueredThisTurn) {
-
let luckItem = this.bobbleheads && this.bobbleheads.find(i => i.key === 'l' && i.cooldown > 0);
// Luck perk now adds a flat +15% to all rare loot drops
- const luckModifier = luckItem ? 0.15 : 0;
-
+ const luckModifier = luckItem ? 0.15 : 0;
let roll = Math.random();
-
// 1. Roll for Bobblehead (5% base + 15% Luck = 20% max)
- if (this.bobbleheads && roll < (0.05 + luckModifier)) {
+ if (this.bobbleheads && roll < (0.05 + luckModifier)) {
let unfoundItems = this.bobbleheads.filter(item => !item.found);
if (unfoundItems.length > 0) {
let foundItem = unfoundItems[Math.floor(Math.random() * unfoundItems.length)];
@@ -3977,83 +4831,98 @@ Gamestate.handleEndTurn = async function(){
let navInv = document.getElementById('nav-inv');
if (navInv) navInv.classList.add('inv-pulse');
this.justFoundLoot = true;
-
-
- // CRITICAL: Call queueToast for the Bobblehead
if (this.queueToast) {
this.queueToast(`>>> SYSTEM OVERRIDE <<< ★ ✚ + ✚ + ☢ ? ${creature.name} near your garrison of ${territory.army} troops at ${formatTerritoryName(territory.name)} .`;
+ const choices = [
+ { id: "attack", text: "[Attack] Try to eliminate the threat." },
+ { id: "avoid", text: "[Avoid] The risk isn't worth it." }
+ ];
+
+ const onChoiceCallback = (decision) => {
+ if (decision === 'attack') {
+ // Log the action but DO NOT await it.
+ this.logAction(`You chose to engage the ${creature.name} at ${formatTerritoryName(territory.name)}!`, true);
+
+ const army = territory.army;
+ const threat = creature.threat;
+ const damagePercent = threat / (army + threat);
+ let casualties = Math.floor(army * damagePercent);
+
+ if (army > 1 && army - casualties < 1) {
+ casualties = army - 1;
+ } else if (army === 1 && casualties > 0) {
+ casualties = 1;
+ }
+
+ if (casualties > 0) {
+ territory.army -= casualties;
+ this.player.army -= casualties;
+ // Log the action but DO NOT await it.
+ this.logAction(`Your soldiers fought bravely, but suffered ${casualties} casualties.`, true);
+ return `The ${creature.name} was driven off, but you lost ${casualties} troops in the fight.`;
+ } else {
+ // Log the action but DO NOT await it.
+ this.logAction(`Your garrison made short work of the ${creature.name} and suffered no losses.`);
+ return `A decisive victory! The ${creature.name} was eliminated with no casualties .`;
+ }
+ } else { // 'avoid'
+ // Log the action but DO NOT await it.
+ this.logAction(`You chose to avoid the ${creature.name}, leaving it to roam the wastes.`);
+ return `You wisely avoid the creature, and your troops remain safe.`;
+ }
+ };
+
+ await this.showEncounterModal(title, message, choices, onChoiceCallback);
+
+ // Update the UI after the modal has closed
+ this.updateInfo();
+ this.drawMapText();
+};
+
+
+Gamestate.triggerEncounterCheck = async function(triggerType) {
+ // --- THIS IS THE NEW CHECK ---
+ // If encounters are disabled in the game settings, do nothing.
+ if (!this.encountersEnabled) return;
+
+ let chance = 0;
+ if (triggerType === 'start_of_turn') {
+ chance = 0.08; // 8% chance at the start of a turn
+ } else if (triggerType === 'post_conquest') {
+ chance = 0.15; // 15% chance after conquering a territory
+ }
+
+ if (Math.random() < chance) {
+ if (triggerType === 'start_of_turn') {
+ await this.resolveCreatureEncounter();
+ }
+ // We will add post-conquest story logic here in a future step.
+ }
+};
+
+
+
+/**
+ * Sets the initial reputation values between all players based on their faction affinities.
+ * This function should be called once at the start of a new game.
+ *
+ * I am assuming:
+ * - You have a global 'players' array where each player object has a 'country' property (e.g., players[0].country = "The Enclave").
+ * - You have a global 'reputation' matrix (e.g., reputation[playerIndex1][playerIndex2]).
+ */
+
+function setInitialReputations() {
+ console.log("Setting initial faction reputations...");
+
+ // The ONLY change is on the next line: "players.length" becomes "Gamestate.players.length"
+ for (let i = 0; i < Gamestate.players.length; i++) {
+
+ for (let j = 0; j < Gamestate.players.length; j++) {
+ if (i === j) {
+ // Also needs to be changed here:
+ Gamestate.diplomacy.reputation[Gamestate.players[i].name][Gamestate.players[j].name] = 0;
+ continue;
+ }
+
+ const faction1_name = Gamestate.players[i].country;
+ const faction2_name = Gamestate.players[j].country;
+
+ if (FACTIONS[faction1_name] && FACTIONS[faction1_name].affinity && FACTIONS[faction1_name].affinity[faction2_name]) {
+ const affinityValue = FACTIONS[faction1_name].affinity[faction2_name];
+
+ // And here:
+ Gamestate.diplomacy.reputation[Gamestate.players[i].name][Gamestate.players[j].name] = affinityValue;
+
+ console.log(`Affinity found: ${faction1_name} -> ${faction2_name} = ${affinityValue}`);
+ } else {
+ // And finally, here:
+ Gamestate.diplomacy.reputation[Gamestate.players[i].name][Gamestate.players[j].name] = 0;
+ }
+ }
+ }
+ console.log("Initial reputations set.", Gamestate.diplomacy.reputation);
+}
+
+
const wastelandRadio = [
{ file: "Fallout3.mp3", title: "Fallout 3 Theme - Inon Zur" }, { file: "IDontWantToSeeTomorrow.mp3", title: "Nat King Cole - I Don't Want to See Tomorrow" },
{ file: "LetsGoSunning.mp3", title: "Jack Shaindlin - Lets Go Sunning" }, { file: "TheendoftheWorld.mp3", title: "Skeeter Davis - The End of the World" },
@@ -5550,7 +6949,6 @@ Gamestate.updateInfo = function() {
}
}
}
-// ---------------------------------------------
// --- BULLETPROOF SVG OVERLAP FIX (V2) ---
Gamestate.fixMapTextOrder = function() {
@@ -5570,7 +6968,6 @@ Gamestate.fixMapTextOrder = function() {
}
});
}
-// -----------------------------------