Stephan Fuchs 10 mesi fa
parent
commit
a8598478dd

+ 4 - 4
sugarcube/src/autogenerated/unsorted/kiosk.tw

@@ -12,12 +12,12 @@
 	<<gs 'kiosk_connections'>>
 	
 	<<image "locations/city/shared/kiosk/kiosk21.jpg">>
-	It is currently very busy and looks like you'll have to wait to get to the counter.
+	It is currently very busy. You'll have to wait to get to the counter.
 		
+		<<set _waitingTime = rand(1,10) + rand(1,10)>>
 
-
-		<<act 'Wait in line (10 Minutes)'>>
-			<<set $time.minutes += 10>><<gt 'kiosk_counter'>>
+		<<act `'Wait in line ('+_waitingTime+' Minutes)'`>>
+			<<set $time.minutes += _waitingTime>><<gt 'kiosk_counter'>>
 		<</act>>
 		/*<<if getvar("$exhibitionist_lvl") > 1>>
 			<<actCLA 'Flash both your tits and your pussy to jump the queue'>>

+ 8 - 8
sugarcube/src/autogenerated/unsorted/stol.tw

@@ -6,7 +6,7 @@
 	<<if $q.questIsActive('school')>>
 		<<if $q.school.homeworkLeft > 0>>
 			You have homework to do. Finishing everything will take $q.school.homeworkLeft <<plural $q.school.homeworkLeft 'hour' 'hours'>>.
-			<<actCLA 'Do some homework'>>
+			<<actCLA 'Do some homework' undefined `{willpower:['choreSchool']}`>>
 				<<image "locations/shared/apartment/homework.jpg">>
 				<<set $time.minutes += 60>>
 				<<set $pc.mood += 5 * $pc.trait('nerd_status')>>
@@ -41,7 +41,7 @@
 
 
 
-	<<if getvar("$lubri") > 0>>
+	/*<<if getvar("$lubri") > 0>>
 		Lubricant, enough for $lubri time(s).
 	<</if>>
 	<<if $inventory.get("sunblock") > 0>>
@@ -80,11 +80,11 @@
 
 
 		<<warn "CONVERSION ERROR c243b895bdd9f2765a9aeec1fe0665e2">>
-	<</if>>-->
+	<</if>>-->*/
 
 	<<ret 'Close the drawer'>>
 
-	<<actCLA 'Check birth control'>>
+	/*<<actCLA 'Check birth control'>>
 		<<gt 'stol' 'bc'>>
 	<</actCLA>>
 	<!--
@@ -188,9 +188,9 @@
 			<</if>>
 			<<set $i to null>>
 		<</if>>
-		-->
-:: asdasdasdsa
-<<if $location_var[$here][0] == 'stolPar'>>
+		-->*/
+:: stol_deprecated
+/*<<if $location_var[$here][0] == 'stolPar'>>
 	<<set $menu_off = 1>>
 	<center><h1>Desk</h1></center>
 	<<image "shared/home/bedroom/stol.jpg">>
@@ -692,4 +692,4 @@
 	<<actCLA 'Get up from your desk'>>
 		<<gt 'stol' '$ARGS[3]'>>
 	<</actCLA>>
-<</if>>
+<</if>>*/

+ 1 - 1
sugarcube/src/autogenerated/unsorted/willpower.tw

@@ -1,4 +1,4 @@
-:: willpower
+:: willpower[include]
 <<set $here = 'willpower'>>
 <<set $ARGS = $location_var[$here]>>
 <!-- !!To use it call it with gs 'willpower', 'action', 'type'-->

+ 36 - 35
sugarcube/src/locations/generic/din_van.tw

@@ -736,7 +736,6 @@
 
 :: showerdin_macro[widget]
 <<widget 'showerdin'>>
-	<<set $menu_off = 1>>
 	<<if getvar("$q.therapist.hypnoAddict") == 0>>
 		<<set $cumspclnt = 1>>
 	<<else>>
@@ -750,20 +749,12 @@
 	<<if $pc.frost > 0>>
 		<<set $pc.frost = 0>>
 	<</if>>
