瀏覽代碼

Merge remote-tracking branch 'Anya/master'

Kevin_Smarts 1 年之前
父節點
當前提交
ae40828cb1
共有 3 個文件被更改,包括 8 次插入5 次删除
  1. 1 1
      locations/anushkachat.qsrc
  2. 7 2
      locations/korrPar.qsrc
  3. 0 2
      locations/pav_complex.qsrc

+ 1 - 1
locations/anushkachat.qsrc

@@ -886,7 +886,7 @@ if $ARGS[0] = 'tell_about_olu':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 				'You tell her the story of your first time with Olu and what it was like. She presses you for details, obviously finding the story a big turn on, then shares her stories of Valentin, the biggest guy she has been with. You pass the time swapping stories and giggling about your sex lives.'
 				act 'Hang out in her room': gt 'anush_bedroom','anushroom'
-				act 'Talk about something else': gt 'anushapt', 'bed'
+				act 'Talk about something else': gt 'anushkachat', 'chat'
 				if npc_sex['A82'] > 0 and DjibrilQW['nush_inv'] = 0:
 					act 'Tell her about Djibril': gt 'anushkachat', 'tell_about_djibril'
 				end

+ 7 - 2
locations/korrPar.qsrc

@@ -103,8 +103,13 @@ if locat['Mother'] = 3:
 		end
 	end
 elseif locat['Mother'] = 1:
-	if hour = 22 and parsexrand = 5 and parentsexday ! daystart:
-		act 'Go to your parents'' room': gt 'bedrPar2', 'peek'
+	if hour = 22 and parsexrand ! daystart and parentsexday ! daystart:
+		parsexrand = daystart
+		if rand(0, 5) = 0:
+			act 'Go to your parents'' room': gt 'bedrPar2', 'peek'
+		else
+			act 'Go to your parents'' room': msg'Your parents are probably asleep. You shouldn''t go in right now.'
+		end
 	else
 		act 'Go to your parents'' room': msg'Your parents are probably asleep. You shouldn''t go in right now.'
 	end

+ 0 - 2
locations/pav_complex.qsrc

@@ -24,8 +24,6 @@ if $ARGS[0] = 'start':
 	litltown = 1
 	alkoblock = 0
 	boynumBlock = 0
-!! the following variable seems to be here on the wrong place as it is related to bedroom, but it is here intentionally because I want it to be stable when PC in the apartement. 
-	parsexrand = rand(0, 5)
 	gs 'stat'
 !! Slut gossip
 	if complx_rand[1] + rand(5,10) < daystart and fame['pav_slut'] >= 50 and (hour > 8 and hour < 23):