Browse Source

Proofreading and some fixes from skybarbie

Vengeance11 1 year ago
parent
commit
baea9289e4

+ 1 - 1
locations/ApperanceSystem.qsrc

@@ -288,7 +288,7 @@ if $ARGS[0] = 'CalcGroomingPenalty':
 	end
 
 	!!Small penalty for not wearing deodorant, if pcs_sweat is low enough
-	if deodorant_on = 0 or pcs_sweat < 20: deodorantPenalty = 5
+	if deodorant_on = 0 and pcs_sweat < 20: deodorantPenalty = 5
 
 	if pcs_sweat < 22:
 		sweatPenalty = 0

+ 1 - 1
locations/gschool_outcast_chats.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'lesco':
 			'You see Lesco sitting quietly by himself as usual. Feeling sorry for him, you approach with a friendly smile. When he sees you, he relaxes and shyly looks up at you. "What do you want?"'
 			'You shrug your shoulders, saying you just wanted to hang out. You end up talking with him about living at the Tsarev residence and, as you suspected, how Lera makes his life a living hell at home. He does tell you a funny story about when they were younger and things were better. Lera found a dead bird and started poking it, but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued running and screaming all the way home.'
 		elseif npc_rel['A7'] <= 20:
-			'You see Lesco sitting quietly by himself as usual. Feeling sorry for him, you approach with a friendly smile. When he sees you, When he sees you, he stiffens and looks up at you with a apprehensive expression. "Please leave me alone."'
+			'You see Lesco sitting quietly by himself as usual. Feeling sorry for him, you approach with a friendly smile. When he sees you, When he sees you, he stiffens and looks up at you with an apprehensive expression. "Please leave me alone."'
 			'"I just want to talk," you say softly trying to reassure him, but he isn''t buying it and you eventually give up and walk away.'
 		else
 			'You see Lesco sitting quietly by himself as usual. Feeling sorry for him, you approach with a friendly smile and strike up a conversation with him. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'

+ 42 - 34
locations/music_buskingevents.qsrc

@@ -75,65 +75,73 @@ if $ARGS[0] = 'anushka':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/activities/music/guitarf'+ rand(1,2) +'.jpg"></center>'
-	if pcs_instrmusic > 80
+	if pcs_instrmusic > 80:
 		gs 'npc_relationship', 'modify', 'A144', 'love'
 		if npc_rel['A144'] > 50:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she grins and walks over. "Wow that was amazing, <<$pcs_nickname>>. You should come over and we can jam together some time." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she grins and walks over. "Wow, that was amazing, <<$pcs_nickname>>! You should come over and we can jam together some time."' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		elseif npc_rel['A144'] > 20:
 			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she grins and walks over. "Wow that was amazing, <<$pcs_nickname>>." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'When she notices that you saw her, she grins and walks over. "Wow, that was amazing, <<$pcs_nickname>>!"' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		else
-			'You start to drift loosing yourself in the music. You glance up looking at the people passing by, several leaving rubles in your case. You see some movement that attracts your attention and you see Anushka standing on the street watching you play. She seems to have a look of surprise as she bobs her head slightly to the music. You know she doesn''t really like you but maybe she at least respects your ability. When she sees you looking at her and disappears into the crowd.'
+			'You start losing yourself in the music, occasionally glancing up to look at the people passing by as several leave some rubles in your case. You then see some movement that attracts your attention and spot Anushka watching you play. She seems to have a look of surprise as she bobs her head slightly to the music. You know she doesn''t really like you, but maybe she at least respects your ability. When she sees you looking at her, she disappears into the crowd.'
 		end
-	elseif pcs_instrmusic > 60
+	elseif pcs_instrmusic > 60:
 		gs 'npc_relationship', 'modify', 'A144', 'like'
 		if npc_rel['A144'] > 50:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she grins and walks over. "Wow that was pretty damn good, <<$pcs_nickname>>. You should come over and we can jam together some time." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she grins and walks over. "That was pretty damn good, <<$pcs_nickname>>. You should come over and we can jam together some time."' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		elseif npc_rel['A144'] > 20:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she grins and walks over. "Wow that was pretty damn good, <<$pcs_nickname>>." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she grins and walks over. "That was pretty damn good, <<$pcs_nickname>>."'
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		else
-			'You start to drift loosing yourself in the music. You glance up looking at the people passing by, some leaving rubles in your case. You see some movement that attracts your attention and you see Anushka standing on the street watching you play. She seems to have a look of mild surprise and respect? You know she doesn''t really like you but maybe she at least respects your ability. When she sees you looking at her and disappears into the crowd.'
+			'You start losing yourself in the music, occasionally glancing up to look at the people passing by as some leave some rubles in your case. You then see some movement that attracts your attention and spot Anushka watching you play. She seems to have a look of mild surprise and respect? You know she doesn''t really like you, but maybe she at least respects your ability. When she sees you looking at her, she disappears into the crowd.'
 		end