-	<<if $inventory.get("shampoo") < 0>>
-		<<run $inventory.set('shampoo',0)>>
-	<</if>>
 	<<setinit $lactation['lactmess'] = 0>>
 	<<if $pc.pcs_sweat > 10>>
 		<<set $pc.pcs_sweat = 10 + rand(0,4)>>
 	<</if>>
-	<<if getvar("$noShampoo") == 0>>
-		<<run $inventory.dec('shampoo',1)>>
-	<<else>>
-		<<set $noShampoo to null>>
-	<</if>>
 	<<gs 'body' 'SkinGain' 'CleanSelf'>>
-	<<if $pc.eyelashes_false >= 1>>
+	/*<<if $pc.eyelashes_false >= 1>>
 		<<if rand(0,4) <= 2>>
 			You're careful enough that your false lashes make it through relatively unscathed.
 		<<else>>
@@ -772,7 +763,7 @@
 			<<set $pc.eyelashes = $pcs_naturallashes>>
 
 		<</if>>
-	<</if>>
+	<</if>>*/
 <</widget>>
 :: bteeth_macro[widget]
 <<widget 'bteeth'>>
@@ -805,21 +796,30 @@ You brush your teeth and now they are clean and minty fresh.
 <</widget>>
 :: shower_macro[widget]
 <<widget 'shower'>>
-	<<actCLA 'Take a shower (0:15)'>>
+	<<act 'Take a shower (0:15)'>>
 		<<gt "shower_macro_exec">>
-	<</actCLA>>
+	<</act>>
 <</widget>>
-:: shower_macro_exec
-		<<set $menu_off = 1>>
-		<<set $time.minutes += 15>>
-		<<if $loc == 'vanrPar' or $loc == 'tanvanr' or $loc == 'albinahome' or $loc == 'LariskaHome' or getvar("$hotelShampoo") == 1>>
-			<<set $noShampoo = 1>>
+:: shower_macro_exec[event]
+	<<set $time.minutes += 15>>
+	
+	/*<<set $noShampoo_tmp = $noShampoo>>*/
+	<<showerdin>>
+	<<video "shared/home/bathroom/dush.mp4">>
+	You undress and turn on the water in the shower. When it hits the right temperature, you step into the shower and let the warm water rain down on you.
+
+	<<if !$location.tags.includes('freeShampoo')>>
+		<<run $inventory.dec("shampoo")>>
+		<<set _shampooLeft = $inventory.get("shampoo")>>
+		<<if _shampooLeft == 0>>
+			<<negative 2>>You have no shampoo left. When you get a chance, you should stop by the supermarket and buy some shampoo.<</negative>>
+		<<elseif _shampooLeft <= 5>>
+			<<negative>>You are getting low on shampoo, with only _shampooLeft remaining. When you get a chance, you should stop by the supermarket and buy some more.<</negative>>
 		<</if>>
-		<<set $noShampoo_tmp = $noShampoo>>
-		<<showerdin>>
-		<<video "shared/home/bathroom/dush.mp4">>
-		You undress and turn on the water in the shower. When it hits the right temperature, you step into the shower and let the warm water rain down on you.
-		<<if $time.daystart < 10 and $start_subtype == 'tg'>>
+	<</if>>
+
+	<<ret 'Get out and dry off'>>
+		/*<<if $time.daystart < 10 and $start_subtype == 'tg'>>
 			<<set $pc.horny += rand(6,10)>>
 			It's really arousing to see your new body with all its smooth curves, breasts with large nipples, wide hips and smooth legs. You begin to lather your body, noticing how soft and tender it feels. Once you're sure you haven''t missed a single spot, you begin to wash yourself off, continuing to experience new and strange sensations.
 		<<elseif $time.daystart < 30 and $start_subtype == 'tg'>>
@@ -834,11 +834,7 @@ You brush your teeth and now they are clean and minty fresh.
 			<</if>>
 			lather yourself up, trying not to miss any spots, and then wash off.
 		<</if>>
-		<<if $inventory.get("shampoo") == 0 and getvar("$noShampoo_tmp") == 1>>
-			When you get a chance, you should stop by the supermarket and buy some shampoo.
-		<<elseif $inventory.get("shampoo") <= 5>>
-			You are getting low on shampoo, with only $inventory.get("shampoo") remaining. When you get a chance, you should stop by the supermarket and buy some more.
-		<</if>>
+		
 		<<if getvar("$q.therapist.hypnoAddict") > 0>>
 			You have no reason to, but you carefully avoid cleaning out your pussy and ass.
 		<</if>>
@@ -941,7 +937,7 @@ You brush your teeth and now they are clean and minty fresh.
 
 		<</if>>
 		<</if>>
-		<<set $noShampoo_tmp to null>>
+		<<set $noShampoo_tmp to null>>*/
 :: bath_macro[widget]
 <<widget 'bath'>>
 	<<actCLA 'Soak in the bath (0:30)'>>
