Browse Source

fix quest `hotel_maid`

Stephan Fuchs 10 months ago
parent
commit
0a55afe593

+ 2 - 2
sugarcube/src/locations/pavlov/hotel/pav_hotel.tw

@@ -177,8 +177,8 @@ setup.npcs["pav_hotel_receptionist"] = {
 	<<actCLA '<b>Work as a maid</b>'>>
 	<<actCLA '<b>Work as a maid</b>'>>
 		<<image 'locations/pavlovsk/hotel/resep.girl0,#.jpg' 0 10>>
 		<<image 'locations/pavlovsk/hotel/resep.girl0,#.jpg' 0 10>>
 		You report in for work at the front desk
 		You report in for work at the front desk
-		<<if !$q.hotel_maid.get("introduced")>>
-			<<run $q.hotel_maid.set('introduced',true)>>
+		<<if !$quest('hotel_maid').get("introduced")>>
+			<<run $quest('hotel_maid').set('introduced',true)>>
 			<<set $npc('pav_hotel_receptionist').nameknown = true>>
 			<<set $npc('pav_hotel_receptionist').nameknown = true>>
 			<p>
 			<p>
 				The brunette manning the desk quickly makes sure no customers will need her for a minute.
 				The brunette manning the desk quickly makes sure no customers will need her for a minute.

+ 5 - 5
sugarcube/src/locations/pavlov/hotel/pav_hotelAdmin.tw

@@ -2,13 +2,13 @@
 <h2>Administration room of the Pavlovsk hotel</h2>
 <h2>Administration room of the Pavlovsk hotel</h2>
 <<image "locations/pavlovsk/hotel/goteladmin.jpg">>
 <<image "locations/pavlovsk/hotel/goteladmin.jpg">>
 Behind his desk, a man of about 30 is busy with some paperwork. He's dressed quite sharply, and you had never expected the hotel manager would be this young.
 Behind his desk, a man of about 30 is busy with some paperwork. He's dressed quite sharply, and you had never expected the hotel manager would be this young.
-<<if $q.questIsStarted('hotel_maid') and $q.hotel_maid.stage < 10>>
+<<if $q.questIsStarted('hotel_maid') and $quest('hotel_maid').stage < 10>>
 	<<actCLA 'Ask about the maid job'>>
 	<<actCLA 'Ask about the maid job'>>
 		<<image "locations/pavlovsk/hotel/goteladmin.jpg">>
 		<<image "locations/pavlovsk/hotel/goteladmin.jpg">>
 		<<set $time.minutes += 5>>
 		<<set $time.minutes += 5>>
 		<p>You approach the man's desk, but he doesn't look up from his work. With a soft voice you carefully try to get his attention: "Umm... excuse me?"</p>
 		<p>You approach the man's desk, but he doesn't look up from his work. With a soft voice you carefully try to get his attention: "Umm... excuse me?"</p>
 		<p>He looks up from his desk: "Oh I'm sorry, I didn't hear you come in. Hello, I'm Herman Leonidovich, manager of this hotel. Is there a problem?"</p>
 		<p>He looks up from his desk: "Oh I'm sorry, I didn't hear you come in. Hello, I'm Herman Leonidovich, manager of this hotel. Is there a problem?"</p>
-		<<if $q.hotel_maid.stage == 0>>
+		<<if $quest('hotel_maid').stage == 0>>
 			<p>You smile and shake your head: "No, no problem. I am looking for a job, I hear you are often looking for maids?"</p>
 			<p>You smile and shake your head: "No, no problem. I am looking for a job, I hear you are often looking for maids?"</p>
 			<p>
 			<p>
 				You can feel his eyes exploring your body for a moment before he responds: "Yes, we are! We currently only have a part-time vacancy, for a maid.
 				You can feel his eyes exploring your body for a moment before he responds: "Yes, we are! We currently only have a part-time vacancy, for a maid.
@@ -18,11 +18,11 @@ Behind his desk, a man of about 30 is busy with some paperwork. He's dressed qui
 		<</if>>
 		<</if>>
 		<p>
 		<p>
 			You would be working between 16:00 and 19:00, give or take. Most of the hotel rooms are empty then, before the new guests come in.
 			You would be working between 16:00 and 19:00, give or take. Most of the hotel rooms are empty then, before the new guests come in.
-			You can work any day you like, no pressure. It would pay <<money $q.hotel_maid.get('salary')>> per shift. After your work, you can immediately go collect your salary at the reception, or you can save it up and collect it all at once later. Does that sound good to you?"
+			You can work any day you like, no pressure. It would pay <<money $quest('hotel_maid').get('salary')>> per shift. After your work, you can immediately go collect your salary at the reception, or you can save it up and collect it all at once later. Does that sound good to you?"
 		</p>
 		</p>
 		<<actCLA '"That sounds great!"'>>
 		<<actCLA '"That sounds great!"'>>
 			<<set $time.minutes += 5>>
 			<<set $time.minutes += 5>>
-			<<run $q.hotel_maid.setStage(10)>>
+			<<run $quest('hotel_maid').setStage(10)>>
 			<h2>Administration room of the Pavlovsk hotel</h2>
 			<h2>Administration room of the Pavlovsk hotel</h2>
 			<<image "locations/pavlovsk/hotel/goteladmin.jpg">>
 			<<image "locations/pavlovsk/hotel/goteladmin.jpg">>
 			<p>You beam: "That sounds fantastic, thank you so much!"</p>
 			<p>You beam: "That sounds fantastic, thank you so much!"</p>
@@ -36,7 +36,7 @@ Behind his desk, a man of about 30 is busy with some paperwork. He's dressed qui
 			<</actCLA>>
 			<</actCLA>>
 		<</actCLA>>
 		<</actCLA>>
 		<<actCLA '"Sorry, not interested"'>>
 		<<actCLA '"Sorry, not interested"'>>
-			<<run $q.hotel_maid.setStage(1)>>
+			<<run $quest('hotel_maid').setStage(1)>>
 			<h2>Administration room of the Pavlovsk hotel</h2>
 			<h2>Administration room of the Pavlovsk hotel</h2>
 			<<image "locations/pavlovsk/hotel/goteladmin.jpg">>
 			<<image "locations/pavlovsk/hotel/goteladmin.jpg">>
 			You frown: "Sorry for wasting your time, but that's not something for me."
 			You frown: "Sorry for wasting your time, but that's not something for me."

+ 4 - 4
sugarcube/src/locations/pavlov/hotel/pav_hotelReception.tw

@@ -22,14 +22,14 @@
 			<</actCLA>>
 			<</actCLA>>
 		<</actCLA>>
 		<</actCLA>>
 	<<else>>
 	<<else>>
-		<<if $q.hotel_maid.paymentsLeft > 0>>
+		<<if $quest('hotel_maid').paymentsLeft > 0>>
 			<<actCLA 'Collect your money'>>
 			<<actCLA 'Collect your money'>>
 				<<image 'locations/pavlovsk/hotel/resep.girl0,#.jpg' 0 10>>
 				<<image 'locations/pavlovsk/hotel/resep.girl0,#.jpg' 0 10>>
-				<<set _moneyEarned = $q.hotel_maid.paymentsLeft * $q.hotel_maid.get('salary')>>
-				<<set $q.hotel_maid.paymentsLeft = 0>>
+				<<set _moneyEarned = $quest('hotel_maid').paymentsLeft * $quest('hotel_maid').get('salary')>>
+				<<set $quest('hotel_maid').paymentsLeft = 0>>
 				<<set $finances.cash += _moneyEarned>>
 				<<set $finances.cash += _moneyEarned>>
 				<p>She quickly checks the computer and then gives you <<money _moneyEarned>> for all the shifts you worked in the hotel.</p>
 				<p>She quickly checks the computer and then gives you <<money _moneyEarned>> for all the shifts you worked in the hotel.</p>
-				<<if $q.hotel_maid.workTotal >= rand(8,10) and getvar("$nichHotelReferral") == 0>>
+				<<if $quest('hotel_maid').workTotal >= rand(8,10) and getvar("$nichHotelReferral") == 0>>
 					<p>"You are doing a good job as our maid. Did you ever think about working as a maid full-time? I know of a person who's living in the city and is looking for a live-in maid. The job also pays well."</p>
 					<p>"You are doing a good job as our maid. Did you ever think about working as a maid full-time? I know of a person who's living in the city and is looking for a live-in maid. The job also pays well."</p>
 					She hesitates for a second.
 					She hesitates for a second.
 					<p>"I could write you a referral. He wouldn't invite you for a job interview without one. But the boss wouldn't like me referring his maids to another employer. That's why I require you to pay me 5.000 <b>₽</b> for my troubles. Just look at it as a small fee. Just tell me if you want the job and have the money."</p>
 					<p>"I could write you a referral. He wouldn't invite you for a job interview without one. But the boss wouldn't like me referring his maids to another employer. That's why I require you to pay me 5.000 <b>₽</b> for my troubles. Just look at it as a small fee. Just tell me if you want the job and have the money."</p>

+ 9 - 9
sugarcube/src/locations/pavlov/hotel/pav_hotelWork.tw

@@ -221,12 +221,12 @@
 	<</actCLA>>
 	<</actCLA>>
 
 
 :: pav_hotelWork_maid_start[event gt]
 :: pav_hotelWork_maid_start[event gt]
-	<<set $q.hotel_maid.today = {}>>
+	<<set $quest('hotel_maid').today = {}>>
 	<<gs 'pav_hotelWork_maid'>>
 	<<gs 'pav_hotelWork_maid'>>
 
 
 :: pav_hotelWork_maid_end[event gs]
 :: pav_hotelWork_maid_end[event gs]
-	<<run $q.hotel_maid.inc('workTotal')>>
-	<<run $q.hotel_maid.inc('paymentsLeft')>>
+	<<run $quest('hotel_maid').inc('workTotal')>>
+	<<run $quest('hotel_maid').inc('paymentsLeft')>>
 	<<run $wardrobe.wearLastWorn('hotel_maid_work',true)>>
 	<<run $wardrobe.wearLastWorn('hotel_maid_work',true)>>
 	<<addtime 5>>
 	<<addtime 5>>
 	<<image "locations/pavlovsk/hotel/maid.cloth6.jpg">>
 	<<image "locations/pavlovsk/hotel/maid.cloth6.jpg">>
@@ -508,8 +508,8 @@
 						<<gt 'pav_hotelWork_maid'>>
 						<<gt 'pav_hotelWork_maid'>>
 					<</actCLA>>
 					<</actCLA>>
 				<</if>>
 				<</if>>
-			<<or $q.hotel_maid.today.coupleEvent ? 0 : 5>>
-				<<set $q.hotel_maid.today.coupleEvent = true>>
+			<<or $quest('hotel_maid').today.coupleEvent ? 0 : 5>>
+				<<set $quest('hotel_maid').today.coupleEvent = true>>
 				<p>
 				<p>
 					While you are cleaning the room, a man, a woman and 2 young children enter the room.
 					While you are cleaning the room, a man, a woman and 2 young children enter the room.
 					When the man sees you he says: "Oh girl you are sent by the heavens, can you please take my children for a walk so my wife and I can spend some 'alone' time."
 					When the man sees you he says: "Oh girl you are sent by the heavens, can you please take my children for a walk so my wife and I can spend some 'alone' time."
@@ -567,8 +567,8 @@
 				<<actCLA 'Continue'>>
 				<<actCLA 'Continue'>>
 					<<gt 'pav_hotelWork_maid'>>
 					<<gt 'pav_hotelWork_maid'>>
 				<</actCLA>>
 				<</actCLA>>
-			<<or $q.hotel_maid.today.guyBoundEvent ? 0 : 5>>
-				<<set $q.hotel_maid.today.guyBoundEvent = true>>
+			<<or $quest('hotel_maid').today.guyBoundEvent ? 0 : 5>>
+				<<set $quest('hotel_maid').today.guyBoundEvent = true>>
 				<<set $time.minutes += 30>>
 				<<set $time.minutes += 30>>
 				<<image "locations/pavlovsk/hotel/cuffed.jpg">>
 				<<image "locations/pavlovsk/hotel/cuffed.jpg">>
 				You enter the room and to your surprise you can see a naked man handcuffed to the bed.
 				You enter the room and to your surprise you can see a naked man handcuffed to the bed.
@@ -849,8 +849,8 @@
 						<</actCLA>>
 						<</actCLA>>
 					<</actCLA>>
 					<</actCLA>>
 				<</either>>
 				<</either>>
-			<<or ($npcs.get('A25','slutStatus',0) == 5 && !$q.hotel_maid.today.soniaSeen) ? 40 : 0>>
-				<<set $q.hotel_maid.today.soniaSeen = true>>
+			<<or ($npcs.get('A25','slutStatus',0) == 5 && !$quest('hotel_maid').today.soniaSeen) ? 40 : 0>>
+				<<set $quest('hotel_maid').today.soniaSeen = true>>
 				<<either 20>>
 				<<either 20>>
 					<<image 'characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy0,#.jpg' 0 4>>
 					<<image 'characters/pavlovsk/school/girl/sonia/sex/hotel/sonia.hotel.boy0,#.jpg' 0 4>>
 					<p>You open the door to the next room, and immediately freeze in place when you hear gagging sounds coming from inside. Curious as you are, you decide to sneak a peek and see what's happening in the room. When you look around the corner, you see a girl giving a guy an enthusiastic blowjob, happily gagging on his cock while she tries to take it down her throat over and over. Wait a minute... that's Sonia, from your class!</p>
 					<p>You open the door to the next room, and immediately freeze in place when you hear gagging sounds coming from inside. Curious as you are, you decide to sneak a peek and see what's happening in the room. When you look around the corner, you see a girl giving a guy an enthusiastic blowjob, happily gagging on his cock while she tries to take it down her throat over and over. Wait a minute... that's Sonia, from your class!</p>

+ 3 - 3
sugarcube/src/locations/pavlov/hotel/quest_hotel_maid.tw

@@ -3,8 +3,8 @@
 	<<case 'title'>>
 	<<case 'title'>>
 		<<set $result ="Hotel Maid">>
 		<<set $result ="Hotel Maid">>
 	<<case 'start'>>
 	<<case 'start'>>
-		<<set $q.hotel_maid.workTotal = 0>>
-		<<set $q.hotel_maid.paymentsLeft = 0>>
+		<<set $quest('hotel_maid').workTotal = 0>>
+		<<set $quest('hotel_maid').paymentsLeft = 0>>
     <<case 'stageDescription'>>
     <<case 'stageDescription'>>
 		<<switch $location_var[$here][1]>>
 		<<switch $location_var[$here][1]>>
 			<<case 0>>
 			<<case 0>>
@@ -23,7 +23,7 @@
     <<case 'vars'>>
     <<case 'vars'>>
 		<<switch $location_var[$here][1]>>
 		<<switch $location_var[$here][1]>>
 			<<case 'isMaid'>>
 			<<case 'isMaid'>>
-                <<set $result = ($q.questIsActive('hotel_maid') && $q.hotel_maid.stage >= 10)>>
+                <<set $result = ($q.questIsActive('hotel_maid') && $quest('hotel_maid').stage >= 10)>>
 			<<case 'salary'>>
 			<<case 'salary'>>
                 <<set $result = 375>>
                 <<set $result = 375>>
         <</switch>>
         <</switch>>