1
0

2 Коміти ceb19684c8 ... fd1d1e66ee

Автор SHA1 Опис Дата
  onxyLumen fd1d1e66ee refactoring: encouter event & fix emit probability 10 місяців тому
  onyxLumen 79d8fc21e7 Merge branch 'dev' of onyxLumen/glife into master 10 місяців тому
1 змінених файлів з 95 додано та 91 видалено
  1. 95 91
      locations/placer_pav_park.qsrc

+ 95 - 91
locations/placer_pav_park.qsrc

@@ -3,109 +3,113 @@
 if hour >= 22 or hour < 8:
 	encounter = 0
 else
-	if placerParameter['friend_index'] = 14 and katjaQW['park_sex'] < 2:
-		encounter = rand(0, 8)
-	else
-		encounter = rand(0, 10)
-	end
+	encounter = rand(0, 2)
 end
 
 met_someone = 0
 
 if encounter = 0:
-	!!no one in the park
-	$textEvent = 'The park is quiet and deserted. There is no one in sight.'
-elseif encounter = 1:
-	!!people in the park mother walking with a baby
-	$textEvent = 'You see a young mother with a stroller walking along a path.'
-elseif encounter = 2:
-	!!people in the park old_man
-	if bimbolevel < 1 or placerParameter['friend_index'] > 0:
-		$textEvent = 'A lonely old man with a newspaper in his hand strolls down a path.'
+	encounterType = rand(0, 8)
+	if encounterType = 0:
+		!!no one in the park
+		$textEvent = 'The park is quiet and deserted. There is no one in sight.'
+	elseif encounterType = 1:
+		!!people in the park mother walking with a baby
+		$textEvent = 'You see a young mother with a stroller walking along a path.'
+	elseif encounterType = 2:
+		!!people in the park old_man
+		if bimbolevel < 1 or placerParameter['friend_index'] > 0:
+			$textEvent = 'A lonely old man with a newspaper in his hand strolls down a path.'
+		else
+			$textEvent='A lonely old man with a newspaper in his hand is strolling down a path. He looks at you greedily when he sees your appearance and walks over to you. When he reaches you, he extends his hand and says: "Hi there, young lady! If you have a minute, come with me! I have something for you!"'
+			act 'Go see what he has':gs 'npcgeneratec', 0, 'Old Man from the park', rand(50,70) & gs 'boyStat', $npclastgenerated & gt 'parkBimbo','pos1'
+		end
+	elseif encounterType = 3:
+		!!people in the park woman with shopping bags
+		$textEvent = 'You see a woman hauling several shopping bags though the park, they look quite heavy. It''s probably the quickest way home for her.'
+	elseif encounterType = 4:
+		!!people in the park two young girls
+		$textEvent = 'You see two young girls taking a stroll in the park.'
+	elseif encounterType = 5:
+		!!dog in the park
+		$textEvent = 'This part of the park is quiet and deserted. The only sign of life is a stray dog, sniffing around near a garbage bin.'
+	elseif encounterType = 6:
+		!!couple in love in the park
+		$textEvent = 'You see a man and woman walking in the park, holding each other''s hands tightly. They''re clearly in love.'
 	else