@@ -949,14 +945,18 @@ You brush your teeth and now they are clean and minty fresh.
 	<</actCLA>>
 <</widget>>
 :: bath_macro_exec[event]
-		<<set $menu_off = 1>>
 		<<set $time.minutes += 30>>
 		<<set $pc.pcs_sweat = 7 + rand(0,4)>>
 		<<set $pc.mood += 20>>
-		<<if $location.tags.includes('freeShampoo')>>
-			<<set $noShampoo = 1>>
+		<<if !$location.tags.includes('freeShampoo')>>
+			<<run $inventory.dec("shampoo")>>
+			<<set _shampooLeft = $inventory.get("shampoo")>>
+			<<if _shampooLeft == 0>>
+				<<negative 2>>You have no shampoo left. When you get a chance, you should stop by the supermarket and buy some shampoo.<</negative>>
+			<<elseif _shampooLeft <= 5>>
+				<<negative>>You are getting low on shampoo, with only _shampooLeft remaining. When you get a chance, you should stop by the supermarket and buy some more.<</negative>>
+			<</if>>
 		<</if>>
-		<<set $noShampoo_tmp = $noShampoo>>
 		<<showerdin>>
 		<<gs 'body' 'SkinGain' 'Bath'>>
 
@@ -965,7 +965,8 @@ You brush your teeth and now they are clean and minty fresh.
 			You undress while the bathtub fills up and dip a toe into the water.
 			It is just the right temperature, so you climb in and let yourself sink into the warm water, moaning softly as you feel your muscles start to relax.
 		</p>
-		<<if $time.daystart < 10 and $start_subtype == 'tg'>>
+		<<ret 'Get out and dry off'>>
+		/*<<if $time.daystart < 10 and $start_subtype == 'tg'>>
 			<<set $pc.horny += rand(6,10)>>
 			You stare at the smooth, soft legs sticking out of the water. You're still not used to this new body and the look of all this roundness.
 			As you start to soap yourself, you unwittingly turn your attention to your breasts. They're so soft and big, and when you touch them you feel an unfamiliar but pleasant sensation. You take your time getting familiar with your new body, then you begin to wash yourself in earnest.
@@ -1034,7 +1035,7 @@ You brush your teeth and now they are clean and minty fresh.
 		<<actCLA 'Take a selfie'>>
 			<<gs 'telefon' 'Phone_selfie_image_bathing' 'bath'>>
 		<</actCLA>>
-		<<brit>>
+		<<brit>>*/
 
 :: SkinCare_macro[widget]
 <<widget 'SkinCare'>>

+ 8 - 10
sugarcube/src/locations/pavlov/pav_commcenter.tw

@@ -8,7 +8,7 @@
 		<<image "locations/pavlovsk/community/dk_night.jpg">>
 	<</if>>
 	<<ConnectedLocation 'Residential Area' 'pav_residential' '' 'locations/pavlovsk/pavres.jpg' 2>>
