9 Commits 50895d7a40 ... 62a72f0116

Author SHA1 Message Date
  KevinSmarts 62a72f0116 [text edit] Typos and grammer fixes from spectre1viper. 5 years ago
  julzor dedffca4f4 [text edit] renamed a room in foto 5 years ago
  julzor 25a88ae3a2 [fixes] dead end in portnoi2 5 years ago
  KevinSmarts 4aee204437 [fixes] Added a stop chunk so you couldn't keep prostituting all night and restructured the code to make it easier to follow and bug hunt 5 years ago
  KevinSmarts 45950e8789 [fixes] text errors spotted by spectre1viper 5 years ago
  julzor 2539330c53 [fixes] made it more clear what the conditions are to prostitute yourself in the city 5 years ago
  julzor 56dcc7c59f [fixes] missing < in gschool_lunch 5 years ago
  julzor 6d5491b853 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  julzor a99a33aff6 [fixes] made the rooms accessible again in tanhouse 5 years ago

+ 6 - 0
locations/Nord.qsrc

@@ -137,6 +137,12 @@ if $ARGS[0] = 'redlight':
 		'There are prostitutes working in places near here.'
 		if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40:
 			act 'Prostitute yourself': gt 'street_walker', 'work'
+		elseif pcs_inhib >= 40:  
+			*nl
+			'You could work as a prostitute, but you need to wear appropriate clothes and more than a little bit of makeup.'
+		else
+			*nl
+			'You could work as a prostitute, but you aren''t comfortable with the idea.'
 		end
 	end
 end

+ 6 - 0
locations/down.qsrc

@@ -235,6 +235,12 @@ if hour >= 20 or hour <= 4:
 	'There are prostitutes working in places near here.'
 	if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40:
 		act 'Prostitute yourself': gt 'street_walker', 'work'
+	elseif pcs_inhib >= 40:  
+		*nl
+		'You could work as a prostitute, but you need to wear appropriate clothes and more than a little bit of makeup.'
+	else
+		*nl
+		'You could work as a prostitute, but you aren''t comfortable with the idea.'
 	end
 end
 

+ 1 - 1
locations/foto.qsrc

@@ -802,7 +802,7 @@ if $ARGS[0] = 'showers':
 		end
 	end
 	act'Go to your makeup station':gt'foto','makeup'
-	act'Go to the toilet stalls':gt'foto','bathroom'
+	act'Go to the bathroom':gt'foto','bathroom'
 end
 
 if $ARGS[0] = 'krystalshower':

+ 1 - 1
locations/foto_models.qsrc

@@ -1221,7 +1221,7 @@ if $ARGS[0] = 'anastasiasex3':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/photo/portraits/anastasia_p/talking/1.jpg"></center>'
 		'"Wow!"'
-		'"Yes indeed, we are quite privileged to have the opportunities we do. However, I really must be going deary. I have an appointment soon." You nod as she stand and picks up her panties. "Let me know if you''d like to get started on escorting. I''d love to help introduce you to the company. But before I go, may I offer some advice?"'
+		'"Yes indeed, we are quite privileged to have the opportunities we do. However, I really must be going deary. I have an appointment soon." You nod as she stands and picks up her panties. "Let me know if you''d like to get started on escorting. I''d love to help introduce you to the company. But before I go, may I offer some advice?"'
 		'You listen eagerly as Anastasia leans in to whisper in your ear.'
 		'"There are three things you need to know in this business. Make sure to enjoy yourself, never forget your birth control, and <i>always</i> charge extra for creampies, swallowing, and anal."'
 		'She stands back, meeting your eyes with a smile. "Words to live by my dear. Words to live by. But I must be off now. Don''t be a stranger!"'

+ 2 - 2
locations/gdktoilet.qsrc

@@ -888,7 +888,7 @@ if $ARGS[0] = 'blowjob':
 		*clr
 		temp = rand(1, 3)
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghbj<<temp>>.mp4"></video></center>'
-		'You suck on his dick, bobbing your head, sometimes using your hands to stroke his shaft at the same time, other times your hands massage his balls. Before to long you hear the guy moan in pleasure, "I''m coming."'
+		'You suck on his dick, bobbing your head, sometimes using your hands to stroke his shaft at the same time, other times your hands massage his balls. Before to long you hear the guy moan in pleasure, "I''m cuming."'
 		gs 'arousal', 'bj', 5, 'unknown', 'sub'
 		gs 'stat'
 		act 'Swallow':
@@ -1050,7 +1050,7 @@ if $ARGS[0] = 'pussy2':
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghsex.mp4"></video></center>'
 	end
 	gs 'gdktoilet', 'pussy'
-	'You turn around and back up to the hole, you use one hand to guide his dick into your pussy. The <<npc_dick[$npclastgenerated]>>cm long <<$npc_thdick[$npclastgenerated]>> cock slides easily into your wet pussy, causing you to moan in pleasure as you move your hips back and forth. You start humping his dick with fast movements, taking the full length of him balls deep into you, which causes him to moan loudly. After several minutes, you hear him on the other side of the wall yell out, "I''m gonna come."'
+	'You turn around and back up to the hole, you use one hand to guide his dick into your pussy. The <<npc_dick[$npclastgenerated]>>cm long <<$npc_thdick[$npclastgenerated]>> cock slides easily into your wet pussy, causing you to moan in pleasure as you move your hips back and forth. You start humping his dick with fast movements, taking the full length of him balls deep into you, which causes him to moan loudly. After several minutes, you hear him on the other side of the wall yell out, "I''m gonna cum."'
 	gs 'arousal', 'vaginal', 10, 'unknown', 'sub'
 	gs 'stat'
 	if protect ! 1:

