From 95eb097a9edffc29d0587d829949c085e81da55e Mon Sep 17 00:00:00 2001 From: zoliking Date: Sat, 27 Jun 2026 00:42:08 +0200 Subject: [PATCH] Update mf_sheet.html Minor bug fixes --- Millennium Freelancers/mf_sheet.html | 41 ++++++++++++++++------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/Millennium Freelancers/mf_sheet.html b/Millennium Freelancers/mf_sheet.html index d19542de0c..21491063c4 100644 --- a/Millennium Freelancers/mf_sheet.html +++ b/Millennium Freelancers/mf_sheet.html @@ -440,7 +440,10 @@ async function startCC(info) { case "currentpc": await setAttrsAsync({"cc0_prompt_hider": "1", "cc1_prompt_hider": "0"}); - setCharacterInfo(); + setTerritory(); + setProfession(); + setBirthPlace(); + setSocialClass(); break; case "npc": @@ -1451,7 +1454,7 @@ on ("clicked:cc2_complete", closeCC); async function closeCC() { - var values = await getAttrsAsync(["cc_points", "profession_select", "social_class_select", "territory_select", "role_select", "str", "piloting", "bridge_tech", "vehicle_engineering", "mounted_weaponry"]); + var values = await getAttrsAsync(["cc_points", "profession_select", "social_class_select", "territory_select", "role_select", "str", "piloting", "bridge_tech", "vehicle_engineering", "mounted_weaponry", "gt_choice"]); var xpInfo = await getXPData(); console.log(xpInfo); await setAttrsAsync({"cc2_prompt_hider": 1, @@ -1713,7 +1716,7 @@ async function closeCC() ["repeating_melees_" + id + "_melee_damage"]: "1d4 + " + Math.round(Number(values.str) / 2) + "i", ["repeating_melees_" + id + "_melee_modifier"]: "0", ["repeating_melees_" + id + "_melee_modifier"]: "A normal steel dagger."}); - gear = "1 S.E.A.L., 1 combat com, <1>"; + gear = "1 S.E.A.L.\n1 combat com\nstandard clothes\n<1>"; otherGear = "uniform"; break; @@ -1721,7 +1724,7 @@ async function closeCC() ccWeapon = electroPistol; ccArmor = heavyMilitiaArmor; ccAmmo = null; - gear = "1 S.E.A.L., 1 combat com, standard clothes, voltaic baton, 1 Turbo, <1>"; + gear = "1 S.E.A.L.\n1 combat com\nstandard clothes\nvoltaic baton\n1 Turbo\n<1>"; otherGear = "uniform"; break; @@ -1729,7 +1732,7 @@ async function closeCC() ccWeapon = arduloM2; ccArmor = combatPolymerSuit; ccAmmo = ammoA; - gear = "1 S.E.A.L., 1 combat com, standard clothes, handheld scancorder, \n<2>"; otherGear = "labwear"; break; @@ -1737,7 +1740,7 @@ async function closeCC() ccWeapon = arduloM2; ccArmor = combatPolymerSuit; ccAmmo = ammoA; - gear = "3 S.E.A.L.-s, 1 combat com, standard clothes, first aid kit, <1>"; + gear = "3 S.E.A.L.-s\n1 combat com\nstandard clothes\nfirst aid kit\n<1>"; otherGear = "labwear"; break; @@ -1745,7 +1748,7 @@ async function closeCC() ccWeapon = yamainu; ccArmor = combatPolymerSuit; ccAmmo = ammoD; - gear = "1 S.E.A.L., 1 combat com, standard clothes, bug, tracking device, <2>"; + gear = "1 S.E.A.L.\n1 combat com\nstandard clothes\nbug\ntracking device\n<2>"; otherGear = "set of elegant clothes"; break; @@ -1753,7 +1756,7 @@ async function closeCC() ccWeapon = arduloM2; ccArmor = lightMilitiaArmor; ccAmmo = ammoA; - gear = "1 S.E.A.L., 1 combat com, standard clothes, 1 Focus, <1>"; + gear = "1 S.E.A.L.\n1 combat com\nstandard clothes\n1 Focus\n<1>"; otherGear = "civilian space suit, protective workwear"; break; @@ -1770,7 +1773,7 @@ async function closeCC() ccWeapon = arduloM2; ccArmor = combatPolymerSuit; ccAmmo = ammoA; - gear = "1 S.E.A.L., 1 combat com, standard clothes, 10m carbon fiber cable with serrated tips, ZX7, <1>"; + gear = "1 S.E.A.L.\n1 combat com\nstandard clothes\n10m carbon fiber cable with serrated tips\nZX7\n<1>"; otherGear = "set of stealthwear"; break; @@ -1778,7 +1781,7 @@ async function closeCC() ccWeapon = arduloT4; ccArmor = combatPolymerSuit; ccAmmo = ammoA; - gear = "1 S.E.A.L., 1 combat com, standard clothes, bug, <2>, 1 Focus"; + gear = "1 S.E.A.L.\n1 combat com\nstandard clothes\nbug\n<2>\n1 Focus"; otherGear = "set of elegant clothing"; break; @@ -1786,7 +1789,7 @@ async function closeCC() ccWeapon = arduloM2; ccArmor = lightMilitiaArmor; ccAmmo = ammoA; - gear = "1 S.E.A.L., 1 combat com, standard clothes, vehicle toolkit, <1>"; + gear = "1 S.E.A.L.\n1 combat com\nstandard clothes\nvehicle toolkit\n<1>"; otherGear = "civilian space suit, set of protective workwear"; break; @@ -1794,7 +1797,7 @@ async function closeCC() ccWeapon = arduloMinotaur; ccArmor = combatPolymerSuit; ccAmmo = ammoB; - gear = "1 S.E.A.L., 1 combat com, standard clothes, 1 Focus, , <2>"; + gear = "1 S.E.A.L.\n1 combat com\nstandard clothes\n1 Focus\n\n<2>"; otherGear = "set of protective workwear"; break; @@ -1802,7 +1805,7 @@ async function closeCC() ccWeapon = arduloM2; ccArmor = combatPolymerSuit; ccAmmo = ammoA; - gear = "1 S.E.A.L., 1 combat com, standard clothes, 1 Focus, <2>, com tap"; + gear = "1 S.E.A.L.\n1 combat com\nstandard clothes\n1 Focus\n<2>\ncom tap"; otherGear = "set of elegant clothing"; break; @@ -1810,7 +1813,7 @@ async function closeCC() ccWeapon = laserPistol; ccArmor = combatPolymerSuit; ccAmmo = null; - gear = "1 S.E.A.L., 1 combat com, standard clothes, 1 Focus, vehicle toolkit, <2>"; + gear = "1 S.E.A.L.\n1 combat com\nstandard clothes\n1 Focus\nvehicle toolkit\n<2>"; otherGear = "civilian space suit, set of protective workwear"; break; @@ -1818,7 +1821,7 @@ async function closeCC() ccWeapon = arduloT4; ccArmor = combatPolymerSuit; ccAmmo = ammoA; - gear = "1 S.E.A.L., 1 combat com, standard clothes, 2 Clear, 1 Focus, <2>, 1 piece of real jewelry"; + gear = "1 S.E.A.L.\n1 combat com\nstandard clothes\n2 Clear\n1 Focus, <2>\n1 piece of real jewelry"; otherGear = "set of elegant clothing"; break; @@ -1826,11 +1829,13 @@ async function closeCC() ccWeapon = arduloM2; ccArmor = combatPolymerSuit; ccAmmo = ammoA; - gear = "1 S.E.A.L., 1 combat com, standard clothes, 1 Focus, <3>"; + gear = "1 S.E.A.L.\n1 combat com\nstandard clothes\n1 Focus\n<3>"; otherGear = "set of elegant clothing"; break; } + console.log("Values: " + JSON.stringify(values)); + if (values.territory_select == "gt" && values.gt_choice == "1") { gear = gear.replaceAll("<1>", "jailbroken tablet (software level 6, memory 8) with hacking I, antivirus III and encryption I"); @@ -1861,7 +1866,7 @@ async function closeCC() ["repeating_armor_" + id2 + "_armor_bonus_hp"]: ccArmor.bonus_hp, ["repeating_armor_" + id2 + "_armor_max_hp"]: ccArmor.max_hp, ["repeating_armor_" + id2 + "_armor_max_bonus_hp"]: ccArmor.max_bonus_hp, - "gear": gear, + "carried_gear": gear, "other_gear": otherGear}); if (ccAmmo != null) @@ -7837,7 +7842,7 @@ function getSectionIDsAsync(sectionName){ - Ammo + Ammo ID Fi