-	<<if $time.hour >= 20 and $time.hour <= 23 and $time.weekday >= 5 and $time.weekday < 7>>
+	/*<<if $time.hour >= 20 and $time.hour <= 23 and $time.weekday >= 5 and $time.weekday < 7>>
 		<p>The entrance to the community centre is full of young people. The guys are just hanging around smoking and joking while the girls are in small groups, all dressed up and gossiping. You see the bushes moving - Pavlovsks' famous make out garden.</p>
 		<<if $gdkincum == $time.daystart and ($pc.cumAtLocation(6) == 0 and $pc.cumAtLocation(7) == 0) and $pc.cumAtLocation(11) == 0>>
 			<<set $gdkincum = 0>>
@@ -35,13 +35,13 @@
 				You should clean the cum off your clothes before heading back to the dance.
 			<</if>>
 		<</if>>
-	<<else>>
+	<<else>>*/
 		The community centre has sports facilities and offers classes in the evening.
 		It houses a small library which is open from 08:00 until 18:00.
-		Upstairs, there are some hobby clubs available from 12:00 until 20:00.
+		/*<Upstairs, there are some hobby clubs available from 12:00 until 20:00.
 		The sports section is open from 14:00 until 20:00 during the week and from 09:00 until 20:00 during the weekend.
 		<p>On Friday and Saturday evenings, from 20:00 to midnight, the main hall is used as a club with popular music and dancing. Entry fee is 25 <b>₽</b>.</p>
-	<</if>>
+	</if>>
 	<<if $time.month > 8 and getvar("$ml_guitarlesson['advertisement']") == 0>>
 		<<gt 'music_guitarlesson' 'advertisement'>>
 
@@ -51,14 +51,12 @@
 			<<gt 'gdksport' 'start'>>
 		<</actCLA>>
 
-	<</if>>
+	<</if>>*/
 	<<if $time.hour >= 8 and $time.hour < 18>>
-		<<actCLA 'Go to the library'>>
-			<<gt 'pav_library'>>
-		<</actCLA>>
+		<<ConnectedLocation 'Library' 'pav_library' '' 'locations/pavlovsk/community/library/gdkbibl.jpg' 2>>
 
 	<</if>>
-	<<if $time.hour >= 12 and $time.hour < 20>>
+	/*<<if $time.hour >= 12 and $time.hour < 20>>
 		<<actCLA 'Go upstairs to the hobby clubs'>>
 			<<gt 'pav_commclubs'>>
 		<</actCLA>>
@@ -97,5 +95,5 @@
 	<<if getvar("$locat['Anya']") == 10>>
 		Your sister <<link "Anya">><<gt 'sister' 'pav_commcenter'>><</link>> is sitting with a group of boys and girls, drinking beer.
 
-	<</if>>
+	<</if>>*/
 

+ 33 - 51
sugarcube/src/locations/pavlov/pav_library.tw

@@ -1,14 +1,4 @@
-:: pav_library
-<<set $here = 'pav_library'>>
-<<set $ARGS = $location_var[$here]>>
-<!-- !2021/10/05-->
-<<set $loc_arg = ''>>
-<<set $loc = 'pav_library'>>
-<<set $location_type = 'public_indoors'>>
-<<set $menu_loc = 'pav_library'>>
-<<set $menu_arg = ''>>
-<<set $menu_off = 0>>
-<<set $pc.frost = 0>>
+:: pav_library[public indoors]
 
 <h2>Community center library</h2>
 <<image "locations/pavlovsk/community/library/gdkbibl.jpg">>
@@ -19,8 +9,8 @@
 	<<set ERROR: FAILED TO CONVERT LITERAL: """'Between the bookshelves are some tables which can be used for studying. Some of them have <a href""" = ERROR: FAILED TO CONVERT LITERAL: """"exec: gs ''internet_mobile''""" , 'get_access' , 'free' , 'noporn' , 'nocamshow'>> <<gs 'internet_mobile' 'add_limitation' 'general-text' 'On this public computer all adult content sites are blocked'>> <<gt 'komp' 'start'">computers</a> for public use.'>>
 
 -->