+ 2 - 2
locations/gschool_lunch.qsrc

@@ -503,7 +503,7 @@ if $ARGS[0] = 'events':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
-			'Your heart is pounding as you let them guide you along. You know perfectly well that they won''t let you go now, no matter what you say. When you arrive at the men''s restroom, one of the Gopniks stays by the door to keep watch while the others shove you in. The walls are covered in all sorts of crude text. A lot of it involves you. Across the entire wall, a large text reads "<<$pcs_firstname>> <<$pcs_lastname>> = <$gnikname>>".'
+			'Your heart is pounding as you let them guide you along. You know perfectly well that they won''t let you go now, no matter what you say. When you arrive at the men''s restroom, one of the Gopniks stays by the door to keep watch while the others shove you in. The walls are covered in all sorts of crude text. A lot of it involves you. Across the entire wall, a large text reads "<<$pcs_firstname>> <<$pcs_lastname>> = <<$gnikname>>".'
 			*nl
 			'Vitek quickly grabs you by your hair, snarling in your your face, "You know why you''re here, slut. Now get down and get to work."'
 
@@ -776,7 +776,7 @@ if $ARGS[0] = 'bjs':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
-				'Your heart is pounding as you let them guide you along. You know perfectly well that they won''t let you go now, no matter what you say. When you arrive at the men''s restroom, one of the Gopniks stays by the door to keep watch while the others shove you in. The walls are covered in all sorts of crude text. A lot of it involves you. Across the entire wall, a large text reads "<<$pcs_firstname>> <<$pcs_lastname>> = <$gnikname>>".'
+				'Your heart is pounding as you let them guide you along. You know perfectly well that they won''t let you go now, no matter what you say. When you arrive at the men''s restroom, one of the Gopniks stays by the door to keep watch while the others shove you in. The walls are covered in all sorts of crude text. A lot of it involves you. Across the entire wall, a large text reads "<<$pcs_firstname>> <<$pcs_lastname>> = <<$gnikname>>".'
 				*nl
 				'Vitek quickly grabs you by your hair, snarling in your your face, "You know why you''re here, slut. Now get down and get to work."'
 

+ 1 - 1
locations/noticeboard.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'advert1':
 	'<center><table bgcolor="#FFFF66" width="60%" cellspacing="30"><tr><th align="center"><h3>Pavlovsk police department newsletter</h3></th></tr><tr><td align="left">'+ _
 	'&nbsp;&nbsp;&nbsp;The Pavlovsk police department recently investigated the rumours that a secret prostitution ring was being run from the Pavlovsk hotel.<p>'+ _ 
 	'&nbsp;&nbsp;&nbsp;After a very thorough investigation, we found absolutely no evidence of this. The hotel manager, <b>Herman Leonidovich</b>, was interrogated and not only did we find him completely innocence he also gave a substantial donation to our department.'+ _
-	'He ensured us that any young, pretty girl could apply for a maid job in their hotel and there is absolutely no chance that they would be forced to prostitute themselves<p><p>.</td></tr></table></center>'
+	'He ensured us that any young, pretty girl could apply for a maid job in their hotel and there is absolutely no chance that they would be forced to prostitute themselves.<p><p></td></tr></table></center>'
 	minut +=2
 	gs 'stat'
 	act 'Continue': gt 'noticeboard','look'

+ 6 - 6
locations/pavaptcourtev.qsrc

@@ -163,7 +163,7 @@ if $ARGS[0] = 'events1':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/3girls.jpg"></center>'
 		'You see some guys checking out three girls, who seem well aware of their attention. After a bit of staring one of the boys says something to his friends and they seem to egg him on, but before he can do what ever is he had planned, the girl on the right walks around her friend in the center, firmly grips her hips and starts to pretend to fuck her from behind. Which gets both of her friends to laugh and the boys to hoot and holler, with this the girl on the left grabs the head of her friend in the center, turning towards her and pulls her head down to her crotch and starts to pretend to fuck her mouth.'
 		*nl
-		'The middle girl seems to get into it and pretends to suck a dick and while her other friend pounds against her ass. They keep this up for a little bit until the boys as a group starts to head for them, with that they giggle, flip off the boys, then run off together. Leaving the boys to holler after them calling them teases and far less pleasant things.'
+		'The middle girl seems to get into it and pretends to suck a dick and while her other friend pounds against her ass. They keep this up for a little bit until the boys as a group starts to head for them, with that they giggle, flip off the boys, then run off together. Leaving the boys frustrated and hollering some surprisingly unpleasant things after them.'
 		act 'Move away':gt 'pavComplex', 'start'
 	elseif events = 8:
 		*clr & cla
@@ -881,7 +881,7 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/passedout.jpg"></center>'
 							'You lose count of the number of beers you drink and really everything becomes fuzzy before going black.'