-		$textEvent='A lonely old man with a newspaper in his hand is strolling down a path. He looks at you greedily when he sees your appearance and walks over to you. When he reaches you, he extends his hand and says: "Hi there, young lady! If you have a minute, come with me! I have something for you!"'
-		act 'Go see what he has':gs 'npcgeneratec', 0, 'Old Man from the park', rand(50,70) & gs 'boyStat', $npclastgenerated & gt 'parkBimbo','pos1'
+		if hotelcouple = 1:
+			$location_type = 'public_indoors'
+			*clr
+			gs 'stat'
+			' after walking around the park for 10 minutes you decide to relax in the grass.'
+			'Suddenly you are approached by a couple. They come sit next to you.'
+			'You think you recognise the man but you can''t quite put your finger on it.'
+			'Then the man starts speaking : " hi girl, I don''t know if you remember but we have met once in the hotel "'
+			'Now you remember where you know the man from, you watched his children so he and his wife could have some ''alone time''.'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/couple_park_meet.jpg"></center>'
+			'" You really helped us out that time.  Usually we are able to drop the children off with my parents but they were out that day."'
+			'" My name is Motya and this is my wife Uliana."'
+			'" So we stay in the Pavlovsk hotel every Thursday. If you want to visit us on a Thursday evening, feel free to drop by in room 207 so we can give you a proper thanks for your help."'
+			'Then they get up and leave you'
+			'You wonder what kind of ''thanks'' they have in mind'
+			hotelcouple = 2
+			jump 'parkaway'
+		end
+		$textEvent = 'You see 2 women walking in the park, holding each other''s hands tightly. They''re clearly in love.'
 	end
-elseif encounter = 3:
-	!!people in the park woman with shopping bags
-	$textEvent = 'You see a woman hauling several shopping bags though the park, they look quite heavy. It''s probably the quickest way home for her.'
-elseif encounter = 4:
-	!!people in the park two young girls
-	$textEvent = 'You see two young girls taking a stroll in the park.'
-elseif encounter = 5:
-	!!people in the park number of guys
-	
-	if placerParameter['friend_index'] = 14 and katjaQW['park_sex'] = 0:
-		!!If Katja never have had sex with a random guy at the park you only meet 1 guy.
-		placerParameter['number_of_man'] = 1
-	elseif placerParameter['friend_index'] = 14 and katjaQW['park_sex'] = 1:
-		!!If Katja have had sex with 1 random guy at the park you have a 50% chance of meeting 1 guy and 25% of meeting 2 and 25% of meeting 3.
-		placerParameter['number_of_man'] = max(1,rand(0,3))
-	elseif rand(0,1) = 0:
-		!!50% chance of meeting 1 guy.
-		placerParameter['number_of_man'] = 1
-	elseif rand(0,1) = 0:
-		!!25% chance of meeting 2 guys.
-		placerParameter['number_of_man'] = 2
-	elseif rand(0,1) = 0:
-		!!12.5% chance of meeting 3 guys.
-		placerParameter['number_of_man'] = 3
-	elseif rand(0,2) > 0:
-		!!8.35% chance of meeting 4 guys.
-		placerParameter['number_of_man'] = 4
+else
+	met_someone = 1
+	if placerParameter['friend_index'] = 14 and katjaQW['park_sex'] < 2:
+		encounterType = 0
 	else
-		!!4.15% chance of meeting 5 guys.
-		placerParameter['number_of_man'] = 5
+		encounterType = rand(0, 2)
 	end
+	
+	if encounterType = 0:
+		!!people in the park number of guys
 
-	if placerParameter['number_of_man'] = 1:$textSub = 'a guy'
-	if placerParameter['number_of_man'] = 2:$textSub = 'two guys'
-	if placerParameter['number_of_man'] = 3:$textSub = 'three guys'
-	if placerParameter['number_of_man'] = 4:$textSub = 'four guys'
-	if placerParameter['number_of_man'] = 5:$textSub = 'five guys'
+		if placerParameter['friend_index'] = 14 and katjaQW['park_sex'] = 0:
+			!!If Katja never have had sex with a random guy at the park you only meet 1 guy.
+			placerParameter['number_of_man'] = 1
+		elseif placerParameter['friend_index'] = 14 and katjaQW['park_sex'] = 1:
+			!!If Katja have had sex with 1 random guy at the park you have a 50% chance of meeting 1 guy and 25% of meeting 2 and 25% of meeting 3.
+			placerParameter['number_of_man'] = max(1,rand(0,3))
+		elseif rand(0,1) = 0:
+			!!50% chance of meeting 1 guy.
+			placerParameter['number_of_man'] = 1
+		elseif rand(0,1) = 0:
+			!!25% chance of meeting 2 guys.
+			placerParameter['number_of_man'] = 2
+		elseif rand(0,1) = 0:
+			!!12.5% chance of meeting 3 guys.
+			placerParameter['number_of_man'] = 3
+		elseif rand(0,2) > 0:
+			!!8.35% chance of meeting 4 guys.
+			placerParameter['number_of_man'] = 4
+		else
+			!!4.15% chance of meeting 5 guys.
+			placerParameter['number_of_man'] = 5
+		end
 