-<<warn "CONVERSION ERROR 289c631fc4f03176dd70192b20b052c8">>
-<<if getvar("$q.school.homeworkLeft") > 0>>
+
+/*<<if getvar("$q.school.homeworkLeft") > 0>>
 	You could do your homework with the help of one of the computers.
 <</if>>
 <<if mid($start_type,1,2) == 'sg' and $time.isSchoolHoliday == 0 and $time.weekday < 6 and $nerdstudynight['day'] != $time.daystart and $time.hour > 14>>
@@ -37,11 +27,9 @@
 	<<if $nataliaQW['library_day'] == $time.daystart>>
 		You see your classmate <<link "Natalia Pavlova">><<gt 'natalia_pavlova' 'library'>><</link>> .
 	<</if>>
-<</if>>
-<<actCLA 'Leave'>>
-	<<gt 'pav_commcenter'>>
-<</actCLA>>
-<<actCLA 'Go to the toilets'>>
+<</if>>*/
+<<ConnectedLocation 'Leave' 'pav_commcenter' '' 'locations/pavlovsk/community/dk.jpg' 2>>
+/*<<actCLA 'Go to the toilets'>>
 	<<gt 'gdktoilet' 'start'>>
 <</actCLA>>
 <<if $nerd_game['game_day'] == $time.daystart and $time.hour == 19>>
@@ -55,9 +43,9 @@
 	<<gt 'nerd_game_night' 'game'>>
 <</actCLA>>
 
-<</if>>
+<</if>>*/
 <<if $time.hour >= 8 and $time.hour < 18>>
-	<<actCLA 'Read a book on science (1:00)'>>
+	/*<<actCLA 'Read a book on science (1:00)'>>
 		<<set $menu_off = 1>>
 		<<if getvar("$blizoruk") == 500 or getvar("$pc.glassqw") == 1>>
 			<<set $pc.glassqw = 1>> <<msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.'>> <<gt $curloc>>
@@ -196,42 +184,36 @@
 		<<actCLA 'Put the book back'>>
 			<<gt 'pav_library'>>
 		<</actCLA>>
-	<</actCLA>>
-	<<set gs 'willpower' , 'chore' , 'self' , iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))>>
-	<<if $pc.trait('nerd_status') == 2>>
-		<<set $will_cost = $will_cost / 2>>
-
-	<</if>>
-	<<if getvar("$q.school.homeworkLeft") > 0 and ($will_cost <= $pc.pcs_willpwr or $pc.trait('nerd_status') == 3)>>
-		<<actCLA 'Do your homework (1:00'+iif(pcs_traits['nerd_status'] = 3, ', ' and will_cost Willpower')+')'>>
-			<<image "locations/pavlovsk/community/library/homework.jpg">>
-			<<set $time.minutes += 60>>
-			<<set $pc.mood += 5 * $pc.trait('nerd_status')>>
-			<<set $lern += 1>>
-			<<set gs 'willpower' , 'chore' , 'self' , iif(grupTipe = 4, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))>>
-			<<if $pc.trait('nerd_status') == 2>>
-				<<set $will_cost = $will_cost / 2>>
-
-			<</if>>
-			<<if $pc.trait('nerd_status') < 3>>
-				<<gs 'willpower' 'pay' 'self'>>
-
-			<</if>>
-			<<run $q.school.func('homework','yes',1,0,)>>
-			You sit down at one of the tables with a a computer and use it to help you do your homework.
-			<<set 'After an hour you have ' + iif(lernHome = 0, 'completed', 'done a part of') + ' your homework.'>>
-			<<actCLA 'Get up form the table'>>
-				<<gt 'pav_library'>>
+	<</actCLA>>*/
+	<<if $pc.isSchoolStudent>>
+		<<if getvar("$q.school.homeworkLeft") > 0>>
+			<<actCLA 'Do your homework (1:00)' undefined `{willpower:['choreSchool']}`>>
+				<<image "locations/pavlovsk/community/library/homework.jpg">>
+				<<set $time.minutes += 60>>
+				<<set $pc.mood += 5 * $pc.trait('nerd_status')>>
+				<<run $q.school.func('homework','yes',1,0,)>>
+				You sit down at one of the tables with a a computer and use it to help you do your homework.
+				You spend an hour
+				<<if $q.school.homeworkLeft == 0>>
+					completing
+				<<else>>
+					doing part of
+				<</if>>
+				your homework.
+				<<actCLA 'Get up form the table'>>
+					<<gt 'pav_library'>>
+				<</actCLA>>
 			<</actCLA>>