-							'You don''t know how long you was passed out for, but you are sure you was. You feel sick to your stomach, your head is starting to hurt. You find yourself laying face down on the ground. As you slowly get up you notice you are completely naked other than your shoes and your purse laying a few feet away. Feeling a bit panicked you look around but don''t see anyone at all. Just all the empty bottles by the bench where they girls where.'
+							'You don''t know how long you were passed out for, but you are sure you were. You feel sick to your stomach, your head is starting to hurt. You find yourself laying face down on the ground. As you slowly get up you notice you are completely naked other than your shoes and your purse laying a few feet away. Feeling a bit panicked you look around but don''t see anyone at all. Just all the empty bottles by the bench where the girls where.'
 							act 'Go home':gt 'pavaptcourtev', 'homenaked'
 						end
 					end
@@ -901,17 +901,17 @@ if $ARGS[0] = 'follownush':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/complex/hey.jpg"></center>'
 	'You follow her inside, not seeing her at the moment you start to head upstairs. Then you hear her below you, apparently she was going down stairs for some reason. "Hey you following me?"'
-	'Not sure what to say, I mean you was following her. "Kinda, I was just curious what you was up too."'
+	'Not sure what to say, I mean you were following her. "Kinda, I was just curious what you were up too."'
 	if hotcat > 5 and npc_rel['A45'] >= 30:
-		'You gives you a small amused smile. "So you''re stalking me huh? Look I know I''m hot, so I can hardly blame you."'
-		'You shake you head, no you''re not stalking her, that just is wrong. "No! I was just curious... never mind." But before you can turn away she grabs your hand.'
+		'She gives you a small amused smile. "So you''re stalking me huh? Look I know I''m hot, so I can hardly blame you."'
+		'You shake your head, no you''re not stalking her, that just is wrong. "No! I was just curious... never mind." But before you can turn away she grabs your hand.'
 		'"Relax I was just yanking your chain. I was just going to sit down here on the basement steps, if you want to join me." With that she takes a seat about half way down the steps.'
 		'You could join her or maybe you should just be on your way.'
 		act 'Leave':gt 'pavComplex', 'start'
 		act 'Join her':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/complex/kiss.jpg"></center>'
-			'You sit down next to her, the two of you start chatting about what has been going on lately in your lives. Just as you was telling her about something your sister did, she leans over and kisses you. You are briefly taken aback but not that much, it is just what she does.'
+			'You sit down next to her, the two of you start chatting about what has been going on lately in your lives. Just as you were telling her about something your sister did, she leans over and kisses you. You are briefly taken aback but not that much, it is just what she does.'
 			act 'Stop the kiss':
 				*clr & cla
 				minut += 1

+ 2 - 2
locations/portnoi2.qsrc

@@ -160,9 +160,9 @@ elseif money >= poshvalldrop:
 end
 
 if $loc = 'Gshveyfab':
-	act 'Leave':gt 'Gshveyfab', 'start'
+	act 'Leave': gt 'pavIndustrial'
 else
-	act 'Leave':gt 'rinok', 'tailor'
+	act 'Leave' :gt 'rinok', 'tailor'
 end
 
 --- portnoi2 ---------------------------------

+ 6 - 0
locations/street.qsrc

@@ -159,6 +159,12 @@ if hour >= 20 or hour <= 4:
 	'There are prostitutes working in places near here.'
 	if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40:
 		act 'Prostitute yourself': gt 'street_walker', 'work'
+	elseif pcs_inhib >= 40:  
+		*nl
+		'You could work as a prostitute, but you need to wear appropriate clothes and more than a little bit of makeup.'
+	else
+		*nl
+		'You could work as a prostitute, but you aren''t comfortable with the idea.'
 	end
 end
 

+ 1 - 1
locations/street_event.qsrc

@@ -474,7 +474,7 @@ if $ARGS[1] = 'main':
 				if spellbefshild = 1:defence = 500
 				'<<$streetev_title>>'
 				'<center><img src="images/locations/shared/street/pursechase.jpg"></center>'
-				'You chase after him, screaming at him to stop or anyone to stop him. All that working out is paying off, you are gaining on him. He keeps glancing back as you get closer, he turns and ducks down a alley when you are nearly on top of him. He leaps over a overturned trash can, obviously still hoping to get away from you. You easily leap of it as well and a few steps later you tackle him, sending both of you rolling on the ground. As you regain your feet you see he has as well, just as he lunges at you.'
+				'You chase after him, screaming at him to stop or anyone to stop him. All that working out is paying off, you are gaining on him. He keeps glancing back as you get closer, he turns and ducks down a alley when you are nearly on top of him. He leaps over a overturned trash can, obviously still hoping to get away from you. You easily leap over it as well and a few steps later you tackle him, sending both of you rolling on the ground. As you regain your feet you see he has as well, just as he lunges at you.'
 				act 'Fight':gt 'fight', 'start'
 			end
 		end

+ 200 - 178
locations/street_walker.qsrc

@@ -97,211 +97,233 @@ end
 
 if $ARGS[0] = 'event1':
 	menu_off = 1
