Parcourir la source

[fixes] Bug fixes from doodab

KevinSmarts il y a 4 ans
Parent
commit
cced389d7c

+ 1 - 2
locations/Snpc.qsrc

@@ -354,9 +354,8 @@ if numnpc = 12:
 
 			if pav_slut < 125:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 			if pav_slut >= 125:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
-			if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
 			if $loc ! 'gdkin':
-				xgt 'gschool_lessons', 'short_break', 'nopict'
+				act' Leave': xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
 				act 'Move away': gt $loc, $metka
 			end

+ 3 - 3
locations/Voltrener.qsrc

@@ -157,9 +157,9 @@ if $ARGS[0] = 'talk':
 					if trenerSex = 1:
 						volleysostav = 1
 						'You ask the coach about joining the team, he smiles and says, "<<$pcs_nickname>>, honey. I can do that, but you''ll have to start as a sub or people might be suspicious."'
-					elseif pcs_vball < 65:
+					elseif pcs_vball < 60:
 						'You ask the coach about joining the team, but he shakes his head. "<<$pcs_lastname>> it''s not personal, you have good amateur skills. Just not enough to make the team."'
-					elseif pcs_vball >= 65:
+					else
 						'You ask the coach about joining the team, the coach thinks for a minute. "You have good skills for an amateur but you''re still not good enough to start on the team. However, I have a spot for a substitute and we can put you there. How does that sound?"'
 
 						act 'Accept the substitute position':
@@ -187,9 +187,9 @@ if $ARGS[0] = 'talk':
 								gs 'willpower', 'pay', 'self'
 								gs 'stat'
 									!!if volleysostav > 0:npc_rel['A69'] -= 1
-								volleysostav = 1
 								if npc_rel['A69'] > 20:
 									npc_rel['A69'] = 20
+									volleysostav = 1
 									'You try to prove to the coach that he should put you on the team, the coach tries to protest, and you get into an argument. Eventually you shout him down and he gives up. "Fine <<$pcs_lastname>>, I''ll put you in the team, but you''re on the bench and any more stunts like this and you''re out."'
 								else
 									'You try to prove to the coach that he should put you on the team, but you are not forceful enough and the coach countered all your arguments, denying you a place on the team.'

+ 8 - 9
locations/din_pav.qsrc

@@ -7,7 +7,7 @@ $pavserjil = {
 	
 	set pavserhom = 1
 	'<center><img <<$set_imgh>> src="images/characters/oldtown/pavser/pavserjil2.jpg" ></center>'
-    'And it is not clear why you itself drew attention to him.'
+    'It is not clear why you you are drawn to him but you can barely take you eyes off him.'
 	act 'Overnutsya':gt'lug', 'start'
 }
 
@@ -18,18 +18,17 @@ $koncepodos = {
 	set koncepo = 0
 	pcs_mood -= 10
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/koncepod.jpg" ></center>'
-    act 'I''m about + kk, - mumbled you. - According to the announcement':
+    act '"I''m enquiring about the apartment", You mumble. "On the advert outside"':
         cls
         '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/koncepod.jpg" ></center>'
-        'Sorry darling, but the apartment was not rented wall - He said the old man reluctantly voice.'
-        act 'Sorry, I probably made a mistake, but there is an ad on the door':
+        '"Sorry darling, but the apartment is not for rent" Says the old man, reluctantly.'
+        act 'Sorry, but there is an ad on the door':
             cls
             gs'stat'
             set koncepo = 1
             '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/koncepod.jpg" ></center>'
-            'Well, on the fence, too, every write - with blatant mockery said the old man.'
-            act'Send and go': gt 'dvor'
-            act'To cry and go': gt 'dvor'
+            '"Kids, on the wall too, writing stuff everywhere" The old man says gesticulating.'
+            act'Leave': gt 'dvor'
         end              
     end
 }
@@ -43,8 +42,8 @@ $koncepodos1 = {
     pcs_horny = 0
     gs'stat'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/koncepod.jpg" ></center>'
-    'You opened a large dimly lit lobby, which sits in the corner of the concierge, cloudy kind old man, who met you evil and indifference.'
-    'I''m about + kk, - mumbled you. - According to the announcement'
+    'You walk into a large dimly lit lobby, in the corner sits the concierge. He looks like a kind old man, who looks at you with indifference.'
+    '"I''m enquiring about the apartment", You mumble. "On the advert outside"'
     'According to the announcement? - I asked the old man to dislike - And I, you know-Does nobody said anything.'
     'I would like to have a look, - you said'
     '- Remove want?'

+ 1 - 1
locations/natbelapt.qsrc

@@ -1011,7 +1011,7 @@ if $ARGS[0] = 'lick_pussy':
 	'You force Natasha to undress you and then watch as she undresses herself before she returns to kneeling at your feet. You pull her face into your pussy and snarl at her, "Now lick!". Natasha fearfully starts to work.'
 	
 	!! You need to train her a bit before she does a good job
-	if nattraining > 3 or NatashaQW = 8:
+	if nattraining > 3 or NatashaQW >= 8:
 		killvar 'nattraining'
 		if NatashaQW = 7: NatashaQW = 8
 		act 'Lie down and open your legs':

+ 4 - 2
locations/shulga_room.qsrc

@@ -204,8 +204,6 @@ end
 !clothed as a prostitute: day and night
 if $ARGS[0] = 'sh_hooker':
 	menu_off = 1
-	sh_hooker_day = daystart
-	sh_hooker_count -= 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/body/h'+rand(1,10)+'.jpg"></center>'
 	
@@ -225,6 +223,8 @@ if $ARGS[0] = 'sh_hooker':
 		act 'Sigh dramatically and open your arms':
 			shgopsex_gr_day = daystart
 			shgopsex_gr_count -= 1
+			sh_hooker_day = daystart
+			sh_hooker_count -= 1
 			gs 'gopsex', 'settings'
 			gs 'gopsex', 'shgopsex_group'
 		end
@@ -237,6 +237,8 @@ if $ARGS[0] = 'sh_hooker':
 			$gopsex_n_npc = 1
 			shgopsex_vasya_day = daystart
 			shgopsex_vasya_count -= 1
+			sh_hooker_day = daystart
+			sh_hooker_count -= 1
 			gs 'boyStat', 'A11'
 			gs 'gopsex', 'settings'
 			gs 'gopsex', 'shgopsex'