-	elseif pcs_instrmusic > 40
+	elseif pcs_instrmusic > 40:
 		gs 'npc_relationship', 'modify', 'A144', 'like'
 		if npc_rel['A144'] > 50:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she smiles and walks over. "I didn''t know you turned into a wandering minstrel, <<$pcs_nickname>>. Not bad, not bad at all. You should come over sometime and we can play together, I can give you some tips if you like." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she smiles and walks over. "I didn''t know you had turned into a wandering minstrel, <<$pcs_nickname>>. Not bad, not bad at all. You should come over sometime and we can play together. I can give you some tips if you like?"' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		elseif npc_rel['A144'] > 20:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she smiles and walks over. "I didn''t know you turned into a wandering minstrel, <<$pcs_nickname>>. Not bad, not bad at all." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she smiles and walks over. "I didn''t know you had turned into a wandering minstrel, <<$pcs_nickname>>. Not bad, not bad at all."' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		else
-			'You start to drift loosing yourself in the music. You glance up looking at the people passing by, some leaving rubles in your case. You see some movement that attracts your attention and you see Anushka standing on the street watching you play. She seems to have a look of mild surprise and maybe even mild approval? You know she doesn''t really like you but maybe she at least respects your ability. When she sees you looking at her and disappears into the crowd.'
+			'You start losing yourself in the music, occasionally glancing up to look at the people passing by as some leave some rubles in your case. You then see some movement that attracts your attention and spot Anushka watching you play. She seems to have a look of mild surprise and maybe even mild approval? You know she doesn''t really like you, but maybe she at least respects your ability. When she sees you looking at her, she disappears into the crowd.'
 		end
-	elseif pcs_instrmusic > 20
+	elseif pcs_instrmusic > 20:
 		if npc_rel['A144'] > 50:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she smiles and walks over. "Not bad, not bad <<$pcs_nickname>> If heard better, but have heard worse too. You should come over sometime and we can play together, I can teach you a few things if you like." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she smiles and walks over. "Not bad, <<$pcs_nickname>>, not bad. I''ve heard better, but also heard worse too. You should come over sometime and we can play together. I can teach you a few things if you like?"' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		elseif npc_rel['A144'] > 20:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she smiles and walks over. "Not bad, not bad <<$pcs_nickname>> If heard better, but have heard worse too." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she smiles and walks over. "Not bad, <<$pcs_nickname>>, not bad. I''ve heard better, but also heard worse too."' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		else
-			'You start to drift loosing yourself in the music. You glance up looking at the people passing by, a couple leaving rubles in your case. You see some movement that attracts your attention and you see Anushka standing on the street watching you play. She seems to have a look of disdain on her face, you know she doesn''t really like you, but had hoped she would respect your ability, maybe if you got better. When she sees you looking at her, she scoffs, followed be a smirk, as she walks away.'
+			'You start losing yourself in the music, occasionally glancing up to look at the people passing by as a few leave some rubles in your case. You then see some movement that attracts your attention and spot Anushka watching you play. She seems to have a look of disdain on her face; you know she doesn''t really like you, but had hoped she would respect your ability at least. When she sees you looking at her, she scoffs before walking away.'
 		end
 	else
 		gs 'npc_relationship', 'modify', 'A144', 'dislike'
 		if npc_rel['A144'] > 50:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly with a pained expression on her face.'
-			'As she notices that you saw her, she forces a smile to her face. "What the fuck <<$pcs_nickname>>, I have heard two cats fucking that sounded more pleasant than that."'
-			'You frown a bit. "I''m trying, I''ve been practicing.'
-			*nl
-			'She shakes her head slightly. "Well you need to practice some more. Honestly you shouldn''t even play in public until you are a lot better." She notices the look on your face and sighs. "Look if you want, stop by some time and I can teach you... well a lot but we will start off with just the damn basics." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a hint of disappointment on her face.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly with a pained expression on her face.'
+			'When she notices that you saw her, she forces a smile to her face. "You need to practice. A lot. Honestly, I wouldn''t even be playing in public with that lack of skill."'
+			'You frown. "I''m trying!"'
+			'She sighs. "Stop by some time and I can teach you the basics you need to know."' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a hint of disappointment on her face.'
 		elseif npc_rel['A144'] > 20:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly with a pained expression on her face.'
-			'As she notices that you saw her, she forces a smile to her face. "My god that physically hurt my soul it was so bad, I have heard two cats fucking that sounded more pleasant than that."'
-			'You frown a bit. "I''m trying, I''ve been practicing.'
-			*nl
-			'She shakes her head slightly. "Well you need to practice some more. Honestly you shouldn''t even play in public until you are a lot better." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away clearly a little disappointed in your performance.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly with a pained expression on her face.'
+			'When she notices that you saw her, she forces a smile to her face. "My god, that physically hurt my soul it was so bad! I''ve heard two cats fucking that sounded more pleasant than that!"'
+			'You frown. "I''m trying! I''ve been practicing!"'
+			'She shakes her head slightly. "Well you need to practice some more. Honestly you shouldn''t even play in public until you''re a lot better than that."' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away clearly a little disappointed in your performance.'
 		else