-	inhib_exp += rand(3,6)
-	if (prst_loc = 0 and RAND(1,3) > 1) or (prst_loc = 1 and RAND(1,5) > 1) or (prst_loc = 2 and RAND(1,8) > 1):
-		*clr & cla
-		street_work = 1
-		streetworkevent = RAND(1,8)
-		if streetworkevent = 3:
-			if prst_loc ! 1: streetworkevent = 5
-			if ruslan_day = daystart: streetworkevent = 5
-		end
-		if streetworkevent <= 2:
+	if hour > 5 and hour < 20:
+		gs 'street_walker', 'start'
+		'It''s gone 05:00 and much too late to find any work now, maybe try again tonight there should be demand from 20:00.'
+		act 'Leave': gt 'street_walker', 'end'
+	else
+		inhib_exp += rand(3,6)
+		if (prst_loc = 0 and RAND(1,3) > 1) or (prst_loc = 1 and RAND(1,5) > 1) or (prst_loc = 2 and RAND(1,8) > 1):
 			*clr & cla
-			minut += 15
-			city_prostitute += 1
-			if month >= 11 or month <= 3:
-				'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/hookersw1.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/hookers' + rand(1,4) + '.jpg"></center>'
+			street_work = 1
+			streetworkevent = RAND(1,8)
+			if streetworkevent = 3:
+				if prst_loc ! 1: streetworkevent = 5
+				if ruslan_day = daystart: streetworkevent = 5
 			end
-			'As you walk along the street trying to entice one of the slower moving cars with no luck. You spot some other girls working the streets as well, it doesn''t look like they are having any better luck than you are.'
-			act 'Stop working for the night': gt 'street_walker', 'end'
-			act 'Keep working the street': gt 'street_walker', 'event1'
-			act 'Walk over and talk to them':
-				!!ruslan_pimp sets to 1 if you trigger the second part and are not working for him. It will then always skip to that
-				if RAND(0,1) = 0 and ruslan_pimp = 0:
-					*clr & cla
-					minut += 15
-					if month >= 11 or month <= 3:
-						'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/hookersw1.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/hookers' + rand(1,4) + '.jpg"></center>'
-					end
-					'You walk over smiling to the other girls, but all you are meet with is dark and dangerous looks. Then one of them speaks up. "What the fuck do you want bitch?"'
-					'Taken a bit aback by the anger you say "I was just coming over to talk and see how the night is going for you guys, been kinda slow for me." Trying to be friendly.'
-					'One of them snarls as the others move to partial circle you. "Listen bitch, this is our street, so get the fuck off it before you get hurt!"'
-					act 'Leave and stop working for the night':
-						cla
-						*nl
-						'You turn and walk away, you can hear the other girls behind you, calling you all sorts of names'
-						act 'Continue': gt 'street_walker', 'end'
-					end
-					act 'Leave to work a new street':
-						cla
-						*nl
-						'You turn and walk away, you can hear the other girls behind you, calling you all sorts of names'
-						act 'Continue': gt 'street_walker', 'work'
-					end
-					!!act 'Tell her to fuck off':
-					!!i will expand this later when I have time. For now want to get this out for this release.
-				else
-					*clr & cla
-					minut += 15
-					if month >= 11 or month <= 3:
-						'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/hookersw1.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/hookers' + rand(1,4) + '.jpg"></center>'
-					end
-					if ruslan_pimp = 2:
-						'You walk over and introduce yourself to the other girls, one of them starts off kinda bitchy but the other one tells her you work for Ruslan too, which quickly calms her down. You make small talk with them for a bit, the more experienced girls share tips for the newer girls. Ways to help encourage guys stop and the type of guys to avoid. Occasionally a car stops and picks up one of the other girls, other times one stops and drops a girl off. After a bit you know you need to get back to work and earn money for Ruslan.'
-						act 'Keep working the street': gt 'street_walker', 'event1'
-					else
-						ruslan_pimp = 1
-						'You walk over and introduce yourself to the other girls, one of them asks "You one of Ruslan''s new girls?"'
-						'You shake your head no. "No I work only for myself"'
-						'The other girls exchange a unease look, then one of them tells you. "You should really change your mind, if you work for Ruslan most of the guys know to pay up and the gopniks know to leave you alone, otherwise you can find yourself in a bad spot."'
-						'You smile to her. "Thanks for the advice, I will think about it." With that they make a excuse that then need to get back to work, you can tell they really don''t want to be seen hanging out with you.'
-						act 'Stop working for the night': gt 'street_walker', 'end'
-						act 'Keep working the street': gt 'street_walker', 'event1'
-					end
-				end
+			if streetworkevent <= 2:
+				gt 'street_walker', 'event2'
+			elseif streetworkevent = 3:
+				gt 'street_walker', 'event3'
+			elseif streetworkevent = 4:
+				gt 'street_walker', 'event4'
+			else
+				gt 'street_walker', 'event5'
 			end
-		elseif streetworkevent = 3:
-			ruslan_day = daystart
-!!can only run into the pimp once a night, after that have it just go down to the else.
+		else
 			*clr & cla
 			minut += 15
 			city_prostitute += 1
-			'<center><img <<$set_imgh>> src="images/locations/shared/street/mugger.jpg"></center>'
-			if ruslan_meet = 0:
-				ruslan_meet = 1
-				'As you walk along the street trying to entice one of the slower moving cars with no luck. As the next car passes you turn and nearly run into a man who walked directly in front of you. You stop and give him your best smile. "You looking to party handsome?"'
-				'He looks you over like a side of beef, then finally looks into your eyes which most guys never do. "It''s dangerous for a young thing like you to be out walking the streets this time of night. I can protect you and make sure no one bothers you, just ask any of my other girls, how good Ruslan protects them."'
+			gs 'stat'
+			if month >= 11 or month <= 3:
+				'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/workingw1.jpg"></center>'
 			else