-	$textEvent = 'You see <<$textSub>> walking through the park, holding a case of beer.'
-	placerParameter['recognize_status'] = 1
-	met_someone = 1
-elseif encounter = 6:
-	!!dog in the park
-	$textEvent = 'This part of the park is quiet and deserted. The only sign of life is a stray dog, sniffing around near a garbage bin.'
-elseif encounter = 7:
-	!!couple in love in the park
-	$textEvent = 'You see a man and woman walking in the park, holding each other''s hands tightly. They''re clearly in love.'
-elseif encounter = 8:
-	if hotelcouple = 1:
-		$location_type = 'public_indoors'
-		*clr
-		gs 'stat'
-		' after walking around the park for 10 minutes you decide to relax in the grass.'
-		'Suddenly you are approached by a couple. They come sit next to you.'
-		'You think you recognise the man but you can''t quite put your finger on it.'
-		'Then the man starts speaking : " hi girl, I don''t know if you remember but we have met once in the hotel "'
-		'Now you remember where you know the man from, you watched his children so he and his wife could have some ''alone time''.'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/couple_park_meet.jpg"></center>'
-		'" You really helped us out that time.  Usually we are able to drop the children off with my parents but they were out that day."'
-		'" My name is Motya and this is my wife Uliana."'
-		'" So we stay in the Pavlovsk hotel every Thursday. If you want to visit us on a Thursday evening, feel free to drop by in room 207 so we can give you a proper thanks for your help."'
-		'Then they get up and leave you'
-		'You wonder what kind of ''thanks'' they have in mind'
-		hotelcouple = 2
-		jump 'parkaway'
+		if placerParameter['number_of_man'] = 1:$textSub = 'a guy'
+		if placerParameter['number_of_man'] = 2:$textSub = 'two guys'
+		if placerParameter['number_of_man'] = 3:$textSub = 'three guys'
+		if placerParameter['number_of_man'] = 4:$textSub = 'four guys'
+		if placerParameter['number_of_man'] = 5:$textSub = 'five guys'
+
+		$textEvent = 'You see <<$textSub>> walking through the park, holding a case of beer.'
+		placerParameter['recognize_status'] = 1
+	elseif encounterType = 1:
+		!!young people in the park company
+		$textEvent = 'You see a group of teenagers sitting on a park bench, listening to some music.'
+		placerParameter['number_of_man'] = rand(2, 6)
+		placerParameter['recognize_status'] = 1
+	else
+		!!Gopnik in the park
+		placerParameter['number_of_man'] = rand(3, 6)
+		$textEvent = 'Some Gopniks are sitting on their haunches just off to the side of one of the main paths, drinking beer. The area around them is littered with empty bottles.'
+		placerParameter['recognize_status'] = 2
 	end
-elseif encounter = 9:
-	!!young people in the park company
-	$textEvent = 'You see a group of teenagers sitting on a park bench, listening to some music.'
-	placerParameter['number_of_man'] = rand(2, 6)
-	placerParameter['recognize_status'] = 1
-	met_someone = 1
-elseif encounter = 10:
-	!!Gopnik in the park
-	placerParameter['number_of_man'] = rand(3, 6)
-	$textEvent = 'Some Gopniks are sitting on their haunches just off to the side of one of the main paths, drinking beer. The area around them is littered with empty bottles.'
-	placerParameter['recognize_status'] = 2
-	met_someone = 1
-else
-	$textEvent = 'You see 2 women walking in the park, holding each other''s hands tightly. They''re clearly in love.'
 end
 
 if met_someone = 1: