Merge branch 'master' into 'master'

Master



Two bug fixes : 

 - Tailor in residential area was never opened due to a bad check for closure time

 - Rima's quest : the comments in the code  indicated that after finishing the questline, we could go back to her and get random previous scene. Instead we always got the last one. I fixed it so it did what it was supposed to do : random scene after the quest line is over.



See merge request !71

locations/RimmaSexQW

@@ -28,13 +28,14 @@ $rimmasexdi = {
 	lesbian += 1
 	RimmaSex += 1
 
-	if RimmaSex > 21:RimmaSex = 21 & RimmaEndEvent = 1 & RimmaRandEvent = rand(2, 21)
+	if RimmaSex <= 21: RimmaRandEvent = RimmaSex
+	if RimmaSex > 21:RimmaSex = 21 & RimmaRandEvent = rand(2, 21)
 
 	orgasm += 1
 	pcs_horny = 0
 	gs 'stat'
 
-	if RimmaSex = 23:
+	if RimmaRandEvent = 23:
 		'<center><img src="images/zoo/rimma14.jpg"></center>'
 		throat += 3
 		SUB += 2
@@ -55,7 +56,7 @@ $rimmasexdi = {
 		end
 
 		exit
-	elseif RimmaSex = 22:
+	elseif RimmaRandEvent = 22:
 		'<center><img src="images/zoo/rimmaBJ.jpg"></center>'
 		throat += 3
 		'Rima pulled the strap-on out of her purse, followed by collar with a chain attached to it. At her order, you put on the collar and hand the chain to Rima who put on the strap-on while you were occupied. She roughly pushes you down on your knees and slips it past your <<$liptalk>>.' 
@@ -75,13 +76,13 @@ $rimmasexdi = {
 		end
 
 		exit
-	elseif RimmaSex = 21 or RimmaEndEvent = 1 and RimmaRandEvent = 21:
+	elseif RimmaRandEvent = 21:
 		'<center><img src="images/zoo/rimma21.jpg"></center>'
 		SUB += 4
 		'Rimma orders you to squat and gets over you, her legs spread wide. Your face an inch from her pussy, you suddenly feel something warm running over it: Without warning, Rima just started peeing on you! Shocked by this, you sit motionless until the jet subsides, the smell intense as the last droplets drip from your chin.' 
 		'When she''s done, Rima orders you to lick her clean and you comply without question.'
 	
-	elseif RimmaSex = 20 or RimmaEndEvent = 1 and RimmaRandEvent = 20:
+	elseif RimmaRandEvent = 20:
 		'<center><img src="images/zoo/rimma14.jpg"></center>'
 		throat += 3
 		SUB += 2
@@ -103,7 +104,7 @@ $rimmasexdi = {
 		end
 
 		exit
-	elseif RimmaSex = 19 or RimmaEndEvent = 1 and RimmaRandEvent = 19:
+	elseif RimmaRandEvent = 19:
 		'<center><img src="images/zoo/rimmaBJ.jpg"></center>'
 		throat += 3
 		SUB += 2
@@ -126,7 +127,7 @@ $rimmasexdi = {
 		end
 
 		exit
-	elseif RimmaSex = 18 or RimmaEndEvent = 1 and RimmaRandEvent = 18:
+	elseif RimmaRandEvent = 18:
 		'<center><img src="images/zoo/rimma14.jpg"></center>'
 		throat += 3
 		SUB += 2
@@ -148,7 +149,7 @@ $rimmasexdi = {
 		end
 
 		exit
-	elseif RimmaSex = 17 or RimmaEndEvent = 1 and RimmaRandEvent = 17:
+	elseif RimmaRandEvent = 17:
 		'<center><img src="images/zoo/rimma14.jpg"></center>'
 		throat += 3
 		SUB += 2
@@ -170,7 +171,7 @@ $rimmasexdi = {
 		end
 
 		exit
-	elseif RimmaSex = 16 or RimmaEndEvent = 1 and RimmaRandEvent = 16:
+	elseif RimmaRandEvent = 16:
 		'<center><img src="images/zoo/rimma14.jpg"></center>'
 		throat += 3
 		SUB += 2
@@ -192,7 +193,7 @@ $rimmasexdi = {
 		end
 
 		exit
-	elseif RimmaSex = 15 or RimmaEndEvent = 1 and RimmaRandEvent = 15:
+	elseif RimmaRandEvent = 15:
 		'<center><img src="images/zoo/rimma14.jpg"></center>'
 		throat += 3
 		SUB += 2
@@ -215,7 +216,7 @@ $rimmasexdi = {
 		end
 
 		exit
-	elseif RimmaSex = 14 or RimmaEndEvent = 1 and RimmaRandEvent = 14:
+	elseif RimmaRandEvent = 14:
 		anus += 8
 		SUB += 1
 		'<center><img src="images/zoo/rimma13.jpg"></center>'
@@ -223,14 +224,14 @@ $rimmasexdi = {
 		'She places both of her hands at your puckered hole and works her fingers in - left, right, left, right, almost like she''s following an obscure sexual knitting manual - but you don''t care as long as she doesn''t stop, her expert stimulation causing you to moan like a bitch in heat right from the start.' 
 		'Not only does she fit both hands into you but she does so in record time, her soft chuckle speaking of her own surprise at this. Then, she comes to the main course: Without warning or warm-up, she begins pounding you with her hands, your yelp turning into a sustained moan as she hits all the right spots.' 
 		'When you come down from your climax, Rima sits down in front of you, dripping wet. You are more than happy to return the favor...'
-	elseif RimmaSex = 13 or RimmaEndEvent = 1 and RimmaRandEvent = 13:
+	elseif RimmaRandEvent = 13:
 		anus += 8
 		SUB += 1
 		'<center><img src="images/zoo/rimma12.jpg"></center>'
 		'Rima tells you to lie back on your couch and lubricate your anus while she does the same with her hands. You are too excited to question her order, instead taking the bottle of lube she presents to you and making sure your backdoor is ready for anything.' 
 		'Even when you tell her that you are done, Rima lifts your ass to check if your anus is properly lubed up, by pushing several fingers at once it. When her hand is almost all the way in, she seems to be convinced... and adds a finger from her other hand. Then another. And another. What you are feeling is beyond description, beyond comprehension, and it leaves you breathless and almost mute.' 
 		'Only when she starts to move, both of her hands all the way inside you, do you make noises again: Soft, understated coos that swell to loud screams when the woman picks up the pace and fucks your ass with both of her hands. The orgasm comes loud and hard and you feel deaf and numb. All you can see is Rima, grinning like a Cheshire cat, and you weakly return that grin.'
-	elseif RimmaSex = 12 or RimmaEndEvent = 1 and RimmaRandEvent = 12:
+	elseif RimmaRandEvent = 12:
 		anus += 6
 		vagina += 5
 		SUB += 1
@@ -238,7 +239,7 @@ $rimmasexdi = {
 		'Once again, Rima leads you into your bedroom and you lie down on your back for her, curious what she intends to do today. She doesn''t keep you wondering for long: Rima rummages around her purse until she finds a bottle of lube and generously applies it to both of her hands, giving you suggestive smiles as she does.' 
 		'Your previous experiences with her have prepared you well for what she has in mind: With terrifying ease and very little patience, Rima pushes one of her hands into your vagina and works the other into your anus. It''s a testament to the times you have spent with her that you don''t hurt as much as you feel full as, knuckle by knuckle, her fingers sink into you, your groans leaving little doubt as to your pleasure.'
 		'Soon, both of her hands are all the way inside you and Rima starts slowly pulling them out again, then back in, fucking you with her entire limbs, the fullness ebbing away only to return in force. It''s an incredible, maddening feeling and your orgasm hits you with the suddenness and violence of a tsunami.'
-	elseif RimmaSex = 11 or RimmaEndEvent = 1 and RimmaRandEvent = 11:
+	elseif RimmaRandEvent = 11:
 		anus += 6
 		SUB += 1
 		'<center><img src="images/zoo/rimma10.jpg"></center>'
@@ -246,7 +247,7 @@ $rimmasexdi = {
 		'When she returns, her hand is glistening with lubricant and as soon as her index finger smoothly pushes past your sphincter, you know where this is going. As if to preempt any resistance, Rima plays with your pussy with her free hand, adding more stimulation to the mix as the second finger enters you.'
 		'Within minutes, the fifth finger has entered you and you feel her pushing her hand against your backdoor, picking up speed and making you moan louder and louder. Her free hand is spreading your ass more to make penetration easier, as is one of yours. Your other hand is furiosly rubbing your clit as you enjoy her fisting your ass.'
 		'It doesn''t take you long to cum and when you do, your ass contracts so hard you are afraid you might hurt Rima. To your relief - and, by the looks of it, hers too - you don''t.'
-	elseif RimmaSex = 10 or RimmaEndEvent = 1 and RimmaRandEvent = 10:
+	elseif RimmaRandEvent = 10:
 		anus += 6
 		SUB += 1
 		'<center><img src="images/zoo/rimma9.jpg"></center>'
@@ -254,13 +255,13 @@ $rimmasexdi = {
 		'Her fingers enter your pussy and expertly tease you but you can tell already that this is not where she wants them to remain. Feeling her spit in your rosebud confirms your suspicion and makes you wetter at the same time in anticipation of what she''s going to do.'
 		'At first, she only sinks two fingers into your ass but more and more spit lubricates you and the third, then fourth finger join them with little resistance and no protest, your moans urging her on. The fifth and final finger pushes past your entrance and all of a sudden, Rima speeds up, her intent of pushing her entire hand in very clear and thoroughly enjoyable.'
 		'You can''t resist her fisting for long. Your orgasm hits you hard, every wave in perfect synchronicity with her thrusts, and when it has passed, your ass feels incredibly full.'
-	elseif RimmaSex = 9 or RimmaEndEvent = 1 and RimmaRandEvent = 9:
+	elseif RimmaRandEvent = 9:
 		anus += 5
 		'<center><img src="images/zoo/rimma8.jpg"></center>'
 		'You find yourself lying on your side, spreading your legs to give Rima easier access to your sex. Indeed, her fingers penetrate your wet pussy and her wonderful touch has you panting in no time at all.' 
 		'Between two strokes, though, she pulls out entirely and instead works the well-lubricated fingers into your ass. You gasp as she gets the speed back to where it was and have your backdoor thoroughly fingerfucked by her. She skillfully teases your clit for additional stimulation but you even without it, you''d have come anyway.'
 		'And come you do, feeling your sphincter twitch around her index and middle finger, beckoning them to stay a little longer as you ride out the waves of your anal climax.'
-	elseif RimmaSex = 8 or RimmaEndEvent = 1 and RimmaRandEvent = 8:
+	elseif RimmaRandEvent = 8:
 		anus += 3
 		'<center><img src="images/zoo/rimma7.jpg"></center>'
 		'Rima puts you on your back, your soft bed ever-willing to serve, and dives right in, her tongue finding your clit with pin-point precision.' 
@@ -268,7 +269,7 @@ $rimmasexdi = {
 		'She circles around your backdoor as if she had all the time in the world, pretending to push a finger in one moment only to pull it away the next, her constant back and forth driving you crazy and making you hornier the longer she persists.'
 		'At some point, you simply cannot hold out any longer and clamp down hard the instant you feel her pushing in. At the same time, you put one hand at the back of her head and pull her against you. This tiny push is all you need to cum, finally.'
 		'When you''ve relaxed enough to release her, she seems a little unhappy about you wresting control from her but the passionate kiss you give her wipes the frown right off her face.'
-	elseif RimmaSex = 7 or RimmaEndEvent = 1 and RimmaRandEvent = 7:
+	elseif RimmaRandEvent = 7:
 		vagina += 5
 		SUB += 1
 		'<center><img src="images/zoo/rimma6.jpg"></center>'
@@ -276,7 +277,7 @@ $rimmasexdi = {
 		'Her second hand squeezes your tits, teases your nipples, strokes your stomach, caresses your cheek - seems to be everywhere at once. Her hand inside your pussy doesn''t go easy on you, not this time: Rima immediately goes from massaging your insides to fist-fucking you and you love every second of it.'
 		'Your climax builds quickly - no surprise after almost half an hour of teasing - when you feel her second hand linger on your throat... and tightening around it. You open your eyes to look at her and while it''s harder to breathe, the passion in Rima''s eyes is infectious.'
 		'The orgasm hits you like a truck, the slight lack of air increasing its intensity by an order of magnitude, and by the looks of it, Rima is just about ready to come herself, getting off immensely on dominating you.'
-	elseif RimmaSex = 6 or RimmaEndEvent = 1 and RimmaRandEvent = 6:
+	elseif RimmaRandEvent = 6:
 		vagina += 5
 		SUB += 1
 		'<center><img src="images/zoo/rimma5.jpg"></center>'
@@ -286,7 +287,7 @@ $rimmasexdi = {
 		nl
 		'You barely even register when she sinks her whole hand into your depths - at that point, you are so desperately horny that you are literally begging her to make you cum, and this time, her fist inside you, she finally relents.' 
 		'From one moment to the next, she starts fucking you with her whole hand, pushing you right to the edge and over, then right to the next and over again. You can feel yourself twitching around her hand, gripping her like a vice, but the rest of your body is a shaking, screaming, sweating mess. That doesn''t change the fact, though, that Rima gave you a couple of incredible orgasms, though.'
-	elseif RimmaSex = 5 or RimmaEndEvent = 1 and RimmaRandEvent = 5:
+	elseif RimmaRandEvent = 5:
 		vagina += 2
 		'<center><img src="images/zoo/rimma4.jpg"></center>'
 		'Rima and you go into the bedroom and you lie down on your back, opening yourself to your female company. She doesn''t even try to resist the enticing view and you can feel her tongue on your clit before she''s come to rest on the bed.'
@@ -294,18 +295,18 @@ $rimmasexdi = {
 		'While there is a lot of variation in the way she angles her hand and hooks her fingers, she never gets slower - her index and middle finger went from teasingly slow to a good, hard fingerfuck and she seems certain that she can hold out longer than you.'
 		nl
 		'She''s right, too: When she adds a third finger - without slowing down - an incredible orgasm rips through you and you have to hold on for dear life. All you can manage when Rima kisses you is a weak smile as you taste yourself on her lips.'
-	elseif RimmaSex = 4 or RimmaEndEvent = 1 and RimmaRandEvent = 4:
+	elseif RimmaRandEvent = 4:
 		'<center><img src="images/zoo/rimma3.jpg"></center>'
 		SUB += 1
 		'Rima leads you into the bedroom and has you lie down. You''ve barely come to rest when she''s already on top of you, her wet pussy mere inches from your mouth, her eyes sparkling as she bends backwards and you feel her fingers caressing your sex.' 
 		'You lose yourself in her expert touch and the arousing taste of her juices, your tongue and lips working tirelessly to pleasure her.' 
 		'When you feel her crotch pressing more strongly against your face, you know that she won''t take much longer and redouble your efforts, as does she. In seconds, you have her screaming and thrashing, your own orgasm muffled by her nether lips.'
-	elseif RimmaSex = 3 or RimmaEndEvent = 1 and RimmaRandEvent = 3:
+	elseif RimmaRandEvent = 3:
 		'<center><img src="images/zoo/rimma2.jpg"></center>'
 		'You go into the living room where she sits down on the sofa, legs spread. You understand the invitation and drop to your knees, languidly licking her pussy up and down, teasing her greedy hole with one hand while you rub your own clit with the other.' 
 		'Rima moans with joy and you can feel her hands on your head, stroking it, urging you on.' 
 		'As her passion grows, her movements become rougher and in her bliss, her fingers claw into your hair. She pulls you closer, grinding her hips against your face and is quickly overcome by her orgasm. Thanks to her rough treatment and your "free" hand, you follow her immediately.'
-	elseif RimmaSex = 2 or RimmaEndEvent = 1 and RimmaRandEvent = 2:
+	elseif RimmaRandEvent = 2:
 		'<center><img src="images/zoo/rimma.jpg"></center>'
 		'You barely make it into the bedroom. As soon as you''re there, Rima pushes you onto the bed and lays on top of you in a 69, offering you her pussy and immediately going down on yours.' 
 		'The passion she licks you with is infectious and as you desperately try to hold onto her, you do your best to reciprocate, exploring Rima''s delicate folds and hole with your tongue and fingers.'

locations/street

@@ -113,7 +113,7 @@ if hour >= 8 and hour <= 20:'The <a href="exec:gt ''shop'', ''start''">supermark
 if hour >= 8 and hour <= 20:'The <a href="exec:gt ''poli'', ''start''">clinic</a> is also nearby.'
 if hour >= 6 and hour <= 9 and military = 1 and week = 6:'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'
 if hour >= 8 and hour <= 14 and week ! 1:'You could go shopping at the noisy local <a href="exec:gt ''rinok'', ''start''">marketplace</a>.'
-if hour >= 8 and hour <= 4 and week < 6:'Near the market is a <a href="exec:gt ''rinok'', ''tailor''">tailor shop</a> where you can get your clothes resized if needed.'
+if hour >= 8 and hour <= 15 and week < 6:'Near the market is a <a href="exec:gt ''rinok'', ''tailor''">tailor shop</a> where you can get your clothes resized if needed.'
 if hour >= 11 and hour < 12 and week > 1 and week < 5 and workKafe = 1:'The side door of the <a href="exec:gt ''kafe'', ''work''">cafe</a> is open, so employees can enter to begin their shift.'
 if hour >= 12 and hour <= 22 and week ! 1:'In a side alley, next to the <a href="exec:gt ''kafe'', ''start''">cafe</a>, you can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">gopniks</a>.'
 if hour > 22 or hour <= 3:'In one of the parking lots you can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">gopniks</a>.'