-				'As you walk along the street trying to entice one of the slower moving cars with no luck. As the next car passes you turn and see Ruslan your wouldbe pimp blocking your path.'
-				'You stop as he looks you over. "You come to your sense yet?"'
+				'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/working' + rand(1,4) + '.jpg"></center>'
 			end
-			act 'Accept his deal':
-				*clr & cla
-				minut += 5
-				ruslan_pimp = 2
-				'You nod your head in agreement. "Yeah you''re right, having some protection would be a good thing."'
-				'When you say that he is all smiles suddenly and pulls you up beside him as he wraps his arm around you."Good good, I knew you was a smart girl. Now every Friday I will come by and collect my half of what you make. You better not hold out on me, the other girls will tell me if you do. Now here is my number, if anyone refuses to pay or you have problems you call." Once you add his number to your contact list, he slaps you on the ass. "Now get to work!" With that he turns and walks off leaving you to wonder if this was a good idea.'
-				act 'Stop working for the night': gt 'street_walker', 'end'
-				act 'Keep working the street': gt 'street_walker', 'event1'
-			end
-			act 'Refuse his deal':
-				*clr & cla
-				minut += 5
-				'You shake your head no. "Thank you but I am doing ok."'
-				'He frowns and his eyes take on a hard glint, for a moment you think he might do something, but finally he just nods. "Very well have it your way, but don''t say I didn''t warn you. I will check back on you some other time and see if you came to your senses yet."'
-				act 'Stop working for the night': gt 'street_walker', 'end'
-				act 'Keep working the street': gt 'street_walker', 'event1'
-			end
-			!!act 'Be a smart ass':
-			!!for now commenting this out until I can finish it.
-			!!	*clr & cla
-			!!	minut += 5
-			!!	gs 'pain', 3, 'cheeks', 'slap'
-			!!	'You laugh at him trying to act all big and bad. "Like someone as scrawny as you could protect me, what you mean is you want to live off my pussy while you are to pathetic earn your own money."'
-			!!	'The words barely leave your mouth before you feel the stinging of the slap across your face. Blinking to clear you vision as you rub your cheek, you notice he has pulled up his shirt to reveal the butt of a pistol. Which quickly makes you change your mind about fighting back. "You''re new here so I will let that slide, but you best learn your place and fast bitch, before you end up dead!" With that he turns and walks off but you doubt you have seen the last of him.'
-			!!	act 'Stop working for the night': gt 'street_walker', 'event1'
-			!!	act 'Keep working the street': gt 'street_walker', 'event1'
-		elseif streetworkevent = 4:
-		!!Prostitute event
+			'You walk along the street trying to entice drivers of cars that drive by slowly, but you are unable to get anyone to stop.'
+			act 'Keep working the street': gt 'street_walker', 'event1'
+			act 'Stop working for the night': gt 'street_walker', 'end'
+		end
+	end
+end
+
+if $ARGS[0] = 'event2':
+	*clr & cla
+	minut += 15
+	city_prostitute += 1
+	if month >= 11 or month <= 3:
+		'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/hookersw1.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/hookers' + rand(1,4) + '.jpg"></center>'
+	end
+	'As you walk along the street trying to entice one of the slower moving cars with no luck. You spot some other girls working the streets as well, it doesn''t look like they are having any better luck than you are.'
+	act 'Stop working for the night': gt 'street_walker', 'end'
+	act 'Keep working the street': gt 'street_walker', 'event1'
+	act 'Walk over and talk to them':
+		!!ruslan_pimp sets to 1 if you trigger the second part and are not working for him. It will then always skip to that
+		if RAND(0,1) = 0 and ruslan_pimp = 0:
 			*clr & cla
 			minut += 15
-			if prst_loc = 0:
-				gs 'fame', 'city', 'prostitute', 5
-			elseif prst_loc = 1:
-				gs 'fame', 'city', 'prostitute', 5
+			if month >= 11 or month <= 3:
+				'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/hookersw1.jpg"></center>'
 			else
-				gs 'fame', 'city', 'prostitute', 5
+				'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/hookers' + rand(1,4) + '.jpg"></center>'
 			end
-			city_prostitute += 1
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/police.jpg"></center>'
-			if prst_caught = 0:
-				prst_caught = 1
-				'"What''s your price?" a man asks from behind you.'
-				'"The price is-" you stop in your tracks as you turn to notice a man dressed in all black. You stare for a moment, he''s giving you a weird vibe, looking at you with a cold and calculating gaze. Something tells you to play it cool so you change your answer. "Uh, I''m sorry, sir, can you repeat that? I don''t think I heard you clearly..." You try to lie.'
-				'The man''s eyes narrow dangerously, and as he moves you catch a glimpse of a police badge clipped to his hip. He''s a cop! "Don''t play dumb, girl. Go on, finish what you were going to say before!"'
-
-				act 'Keep on lying': gt 'street_walker', 'policelie'
-				act 'Offer him a bribe': gt 'street_walker', 'policebribe'
-				act 'Offer him a blowjob': gt 'street_walker', 'policeblowjob'
-			else
-				'"Didn''t I tell you to stay away from here?" you hear a familiar voice.'
-				'You turn turn around and find that it''s the cop from before. "Y-Yes sir, you did..." You stare down at the ground.'
-				'"So what are you doing here then, whoring again?" he brashly asks.'
-
-				act 'Try to explain': gt 'street_walker', 'policeexp'
-				act 'Offer him a bribe': gt 'street_walker', 'policebribe'
-				act 'Offer him a blowjob': gt 'street_walker', 'policeblowjob'
+			'You walk over smiling to the other girls, but all you are meet with is dark and dangerous looks. Then one of them speaks up. "What the fuck do you want bitch?"'
+			'Taken a bit aback by the anger you say "I was just coming over to talk and see how the night is going for you guys, been kinda slow for me." Trying to be friendly.'
+			'One of them snarls as the others move to partial circle you. "Listen bitch, this is our street, so get the fuck off it before you get hurt!"'
+			act 'Leave and stop working for the night':
+				cla
+				*nl
+				'You turn and walk away, you can hear the other girls behind you, calling you all sorts of names'
+				act 'Continue': gt 'street_walker', 'end'
+			end
+			act 'Leave to work a new street':
+				cla
+				*nl
+				'You turn and walk away, you can hear the other girls behind you, calling you all sorts of names'
+				act 'Continue': gt 'street_walker', 'work'
 			end
+			!!act 'Tell her to fuck off':
+			!!i will expand this later when I have time. For now want to get this out for this release.
 		else
 			*clr & cla
 			minut += 15
-			city_prostitute += 1
-			if prst_loc = 0:
-				gs 'fame', 'city', 'prostitute', 10
-			elseif prst_loc = 1:
-				gs 'fame', 'city', 'prostitute', 10
-			else
-				gs 'fame', 'city', 'prostitute', 10
-			end
 			if month >= 11 or month <= 3:
-				'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/barginw1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/hookersw1.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/bargin' + rand(1,3) + '.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/hookers' + rand(1,4) + '.jpg"></center>'
 			end
-			'A car slows down and pulls up the curb where you are walking, he is obviously look at you. So you walk over to him, as you do he rolls down his window. You bend over and practically lean into his window. "You looking to party handsome?"'
-			'He looks you over as best he can and licks his lips. "How much?"'
-			'You smile to him. "That depends on what you want to do." You take a little time listening to his wants and telling him the price before he decides.'
-			!!it should be 50/50 is the first one, than 50/50 the second or last
-			if RAND(0,1) = 0:
-				'He decides he wants a blowjob.'
-				act 'Accept':
-					cla
-					*nl
-					'With that and the price decided you get into the car.'
-					act 'Continue': gt 'street_walker', 'blowjob'
-				end
-				act 'Decline': gt 'street_walker', 'work'
-			elseif RAND(0,1) = 0:
-				'He decides he wants a fuck.'
-				act 'Accept':
-					cla
-					*nl
-					'With that and the price decided you get into the car.'
-					act 'Continue': gt 'street_walker', 'vaginal'
-				end
-				act 'Decline': gt 'street_walker', 'work'
+			if ruslan_pimp = 2:
+				'You walk over and introduce yourself to the other girls, one of them starts off kinda bitchy but the other one tells her you work for Ruslan too, which quickly calms her down. You make small talk with them for a bit, the more experienced girls share tips for the newer girls. Ways to help encourage guys stop and the type of guys to avoid. Occasionally a car stops and picks up one of the other girls, other times one stops and drops a girl off. After a bit you know you need to get back to work and earn money for Ruslan.'
+				act 'Keep working the street': gt 'street_walker', 'event1'
 			else
-				'He decides he wants a anal.'
-				act 'Accept':
-					cla
-					*nl
-					'With that and the price decided you get into the car.'
-					act 'Continue': gt 'street_walker', 'anal'
-				end
-				act 'Decline': gt 'street_walker', 'work'
+				ruslan_pimp = 1
+				'You walk over and introduce yourself to the other girls, one of them asks "You one of Ruslan''s new girls?"'
+				'You shake your head no. "No I work only for myself"'
+				'The other girls exchange a unease look, then one of them tells you. "You should really change your mind, if you work for Ruslan most of the guys know to pay up and the gopniks know to leave you alone, otherwise you can find yourself in a bad spot."'
+				'You smile to her. "Thanks for the advice, I will think about it." With that they make a excuse that then need to get back to work, you can tell they really don''t want to be seen hanging out with you.'
+				act 'Stop working for the night': gt 'street_walker', 'end'
+				act 'Keep working the street': gt 'street_walker', 'event1'
 			end
 		end
+	end
+end
+
+if $ARGS[0] = 'event3':
+	ruslan_day = daystart
+!!can only run into the pimp once a night, after that have it just go down to the else.
+	*clr & cla
+	minut += 15
+	city_prostitute += 1
+	'<center><img <<$set_imgh>> src="images/locations/shared/street/mugger.jpg"></center>'
+	if ruslan_meet = 0:
+		ruslan_meet = 1
+		'As you walk along the street trying to entice one of the slower moving cars with no luck. As the next car passes you turn and nearly run into a man who walked directly in front of you. You stop and give him your best smile. "You looking to party handsome?"'
+		'He looks you over like a side of beef, then finally looks into your eyes which most guys never do. "It''s dangerous for a young thing like you to be out walking the streets this time of night. I can protect you and make sure no one bothers you, just ask any of my other girls, how good Ruslan protects them."'
 	else
+		'As you walk along the street trying to entice one of the slower moving cars with no luck. As the next car passes you turn and see Ruslan your wouldbe pimp blocking your path.'
+		'You stop as he looks you over. "You come to your sense yet?"'
+	end
+	act 'Accept his deal':
 		*clr & cla
-		minut += 15
-		city_prostitute += 1
-		gs 'stat'
-		if month >= 11 or month <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/workingw1.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/working' + rand(1,4) + '.jpg"></center>'
-		end
-		'You walk along the street trying to entice drivers of cars that drive by slowly, but you are unable to get anyone to stop.'
+		minut += 5
+		ruslan_pimp = 2
+		'You nod your head in agreement. "Yeah you''re right, having some protection would be a good thing."'
+		'When you say that he is all smiles suddenly and pulls you up beside him as he wraps his arm around you."Good good, I knew you was a smart girl. Now every Friday I will come by and collect my half of what you make. You better not hold out on me, the other girls will tell me if you do. Now here is my number, if anyone refuses to pay or you have problems you call." Once you add his number to your contact list, he slaps you on the ass. "Now get to work!" With that he turns and walks off leaving you to wonder if this was a good idea.'
 		act 'Stop working for the night': gt 'street_walker', 'end'
 		act 'Keep working the street': gt 'street_walker', 'event1'
 	end
+	act 'Refuse his deal':
+		*clr & cla
+		minut += 5
+		'You shake your head no. "Thank you but I am doing ok."'
+		'He frowns and his eyes take on a hard glint, for a moment you think he might do something, but finally he just nods. "Very well have it your way, but don''t say I didn''t warn you. I will check back on you some other time and see if you came to your senses yet."'
+		act 'Stop working for the night': gt 'street_walker', 'end'
+		act 'Keep working the street': gt 'street_walker', 'event1'
+	end
+	!!act 'Be a smart ass':
+	!!for now commenting this out until I can finish it.
+	!!	*clr & cla
+	!!	minut += 5
+	!!	gs 'pain', 3, 'cheeks', 'slap'
+	!!	'You laugh at him trying to act all big and bad. "Like someone as scrawny as you could protect me, what you mean is you want to live off my pussy while you are to pathetic earn your own money."'
+	!!	'The words barely leave your mouth before you feel the stinging of the slap across your face. Blinking to clear you vision as you rub your cheek, you notice he has pulled up his shirt to reveal the butt of a pistol. Which quickly makes you change your mind about fighting back. "You''re new here so I will let that slide, but you best learn your place and fast bitch, before you end up dead!" With that he turns and walks off but you doubt you have seen the last of him.'
+	!!	act 'Stop working for the night': gt 'street_walker', 'event1'
+	!!	act 'Keep working the street': gt 'street_walker', 'event1'
+end
+
+if $ARGS[0] = 'event4':
+!!Prostitute event
+	*clr & cla
+	minut += 15
+	if prst_loc = 0:
+		gs 'fame', 'city', 'prostitute', 5
+	elseif prst_loc = 1:
+		gs 'fame', 'city', 'prostitute', 5
+	else
+		gs 'fame', 'city', 'prostitute', 5
+	end
+	city_prostitute += 1
+	'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/police.jpg"></center>'
+	if prst_caught = 0:
+		prst_caught = 1
+		'"What''s your price?" a man asks from behind you.'
+		'"The price is-" you stop in your tracks as you turn to notice a man dressed in all black. You stare for a moment, he''s giving you a weird vibe, looking at you with a cold and calculating gaze. Something tells you to play it cool so you change your answer. "Uh, I''m sorry, sir, can you repeat that? I don''t think I heard you clearly..." You try to lie.'
+		'The man''s eyes narrow dangerously, and as he moves you catch a glimpse of a police badge clipped to his hip. He''s a cop! "Don''t play dumb, girl. Go on, finish what you were going to say before!"'
+
+		act 'Keep on lying': gt 'street_walker', 'policelie'
+		act 'Offer him a bribe': gt 'street_walker', 'policebribe'
+		act 'Offer him a blowjob': gt 'street_walker', 'policeblowjob'
+	else
+		'"Didn''t I tell you to stay away from here?" you hear a familiar voice.'
+		'You turn turn around and find that it''s the cop from before. "Y-Yes sir, you did..." You stare down at the ground.'
+		'"So what are you doing here then, whoring again?" he brashly asks.'
+
+		act 'Try to explain': gt 'street_walker', 'policeexp'
+		act 'Offer him a bribe': gt 'street_walker', 'policebribe'
+		act 'Offer him a blowjob': gt 'street_walker', 'policeblowjob'
+	end
+end
+
+if $ARGS[0] = 'event5':
+	*clr & cla
+	minut += 15
+	city_prostitute += 1
+	if prst_loc = 0:
+		gs 'fame', 'city', 'prostitute', 10
+	elseif prst_loc = 1:
+		gs 'fame', 'city', 'prostitute', 10
+	else
+		gs 'fame', 'city', 'prostitute', 10
+	end
+	if month >= 11 or month <= 3:
+		'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/barginw1.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/shared/streetwalker/bargin' + rand(1,3) + '.jpg"></center>'
+	end
+	'A car slows down and pulls up the curb where you are walking, he is obviously look at you. So you walk over to him, as you do he rolls down his window. You bend over and practically lean into his window. "You looking to party handsome?"'
+	'He looks you over as best he can and licks his lips. "How much?"'
+	'You smile to him. "That depends on what you want to do." You take a little time listening to his wants and telling him the price before he decides.'
+	!!it should be 50/50 is the first one, than 50/50 the second or last
+	if RAND(0,1) = 0:
+		'He decides he wants a blowjob.'
+		act 'Accept':
+			cla
+			*nl
+			'With that and the price decided you get into the car.'
+			act 'Continue': gt 'street_walker', 'blowjob'
+		end
+		act 'Decline': gt 'street_walker', 'work'
+	elseif RAND(0,1) = 0:
+		'He decides he wants a fuck.'
+		act 'Accept':
+			cla
+			*nl
+			'With that and the price decided you get into the car.'
+			act 'Continue': gt 'street_walker', 'vaginal'
+		end
+		act 'Decline': gt 'street_walker', 'work'
+	else
+		'He decides he wants a anal.'
+		act 'Accept':
+			cla
+			*nl
+			'With that and the price decided you get into the car.'
+			act 'Continue': gt 'street_walker', 'anal'
+		end
+		act 'Decline': gt 'street_walker', 'work'
+	end
 end
 
 if $ARGS[0] = 'blowjob':

