13 Commits c6cd68ca0b ... adac28d28d

Autor SHA1 Mensaje Fecha
  Kevin_Smarts adac28d28d Merge branch 'master' of maankamara/glife into master hace 1 año
  maankamara 23c52fdec5 merged with the more completed fix hace 1 año
  bgkjdgbizgblzdgbr 40a7071623 [fixed] function calls and not gt for the npc reactions. Spotted by maankamara hace 1 año
  maankamara 212bcdb90e corrected the logic in journal displaying relations to PCs kids hace 1 año
  maankamara d9a899a3f9 Merge remote-tracking branch 'upstream/master' hace 1 año
  Kevin_Smarts d45ac1a9fe Merge remote-tracking branch 'hornguy6/master' hace 1 año
  Kevin_Smarts 6df2a8e9b6 [fixed] Sewing when storage was full was causing issues so added check to prevent this thanks to jimmybob hace 1 año
  maankamara dea52c55cb npc reaction about pregnancy caused blank screen hace 1 año
  maankamara 0a773a87e7 Ensured BC shot counts down regardless of main contraception method in use hace 1 año
  maankamara 0028eec4e5 Removed contraception type blocking potential father consideration hace 1 año
  maankamara f2a746234a Removed twinge message, too much information hace 1 año
  Kevin_Smarts 79d3dc2071 [fixed] The flash back scene could just repeat foever as the actions were not cleared hace 1 año
  hornguy6 12c36708bb [fixed] some classmate tampon stuff hace 1 año

+ 3 - 1
locations/femcyc.qsrc

@@ -567,7 +567,9 @@ if $ARGS[0] = 'cyc2':
 			if cumarrkno[can_idx] = 1 and arrpos('$wombpotfath', $cumarrnam[can_idx]) < 0:$wombpotfath[arrsize('$wombpotfath')] = $cumarrnam[can_idx]
 
 			!! If the guy is a known/possible element (PC know about the sex, it was actual sex, condom/pill was not used or condom was broken, etc.), he can be considered as father.
-			if instr('14570',str(cumarrcon[can_idx])) > 0 and cumarrdel[can_idx] = 0 and cumarrkno[can_idx] >= 0:
+			if cumarrdel[can_idx] = 0 and cumarrkno[can_idx] >= 0:
+				!! Removed 'instr('14570',str(cumarrcon[can_idx])) > 0 and ' from above if-statement
+				!! to make each conscious vaginal sex partner eligible for consideration to be the dad if pregnancy happens
 				!! If guy is recorded already, increase his cumtime, else record him for the first time.
 				if arrpos('$cumfthname', $cumarrnam[can_idx]) = -1:
 					$cumfthname[arrsize('$cumfthname')] = $cumarrnam[can_idx]

+ 3 - 1
locations/fertility.qsrc

@@ -69,8 +69,10 @@ if $ARGS[0] = 'birth_control':
 		end
 
 		if shotdays > -100:shotdays -=1
-		if tabletkishot > 0:tabletkishot -= 1
 	end
+	!! dropped the decrement out of the above if-statement so that players on pill would still run out of BC shot
+	!! as in for example the case of the therapist forcing you on the pill while you already had the shot.
+	if tabletkishot > 0:tabletkishot -= 1
 
 	!! birth_control['implant_status']
 	!! 0: No implant

+ 8 - 8
locations/gschool_coolkid_chats.qsrc

@@ -715,7 +715,7 @@ if $ARGS[0] = 'katja':
 					gs 'gschool_coolkid_chats', 'katja_tampon'
 				end
 			end
-		elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+		elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 			act'Ask for a tampon':
 				$temp['tampon_ask'] = '"Katja," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'katja_tampon'
@@ -959,7 +959,7 @@ if $ARGS[0] = 'bella':
 				gs 'gschool_coolkid_chats', 'bella_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Bella," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'bella_tampon'
@@ -1189,7 +1189,7 @@ if $ARGS[0] = 'lizaveta':
 				gs 'gschool_coolkid_chats', 'lizaveta_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Lizaveta," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'lizaveta_tampon'
