diff --git a/game/base-clothing/wardrobes.twee b/game/base-clothing/wardrobes.twee index dea06bdb7d68c5384d328583d8cf8d47caa2c842..8b427a202b6c2612ccf1174c5d39836759181349 100644 --- a/game/base-clothing/wardrobes.twee +++ b/game/base-clothing/wardrobes.twee @@ -47,7 +47,7 @@ <<if _equipSkip[_slot] is true>> <<continue>> <</if>> - <<if !Object.keys($worn).includes(_wardrobe_list)>> + <<if !Object.keys($worn).includes(_slot)>> <<continue>> <<else>> <<set _wearId to V["wear_"+_slot]>> diff --git a/game/base-system/deviancy.twee b/game/base-system/deviancy.twee index e868aef134e174e3e0fce938ef0ddde1e02e8f21..e6698a39fcc8404b88727f9b6bf9b9c133d654c7 100644 --- a/game/base-system/deviancy.twee +++ b/game/base-system/deviancy.twee @@ -76,6 +76,7 @@ <<widget "combatdeviancyN">> <<if $consensual is 1>> + <<set $_n to _args[0]>> <<set $_scaledDeviancyMax to 20 * $_n>> <<if $deviancy lt $_scaledDeviancyMax>> <<set $deviancy += ($control lt $controlmax ? 2 : 1)>> diff --git a/game/base-system/overlays/statistics.twee b/game/base-system/overlays/statistics.twee index 0b3e758c22f8803162e07dfbde04e4a057291122..43738f835ba621459b8b5348071ddfbff8ea3404 100644 --- a/game/base-system/overlays/statistics.twee +++ b/game/base-system/overlays/statistics.twee @@ -250,7 +250,7 @@ Minutes spent masturbating: $masturbationtimestat <</if>> Machines disabled: $machine_stat <br> - <<if $lurkerdisable if "f">> + <<if $lurkerdisable is "f">> Lurkers captured: $stat_lurkers_captured <br><br> <</if>> diff --git a/game/base-system/widgets.twee b/game/base-system/widgets.twee index b31661a92423ff4596543c916766e09f484c3e0b..4efe3fe7802be0a26d4370192cd64a9dc3e34079 100644 --- a/game/base-system/widgets.twee +++ b/game/base-system/widgets.twee @@ -447,7 +447,7 @@ <<stress _args[0] $_stress_multiplier>> <<combattrauma _args[0]>> <<else>> - <<stress _args[0] 10>> + <<stress _args[0] -10>> <</if>> <<set _arousal to 20 * _args[0]>> <<arousal _arousal>> diff --git a/game/overworld-town/loc-domus-homes/demon.twee b/game/overworld-town/loc-domus-homes/demon.twee index 77267c76da96368024730721a9bb74fc14dde9ef..8d5abf6d4c71d641a292d2cb39042928fba9686f 100644 --- a/game/overworld-town/loc-domus-homes/demon.twee +++ b/game/overworld-town/loc-domus-homes/demon.twee @@ -925,7 +925,7 @@ You throw the cat o' nine tails out the window, where it disappears in a bush. Y "I've got a better idea," you say. You rummage in the bedside cabinet, and find what you need. <<His>> phone. You drop it in front of <<him>>. "Open it." <br><br> -"Fuck off- Ah!" <<he>> cries as you strike <<him>> again. "Okay! Just stop hititng me!" <<He>> unlocks the phone. You keep the cat o' nine tails held menacingly aloft as you open a web browser. <<His>> homepage is an amateur porn site. It's already logged into <<his>> account. +"Fuck off- Ah!" <<he>> cries as you strike <<him>> again. "Okay! Just stop hitting me!" <<He>> unlocks the phone. You keep the cat o' nine tails held menacingly aloft as you open a web browser. <<His>> homepage is an amateur porn site. It's already logged into <<his>> account. <br><br> "Hold still," you say, turning on the phone's camera. diff --git a/game/overworld-town/loc-home/rent.twee b/game/overworld-town/loc-home/rent.twee index bafb036fe4d975b6cb583e6d40852a0c8ba661e2..84e113d13cdc401181dd4c8735f459de2e10e365 100644 --- a/game/overworld-town/loc-home/rent.twee +++ b/game/overworld-town/loc-home/rent.twee @@ -546,7 +546,7 @@ You trip a couple of times, prompting Bailey to drag you back to your feet and s You hear a rustle of paper before being dragged further along the tunnel. <br><br> <<if _robinIsPresent>> - <<link [[Next|Underground Intro]]>><<set $baileySold to true>><<set $phase to 1>><<endevent "phaseless">><</link>> + <<link [[Next|Underground Intro]]>><<set $baileySold to true>><<endevent "phaseless">><<set $phase to 1>><</link>> <<else>> <<link [[Next|Underground Intro]]>><<set $baileySold to true>><</link>> <</if>> diff --git a/game/overworld-town/special-kylar/abduction.twee b/game/overworld-town/special-kylar/abduction.twee index 5728c398673e08bc2549ae2a5044e5602a6853cf..bff86f62721266fc29f632713f03f5133cecd31a 100644 --- a/game/overworld-town/special-kylar/abduction.twee +++ b/game/overworld-town/special-kylar/abduction.twee @@ -659,9 +659,9 @@ Kylar breaks down in tears at your words. <<His>> head sags. <<He>> no longer ha <<unbind>> <br><br> -<<link [[Comfort Kylar|Kylar Abduction Comfort]]>><<endevent>><</link>> +<<link [[Comfort Kylar|Kylar Abduction Comfort]]>><</link>> <br> -<<link [[Just leave|Kylar Abduction Leave]]>><<endevent>><</link>> +<<link [[Just leave|Kylar Abduction Leave]]>><</link>> <br> :: Kylar Abduction Comfort diff --git a/game/overworld-town/special-kylar/manor.twee b/game/overworld-town/special-kylar/manor.twee index 3e60ee757107ce1b68750791a502abce08531267..ed888bce67c535a408f890576f5a062a37346168 100644 --- a/game/overworld-town/special-kylar/manor.twee +++ b/game/overworld-town/special-kylar/manor.twee @@ -88,7 +88,7 @@ You are in the grounds behind Kylar's manor, an elevated patch of woodland full <br><br> <<if $manor_forage is undefined>> - <<ind>><<link [[Pick mushrooms (1:00)|Manor Forage]]>><<set $manor_forage to 1>><</link>><<tendingdifficulty 1 500>> + <<ind>><<link [[Pick mushrooms (1:00)|Manor Forage]]>><<set $manor_forage to 1>><<pass 60>><</link>><<tendingdifficulty 1 500>> <br> <</if>> diff --git a/game/overworld-town/special-robin/main.twee b/game/overworld-town/special-robin/main.twee index 71e82ea20bca1855004b53814f6e9a8fb060d068..c1a022ba25688776e665eb715476196dce9c9af9 100644 --- a/game/overworld-town/special-robin/main.twee +++ b/game/overworld-town/special-robin/main.twee @@ -2460,12 +2460,14 @@ Robin leans on to you, panting, beads of sweat dripping down <<his>> naked body. <br><br> <<endcombat>> -<<if $kylar_camera is 2 and !$syndromekylar>> - A dreadful shiver passes through you. <span class="blue">Something is watching you.</span><<set $kylar_mad to 1>> - <br><br> -<<else>> - The owl plushie watches you, judging you from the gloom. <<gggksuspicion>><<npcincr Kylar rage 10>> - <br><br> +<<if $kylar_camera is 2>> + <<if !$syndromekylar>> + A dreadful shiver passes through you. <span class="blue">Something is watching you.</span><<set $kylar_mad to 1>> + <br><br> + <<else>> + The owl plushie watches you, judging you from the gloom. <<gggksuspicion>><<npcincr Kylar rage 10>> + <br><br> + <</if>> <</if>> <<link [[Next|Bed]]>><<clotheson>><</link>> diff --git a/game/overworld-underground/loc-underground/main.twee b/game/overworld-underground/loc-underground/main.twee index 4c574c7e30272c026acbbf8a15f78eb02bb7df35..a9dc411990693a04163259d17a0a95c503ba9e80 100644 --- a/game/overworld-underground/loc-underground/main.twee +++ b/game/overworld-underground/loc-underground/main.twee @@ -95,9 +95,10 @@ :: Underground Intro <<set $outside to 0>><<set $location to "underground">><<effects>> <<if $phase is 1>> + /* endevent was called before setting phase to 1, regen all npcs */ <<set _withRobin to 1>> <<set _robin to statusCheck("Robin")>> - <<npc Robin 1>><<generate2>><<generate3>> + <<npc Robin 1>><<generate2>><<generate3>><<generate4>> <</if>> <<if _withRobin>> @@ -110,7 +111,7 @@ <br><br> You are forced through the door and to your knees before a - <<generate4>><<person4>><<person>>, who crouches and grabs your neck. + <<person4>><<person>>, who crouches and grabs your neck. <<He>> turns your head to examine one side of your face, then the other, then forces your mouth open and looks inside. "<<pShe>> will do," <<he>> says, standing up. <<He>> then looks at Robin and does the same before making a sly grin in the torchlight. <<person1>>"<<He>>'ll be popular, I can tell." @@ -173,22 +174,22 @@ <<set _robin to statusCheck("Robin")>> <</if>> -<<if _withRobin is 1>> - You and Robin enter another corridor, lined on one side with metal floor hatches. <<person3>><<He>> opens one of them, and shoves you inside. You land on something soft at least. - Soon you hear an adjacent hatch open and Robin lets out a yelp as you assume <<person1>><<hes>> tossed in as well. +<<if _withRobin is 1>>/* 4 npcs are generated so far, person1 is robin */ + You and Robin enter another corridor, lined on one side with metal floor hatches. <<person3>><<person>> opens one of them, and shoves you inside. You land on something soft at least. + Soon you hear an adjacent hatch open and <<person1>>Robin lets out a yelp as you assume <<hes>> tossed in as well. <br><br> - "Both of you, your role here is simple. Do as you're told. You don't want to know what happened to the last <<girl>> who made a fuss." - <<person3>><<He>> slams the hatch shut, plunging you into complete darkness as you hear <<his>> receding footsteps. + <<person3>>"Both of you, your role here is simple. Do as you're told. You don't want to know what happened to the last <<girl>> who made a fuss." + <<He>> slams the hatch shut, plunging you into complete darkness as you hear <<his>> receding footsteps. <br><br> You fumble around in the dark, and find you fell on what feels like a mattress. There's also a locked metal door and a tap in the corner, but the room is otherwise bare. <br><br> - "Are you there?" You hear Robin's<<if _robin.dom lte 40>> trembling<</if>> voice coming from nearby. + <<person1>>"Are you there?" You hear Robin's<<if _robin.dom lte 40>> trembling<</if>> voice coming from nearby. As you trace the location of <<his>> voice, you find that there is a small hole in the wall that connects you. -<<else>> - You enter another corridor, lined on one side with metal floor hatches. <<He>> opens one of them, and shoves you inside. You land on something soft at least. +<<else>>/* 2 npcs are present */ + You enter another corridor, lined on one side with metal floor hatches. <<person2>><<He>> opens one of them, and shoves you inside. You land on something soft at least. "Your role here is simple. Do as you're told. You don't want to know what happened to the last <<girl>> who made a fuss." <<He>> slams the hatch shut, plunging you into complete darkness. <br><br> diff --git a/game/overworld-underground/loc-underground/robin.twee b/game/overworld-underground/loc-underground/robin.twee index 68dee3b147c7a4a9ccd71e580746fd614f53f389..60ecc1f4d3e3614d396f48bed8781a493d6454fd 100644 --- a/game/overworld-underground/loc-underground/robin.twee +++ b/game/overworld-underground/loc-underground/robin.twee @@ -1136,7 +1136,7 @@ You notice a pair of odd machines being wheeled in. Attached to them are chains <label><<radiobutton "$phase" 0 autocheck>> Rest</label> | <<if $anusfucked is 1 or $vaginafucked is 1 or $penisfucked is 1>> <<if $machine.speed is 3>> - <label><<radiobutton "$phase" 1 autocheck>> <span class="brat">Ask them to slow down</span><</label> | + <label><<radiobutton "$phase" 1 autocheck>> <span class="brat">Ask them to slow down</span></label> | <<elseif $machine.speed is 2>> <label><<radiobutton "$phase" 2 autocheck>> <span class="brat">Ask them to slow down</span></label> | <</if>> diff --git a/img/clothes/upper/monster/0_gray.png b/img/clothes/upper/monster/0_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..0f742ddda516f99467840f593096bacfbd68b7b4 Binary files /dev/null and b/img/clothes/upper/monster/0_gray.png differ diff --git a/modules/02-array-extensions.js b/modules/02-array-extensions.js index 3636f9d717deab78f3df19c6b2ee947d34cba2f8..6b6697597e0a6f6885c4a2c25b705e0959186158 100644 --- a/modules/02-array-extensions.js +++ b/modules/02-array-extensions.js @@ -64,6 +64,6 @@ Object.defineProperty(Array.prototype, 'formatList', { conjunction += " "; if (this.length <= 2) return this.join(" " + conjunction); const oxConj = (useOxfordComma ? separator : " ") + conjunction; - return this.slice(0, -1).join(separator) + oxConj + this.at(-1); + return this.slice(0, -1).join(separator) + oxConj + this.last(); } }); diff --git a/modules/css/base.css b/modules/css/base.css index 32b6d9f0bb2b6ee3046a2ff4b23b9ea6394af5d3..9c39b80e2a76c8b625ff263751eed94c64adff5f 100644 --- a/modules/css/base.css +++ b/modules/css/base.css @@ -3292,7 +3292,7 @@ label { filter: saturate(0%) brightness(310%) sepia(10%); } -.clothes-blue-steel { +.clothes-blue-steel, .icon-blue-steel { -webkit-filter: saturate(0%) brightness(160%) sepia(80%) hue-rotate(180deg); filter: saturate(0%) brightness(160%) sepia(80%) hue-rotate(180deg); }