+ 1 - 1
locations/succubus.qsrc

@@ -93,7 +93,7 @@ if $ARGS[0] = 'RapistFight':
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/body/succubusself.jpg"></center>'
-	'Instinctively you are barely aware of causes your power to reach out and take hold of your would-be rapist''s mind.'
+	'Instinctively you are barely aware of what causes your power to reach out and take hold of your would-be rapist''s mind.'
 	'You see fear fill his eyes even as lust fills his loins and you feel his mind fighting your hold.'
 	pcs_horny = 100
 	act 'Continue':

+ 1 - 1
locations/talent_agency.qsrc

@@ -545,7 +545,7 @@ if $ARGS[0] = 'wrong_room':
 	elseif interview = 7:
 		'<center><video autoplay loop src="images/locations/city/citycenter/aurora/interview/wrong/7.mp4"></video></center>'
 		'You open the door and see an upset looking girl bent over the desk as the man behind her slowly pulls his cock out from her pussy. You freeze in shock and then swiftly shut the door without a word but through it you can hear voices.'
-		'"Congratulations on landing the part sweetie. I just hope you what you''re role is going to be moving forward."'
+		'"Congratulations on landing the part sweetie. I just hope you realise what your role is going to be moving forward."'
 		act 'Leave':gt'talent_agency','hallway'
 	
 	elseif interview = 8:

+ 6 - 7
locations/tanhouse.qsrc

@@ -55,13 +55,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	end
 
 	act '<b>Leave and go to the city center</b>':
-	act 'Go to the bathroom':gt 'tanvanr'
-	act 'Go to the kitchen':gt 'tankitchen'
-	act 'Go to your bedroom':gt 'tanspalnya'
-	act 'Go to the master bedroom':gt 'tanhozspal'
-	act 'Go to the living room':gt 'tanhousezal'
-	act 'Go to Tanya''s room':gt 'tanroom'
-	
 		if $clothingworntype ! 'nude':
 			gt'down'
 		else
@@ -69,6 +62,12 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			gt $CURLOC
 		end
 	end
+	act 'Go to the bathroom':gt 'tanvanr'
+	act 'Go to the kitchen':gt 'tankitchen'
+	act 'Go to your bedroom':gt 'tanspalnya'
+	act 'Go to the master bedroom':gt 'tanhozspal'
+	act 'Go to the living room':gt 'tanhousezal'
+	act 'Go to Tanya''s room':gt 'tanroom'
 
 	if tanwork = 1:
 		act 'Quit your Maid Job':

+ 4 - 4
locations/telefon.qsrc

@@ -290,7 +290,7 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
 
 	'Hey <<$sveta>>, it''s me, <<$loverdesc[lover_number]>>. How''s it going?'
 
-	act 'Normally':
+	act 'Reply':
 		cla
 		'"Pretty good, you?"'
 		'<<$loverdesc[lover_number]>>, "Great, but I kind of miss you, can we meet today?"'
@@ -410,7 +410,7 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
 		end
 	end
 
-	act 'Leave':
+	act 'Hang up (end relationship)':
 		cla
 		gs 'lover', 'remove', lover_number
 		gt 'telefon', 'fin'
@@ -436,7 +436,7 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 1:
 
 	'Hey <<$sveta>>, it''s me, <<$loverdesc[lover_number]>>. How''s it going?'
 
-	act 'Normally':
+	act 'Reply':
 		cla
 		'"Pretty good, you?"'
 		'<<$loverdesc[lover_number]>>, "Great, but I kind of miss you, can we meet today?"'
@@ -481,7 +481,7 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 1:
 		end
 	end
 
-	act 'Leave':
+	act 'Hang up (end relationship)':
 		cla
 		gs 'lover', 'remove', lover_number
 		gt 'telefon', 'fin'