@@ -1591,7 +1591,7 @@ if $ARGS[0] = 'vicky':
 				gs 'gschool_coolkid_chats', 'vicky_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Vicky," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'vicky_tampon'
@@ -1701,7 +1701,7 @@ if $ARGS[0] = 'stasya':
 				gs 'gschool_coolkid_chats', 'stasya_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Stasya," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'stasya_tampon'
@@ -1857,7 +1857,7 @@ if $ARGS[0] = 'irina':
 				gs 'gschool_coolkid_chats', 'irina_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Irina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'irina_tampon'
@@ -2023,7 +2023,7 @@ if $ARGS[0] = 'sonia':
 				gs 'gschool_coolkid_chats', 'sonia_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'sonia_tampon'
@@ -2040,7 +2040,7 @@ end
 
 if $ARGS[0] = 'sonia_tampon':
 	cla & *clr
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big139.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 	'<<$temp[''tampon_ask'']>>'
 	if $temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A25'] >= 70:

+ 2 - 3
locations/gschool_gopnik_chats.qsrc

@@ -1014,7 +1014,7 @@ if $ARGS[0] = 'alyona':
 				gs 'gschool_gopnik_chats', 'alyona_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Alyona," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_gopnik_chats', 'alyona_tampon'
@@ -1384,7 +1384,7 @@ if $ARGS[0] = 'anushka':
 				gs 'gschool_gopnik_chats', 'anushka_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Anushka," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_gopnik_chats', 'anushka_tampon'
@@ -1424,7 +1424,6 @@ if $ARGS[0] = 'nush_invite_yes':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
-
 if $ARGS[0] = 'anushka_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'

+ 5 - 5
locations/gschool_jock_chats.qsrc

@@ -524,7 +524,7 @@ if $ARGS[0] = 'christina':
 				gs 'gschool_jock_chats', 'christina_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'christina_tampon'
@@ -701,7 +701,7 @@ if $ARGS[0] = 'albina':
 				gs 'gschool_jock_chats', 'albina_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Albina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'albina_tampon'
@@ -917,7 +917,7 @@ if $ARGS[0] = 'veronika':
 				gs 'gschool_jock_chats', 'veronika_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Veronika," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'veronika_tampon'
@@ -1115,7 +1115,7 @@ if $ARGS[0] = 'lina':
 				gs 'gschool_jock_chats', 'lina_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Lina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'lina_tampon'
@@ -1363,7 +1363,7 @@ if $ARGS[0] = 'lariska':
 				gs 'gschool_jock_chats', 'lariska_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Lariska," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'lariska_tampon'

+ 1 - 1
locations/gschool_nerd_chats.qsrc

@@ -292,7 +292,7 @@ if $ARGS[0] = 'julia':
 				gs 'gschool_nerd_chats', 'julia_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Julia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_nerd_chats', 'julia_tampon'

+ 1 - 1
locations/journal.qsrc

@@ -337,7 +337,7 @@ if $ARGS[0] = 'relationstab':
 		else
 			'You have children:'
 			:LoopKidCounter
-			if i <= kid + 1:
+			if i < kid:
 				'<br> a <<$polreb[i]>> named <<$kidname[i]>>. Born <<daykid[i]>>-<<monthkid[i]>>-<<yearkid[i]>>. Aged <<kidage[i]>>.'
 				i += 1
 				jump 'LoopKidCounter'

+ 3 - 3
locations/npc_reactions.qsrc

@@ -56,12 +56,12 @@ if $ARGS[0] = 'general':
 	if dyneval( 'RESULT =npc_reaction_first_time[''<<$ARGS[1]>>_tan'']') = 1 and pcs_tan = 0: dynamic 'npc_reaction_first_time[''<<$ARGS[1]>>_tan''] = 0'
 	
 	if (cumloc[11] = 1 or cumloc[16] = 1) and dyneval( 'RESULT =npc_reaction_hourly[''<<$ARGS[1]>>_cum_on_face'']') = 0:
-		gt 'npc_reactions', 'cum_on_face'
+		$result = func('npc_reactions', 'cum_on_face', $ARGS[1], $ARGS[2])
 	elseif (cumloc[6] = 1 or cumloc[7] = 1) and dyneval( 'RESULT =npc_reaction_hourly[''<<$ARGS[1]>>_cum_on_clothes'']') = 0:
-		gt 'npc_reactions', 'cum_on_clothes'
+		$result = func('npc_reactions', 'cum_on_clothes', $ARGS[1], $ARGS[2])
 	else
 		if func('body_din','pregnancyVisibility') = 1 and dyneval( 'RESULT =npc_reaction_pregnant[''<<$ARGS[1]>>'']') = 0:
-			gt 'npc_reactions', 'pregnant'
+			$result = func('npc_reactions', 'pregnant', $ARGS[1], $ARGS[2])
 		else
 			i = 0
 			if bimbo_flag = 1 and dyneval( 'RESULT = npc_reaction_weekly[''<<$ARGS[1]>>_bimbo'']') = 0:

+ 2 - 0
locations/pav_parkev.qsrc

@@ -491,6 +491,7 @@ if $ARGS[0] = 'walk2':
 			gs 'stat'
 			if PCLoSkirt > 0:
 				act 'Flash him back':
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/deep/get_flashed2.jpg"></center>'
 					if $pantyworntype = 'none':
 						'You laugh and pull up your skirt, flashing him your pussy back. Once you''re past him, you drop your skirt back in place and finish your walk.'
@@ -501,6 +502,7 @@ if $ARGS[0] = 'walk2':
 					gs 'arousal', 'erotic_nudity', -1
 					gs 'arousal', 'end'
 					gs 'stat'
+					act 'Finish your walk': gt 'pav_park', 'deeper_park'
 				end
 			end
 		elseif temprand = 13:

+ 2 - 0
locations/sewing.qsrc

@@ -38,6 +38,8 @@ if $ARGS[0] = 'start':
 		act 'Finish':gt 'sewing', 'start'
 		if tkan < 1:
 			'You do not have any material to sew anything. You should buy some from the supermarket.'
+		elseif tovarL = 30 and (YouCanGar = 0 or GarTorgItem = 100):
+			'You do not have any further storage space, you need to sell some trinkets to make room before sewing more of them.'
 		else
 			sew_trinket_success = rand(1,240)
 			tkan -= 1

+ 6 - 6
locations/stat_display.qsrc

@@ -1049,9 +1049,9 @@ if cheatStatusIcons = 0:
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
 		$stat_bleed_msg = 'Your period is due to start soon.'
 		$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = <<set_siconht>> src="images/system/icons/status/vunknown.png"></a></td>'
-	elseif implant_day > 0 and ((daystart - implant_day) * 24 + hour - implant_hour) < 5:
-		$stat_bleed_msg = 'You feel a slight twinge in your abdomen.'
-		$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = <<set_siconht>> src="images/system/icons/status/vunknown.png"></a></td>'
+!!TMI				elseif implant_day > 0 and ((daystart - implant_day) * 24 + hour - implant_hour) < 5:
+!!pregnancy spoiler		$stat_bleed_msg = 'You feel a slight twinge in your abdomen.'
+!!				$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = <<set_siconht>> src="images/system/icons/status/vunknown.png"></a></td>'
 	elseif thinkpreg = 0 and knowpreg = 0 and cycle ! 6 and pillcon2 <= 30000 and succubusflag ! 1 and cheatSlut = 0 and mesec = 0:
 		if abortionbirthdate = 0 and daystart - daylastperiod > 28:
 			if (daystart - daylastperiod > 28) and (daystart - daylastperiod <= 35):
@@ -1706,9 +1706,9 @@ if enable_extra_msg = 1:
 		end
 	end
 
-	if implant_day > 0 and ((daystart - implant_day) * 24 + hour - implant_hour) < 5:
-		$stat_msg += '<BR><font color=#AB052A>You feel a slight twinge in your abdomen.</font>'
-	end
+!!TMI			if implant_day > 0 and ((daystart - implant_day) * 24 + hour - implant_hour) < 5:
+!!pregnancy spoiler		$stat_msg += '<BR><font color=#AB052A>You feel a slight twinge in your abdomen.</font>'
+!!			end
 
 	if mesec > 0:
 		$stat_msg += '<BR><font color="red">You are currently having your period. '