-		<</actCLA>>
-	<<elseif getvar("$q.school.homeworkLeft") > 0 and $will_cost > $pc.pcs_willpwr>>
-		<<actCLA `'Do your homework ('+$will_cost+')'`>><font color=red><br/>You don`t have enough willpower to use this action.</font><</actCLA>>
+			You could use one of the computers to do your homework here.
+		<<else>>
+			If you had homework to do, you could use one of the computers here to do so.
+		<</if>>
 	<</if>>
-	<<if mid($start_type,1,2) == 'sg' and $time.isSchoolHoliday == 0 and $time.weekday < 6 and $nerdstudynight['day'] != $time.daystart and $time.hour > 14>>
+	/*<<if mid($start_type,1,2) == 'sg' and $time.isSchoolHoliday == 0 and $time.weekday < 6 and $nerdstudynight['day'] != $time.daystart and $time.hour > 14>>
 		<<actCLA 'Join the nerd`s study group'>>
 			<<gt 'pav_library_nerdstudy' 'nerd_study_night'>>
 		<</actCLA>>
-	<</if>>
+	<</if>>*/
 <<else>>
 	The library is closed.
 <</if>>

+ 6 - 13
sugarcube/src/locations/pavlov/residential/pav_residential.tw

@@ -89,30 +89,23 @@
 <</if>>
 
 <<if $pc.isSchoolStudent>>
-	<<set $schoolname = 'the local school.'>>
+	<<set _schoolname = 'the local school.'>>
 	<<ConnectedLocationCode 'School' 'locations/pavlovsk/school/building/gschool.jpg' 22 `{priority:5000,hotkeys:['S']}`>>
 		<<gt 'school_grounds'>>
 	<</ConnectedLocationCode>>
 <<else>>
-	<<set $schoolname = 'your old school.'>>
+	<<set _schoolname = 'your old school.'>>
 <</if>>
 
-<<ConnectedLocationCode 'Community Center' 'locations/pavlovsk/community/dk.jpg' 2>>
-	<<gt 'pav_commcenter'>>
-<</ConnectedLocationCode>>
-
-<<ConnectedLocationCode 'Public Park' 'locations/pavlovsk/park/skver.jpg' 5>>
-	<<gt 'pav_park'  'start'>>
-<</ConnectedLocationCode>>
+<<ConnectedLocation 'Community Center' 'pav_commcenter' '' 'locations/pavlovsk/community/dk.jpg' 2>>
+<<ConnectedLocation 'Public Park' 'pav_park'  'start' 'locations/pavlovsk/park/skver.jpg' 5>>
+<<ConnectedLocation 'Lake' 'pav_lake' '' 'locations/pavlovsk/lake/lake.summer.jpg' 5>>
 
-<<ConnectedLocationCode 'Lake' 'locations/pavlovsk/lake/lake.summer.jpg' 5>>
-	<<gt 'pav_lake'>>
-<</ConnectedLocationCode>>
 
 <p>
 	In the center of Pavlovsk is the town square,
 	which features the community center, a popular hotspot for the local teenagers to hang out
-	after a long day at $schoolname
+	after a long day at _schoolname
 	Connected to the town center is the old palace grounds
 	which have been turned into a large public park.
 	With the lake nearby, the area can get quite busy, especially during the summer and

+ 1 - 5
sugarcube/src/locations/stores/budgetclothes.tw

@@ -1,10 +1,6 @@
 :: budgetclothes[indoors public]
-<<set $here = 'budgetclothes'>>
-<<set $ARGS = $location_var[$here]>>
 
-<<if $location_var[$here][0]>>
-	<<set $budgetclothes_returnPassage = $location_var[$here][0]>>
-<</if>>
+	<<set $budgetclothes_returnPassage = $location_var[$here]?.[0] ?? $budgetclothes_returnPassage>>
 
 	<h2>Welcome to G & M - Clothes for all your needs</h2>
 	<<image 'locations/city/citycenter/mall/gandm/shop.jpg'>>