-			'You start to drift loosing yourself in the music. You glance up looking at the people passing by, most seem to hurry by to try and get away from the racket you are making. You see some movement that attracts your attention and you see Anushka standing on the street watching you play. She seems to have a look of utter pain and disdain on her face, it doesn''t seem she approves of your musical talents or lack there for of. You know she doesn''t really like you, but had hoped she would respect your ability, maybe if you got better. When she sees you looking at her, she scoffs and shakes her head in disgust, as she walks away.'
+			'You start losing yourself in the music, occasionally glancing up to look at the people passing by. Most seem to hurry by to try and get away from the racket you''re making as you see some movement that attracts your attention and you spot Anushka watching you play. She seems to have a look of utter pain and disdain on her face; she clearly doesn''t approve of your lack of musical talent. When she sees you looking at her, she scoffs and shakes her head in disgust before walking away.'
 		end
 	end
 	act 'Finish': gt $loc, $loc_arg

File diff suppressed because it is too large
+ 185 - 192
locations/pav_aptcourtev.qsrc


+ 11 - 8
locations/stwork.qsrc

@@ -214,31 +214,34 @@ if $ARGS[0] = 'tipcalculator':
 	if striptip < 25:
 		'Nobody even noticed you or your efforts on the stage and it''s no surprise you got nothing for your efforts.'
 	elseif striptip < 40:
-		'A couple of people looked at you but nothing more than that, you didn''t receive a single tip.'
+		'A few people looked at you, but you didn''t receive a single tip.'
 	elseif striptip < 55:
-		'A couple of people looked at you but nothing more than that, you didn''t receive any tips.'
+		'A few people looked at you, but you didn''t receive any tips.'
 	elseif striptip < 70:
 		if rand(0,5) = 0:
-			'The customers were pleased with your performance, not enough to both tipping you.'
+			'The customers were pleased with your performance, but not enough to tip you.'
 		else
 			paymoneyrand = rand(3,10) * 2
 			money += paymoneyrand
 			pcs_mood += rand(1,5)
+			gs 'stat'
 			'The customers were pleased with your performance. They gave you <<paymoneyrand>> <b>₽</b> in tips.'
 		end
 	elseif striptip < 90:
 		if rand(0,10) = 0:
-			'The customers followed your movements between their conversations. You deserved some tips but luck was against you and you got nothing.'
+			'The customers followed your movements between their conversations. You deserved some tips, but luck was against you and you got nothing.'
 		else
 			paymoneyrand = rand(10,(striptip/5)) * 2
 			money += paymoneyrand
 			pcs_mood += rand(3,10)
-		'The customers followed your movements between their conversations. After counting out your tips it amounts to <<paymoneyrand>> <b>₽</b>.'
+			gs 'stat'
+		'The customers followed your movements between their conversations. After counting out your tips, it amounts to <<paymoneyrand>> <b>₽</b>.'
 		end
 	else
 		paymoneyrand = rand(20,striptip)
 		money += paymoneyrand
 		pcs_mood += rand(5,20)
+		gs 'stat'
 		'The customers were mesmerized by your dancing and tipped you <<paymoneyrand>> <b>₽</b>.'
 	end
 end
@@ -270,10 +273,10 @@ if $ARGS[0] = 'guard':
 	*clr & cla
 	gs 'stat'
 	if $clothingworntype = 'nude':
-		'The bored security guard perks up when you approach him, "Looking good there <<$pcs_nickname>>."'
+		'The bored security guard perks up when you approach him. "Looking good there, <<$pcs_nickname>>."'
 		'He doesn''t really have anything much to say and the conversation just becomes an awkward silence.'
 	else
-		'A bored looking security guard stands by the door. Seeing you, he lazily nods, "Hello <<$pcs_nickname>>."'
+		'A bored looking security guard stands by the door. Seeing you, he lazily nods. "Hello <<$pcs_nickname>>."'
 	end
 
 	act 'Move away':gt 'stwork', 'start'
@@ -289,7 +292,7 @@ if $ARGS[0] = 'toilet':
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/toilet.jpg"></center>'
 	*nl
 	'You enter a dirty and smelly staff bathroom that''s probably never been cleaned.'
-	'There is no mirror, only a grimy shower, toilet, and basin'
+	'There is no mirror, only a grimy shower, toilet and basin.'
 	*nl
 	'Your razor will last <b><<stanok>></b> more ' + iif(stanok = 1, 'shave', 'shaves') + '. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 

Some files were not shown because too many files changed in this diff