diff --git a/src/Mods/SpecialForce/editSF.tw b/src/Mods/SpecialForce/editSF.tw index 6f60ba36bb811aa605e6b9504dacd244bc4421e7..f66a5b9a515cbc7a2ea05c952afabf8487f74b92 100644 --- a/src/Mods/SpecialForce/editSF.tw +++ b/src/Mods/SpecialForce/editSF.tw @@ -13,43 +13,43 @@ for (let i in V.SF.Squad) { $nextButton = "Back to $SF.Lower's Firebase", $nextLink = "Firebase", _options = new App.UI.OptionsGroup()>> __Upgrades__: _size/_max(<<= (_size/_max).toFixed(2)>>%) -<<run _options.addOption("''Firebase: '' (current max <<= App.SF.upgrades.currentUnitMax('Firebase')>>)", "Firebase", V.SF.Squad).showTextBox()>> -<<run _options.addOption("''Armoury: '' (current max <<= App.SF.upgrades.currentUnitMax('Armoury')>>)", "Armoury", V.SF.Squad).showTextBox()>> -<<run _options.addOption("''Drugs: '' (current max <<= App.SF.upgrades.currentUnitMax('Drugs')>>)", "Drugs", V.SF.Squad).showTextBox()>> +<<run _options.addOption("<strong>Firebase:</strong> (current max <<= App.SF.upgrades.currentUnitMax('Firebase')>>)", "Firebase", V.SF.Squad).showTextBox()>> +<<run _options.addOption("<strong>Armoury: </strong (current max <<= App.SF.upgrades.currentUnitMax('Armoury')>>)", "Armoury", V.SF.Squad).showTextBox()>> +<<run _options.addOption("<strong>Drugs: </strong (current max <<= App.SF.upgrades.currentUnitMax('Drugs')>>)", "Drugs", V.SF.Squad).showTextBox()>> <<if $SF.Squad.Firebase >= 2>> - <<run _options.addOption("''Drones: '' (current max <<= App.SF.upgrades.currentUnitMax('Drones')>>)", "Drones", V.SF.Squad).showTextBox()>> + <<run _options.addOption("<strong>Drones: </strong (current max <<= App.SF.upgrades.currentUnitMax('Drones')>>)", "Drones", V.SF.Squad).showTextBox()>> <</if>> <<if App.SF.unlocked.garage()>> - <<run _options.addOption("''Garage:''<br> ''Attack Vehicles: '' (current max <<= App.SF.upgrades.currentUnitMax('AV')>>)", "AV", V.SF.Squad).showTextBox()>> - <<run _options.addOption(" ''Transport Vehicles: '' (current max <<= App.SF.upgrades.currentUnitMax('TV')>>)", "TV", V.SF.Squad).showTextBox()>> + <<run _options.addOption("<strong>Garage:</strong><br> <strong>Attack Vehicles: </strong (current max <<= App.SF.upgrades.currentUnitMax('AV')>>)", "AV", V.SF.Squad).showTextBox()>> + <<run _options.addOption(" <strong>Transport Vehicles: </strong (current max <<= App.SF.upgrades.currentUnitMax('TV')>>)", "TV", V.SF.Squad).showTextBox()>> <<if _T1>> - <<run _options.addOption(" ''Prototype Goliath Tank: '' (current max <<= App.SF.upgrades.currentUnitMax('PGT')>>)", "PGT", V.SF.Squad).showTextBox()>> + <<run _options.addOption(" <strong>Prototype Goliath Tank: </strong (current max <<= App.SF.upgrades.currentUnitMax('PGT')>>)", "PGT", V.SF.Squad).showTextBox()>> <</if>> <</if>> <<if App.SF.unlocked.hangar()>> - <<run _options.addOption("''Hangar:''<br> ''Attack Planes: '' (current max <<= App.SF.upgrades.currentUnitMax('AA')>>)", "AA", V.SF.Squad).showTextBox()>> - <<run _options.addOption(" ''Transport Planes: '' (current max <<= App.SF.upgrades.currentUnitMax('TA')>>)", "TA", V.SF.Squad).showTextBox()>> + <<run _options.addOption("<strong>Hangar:</strong><br> <strong>Attack Planes: </strong (current max <<= App.SF.upgrades.currentUnitMax('AA')>>)", "AA", V.SF.Squad).showTextBox()>> + <<run _options.addOption(" <strong>Transport Planes: </strong (current max <<= App.SF.upgrades.currentUnitMax('TA')>>)", "TA", V.SF.Squad).showTextBox()>> <<if _T1>> - <<run _options.addOption(" ''Spaceplane: '' (current max <<= App.SF.upgrades.currentUnitMax('SpacePlane')>>)", "SpacePlane", V.SF.Squad).showTextBox()>> - <<run _options.addOption(" ''Gunship: '' (current max <<= App.SF.upgrades.currentUnitMax('GunS')>>)", "GunS", V.SF.Squad).showTextBox()>> + <<run _options.addOption(" <strong>Spaceplane: </strong (current max <<= App.SF.upgrades.currentUnitMax('SpacePlane')>>)", "SpacePlane", V.SF.Squad).showTextBox()>> + <<run _options.addOption(" <strong>Gunship: </strong (current max <<= App.SF.upgrades.currentUnitMax('GunS')>>)", "GunS", V.SF.Squad).showTextBox()>> <</if>> <</if>> <<if App.SF.unlocked.launchBay()>> - <<run _options.addOption("''Launch Bay:''<br> ''Satellite: '' (current max <<= App.SF.upgrades.currentUnitMax('Satellite')>>)", "Satellite", V.SF.Squad).showTextBox()>> + <<run _options.addOption("<strong>Launch Bay:</strong><br> <strong>Satellite: </strong (current max <<= App.SF.upgrades.currentUnitMax('Satellite')>>)", "Satellite", V.SF.Squad).showTextBox()>> <<if $terrain != "oceanic">> - <<run _options.addOption(" ''Giant Robot: '' (current max <<= App.SF.upgrades.currentUnitMax('GiantRobot')>>)", "GiantRobot", V.SF.Squad).showTextBox()>> + <<run _options.addOption(" <strong>Giant Robot: </strong (current max <<= App.SF.upgrades.currentUnitMax('GiantRobot')>>)", "GiantRobot", V.SF.Squad).showTextBox()>> <</if>> - <<run _options.addOption(" ''Cruise Missile: '' (current max <<= App.SF.upgrades.currentUnitMax('MissileSilo')>>)", "MissileSilo", V.SF.Squad).showTextBox()>> + <<run _options.addOption(" <strong>Cruise Missile: </strong (current max <<= App.SF.upgrades.currentUnitMax('MissileSilo')>>)", "MissileSilo", V.SF.Squad).showTextBox()>> <</if>> <<if App.SF.unlocked.navalYard()>> - <<run _options.addOption("<br><br>''Naval Yard:''<br> ''Aircraft Carrier: '' (current max <<= App.SF.upgrades.currentUnitMax('AircraftCarrier')>>)", "AircraftCarrier", V.SF.Squad).showTextBox()>> - <<run _options.addOption(" ''Submarine: '' (current max <<= App.SF.upgrades.currentUnitMax('Sub')>>)", "Sub", V.SF.Squad).showTextBox()>> - <<run _options.addOption(" ''Amphibious Transport: '' (current max <<= App.SF.upgrades.currentUnitMax('HAT')>>)", "HAT", V.SF.Squad).showTextBox()>> + <<run _options.addOption("<br><br><strong>Naval Yard:</strong><br> <strong>Aircraft Carrier: </strong (current max <<= App.SF.upgrades.currentUnitMax('AircraftCarrier')>>)", "AircraftCarrier", V.SF.Squad).showTextBox()>> + <<run _options.addOption(" <strong>Submarine: </strong (current max <<= App.SF.upgrades.currentUnitMax('Sub')>>)", "Sub", V.SF.Squad).showTextBox()>> + <<run _options.addOption(" <strong>Amphibious Transport: </strong (current max <<= App.SF.upgrades.currentUnitMax('HAT')>>)", "HAT", V.SF.Squad).showTextBox()>> <</if>> <<includeDOM _options.render()>> diff --git a/src/gui/options/options.js b/src/gui/options/options.js index b9e72dc79801e2dfc65bad0d7df3beea53c82e31..4558b19fbb800e4009b3efc89e4d14dc466938c2 100644 --- a/src/gui/options/options.js +++ b/src/gui/options/options.js @@ -365,7 +365,7 @@ App.UI.optionsPassage = function() { options.addOption("Slaves with fat lips or heavy oral piercings may lisp", "disableLisping") .addValue("Yes", 0).on().addValue("No", 1).off(); - options.addOption("Disables the long term damage mechanic. //Temp option//", "disableLongDamage") + options.addOption("Disables the long term damage mechanic. <span class='note'>Temp option</span>", "disableLongDamage") .addValue("Enabled", 0).on().addValue("Disabled", 1).off(); options.addOption("Experimental male pronouns are currently", "diversePronouns") diff --git a/src/gui/options/optionsGroup.js b/src/gui/options/optionsGroup.js index bfcdbc3d19e99e7c7866dbcb4ed9d7785475919d..60fea477428a9de553d7cb954aec09e9d7fac8fa 100644 --- a/src/gui/options/optionsGroup.js +++ b/src/gui/options/optionsGroup.js @@ -21,7 +21,7 @@ App.UI.OptionsGroup = (function() { class Option extends Row { /** - * @param {string} description can be SC markup + * @param {string|HTMLElement} description string can be HTML markup * @param {string} property * @param {object} [object=V] */ @@ -206,7 +206,7 @@ App.UI.OptionsGroup = (function() { /* left side */ const desc = document.createElement("div"); desc.className = "description"; - $(desc).wiki(this.description); + $(desc).append(this.description); container.append(desc); /* right side */ diff --git a/src/npc/startingGirls/startingGirls.js b/src/npc/startingGirls/startingGirls.js index 2b595a01de009ae330512f565067d3d81da4d660..07907b46c97f4b6ff67dc48efefb636de75f8e80 100644 --- a/src/npc/startingGirls/startingGirls.js +++ b/src/npc/startingGirls/startingGirls.js @@ -685,7 +685,7 @@ App.StartingGirls.physical = function(slave) { .addRange(165, 170, "<", "Average") .addRange(180, 185, "<", "Tall") .addRange(190, 185, ">=", "Very tall"); - option = options.addOption(`Average height for a ${slave.actualAge} year old """is ${heightToEitherUnit(Math.round(Height.mean(slave)))}"""`) + option = options.addOption(`Average height for a ${slave.actualAge} year old is ${heightToEitherUnit(Math.round(Height.mean(slave)))}`) .customButton( "Make average", () => resyncSlaveHight(slave),