diff --git a/DoL Changelog.txt b/DoL Changelog.txt index e5547346e98e13b29075bf3d15bd57777cd9acbb..33c85c3c7b822ec1ca281ea622d5f3878de940eb 100644 --- a/DoL Changelog.txt +++ b/DoL Changelog.txt @@ -26,7 +26,7 @@ Thanks to Lollipop Scythe for the following additions and improvements: Added additional sources of pregnancy fame. Added the All category link to the sex shop clothing links. Added the ability to save the theme settings as global defaults. -The ear slime will now change it's commands based on how the player first reacts to it, any lewd actions they do and how deep it's influence on the player it has +The ear slime will now change its commands based on how the player first reacts to it, any lewd actions they do and how deep its influence on the player it has Moved and adjusted the corruption characteristics display, so that both corruption and growth are displayed at the same time Early on, the slime may now try to "ask" the player to do more mundane actions such as skip a class, cheat in exams, buy a specific item from the cafe, take a stroll by the lake, or even relax in a meadow. Ivory wraith ear slime text additions. @@ -44,7 +44,7 @@ Added alternate reveal text when Alex learns of your pregnancy. Minor text changes when the player gives birth at Alex's Cottage. Minor update to the pregnancy doc. Minor changes to the info displayed when asking Alex to have a baby. -A Confessor at the temple may now weaken the ear slime and potentially remove parts of it's external parasites. +A Confessor at the temple may now weaken the ear slime and potentially remove parts of its external parasites. Thanks to PurityGuy for the following additions and improvements: Added the bog, which serves as a one-way shortcut between the deep forest and deep moor. It can be discovered in a few different ways, either by a player with high history and moderate science and tending while passing by the lake waterfall, by asking Winter about the lake at the field office built during the hookah questline, or by being swept down the forest's river in a random event and failing the swimming check while deep enough in the forest. @@ -303,6 +303,21 @@ The school trait will now be given from the start of a new game if the requireme Removed an unintended old sewer exit. +0.4.4.5 +The Whitney analingus even should no longer have such a disproportionate influence on Whitney's dominance. +Thanks to Lollipop Scythe for code improvements. + +Thanks to Lollipop Scythe for the following fixes: +Moved the ruined orgasms setting toggle to the fetish tab. +Fixed error found in combat when holding someone's penis. +Fixed penis parasites not being removed by the free procedure at the Hospital. +Fixes for lewd clothes prices being too high. +Fix to being able to repeatly tell Jordan about the stolen spear. +Prevented the removal of ear slimes in the cheat menu when pregnant. +Minor fix to earslime commando checks when wearing crotchless panties. +Typo fixes. + + 0.4.3.3 Thanks to Lollipop Scythe for code improvements. @@ -431,7 +446,7 @@ Thanks to Lollipop Scythe for the following additions and improvements: Items in clothing shops can now have multiple styles, that can be switched when viewing an item. All the classic items have been moved back to the main clothing shop as an alternate style. Added an orgasm scene add-on when breastfeeding during a mansion job. -Re-wrote the island build system to improve it's usability and code. +Re-wrote the island build system to improve its usability and code. Minor additions to Sydney comments to the pc. Thanks to Kirsty for the following additions and improvements: diff --git a/devTools/androidsdk/image/cordova/config.xml b/devTools/androidsdk/image/cordova/config.xml index b1c8474cff125abbee524790b9a83fb7c947935f..1a0c93773aadeb9fcbfd0dd6eb3482e5cb7eb18f 100644 --- a/devTools/androidsdk/image/cordova/config.xml +++ b/devTools/androidsdk/image/cordova/config.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='utf-8'?> <widget id="dol" - version="0.4.4.4 DoLP 0.5" + version="0.4.4.5 DoLP 0.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" android-packageName="com.Frostberg.DegreesOfLewdityPlus" diff --git a/game/01-config/sugarcubeConfig.js b/game/01-config/sugarcubeConfig.js index 579537b810fcbace79c23e9b9ee8526fe6d77dc9..19fd08c0f6babc04d3161e19c4a40281295fcc57 100644 --- a/game/01-config/sugarcubeConfig.js +++ b/game/01-config/sugarcubeConfig.js @@ -12,7 +12,7 @@ window.StartConfig = { debug: false, enableImages: true, enableLinkNumberify: true, - version: "0.4.4.4 DoLP 0.5", + version: "0.4.4.5 DoLP 0.5", versionName: "", sneaky: false, }; diff --git a/game/03-JavaScript/save.js b/game/03-JavaScript/save.js index c69b679e87e6fa218ba8542d358de46582b5d0c3..e92123247b960f3c69a2d52928bbc776d83ea2e8 100644 --- a/game/03-JavaScript/save.js +++ b/game/03-JavaScript/save.js @@ -965,7 +965,7 @@ function settingsObjects(type) { clothesPrice: { min: 1, max: 10, decimals: 1, displayName: "Cost of clothing:", randomize: "gameplay" }, clothesPriceUnderwear: { min: 1, max: 2, decimals: 1, displayName: "Cost of underwear:", randomize: "gameplay" }, clothesPriceSchool: { min: 1, max: 2, decimals: 1, displayName: "Cost of school clothes:", randomize: "gameplay" }, - clothesPriceLewd: { min: 0.1, max: 5, decimals: 1, displayName: "Cost of lewd clothes:", randomize: "gameplay" }, + clothesPriceLewd: { min: 0.1, max: 2, decimals: 1, displayName: "Cost of lewd clothes:", randomize: "gameplay" }, furniturePriceFactor: { min: 0.6, max: 2, decimals: 1, displayName: "Cost of furniture:", randomize: "gameplay" }, tending_yield_factor: { min: 1, max: 10, decimals: 1, displayName: "Crop yield:", randomize: "gameplay" }, rentmod: { min: 0.1, max: 3, decimals: 1, displayName: "Bailey's rent:", randomize: "gameplay" }, diff --git a/game/04-Variables/variables-versionUpdate.twee b/game/04-Variables/variables-versionUpdate.twee index 71678642496b9b2d255a9b61fd6f0d83f2339fc7..b96cf4ae6020fc6abb662e46e755997079134c9b 100644 --- a/game/04-Variables/variables-versionUpdate.twee +++ b/game/04-Variables/variables-versionUpdate.twee @@ -4789,6 +4789,15 @@ <<set $blackjack.seenMarkedCardsSoFar to JSON.parse($blackjack.seenMarkedCardsSoFar)>> <</if>> + <!-- V0.4.4.4 clothesPriceLewd being higher than 2 --> + <<if $clothesPriceLewd gt 2>><<set $clothesPriceLewd to 2>><</if>> + + <!-- V0.4.4.4 ear slime typo fix --> + <<if !$objectVersion.earSlimeFix and $parasite.left_ear.name isnot "slime" and $parasite.right_ear.name isnot "slime" and $earSlime and ($earSlime.days or $earSlime.corruption or $earSlime.growth)>> + <<resetEarSlime>> + <<set $objectVersion.earSlimeFix to 1>> + <</if>> + <<modupdate>> <</widget>> diff --git a/game/base-clothing/wardrobes.twee b/game/base-clothing/wardrobes.twee index b21e67dbed0e073d7be754b932fa8f9891863e8b..9149ceefa6f30beb343c33296d7588813403f4ef 100644 --- a/game/base-clothing/wardrobes.twee +++ b/game/base-clothing/wardrobes.twee @@ -1455,7 +1455,7 @@ <</if>> <<case "Sydney Beach Changing Room Leave">> <<set _earSlimeEnableSwimwear to true>> - <<if $earSlime.forcedCommando isnot undefined and $worn.under_lower.name isnot "naked">> + <<if $earSlime.forcedCommando isnot undefined and !$worn.under_lower.type.includes("naked")>> <span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span> <<elseif $exposed lte 1>> <<getouticon>><<link [[Leave|Sydney Beach Leave]]>><<cleanupOnWardrobeExit>><</link>> diff --git a/game/base-combat/actionsGeneration.twee b/game/base-combat/actionsGeneration.twee index f1c9f4e2cb465078bbdba6e88b9e1bc9406bbc15..510e53f9c41a8890e93c40edd9a5c48e7c4730f3 100644 --- a/game/base-combat/actionsGeneration.twee +++ b/game/base-combat/actionsGeneration.twee @@ -276,7 +276,7 @@ <</if>> <<case "penis">> <<set _leftOptions to "penis">> - <span @class="($lastOptions.left isnot _leftOptions or _leftGold is true ?'gold':'')"><<selectNpcWithPartInPosition "penis" "leftarm">><<set $lefttarget to $index>>Your left hand is <<if $NPCList[_j].chastity.penis.includes("chastity")>>teasing<<else>>holding<</if>> <<combatpersons>> $NPCList[_j].penisdesc<<if $NPCList[_j].chastity.penis.includes("chastity")>> through <<his>> $NPCList[_j].chastity.penis<</if>>.</span> + <span @class="($lastOptions.left isnot _leftOptions or _leftGold is true ?'gold':'')"><<selectNpcWithPartInPosition "penis" "leftarm">><<set $lefttarget to $index>>Your left hand is <<if $NPCList[$index] and $NPCList[$index].chastity.penis.includes("chastity")>>teasing<<else>>holding<</if>> <<personselect $index>><<combatpersons>> $NPCList[$index].penisdesc<<if $NPCList[$index].chastity.penis.includes("chastity")>> through <<his>> $NPCList[$index].chastity.penis<</if>>.</span> <<case "grappled">> <<if $orgasmdown gte 1>> <<set _leftOptions to "bothBound">> @@ -309,7 +309,7 @@ <</if>> <<case "othervagina">> <<set _leftOptions to "pussy">> - <span @class="($lastOptions.left isnot _leftOptions or _leftGold is true ?'gold':'')"><<selectNpcWithPartInPosition "vagina" "leftarm">><<set $lefttarget to $index>>Your left hand is <<if $NPCList[_j].chastity.vagina.includes("chastity")>>teasing<<else>>stroking<</if>> <<combatpersons>> pussy<<if $NPCList[_j].chastity.vagina.includes("chastity")>> through <<his>> $NPCList[_j].chastity.vagina<</if>>.</span> + <span @class="($lastOptions.left isnot _leftOptions or _leftGold is true ?'gold':'')"><<selectNpcWithPartInPosition "vagina" "leftarm">><<set $lefttarget to $index>>Your left hand is <<if $NPCList[$index].chastity.vagina.includes("chastity")>>teasing<<else>>stroking<</if>> <<personselect $index>><<combatpersons>> pussy<<if $NPCList[$index].chastity.vagina.includes("chastity")>> through <<his>> $NPCList[$index].chastity.vagina<</if>>.</span> <<case "vagina">> <<set _leftOptions to "coverVagina">> <span @class="($lastOptions.left isnot _leftOptions or _leftGold is true ?'gold':'')">Your left hand is protecting your <<pussy>>.</span> @@ -649,7 +649,7 @@ <</if>> <<case "penis">> <<set _rightOptions to "penis">> - <span @class="($lastOptions.right isnot _rightOptions or _rightGold is true ?'gold':'')"><<selectNpcWithPartInPosition "penis" "rightarm">><<set $righttarget to $index>>Your right hand is <<if $NPCList[_j].chastity.penis.includes("chastity")>>teasing<<else>>holding<</if>> <<combatpersons>> $NPCList[_j].penisdesc<<if $NPCList[_j].chastity.penis.includes("chastity")>> through <<his>> $NPCList[_j].chastity.penis<</if>>.</span> + <span @class="($lastOptions.right isnot _rightOptions or _rightGold is true ?'gold':'')"><<selectNpcWithPartInPosition "penis" "rightarm">><<set $righttarget to $index>>Your right hand is <<if $NPCList[$index].chastity.penis.includes("chastity")>>teasing<<else>>holding<</if>> <<personselect $index>><<combatpersons>> $NPCList[$index].penisdesc<<if $NPCList[$index].chastity.penis.includes("chastity")>> through <<his>> $NPCList[$index].chastity.penis<</if>>.</span> <<case "grappled">> <<if $orgasmdown gte 1>> <<set _rightOptions to "bothBound">> @@ -682,7 +682,7 @@ <</if>> <<case "othervagina">> <<set _rightOptions to "pussy">> - <span @class="($lastOptions.right isnot _rightOptions or _rightGold is true ?'gold':'')"><<selectNpcWithPartInPosition "vagina" "rightarm">><<set $righttarget to $index>>Your right hand is <<if $NPCList[_j].chastity.vagina.includes("chastity")>>teasing<<else>>stroking<</if>> <<combatpersons>> pussy<<if $NPCList[_j].chastity.vagina.includes("chastity")>> through <<his>> $NPCList[_j].chastity.vagina<</if>>.</span> + <span @class="($lastOptions.right isnot _rightOptions or _rightGold is true ?'gold':'')"><<selectNpcWithPartInPosition "vagina" "rightarm">><<set $righttarget to $index>>Your right hand is <<if $NPCList[$index].chastity.vagina.includes("chastity")>>teasing<<else>>stroking<</if>> <<combatpersons>> pussy<<if $NPCList[$index].chastity.vagina.includes("chastity")>> through <<his>> $NPCList[$index].chastity.vagina<</if>>.</span> <<case "vagina">> <<set _rightOptions to "coverVagina">> <span @class="($lastOptions.right isnot _rightOptions or _rightGold is true ?'gold':'')">Your right hand is protecting your <<pussy>>.</span> @@ -734,13 +734,13 @@ <span @class="($lastOptions.right isnot _rightOptions or _rightGold is true ?'gold':'')">Your right hand fucks your <<penisSimple>> with the <<print $currentSexToyRight.name>></span> <<case "dildoOtherPussyTease">> <<set _rightOptions to "dildoOtherPussyTease">> - <span @class="($lastOptions.right isnot _rightOptions or _rightGold is true ?'gold':'')">Your right hand is <<if $NPCList[$righttarget].chastity.vagina.includes("chastity")>>teasing<<else>>stroking<</if>> <<combatpersons>> pussy<<if $NPCList[$righttarget].chastity.vagina.includes("chastity")>> through <<his>> $NPCList[_j].chastity.vagina<</if>> with your $currentSexToyRight.name.</span> + <span @class="($lastOptions.right isnot _rightOptions or _rightGold is true ?'gold':'')">Your right hand is <<if $NPCList[$righttarget].chastity.vagina.includes("chastity")>>teasing<<else>>stroking<</if>> <<combatpersons>> pussy<<if $NPCList[$righttarget].chastity.vagina.includes("chastity")>> through <<his>> $NPCList[$righttarget].chastity.vagina<</if>> with your $currentSexToyRight.name.</span> <<case "dildoOtherPussyFuck">> <<set _rightOptions to "dildoOtherPussyFuck">> <span @class="($lastOptions.right isnot _rightOptions or _rightGold is true ?'gold':'')"><<selectNpcWithPartInPosition "vagina" "rightDildo">><<set $righttarget to $index>>Your right hand fucks <<combatpersons>> pussy with the $currentSexToyRight.name.</span> <<case "dildoOtherAnusTease">> <<set _rightOptions to "dildoOtherAnusTease">> - <span @class="($lastOptions.right isnot _rightOptions or _rightGold is true ?'gold':'')">Your right hand is <<if $NPCList[$righttarget].chastity.vagina.includes("chastity")>>teasing<<else>>stroking<</if>> <<combatpersons>> ass<<if $NPCList[$righttarget].chastity.vagina.includes("chastity")>> through <<his>> $NPCList[_j].chastity.vagina<</if>> with your $currentSexToyRight.name.</span> + <span @class="($lastOptions.right isnot _rightOptions or _rightGold is true ?'gold':'')">Your right hand is <<if $NPCList[$righttarget].chastity.vagina.includes("chastity")>>teasing<<else>>stroking<</if>> <<combatpersons>> ass<<if $NPCList[$righttarget].chastity.vagina.includes("chastity")>> through <<his>> $NPCList[$righttarget].chastity.vagina<</if>> with your $currentSexToyRight.name.</span> <<case "dildoOtherAnusFuck">> <<set _rightOptions to "dildoOtherAnusFuck">> <span @class="($lastOptions.right isnot _rightOptions or _rightGold is true ?'gold':'')"><<selectNpcWithPartInPositionAnus "rightDildoAnus">><<set $righttarget to $index>>Your right hand fucks <<combatpersons>> ass with the $currentSexToyRight.name.</span> diff --git a/game/base-system/overlays/cheats.twee b/game/base-system/overlays/cheats.twee index 3955ab7a29b410c0c03e8da64051962117d86242..9009027f77fa8407e038be3102573c3051d2d588 100644 --- a/game/base-system/overlays/cheats.twee +++ b/game/base-system/overlays/cheats.twee @@ -39,8 +39,11 @@ <<set _bodypart to _args[0]>> <<set _id to `stats${_bodypart}parasite`>> <<capture _bodypart _id>> - <<set $_currentType to $parasite[_bodypart].name or "none">> - <<print _bodypart.toUpperFirst().replace("_", " ")>> parasite: <span @id="_id" class="gold"><<print $_currentType>></span> | + <<print _bodypart.toUpperFirst().replace("_", " ")>> parasite: <span @id="_id" class="gold"><<print $_currentType>></span> + <<if ["left_ear", "right_ear"].includes(_bodypart) and !$player.vaginaExist and ["pregnancy", "mixed"].includes($earSlime.focus) and playerIsPregnant()>> + <span class="red">Unable to change while a pregnant male</span> + <<exit>> + <</if>> <<set T["parasiteType"+_bodypart] to $_currentType>> <<set _optionName to "_parasiteType"+_bodypart>> diff --git a/game/base-system/parasites.twee b/game/base-system/parasites.twee index accca7594c76cf9e85c3a73db3d77fe45534e998..bfc2497046273f1c504a45409b3df0d8dc8efea5 100644 --- a/game/base-system/parasites.twee +++ b/game/base-system/parasites.twee @@ -83,6 +83,7 @@ <<set _temp0 to _args[0]>> <<if _temp0 is "clit" and $parasite.clit.name is "parasite" and $player.gender is "f" and $player.penisExist>> + <<bodyliquid penis "all" -5>> <<set $player.penisExist to false>> <<set $penisuse to "none">> <<set $penisstate to "none">> @@ -106,7 +107,7 @@ <<for _type range $parasite.types>> <<set $parasite[_type].delete(_temp0)>> <</for>> - <<if $parasite.left_ear.name isnot "slime" and $parasite.right_ear.name isnot "slime" and $earslime and ($earSlime.days or $earSlime.corruption or $earSlime.growth)>> + <<if $parasite.left_ear.name isnot "slime" and $parasite.right_ear.name isnot "slime" and $earSlime and ($earSlime.days or $earSlime.corruption or $earSlime.growth)>> <<resetEarSlime true>> <</if>> <</if>> diff --git a/game/base-system/settings.twee b/game/base-system/settings.twee index 04470acef03995195ea7d2459333d6fb7b9f8fa1..11bfe5f81c2768bf8076272f2d0267290bf0c338 100644 --- a/game/base-system/settings.twee +++ b/game/base-system/settings.twee @@ -1686,9 +1686,6 @@ <label> <<checkbox "$parasitedisable" "t" "f" autocheck>> Enable parasites </label> - <label> - <<checkbox "$ruinedorgasmdisable" "t" "f" autocheck>> Enable ruined orgasms - </label> </div> <div class="settingsToggleItem"> <label> @@ -1849,9 +1846,17 @@ <<checkbox "$forcedcrossdressingdisable" "t" "f" autocheck>> Enable forced crossdressing </label> </div> + + <div class="settingsToggleItem"> + <label> + <<checkbox "$ruinedorgasmdisable" "t" "f" autocheck>> Enable ruined orgasms + <mouse class="tooltip linkBlue">(?)<span>Ear slimes only.</span></mouse> + </label> + </div> <div class="settingsToggleItem" role="group" aria-labelledby="settingsToysHead"> <span id="settingsSexToysHead">Sex toys:</span> + <br> <label> <<checkbox "$toydildodisable" "t" "f" autocheck>> Dildos </label> @@ -1879,7 +1884,7 @@ <<run settingsAsphyxiation()>> </div> - <div class="settingsToggleItemWide"> + <div class="settingsToggleItem"> Nude Gender Appearance: <<numberslider "$NudeGenderDC" $NudeGenderDC -1 2 1>> <<run settingsNudeGenderAppearance()>> diff --git a/game/base-system/widgets.twee b/game/base-system/widgets.twee index 67d14cd96a0c0ba9dc31d45091d9b177235278dc..fd9efe79d904f2b077abb17197934800ac8e7d05 100644 --- a/game/base-system/widgets.twee +++ b/game/base-system/widgets.twee @@ -5220,7 +5220,7 @@ <</if>> <!--/case --> <</switch>> - <<if !$_fail>> + <<if !$_fail and (!$_clear or _args.last() lte -5)>> <<if !V.player.penisExist>> <<run $_bodypart.delete("penis")>> <</if>> diff --git a/game/overworld-forest/loc-forest/main.twee b/game/overworld-forest/loc-forest/main.twee index 7c45ea8388e72dbddf3b4c68fb7b2ed30338d4f3..2d5ee56f486edf1ff0c6958757e69a5b767f2388 100644 --- a/game/overworld-forest/loc-forest/main.twee +++ b/game/overworld-forest/loc-forest/main.twee @@ -570,7 +570,7 @@ There's sharp declines and sharper rocks pointing downstream. Any further will m <<lakeicon "waterfall">><<link [[Go upstream towards the lake (0:30)|Lake Waterfall]]>><<pass 30>><<tiredness 6>><</link>><<gtiredness>> <br> -<<if $earSlime.forcedCommando isnot undefined and $worn.under_lower.name isnot "naked" and $exhibitionism gte 35>> +<<if $earSlime.forcedCommando isnot undefined and !$worn.under_lower.type.includes("naked") and $exhibitionism gte 35>> <span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span> <<else>> <<if $bogProgress gte 1>> diff --git a/game/overworld-forest/loc-lake/main.twee b/game/overworld-forest/loc-lake/main.twee index 408a0a25c2deb0b9e0c0f66d515cdaad60b687d5..939b4a4129248a3ef278246d3ee26248c885f10e 100644 --- a/game/overworld-forest/loc-lake/main.twee +++ b/game/overworld-forest/loc-lake/main.twee @@ -217,7 +217,7 @@ <</if>> <br><br> /* Added $exhibitionism due to situations where the player can be soft locked and unsure how best to deal with it */ - <<if $earSlime.forcedCommando isnot undefined and $worn.under_lower.name isnot "naked" and $exhibitionism gte 35>> + <<if $earSlime.forcedCommando isnot undefined and !$worn.under_lower.type.includes("naked") and $exhibitionism gte 35>> <span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span> <<else>> <<foresticon>><<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>> @@ -574,7 +574,7 @@ You are at the bus stop beside the lake. The road from town terminates here, end <br> <</if>> <br> - <<if $earSlime.forcedCommando isnot undefined and $worn.under_lower.name isnot "naked" and $exhibitionism gte 35>> + <<if $earSlime.forcedCommando isnot undefined and !$worn.under_lower.type.includes("naked") and $exhibitionism gte 35>> <span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span> <<else>> <<foresticon>><<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>> @@ -650,7 +650,7 @@ You are at the bus stop beside the lake. The road from town terminates here, end <<lakeicon "campfire">><<link [[South to campsite (0:20)|Lake Campsite]]>><<pass 20>><</link>> <br><br> - <<if $earSlime.forcedCommando isnot undefined and $worn.under_lower.name isnot "naked" and $exhibitionism gte 35>> + <<if $earSlime.forcedCommando isnot undefined and !$worn.under_lower.type.includes("naked") and $exhibitionism gte 35>> <span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span> <<else>> <<foresticon>><<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>> @@ -729,7 +729,7 @@ You are at the bus stop beside the lake. The road from town terminates here, end <<link [[South to shore (0:10)|Lake Shore]]>><<pass 10>><</link>> <br><br> - <<if $earSlime.forcedCommando isnot undefined and $worn.under_lower.name isnot "naked" and $exhibitionism gte 35>> + <<if $earSlime.forcedCommando isnot undefined and !$worn.under_lower.type.includes("naked") and $exhibitionism gte 35>> <span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span> <<else>> <<foresticon>><<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>> @@ -806,7 +806,7 @@ You are at the bus stop beside the lake. The road from town terminates here, end <</if>> <br><br> - <<if $earSlime.forcedCommando isnot undefined and $worn.under_lower.name isnot "naked" and $exhibitionism gte 35>> + <<if $earSlime.forcedCommando isnot undefined and !$worn.under_lower.type.includes("naked") and $exhibitionism gte 35>> <span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span> <<else>> <<foresticon>><<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>> @@ -1551,14 +1551,14 @@ The others try to entertain themselves with ghost stories. <br><br> <<set _storedClothes to clothingInStorage("lakeshore")>> - <<if $earSlime.forcedCommando isnot undefined and _storedClothes.find(item => item.slot is "under_lower")>> + <<if $earSlime.forcedCommando isnot undefined and _storedClothes.find(item => item.slot is "under_lower" and !item.type.includes("naked"))>> <span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span> <<set _earSlimeText to true>> <<elseif _storedClothes.length>> <<ind>><<link [[Get changed, then go with them (0:40)|Lake Return Journey]]>><<storeload "lakeshore">><<set $foresthunt to 0>><<pass 30>><</link>> <br> <</if>> - <<if $earSlime.forcedCommando isnot undefined and $worn.under_lower.name isnot "naked">> + <<if $earSlime.forcedCommando isnot undefined and !$worn.under_lower.type.includes("naked")>> <<if _earSlimeText>><span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span><</if>> <<elseif $exposed lte 0>> <<ind>><<link [[Go with them (0:30)|Lake Return Journey]]>><<set $foresthunt to 0>><<pass 30>><</link>> diff --git a/game/overworld-forest/loc-lake/mason.twee b/game/overworld-forest/loc-lake/mason.twee index c39c6e9f9278d075a7b8ace0ba0bab07baf196cc..a1d5da54a43077fe7ef1075c78616e9607a0dd92 100644 --- a/game/overworld-forest/loc-lake/mason.twee +++ b/game/overworld-forest/loc-lake/mason.twee @@ -521,7 +521,7 @@ Mason seems unsure, but nods. "If you're sure. Be careful." <<He>> dries <<himse <br><br> <<set _storedClothes to clothingInStorage("lakeshore")>> - <<if $earSlime.forcedCommando isnot undefined and _storedClothes.find(item => item.slot is "under_lower")>> + <<if $earSlime.forcedCommando isnot undefined and _storedClothes.find(item => item.slot is "under_lower" and !item.type.includes("naked"))>> <span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span> <<set _earSlimeText to true>> <<elseif _storedClothes.length>> @@ -529,7 +529,7 @@ Mason seems unsure, but nods. "If you're sure. Be careful." <<He>> dries <<himse <br> <</if>> - <<if $earSlime.forcedCommando isnot undefined and $worn.under_lower.name isnot "naked">> + <<if $earSlime.forcedCommando isnot undefined and !$worn.under_lower.type.includes("naked")>> <<if !_earSlimeText>><span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span><</if>> <<else>> <<link [[Walk home with Mason (0:30)|Mason Walk]]>><<pass 30>><</link>> diff --git a/game/overworld-town/loc-beach/main.twee b/game/overworld-town/loc-beach/main.twee index 9276149ba33b84630e156709d9b93b54d30189b1..645d2b552e67a410ddda54f54c9362958d85f783 100644 --- a/game/overworld-town/loc-beach/main.twee +++ b/game/overworld-town/loc-beach/main.twee @@ -202,7 +202,7 @@ You could go for a swim, but make sure to dress appropriately. <br> <</if>> <</if>> - <<if $earSlime.forcedCommando isnot undefined and $worn.under_lower.name isnot "naked">> + <<if $earSlime.forcedCommando isnot undefined and !$worn.under_lower.type.includes("naked")>> <br> <span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span> <<elseif $exposed gte 1 and Time.dayState isnot "night">> diff --git a/game/overworld-town/loc-hospital/parasite-removal.twee b/game/overworld-town/loc-hospital/parasite-removal.twee index 777cb3839c36a305bec60eac1e9bbb55be157d5e..2d874721b705c0feeecb94bb67eb1497a6515f3c 100644 --- a/game/overworld-town/loc-hospital/parasite-removal.twee +++ b/game/overworld-town/loc-hospital/parasite-removal.twee @@ -466,6 +466,7 @@ The pulses increase in intensity, it's certainly not the "tingle" that was adver <<else>> Finally, the creature clinging to your penis begins to respond. It massages you with increasing fervour, before releasing its hold and dropping off. Harper wastes no time in picking it up with a gloved hand and placing it in a tiny container. <</if>> + <<removeparasite penis>> <br><br> <<elseif $parasite_procedure.includes("nipples")>> <<removeparasite nipples>> diff --git a/game/overworld-town/loc-pirates/main.twee b/game/overworld-town/loc-pirates/main.twee index 01afc5b006e6d9e43818344ab43f60ce1e8523f1..d4cda7c74ff8415404dac6461b35d77954fab262 100644 --- a/game/overworld-town/loc-pirates/main.twee +++ b/game/overworld-town/loc-pirates/main.twee @@ -449,7 +449,7 @@ You jump out of the way, <span class="red">but it's no good.</span> The <<person <span class="gold">You are now <i>scum</i> aboard the pirate ship.</span> <br><br> -<<link [[Next|Pirate Deck]]>><<set $pirateintro to 1>><<endevent>><</link>> +<<link [[Next|Pirate Deck]]>><<set $pirate_intro to 1>><<endevent>><</link>> <br> :: Pirate Intro Gangrape diff --git a/game/overworld-town/loc-school/changing-rooms-widgets.twee b/game/overworld-town/loc-school/changing-rooms-widgets.twee index dbb607e74ece0d02e724f2bc47db650dbccfa73b..c30ac6e268804b26a48b03c500dd80381b45b153 100644 --- a/game/overworld-town/loc-school/changing-rooms-widgets.twee +++ b/game/overworld-town/loc-school/changing-rooms-widgets.twee @@ -170,7 +170,7 @@ <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><<set $lastChangingRoom to $passage>><<set $justEntered to true>><</link>> <</if>> <br> - <<if $earSlime.forcedCommando isnot undefined and $worn.under_lower.name isnot "naked">> + <<if $earSlime.forcedCommando isnot undefined and !$worn.under_lower.type.includes("naked")>> <span class="red">The slime in your ear refuses to allow you to leave with swimwear on.</span> <<elseif $exhibitionism lte 75 and $exposed gte 1>> <span class="pink">You can't go out while so exposed!</span> diff --git a/game/overworld-town/loc-school/classes/english-events.twee b/game/overworld-town/loc-school/classes/english-events.twee index 55bce209852b1f5078e7376d918671ca1d84ea44..0cb41660f24275bb294ce8661aa499bb326dea6d 100644 --- a/game/overworld-town/loc-school/classes/english-events.twee +++ b/game/overworld-town/loc-school/classes/english-events.twee @@ -133,7 +133,7 @@ Doren makes you sit alone on the other side of the room. You got away at least. <<set $outside to 0>><<set $location to "school">><<schooleffects>><<effects>> <<He>> runs <<his>> hand further up your thigh, with no regard for how you feel about it. <<if playerChastity() and $worn.under_lower.type.includes("naked")>> - <<if $worn.gentials.name is "chastity parasite">> + <<if $worn.genitals.name is "chastity parasite">> <<He>> stops when <<he>> feels the flesh of your $worn.genitals.name. "Ew, What's this? What is this thing thats attached to you?" <<He>> smirks. "I'd best be careful, I don't want to catch anything from you." <<He>> doesn't bother you for the rest of the lesson. <<else>> <<He>> stops when <<he>> feels the metal of your $worn.genitals.name. "What's this? I heard slaves are sometimes forced to wear these things, are you someone's property?" <<He>> smirks. "I'd best be careful, I don't want to offend anyone." <<He>> doesn't bother you for the rest of the lesson. @@ -145,7 +145,7 @@ Doren makes you sit alone on the other side of the room. You got away at least. <<He>> traces the outline of your $worn.under_lower.name with a finger, from your waist to your groin. <<He>> moves slowly, clearly enjoying the moment. <<He>> takes things no further though, withdrawing <<his>> hand and acting like nothing happened. <</if>> <<garousal>><<arousal 200>> -<<if $worn.gentials.name is "chastity parasite">> +<<if $worn.genitals.name is "chastity parasite">> <<gstress>><<stress 6>> <</if>> <br><br> diff --git a/game/overworld-town/loc-school/widgets-events.twee b/game/overworld-town/loc-school/widgets-events.twee index 781638b45e4e0317eaeac805e905190c6da74597..9909ee83f8b1b7b71f7898d779368c28a2725096 100644 --- a/game/overworld-town/loc-school/widgets-events.twee +++ b/game/overworld-town/loc-school/widgets-events.twee @@ -1966,10 +1966,10 @@ <<link [[Kiss|Bully Analingus Punishment]]>><<set $phase to 1>><<status -10>><<stress 12>><<trauma 3>><</link>><<lcool>><<gstress>><<gtrauma>> <br> - <<link [[Fight|Bully Fight]]>><<set $fightstart to 1>><<npcincr Whitney love -1>><<npcincr Whitney dom -5>><</link>><<llove>><<ldom>> + <<link [[Fight|Bully Fight]]>><<set $fightstart to 1>><<npcincr Whitney love -1>><<npcincr Whitney dom -1>><</link>><<llove>><<ldom>> <br> <<if $promiscuity gte 35 and $awareness gte 200>> - <<link [[Take it further|Bully Analingus Punishment]]>><<set $phase to 2>><<status -10>><<npcincr Whitney love 1>><<npcincr Whitney dom 10>><</link>><<promiscuous3>><<lcool>><<glove>><<ggdom>> + <<link [[Take it further|Bully Analingus Punishment]]>><<set $phase to 2>><<status -10>><<npcincr Whitney love 1>><<npcincr Whitney dom 3>><</link>><<promiscuous3>><<lcool>><<glove>><<ggdom>> <</if>> diff --git a/game/overworld-town/loc-temple/main.twee b/game/overworld-town/loc-temple/main.twee index 56e722b3caf947ba169f5c950f4a514128f72f7b..c500149dc218c34a891569cbfc3573d4341c11c8 100644 --- a/game/overworld-town/loc-temple/main.twee +++ b/game/overworld-town/loc-temple/main.twee @@ -966,11 +966,11 @@ You look away from the <<monk>>, and <<he>> continues down the aisle. <<danubeicon>><<link [[Inform Jordan of what you found beneath the Danube manor|Temple Ritual Inform]]>><<set $jordan_ritual_dance to 3>><</link>> <br> <</if>> - <<if $spear_vessel is "sea">> + <<if $spear_vessel is "sea" and !($temple_spear_mission gte 2)>> <<ind>><<link [[Inform Jordan that the spear was lost at sea|Temple Spear Sea]]>><</link>> <br> <</if>> - <<if $spear_vessel is "Zephyr">> + <<if $spear_vessel is "Zephyr" and !($temple_spear_mission gte 2)>> <<ind>><<link [[Inform Jordan that the spear was taken by pirates|Temple Spear Zephyr]]>><</link>> <br> <</if>> diff --git a/version b/version index fb4be4e448aa9bab0b6046a778aa42cbd95fd10e..22c0ed191d340650f85144e8da67e183b1fa89bc 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.4.4.4 DoLP 0.5 \ No newline at end of file +0.4.4.5 DoLP 0.5 \ No newline at end of file