From 7e38e3fd2629c9cb4ce71ace9622bd91be976752 Mon Sep 17 00:00:00 2001
From: Vrelnir <vrelnir@gmail.com>
Date: Sat, 16 Jan 2021 09:48:08 +0000
Subject: [PATCH] Updated to 0.2.21.1
---
devTools/androidsdk/image/cordova/config.xml | 2 +-
.../androidsdk/image/cordova/package.json | 2 +-
game/01-config/sugarcubeConfig.js | 2 +-
game/base-clothing/clothing-legs.twee | 2 +-
game/base-combat/widgets.twee | 6 +--
game/overworld-plains/loc-farm/work.twee | 27 ++++++++++
.../overworld-town/loc-docks/skulduggery.twee | 9 ++--
game/overworld-town/loc-home/main.twee | 2 +-
game/overworld-town/special-robin/walk.twee | 2 +-
game/special-templates/main.twee | 52 +++++++++++++++++--
10 files changed, 88 insertions(+), 18 deletions(-)
diff --git a/devTools/androidsdk/image/cordova/config.xml b/devTools/androidsdk/image/cordova/config.xml
index bd09d18886..c8c8d1eae3 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.2.20.3"
+ version="0.2.21.2"
xmlns="http://www.w3.org/ns/widgets"
xmlns:cdv="http://cordova.apache.org/ns/1.0"
android-packageName="com.vrelnir.DegreesOfLewdity"
diff --git a/devTools/androidsdk/image/cordova/package.json b/devTools/androidsdk/image/cordova/package.json
index 2c2dbeebf0..293900ce99 100644
--- a/devTools/androidsdk/image/cordova/package.json
+++ b/devTools/androidsdk/image/cordova/package.json
@@ -1,6 +1,6 @@
{
"name": "degrees-of-lewdity-android-app",
- "version": "0.2.20.3",
+ "version": "0.2.21.2",
"description": "This sub-project exists to build DoL as an Android app",
"main": "Degrees of Lewdity.html",
"scripts": {
diff --git a/game/01-config/sugarcubeConfig.js b/game/01-config/sugarcubeConfig.js
index 810ab8699b..5c5f16168b 100644
--- a/game/01-config/sugarcubeConfig.js
+++ b/game/01-config/sugarcubeConfig.js
@@ -21,7 +21,7 @@ window.StartConfig = {
"debug": false,
"enableImages": true,
"enableLinkNumberify": true,
- "version": "0.2.21.0",
+ "version": "0.2.21.1",
}
config.saves.autosave = "autosave";
diff --git a/game/base-clothing/clothing-legs.twee b/game/base-clothing/clothing-legs.twee
index 3c25dd5c00..3e30841d00 100644
--- a/game/base-clothing/clothing-legs.twee
+++ b/game/base-clothing/clothing-legs.twee
@@ -417,7 +417,7 @@
shop: ["clothing"],
accessory: 1,
accessory_colour: 0,
- accessory_colour_options: [],
+ accessory_colour_options: ["white"],
cursed: 0,
location: 0,
iconFile: "Ankle socks.png",
diff --git a/game/base-combat/widgets.twee b/game/base-combat/widgets.twee
index ff19c80279..969819b9ff 100644
--- a/game/base-combat/widgets.twee
+++ b/game/base-combat/widgets.twee
@@ -50,11 +50,11 @@
<<case "romantic">>
<span class="lewd">You're happy your first kiss was taken in such a romantic way.</span><<arousal 1500>><<stress -6>><<trauma -6>><<garousal>><<lstress>>
<<case "rape">>
- <span class="red">You feel disgusted at them for stealing your first kiss.</span><<stress 40>><<ggstress>>
+ <span class="red">You feel disgusted at them for stealing your first kiss.</span><<stress 40>><<gggstress>>
<<case "tentacle">>
<span class="lewd">You wonder what others would say about giving a tentacle your first kiss, if they would even believe you.</span><<arousal 3000>>
<<default>>
- <span class="blue">You wonder if it was right to give them your first kiss.</span><<stress 20>><<gstress>>
+ <span class="blue">You wonder if it was right to give them your first kiss.</span><<stress 20>><<ggstress>>
<</switch>>
<<takeVirginity $args[0] "kiss">>
<</if>>
@@ -92,7 +92,7 @@
<<if _loveInterest is true and $consensual is 1>>
<<takeKissVirginity $args[0] "loveInterest">>
<<elseif $consensual is 1>>
- <<takeKissVirginity $args[0] "romantic">>
+ <<takeKissVirginity $args[0] "consensual">>
<<else>>
<<takeKissVirginity $args[0] "rape">>
<</if>>
diff --git a/game/overworld-plains/loc-farm/work.twee b/game/overworld-plains/loc-farm/work.twee
index aed37f9fdc..e301d1c360 100644
--- a/game/overworld-plains/loc-farm/work.twee
+++ b/game/overworld-plains/loc-farm/work.twee
@@ -389,6 +389,33 @@ Following the slimes command, you find a spot where you think your clothes will
<</if>>
+:: Farm Alex Dry [nobr]
+<<effects>>
+
+<<npc Alex>><<person1>>
+You sneak up to Alex, though you keep yourself hidden behind a bush.
+
+<<if $submissive gte 1150>>
+ "A-Alex," you say. "I had an accident. D-do you have something I can dry with?"
+<<elseif $submissive lte 850>>
+ "Hey," you say. "Alex. Got anything I can dry with?"
+<<else>>
+ "Alex," you say. "I've had an accident. Do you have anything I could dry with?"
+<</if>>
+<<exhibitionism1>>
+
+Alex turns, looks perplexed for a moment, then laughs. "You got yourself wet? Don't worry. I'll get you something."
+<br><br>
+
+You follow <<him>> to the farmhouse. Alex need only turn to see your <<lewdness>>, but <<he>> doesn't take advantage. "Wait here," <<he>> says as <<he>> climbs the stairs. "I'll chuck something down."
+<br><br>
+
+<<link [[Next|Farm Alex Dry 2]]>><</link>>
+<br>
+
+
+
+
:: Farm Alex Dry 2 [nobr]
<<effects>>
diff --git a/game/overworld-town/loc-docks/skulduggery.twee b/game/overworld-town/loc-docks/skulduggery.twee
index 5337518ec8..4de962de30 100644
--- a/game/overworld-town/loc-docks/skulduggery.twee
+++ b/game/overworld-town/loc-docks/skulduggery.twee
@@ -95,7 +95,7 @@ You are on the docks.
The containers here hold nothing of value to you.
<br><br>
<<else>>
- <<link [[Break into the containers (0:30)|Docks Search]]>><<pass 30>><<crimeup>><<dock_security 1>><</link>><<crime>><<gsecurity>><<skul_dock_state $bus>>
+ <<link [[Break into the containers (0:30)|Docks Search]]>><<crimeup>><<dock_security 1>><</link>><<crime>><<gsecurity>><<skul_dock_state $bus>>
<br>
<</if>>
<<skul_dock_nav>>
@@ -110,7 +110,7 @@ You are on the docks.
:: Docks Search [nobr]
<<effects>>
-
+<<skul_dock_init>>
The containers are virtually identical. One by one, you pick the padlocks and enter the containers.
<<if $skulduggery lt 500>>
@@ -174,8 +174,9 @@ Valuable in bulk, but you can't carry much.
<br><br>
<<else>>
You search another. The interior is loaded with electronic goods. Televisions, speakers, most too big to carry. But there are smaller items as well. You won't get their full value on the black market, but they should be valuable enough to be worth the trouble.
+ <br><br>
<</if>>
- <br><br>
+
<<link [[Take Them|Docks Electronics]]>><<crimeup 300>><<set $blackmoney += 300>><</link>><<crime>>
<br>
<<else>>
@@ -188,7 +189,7 @@ Valuable in bulk, but you can't carry much.
<br>
<<set $skul_dock[$bus].state to "empty">>
-
+<<pass 30>>
:: Docks Gold [nobr]
<<effects>>
diff --git a/game/overworld-town/loc-home/main.twee b/game/overworld-town/loc-home/main.twee
index 3db39f02fa..44f10995c4 100644
--- a/game/overworld-town/loc-home/main.twee
+++ b/game/overworld-town/loc-home/main.twee
@@ -1850,7 +1850,7 @@ The kid studies your face for a long moment. Seems to weigh something.
<br>
"Okay. Look, if- Wait! Wait right there... Nice try!"
<br>
- The kid glares at your hair, walks up to you and runs fingers through your hair, checking it. This goes on for a few minutes. You ears are also checked for earrings
+ The kid glares at your hair, walks up to you and runs fingers through your hair, checking it. This goes on for a few minutes. Your ears are also checked for earrings
and headsets.
<</if>>
<br><br>
diff --git a/game/overworld-town/special-robin/walk.twee b/game/overworld-town/special-robin/walk.twee
index 4df36116c0..e5c7166965 100644
--- a/game/overworld-town/special-robin/walk.twee
+++ b/game/overworld-town/special-robin/walk.twee
@@ -727,7 +727,7 @@ You quote one of the film's leads, from the part right before the two protagonis
<br><br>
<<if $robinromance is 1>>
-<<He>> hugs you and leans close. "We have to kiss now," <<he>> says. "Or it won't be proper." <<He>> kisses you with more vigour than usual, trying to replicate the movie. <<Hes>> blushing when <<he>> pulls away, and continues to until you make it back to <<his>> room.
+<<He>> hugs you and leans close. "We have to kiss now," <<he>> says. "Or it won't be proper." <<He>> kisses you with more vigour than usual, trying to replicate the movie. <<Hes>> blushing when <<he>> pulls away, and continues to until you make it back to <<his>> room.<<takeKissVirginity "Robin" `($robinromance is 1?"loveInterest":"romantic")`>>
<br><br>
<<link [[Next|Robin Options]]>><</link>>
diff --git a/game/special-templates/main.twee b/game/special-templates/main.twee
index 828c0385bf..956eb06d90 100644
--- a/game/special-templates/main.twee
+++ b/game/special-templates/main.twee
@@ -3,12 +3,54 @@
<<endevent>>
<<endcombat>>
-<<farm_init>>
-<<set $lactating to 1>>
-<<link [[Farm Barn Breasts 2]]>><</link>>
-<br>
-
+
+<<set $skul_dock[$bus].contents to "aphrodisiacs">>
+<<if $skul_dock[$bus].contents is "gold">>
+ <<if $skul_dock[$bus].state is "known">>
+ You know there's gold here somewhere. You break into another. It's full of brown packages. You recognise them. You search among them, and then you find it. It's heavier than the others. You tear it open, and find the small bar of gold.
+ <br><br>
+ <<earnFeat "Employee Benefits">>
+ <<link [[Take it|Docks Gold]]>><<crimeup 3000>><<set $blackmoney += 3000>><</link>><<crime>>
+ <br>
+ <<else>>
+ You keep searching, and come to a container full of brown packages.
+ <br><br>
+ <<link [[Search carefully (1:00)|Docks Gold Careful]]>><<pass 60>><</link>>
+ <br>
+ <<link [[Tear into them (0:05)|Docks Gold Tear]]>><<crimeup 100>><<pass 5>><</link>><<crime>>
+ <br>
+ <</if>>
+
+<<elseif $skul_dock[$bus].contents is "aphrodisiacs">>
+ <<if $skul_dock[$bus].state is "known">>
+ You know that strange fluid is here somewhere. You break into another, and a purple light greets you. A number of canisters sit inside, marked with hazard warnings. But only one emits light. The strange fluid swirls behind the glass.
+ <br><br>
+ <<else>>
+ You keep searching. You break into another, and a purple light greets you. A number of canisters sit inside, marked with hazard warnings. But only one emits light. A strange fluid swirls behind the glass.
+ <br><br>
+ <</if>>
+
+
+ <<link [[Take it|Docks Aphrodisiacs]]>><<crimeup 1200>><<set $blackmoney += 1200>><</link>><<crime>>
+ <br>
+<<elseif $skul_dock[$bus].contents is "electronics">>
+ <<if $skul_dock[$bus].state is "known">>
+ You know that one of these hold something you can actually carry. You break into another. The interior is loaded with electronic goods. The televisions are too big to carry, but there are smaller items as well. You won't get their full value on the black market, but they should be valuable enough to be worth the trouble.
+ <br><br>
+ <<else>>
+ You search another. The interior is loaded with electronic goods. Televisions, speakers, most too big to carry. But there are smaller items as well. You won't get their full value on the black market, but they should be valuable enough to be worth the trouble.
+ <br><br>
+ <</if>>
+
+ <<link [[Take Them|Docks Electronics]]>><<crimeup 300>><<set $blackmoney += 300>><</link>><<crime>>
+ <br>
+<<else>>
+ You open the final container. It's empty.
+ <br><br>
+<</if>>
+
+
:: Test2 [nobr]
<<set $NPCName[$NPCNameList.indexOf("Kylar")].state to "active">>
--
GitLab