diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js index c6cf2e9837aa99050596838209e512c975ba45a7..60b8f258a82b3a7610e9e03eb6ec41d4c71d3446 100644 --- a/src/js/rulesAssistant.js +++ b/src/js/rulesAssistant.js @@ -233,6 +233,8 @@ App.RA.newRule = function() { speechRules: null, clothes: null, collar: null, + faceAccessory: null, + mouthAccessory: null, shoes: null, armAccessory: null, legAccessory: null, diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index 0b30a912f374326370a638ccbc0963adb82d0dac..af35326512a842f6cb9d7845337d7be85c21d4c4 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -1836,7 +1836,8 @@ globalThis.rulesAssistantOptions = (function() { class MaskList extends ListSelector { constructor() { - super("Mask", isItemAccessible.array(App.Data.misc.faceAccessory )); + const pairs = [["No mask", "none"]].concat(isItemAccessible.array(App.Data.misc.faceAccessory )); + super("Mask", pairs); this.setValue(current_rule.set.faceAccessory ); this.onchange = (value) => current_rule.set.faceAccessory = value; } @@ -1844,7 +1845,8 @@ globalThis.rulesAssistantOptions = (function() { class GagList extends ListSelector { constructor() { - super("Gag", isItemAccessible.array(App.Data.misc.mouthAccessory )); + const pairs = [["No gag", "none"]].concat(isItemAccessible.array(App.Data.misc.mouthAccessory )); + super("Gag", pairs); this.setValue(current_rule.set.mouthAccessory ); this.onchange = (value) => current_rule.set.mouthAccessory = value; } diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw index ce99360e93a19e189938fea75cfc55bac0ca5500..2fa93f6a0e2f59714c7e6c2c519813d51d0b18cb 100644 --- a/src/uncategorized/pePitFight.tw +++ b/src/uncategorized/pePitFight.tw @@ -11,6 +11,7 @@ <span id="artFrame"> /* 000-250-006 */ +<<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "no clothing">> <<if $seeImages == 1>> <<if $imageChoice == 1>> <div class="imageRef lrgVector"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div> @@ -18,6 +19,7 @@ <div class="imageRef lrgRender"><div class="mask"> </div><<= SlaveArt($activeSlave, 2, 0)>></div> <</if>> <</if>> +<<set $activeSlave.clothes = _clothesTemp>> /* 000-250-006 */ </span> @@ -134,19 +136,19 @@ Across the ring, $his opponent's owner nods civilly to you and examines $activeS $His distended, <<print $activeSlave.inflationType>>-belly is uncomfortable and heavy, distracting $him. <</if>> -<<if $slaves[$i].teeth == "pointy">> +<<if $activeSlave.teeth == "pointy">> $His sharp teeth add nothing to $his actual effectiveness, but they're certainly intimidating. <</if>> -<<if !canSee($slaves[$i])>> +<<if !canSee($activeSlave)>> $His lack of eyesight means certain death. -<<elseif !canSeePerfectly($slaves[$i])>> +<<elseif !canSeePerfectly($activeSlave)>> $His poor eyesight makes $him a weaker fighter. <</if>> -<<if !canHear($slaves[$i])>> +<<if !canHear($activeSlave)>> $His lack of hearing is a major detriment. -<<elseif (($slaves[$i].hears == -1) && ($slaves[$i].earwear != "hearing aids")) || ($slaves[$i].hears == 0 && ($slaves[$i].earwear == "muffling ear plugs"))>> +<<elseif (($activeSlave.hears == -1) && ($activeSlave.earwear != "hearing aids")) || ($activeSlave.hears == 0 && ($activeSlave.earwear == "muffling ear plugs"))>> $His lack of hearing is a minor detriment. <</if>> @@ -214,6 +216,8 @@ The umpire announces gravely that the fight is to the death and rings a bell. <<if $activeSlave.health.health < -90>> <<= removeActiveSlave() >> + <<set $nextLink = "Random Nonindividual Event">> + <<UpdateNextButton>> <</if>> <<set $pitFightsTotal++>> \ No newline at end of file