diff --git a/css/gui/tooltips/tippy.css b/css/gui/tooltips/tippy.css index 020f60d5d539062a097b435a48003672c64127a4..0025e60e0503ff55ccc7f55dbe171352cc5ddb24 100644 --- a/css/gui/tooltips/tippy.css +++ b/css/gui/tooltips/tippy.css @@ -1,5 +1,6 @@ .has-tooltip { text-decoration: underline dotted; + white-space: nowrap; } .tippy-content { diff --git a/devTools/javaSanityCheck/excluded b/devTools/javaSanityCheck/excluded index 77372f70251a771e95c1337a2d66e75f3d6f4b8c..a9bc4033967119c6ec2bac63456ad793bc88003f 100644 --- a/devTools/javaSanityCheck/excluded +++ b/devTools/javaSanityCheck/excluded @@ -3,10 +3,8 @@ #O : OnlyUsedOnce, if variables are used more than once #S : SpellCheck, matches based on dictionaries in devTools/ # -src/art/;LO src/gui/svgFilters.tw;L # #JS files, logic won't be checked here anyways -src/js/economyJS.js;S src/data/backwardsCompatibility/datatypeCleanup.js;S js/003-data/miscDataNames.js;S diff --git a/sanityCheck.sh b/sanityCheck.sh index be825347d967449688397e816e92e00d6d7f56ca..9d2f403dd3ef21a95e6d7050b67c5f3f0dfa4560 100755 --- a/sanityCheck.sh +++ b/sanityCheck.sh @@ -31,7 +31,7 @@ $GREP "<<[ ]*[^\$><_\[]*\(activeSlave\|PC\)[.]" -- "src/*" | myprint "MissingDol # Check for closing bracket without opening bracket. e.g.: <<if foo)>> (but <<case "foo")>> is valid, so ignore those $GREP -e "<<[ a-zA-Z]\+\([^()<>]\|[^()<>][<>][^()<>]\)*)" --and --not -e "<< *case" -- "src/**/*.tw" | myprint "MissingOpeningBracket" # Check for opening bracket without closing bracket. e.g.: <<if (foo>> -$GREP -e "<<[ a-zA-Z]\([^<>]\|[^<>][<>][^<>]\)\+(\([^()<>]\|[^<>()][<>][^<>()]\|([^<>()]*])\)*>>" -- "src/*" | myprint "MissingClosingBracket" +$GREP -e "<<[ a-zA-Z]\([^<>]\|[^<>][<>][^<>]\)\+(\([^()<>]\|[^<>()][<>][^<>()]\|([^<>()]*])\)*>>" -- "src/**/*.tw" | myprint "MissingClosingBracket" # Check for two closing brackets but one opening bracket. e.g.: <<if (foo))>> $GREP -e "<<[ a-zA-Z]\+[^()<>]*([^()]*)[^()]*)[^()<>]*>>" -- "src/**/*.tw" | myprint "MissingOpeningBracket2" # Check for one closing bracket but two opening brackets. e.g.: <<if ((foo)>> diff --git a/src/events/nonRandom/rival/pRivalryActions.js b/src/events/nonRandom/rival/pRivalryActions.js index 4d21a3303466f9a933ed5c03c504c832969ca461..03d1efafd092d7f5c8a5d79d20246eb781245141 100644 --- a/src/events/nonRandom/rival/pRivalryActions.js +++ b/src/events/nonRandom/rival/pRivalryActions.js @@ -3562,19 +3562,23 @@ App.Events.pRivalryActions = function() { arc.rival = 0; arc.government = "direct democracy"; if (rivalCaptured) { - V.rival.state = 3; if (arc.FSSupremacist > 20) { + // @ts-ignore V.rival.race = arc.FSSupremacistRace; } else if (arc.FSSubjugationist > 20) { V.rival.race = Array.from(App.Data.misc.filterRacesPublic.keys()).filter(race => race !== arc.FSSubjugationistRace).random(); } - } else { - V.rival.state = 4; } break; } } } + if (rivalCaptured) { + V.rival.state = 3; + } else { + V.rival.state = 4; + } + if (V.rival.hostageState === 1) { r.push(`${V.assistant.name} pauses. "Also confirm package is secure."`); V.rival.hostageState = 2; diff --git a/src/markets/marketUI.js b/src/markets/marketUI.js index 66291e9f0a0041552c8cd9e4cbe881253c3b3b4f..066f9ac62cb7ec9a2c096295b702cf971bc7b879 100644 --- a/src/markets/marketUI.js +++ b/src/markets/marketUI.js @@ -98,7 +98,10 @@ App.Markets.purchaseFramework = function(slaveMarket, {sTitleSingular = "slave", V.nextButton = "Continue"; V.returnTo = "Main"; student(); - jQuery("#slave-markets").empty().append(App.UI.newSlaveIntro(slave)); + jQuery("#slave-markets").empty().append( + App.Desc.longSlave(slave, {market: slaveMarket}), + App.UI.newSlaveIntro(slave) + ); }, ) );