15 Commits 2991076411 ... 4289b0e92a

Author SHA1 Message Date
  julzor 4289b0e92a [text edit] by nutluck 5 years ago
  julzor 828a247aee [fixed] moved orgasm text below the image 5 years ago
  julzor 27b0098ae5 Merge branch 'master' of https://git.catrenelle.com/Jefke11/glife 5 years ago
  julzor 76a3124c00 [fixed] moved the leave option to the top 5 years ago
  julzor 245c8dd903 [fixed] rewrote all arousal, cum_calls, replaced dynamics with gosubs, added missing menu variables to lake 5 years ago
  CroWke 6cb9119d13 [fixed] trigger for the kolka conversation doesn't reset every time anymore 5 years ago
  CroWke be6d4572de [fixed] condition lowered 5 years ago
  julzor 594183e48d Merge branch 'master' of https://git.catrenelle.com/sovietmercader/glife 5 years ago
  julzor 795c503b46 [fixed] unnecessary variable in glakeNude 5 years ago
  sandra_schulz 0ab4e00b4a [fixed] Lact_lib case 3 - now everything is changing accordingly. 5 years ago
  julzor e562ee6365 [added] cheat to block the random boyfriend girlfriend events 5 years ago
  julzor 3d74bc279e [fixed] wrong exit location for the gopnik bj event in gschool_events 5 years ago
  julzor 7a1670505d Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 5 years ago
  julzor 699228b5c0 [fixed] Unclear time cost for doing homework 5 years ago
  sovietmercader cf72fade5a [fixed] added daystart to confrontation with vitek over high pav_slut fame 5 years ago

+ 14 - 0
locations/Cheatmenu_din.qsrc

@@ -407,6 +407,17 @@ $cheatmenu['timecheat'] = {
 	end
 }
 
+$cheatmenu['random_bf_gf'] = {
+	if random_bf_gf_cheat = 0:
+		random_bf_gf_cheat = 1
+		dynamic $cheatmenu['permanent']
+		exit
+	elseif random_bf_gf_cheat = 1:
+		random_bf_gf_cheat = 0
+		dynamic $cheatmenu['permanent']
+	end
+}
+
 $cheatmenu['permanent'] = {
 	gs'stat'
 	*clr & cla
@@ -461,6 +472,8 @@ $cheatmenu['permanent'] = {
 	if cheatConsole = 1:$cheatConsole = 'Hidden'
 	if cheatTime = 0:$cheatTime = 'Disabled'
 	if cheatTime = 1:$cheatTime = 'Enabled'
+	if random_bf_gf_cheat = 0: $random_bf_gf_cheat = 'Enabled'
+	if random_bf_gf_cheat = 1: $random_bf_gf_cheat = 'Disabled'
 
 	'<center><h1>Cheat Menu - Recurrent Cheats</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -482,6 +495,7 @@ $cheatmenu['permanent'] = {
 	else
 		'Allow any clothing for school: <a href="exec:Enable_sforma = 1 & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end
+	'Random boyfriend/girlfriend events: <a href="exec:dynamic $cheatmenu[''random_bf_gf'']"><<$random_bf_gf_cheat>></a>'
 	
 	*nl
 	

+ 0 - 1
locations/gLakeNude.qsrc

@@ -328,7 +328,6 @@ if $ARGS[0] = 'sauna':
 			minut += 5
 			gs 'clothing', 'wear_last_worn'
 			gs 'underwear', 'wear'
-			nudelake = rand(1,10)
 			'You put your clothes back on.'
 			act'Continue': gt 'gLakeNude', 'sauna'
 		end

+ 2 - 3
locations/gschool_chats.qsrc

@@ -3,16 +3,15 @@
 if $ARGS[0] = 'nerds':
 	*clr & cla
 	minut += 5
-	if rand(1,6) = 1 and pcs_vag > 12 and mesec <= 0 and gschool_ignore = 0 and gschool_gropeday ! daystart:
+	if rand(1,6) = 1 and pcs_vag > 12 and mesec <= 0 and gschool_gropeday ! daystart:
 		gschool_gropeday = daystart
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boysex_tualet.jpg"></center>'
 		*nl
 		'When you enter the class, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air, before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you.'
 
-		act 'Ignore it': gschool_ignore = 1 & gt 'gschool_chats', 'nerds'
+		act 'Ignore it': gt 'gschool_chats', 'nerds'
 		act 'Identify the perpetrator': gt 'gschool_events', 'rand_scoolboy'
 	else
-		killvar 'gschool_ignore'
 		if grupTipe = 3:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/nerd' + rand(1,3) + '.jpg"></center>'
 			*nl

+ 3 - 3
locations/gschool_events.qsrc

@@ -2059,7 +2059,7 @@ if $ARGS[0] = 'rand_gopnic':
 				'As you try and pull away <<$rand_boy1>> comes over and pulls the gopnik off you and turns to him. "Leave her alone!"'
 				'The gopnik turns towards him and narrows his eyes. "Or what pussy?"'
 				'<<$rand_boy1>> Steps up close crowding him. "Or I will fucking kick your ass right here!" Then they start shoving each other, but before more can happen a teacher interupts. "What''s going on here, break it up all of you." With that you word a thank you to <<$rand_boy1>> and slip away.'
-				act 'Leave': gt 'gschool_grounds', 'main'
+				act 'Leave': gt 'gschool_events', 'leave_break_events2'
 			else
 				gs 'willpower', 'bj'
 				if will_cost <= pcs_willpwr:
@@ -2077,7 +2077,7 @@ if $ARGS[0] = 'rand_gopnic':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/resistgop.jpg"></center>'
 								'"I''ll scream and when the teachers arrive I will tell him you tried to rape me." He fumes and leans in real close. "You''ll regreat this slut, I promise." With that he relents and leaves with the others going with him, all giving you looks you would rather not think about.'
-								act 'Continue': gt 'gschool_grounds', 'main'
+								act 'Continue': gt 'gschool_events', 'leave_break_events2'
 							end
 						else
 							'<br>You don''t have enough willpower to resist.'
@@ -2129,7 +2129,7 @@ if $ARGS[0] = 'toilet_bj':
 		gs 'arousal', 'bj', 20, 'group', 'sub'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Continue': gt 'gschool_grounds', 'main'
+		act 'Continue': gt 'gschool_events', 'leave_break_events2'
 	end
 end
 

+ 1 - 1
locations/gschool_lessons1.qsrc

@@ -789,7 +789,7 @@ if $ARGS[0] = 'literature':
 					end
 					gs 'willpower', 'misc'
 					if $braworntype ! 'none' and will_cost <= pcs_willpwr:
-						act 'Hide the phone in your bra <<will_cost>>':
+						act 'Hide the phone in your bra (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'misc'
 							gs 'willpower', 'force', 'self'

+ 2 - 1
locations/kotovEv.qsrc

@@ -3,7 +3,7 @@ gs 'stat'
 '<center><b><font color="maroon"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></font></b></center>'
 '<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 
-if kotovLoveQW > 0 and pav_slut >= 25:
+if kotovLoveQW > 0 and pav_slut >= 25 and kotovsluttalk ! daystart:
 	'Vitek scowls at you and tells you: "<<$pcs_nickname>>, what is this shit I hear? I thought you were my girl, but then I hear people talking about you being a <<$gnikname>>! Apparently the whole town knows it, too... all the guys were laughing at me! What do you have to say for yourself, you bitch!?"'
 
 	act '"You have sex with others too!"':
@@ -25,6 +25,7 @@ if kotovLoveQW > 0 and pav_slut >= 25:
 			sub += 20
 			pav_sex = 0
 			pav_prostitute = 0
+			kotovsluttalk = daystart
 			gs 'stat'
 			'What he heard is true, but there is absolutely no way you''re going to tell him that. Especially not in his current state.'
 			'You soothingly put your hand on his arm and softly tell him: "No way, babe! I''m with you... you know I would never do something like that, right? I bet those others are just jealous, trying to break us up!"'

+ 43 - 6
locations/lact_lib.qsrc

@@ -299,12 +299,49 @@ if $ARGS[0] = 'BreastGrowth':
 		!!	first - check for alveoligrowth: yes, do the crazy stuff
 		!!	second - check for nbsize, magicf2b and silicone change
 		!!	there is no else on purpose, because nothing should happen to svetas breasts if nothing else changes
-		if lactation['alveolicount_change'] <> lactation['alveolicount'] or lactation['alveoliexpandlvl_change'] <> lactation['alveoliexpandlvl']:
-			func('lact_lib','breastgrowthcalc')
-		elseif (lactation['nbsizechange'] + lactation['siliconechange'] + lactation['magicf2bchange']) <> (nbsize + magicf2b + silicone):
-			func('lact_lib','breastrecalc')
-		else
-		end
+		!!	checking for internal changes or growth
+	!!	if lactation['alveolicount_change'] <> lactation['alveolicount'] or lactation['alveoliexpandlvl_change'] <> lactation['alveoliexpandlvl']: lactation['internal_growth'] = 1
+		!!	checking for external changes or growth
+		!!	if (lactation['nbsizechange'] + lactation['siliconechange'] + lactation['magicf2bchange']) <> (nbsize + magicf2b + silicone): lactation['external_growth'] = 1
+		!!	changing the breasts
+	!!	if lactation['external_growth'] > 0 and lactation['internal_growth'] > 0:
+			!!	changes in nbsize, magicf2b or silicone?
+			if nbsize <> lactation['nbsizechange'] or magicf2b <> lactation['magicf2bchange'] or silicone <> lactation['siliconechange']:
+				!!	getting the new percentages
+				lactation['nbsizepercent'] = (nbsize*100/(nbsize + magicf2b + silicone)*100)/100
+				lactation['magicf2bpercent'] = (magicf2b*100/(nbsize + magicf2b + silicone)*100)/100
+				lactation['siliconepercent'] = (silicone*100/(nbsize + magicf2b + silicone)*100)/100
+				lactation['magicf2bpercent_wos'] = (magicf2b*100/(nbsize + magicf2b)*100)/100
+				!!	calculating new breastccm
+				lactation['breastccm'] = func('lact_lib','bsizetoccm',(nbsize + magicf2b + silicone))				
+			end
+			!!	calculating all the breast tissue - breastglandtissue, breastfat and silicone.
+			lactation['breastfat'] = (lactation['breastccm'] - lactation['breastglandtissue'] - ((lactation['siliconepercent']*lactation['breastccm'])/100))
+			lactation['breastsiliconeccm'] = (lactation['siliconepercent']*lactation['breastccm'])/100
+			if lactation['breastfat'] < 0: lactation['breastfat'] = 0
+			if lactation['breastsiliconeccm'] < 0: lactation['breastsiliconeccm'] = 0
+			!!	getting new breastglandtissue
+			lactation['breastglandtissue']= (lactation['alveolicount'] * (218 + (lactation['alveoliexpandlvl'] * 20)))/100000
+			!!	Crazy Math going on here. When I was coding this, only god and I knew what I was doing. Now only god knows.
+			!!	Well actually, this one recalculates all the CCM stuff to normal nbsize, magicf2b and silicone. It works, no idea why, but it works.
+			lactation['breastccm'] = (lactation['breastglandtissue'] + lactation['breastfat'] + lactation['breastsiliconeccm'])
+			lactation['siliconepercent'] = ((lactation['breastsiliconeccm']*100)/lactation['breastccm'])
+			lactation['magicf2bccm'] = ((lactation['breastccm'] - ((lactation['breastccm']*lactation['siliconepercent'])/100))*lactation['magicf2bpercent_wos'])/100
+			lactation['nbsizebccm'] = lactation['breastccm'] - lactation['breastsiliconeccm'] - lactation['magicf2bccm']
+			lactation['nbsizepercent'] = ((lactation['nbsizebccm']*100)/lactation['breastccm'])
+			lactation['magicf2bpercent'] = ((lactation['magicf2bccm']*100)/lactation['nbsizebccm'])
+			!!	writing back nbsize and magicf2b. Silicone does not change
+			nbsize = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['nbsizepercent'])/100
+			magicf2b = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['magicf2bpercent'])/100
+			lactation['nbsizechange'] = nbsize
+			lactation['magicf2bchange'] = magicf2b
+			lactation['siliconechange'] = silicone			
+	!!	elseif lactation['external_growth'] <= 0 and lactation['internal_growth'] > 0:
+		!!	func('lact_lib','breastgrowthcalc')
+	!!	elseif lactation['external_growth'] > 0 and lactation['internal_growth'] <= 0:
+		!!	func('lact_lib','breastrecalc')
+	!!	else
+	!!	end
 	end
 end
 

File diff suppressed because it is too large
+ 302 - 400
locations/lake.qsrc


+ 2 - 2
locations/natbelEv.qsrc

@@ -103,7 +103,7 @@ if $ARGS[0] = 'carrybooks':
 	'When you head over to Natasha''s apartment to pick her up her mother opens the door and tells you she''s in her room getting ready so you go there.'
 	'As you open the door you see Natasha sitting on her small sofa, pulling up her stockings'
 	'"Ready to go?" You ask her, as you put your bag next to her.'
-	if NatashaQW > 7:
+	if NatashaQW >= 7:
 		act 'Lift her skirt':
 			*clr & cla
 			'<center><img src="images/characters/pavlovsk/school/girl/natasha/skirt.jpg"></center>'
@@ -141,7 +141,7 @@ end
 
 if $ARGS[0] = 'schoolwalk':
 	if rand(0,4) = 0:
-		natkolkatease = 1
+		if natkolkatease = 0: natkolkatease = 1
 		*clr & cla
 		'<center><img src="images/characters/pavlovsk/school/girl/natasha/tease.jpg"></center>'
 		'As you reach the bottom of the stairs, you notice Kolka coming down as well.'

+ 2 - 2
locations/npcstatic1.qsrc

@@ -565,7 +565,7 @@ $school_static_num['A<<npctemp>>'] = 'A13'
 npctemp = 14
 gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1743820731 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976'
-$npc_firstname['A<<npctemp>>'] = 'Katja'
+$npc_firstname['A<<npctemp>>'] = 'Ekaterina'
 $npc_nickname['A<<npctemp>>'] = 'Katja'
 $npc_lastname['A<<npctemp>>'] = 'Meynold'
 $npc_usedname['A<<npctemp>>'] = 'Katja'
@@ -845,7 +845,7 @@ $school_static_num['A<<npctemp>>'] = 'A21'
 npctemp = 22
 gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2099547924 1046564078 1433794796 1591674416 1440637551 1386979191 1773169648'
-$npc_firstname['A<<npctemp>>'] = 'Bella'
+$npc_firstname['A<<npctemp>>'] = 'Elžbieta'
 $npc_nickname['A<<npctemp>>'] = 'Bella'
 $npc_lastname['A<<npctemp>>'] = 'Artamonov'
 $npc_usedname['A<<npctemp>>'] = 'Bella'

+ 5 - 6
locations/npcstatic3.qsrc

@@ -1,6 +1,5 @@
 # npcstatic3
 
-
 ! {Original Start}
 npctemp = 100
 
@@ -836,7 +835,7 @@ $school_static_num['A<<npctemp>>'] = 'A138'
 npctemp = 139
 gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1194676974 1594146631 1238391630 1274433221 1950748802 1727312584 8321006077'
-$npc_firstname['A<<npctemp>>'] = 'Stasya'
+$npc_firstname['A<<npctemp>>'] = 'Stanislava'
 $npc_nickname['A<<npctemp>>'] = 'Stasya'
 $npc_lastname['A<<npctemp>>'] = 'Pavlov'
 $npc_usedname['A<<npctemp>>'] = 'Stasya'
@@ -864,7 +863,7 @@ $school_static_num['A<<npctemp>>'] = 'A139'
 npctemp = 140
 gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1388957981 1104285969 1184925418 1994156965 1456422790 2095370094 1430302038'
-$npc_firstname['A<<npctemp>>'] = 'Lizaveta'
+$npc_firstname['A<<npctemp>>'] = 'Yelizaveta'
 $npc_nickname['A<<npctemp>>'] = 'Lizaveta'
 $npc_lastname['A<<npctemp>>'] = 'Petrov'
 $npc_usedname['A<<npctemp>>'] = 'Lizaveta'
@@ -893,7 +892,7 @@ npctemp = 141
 gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '2132183395 1401313649 8321006077 1434417039 2321026077 7921283143 7765736018'
 $npc_firstname['A<<npctemp>>'] = 'Veronika'
-$npc_nickname['A<<npctemp>>'] = 'Veronika'
+$npc_nickname['A<<npctemp>>'] = 'Ronnie'
 $npc_lastname['A<<npctemp>>'] = 'Sokolov'
 $npc_usedname['A<<npctemp>>'] = 'Veronika'
 $npc_notes['A<<npctemp>>'] = 'Veronika Sokolov is called the ice queen by her fellow students behind her back, for a couple of reasons. One of the reasons is that she is very talented ice skater, there is even talk about she might compete in the next winter Olympics. The other reason is because she is cold and indifferent. She never lets anyone get close to her. She comes from a rich family.'
@@ -921,7 +920,7 @@ npctemp = 142
 gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1972767054 1454786801 1222281674 1247981358 1828806656 1613393781 2115243730'
 $npc_firstname['A<<npctemp>>'] = 'Zinaida'
-$npc_nickname['A<<npctemp>>'] = 'Zinaida'
+$npc_nickname['A<<npctemp>>'] = 'Zina'
 $npc_lastname['A<<npctemp>>'] = 'Alkaev'
 $npc_usedname['A<<npctemp>>'] = 'Zinaida'
 $npc_notes['A<<npctemp>>'] = 'Zinaida Alkaev is a mousey girl who is very plain looking. She never wears makeup, dresses in baggy clothes and barely bothers to brush her hair. She mostly keeps to herself, playing various games on her phone, although she is fairly popular with the nerd boys, for reasons unknown to everyone else.'
@@ -977,7 +976,7 @@ npctemp = 144
 gs 'npcstaticdefaults', 'defaults'
 $npc_dna['A<<npctemp>>'] = '1273241012 2077038465 1275739884 1535053248 1434891447 1879708703 1237809681'
 $npc_firstname['A<<npctemp>>'] = 'Anushka'
-$npc_nickname['A<<npctemp>>'] = 'Anushka'
+$npc_nickname['A<<npctemp>>'] = 'Nush'
 $npc_lastname['A<<npctemp>>'] = 'Konstantinov'
 $npc_usedname['A<<npctemp>>'] = 'Anushka'
 $npc_notes['A<<npctemp>>'] = 'Anushka Konstantinov is the lead guitarist in Radomir''s band. She has very strong political views, which she shares in her anarchist lyrics that she writes for the band. She has strong if untrained vocal ability as well, doing some of the singing. She is pretty dominant and can be cruel but not sadistic like some of the other Gopniks. She is very adventurous and not shy about her bisexuality, she is also a bit of an exhibitionist.'

+ 27 - 24
locations/stol.qsrc

@@ -106,36 +106,39 @@ if $ARGS[0] = 'stolPar':
 	act 'Get up':gt $loc, $metka
 	act 'Check your birth control': gt 'stol', 'bc'
 	
-	if mentats_have > 0:
-		'<a href="exec:dynamic $use_mentats & gt ''stol'', ''stolPar''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
-	end
-	if steroid_have > 0:
-		'<a href="exec:dynamic $use_steroids & gt ''stol'', ''stolPar''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
-	end
-	if aphrodisiac_have > 0:
-		'<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''stolPar''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
-	end
-
+	if mentats_have > 0: '<a href="exec:dynamic $use_mentats & gt ''stol'', ''stolPar''"><b>Take neurobooster pill.</b></a> Uses left: <<mentats_have>>. Warning on the box says not to take more than one per day.'
+	if steroid_have > 0: '<a href="exec:dynamic $use_steroids & gt ''stol'', ''stolPar''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
+	if aphrodisiac_have > 0: '<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''stolPar''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
+		
 	if lernHome > 0:
-		act 'Do your homework':
+		'<br>You have to do homework for school. Finishing everything will take <<lernHome>> hours.'
+		act 'Do your homework (1 hour)':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/homework.jpg"></center>'
-			if lernHome <= 2:
-				minut += 60*lernHome
-				lernHome = 0
-				lern += 1
-				'It takes you one hour to complete your homework.'
-				gs'stat'
-			elseif lernHome > 2:
-				minut += 60*2
-				lernHome = 0
-				'It takes you two hours to complete your homework.'
-				gs'stat'
-			end
+			minut += 60
+			lernHome -= 1
+			lern += 1
+			'It took you one hour to '+iif(lernHome = 0, 'complete', 'do a part of')+' your homework.'
+			gs'stat'
 			
-			act 'Get up from the table':gt $loc, $metka
+			act 'Continue':gt 'stol', 'stolPar'
 		end
 	end
+	
+	if lernHome > 1:
+		act 'Finish all of your homework (<<lernHome>> hours)':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/homework.jpg"></center>'
+			minut += 60 * lernHome
+			lern += 1 + lernHome/2
+			'It took you <<lernHome>> hours to complete your homework.'
+			lernHome = 0
+			gs'stat'
+			
+			act 'Continue':gt 'stol', 'stolPar'
+		end
+	end
+	
 !{	
 	!! use gs 'boyStat', 'D<<strapnumber>>' to recall which dildo is attached?
 	if strapon = 1:

+ 1 - 2
locations/street_event.qsrc

@@ -130,10 +130,9 @@ if streetev_rob > 10: streetev_rob = 10
 if streetev_hijack > 10: streetev_hijack = 10
 
 if $ARGS[1] = 'extras':
-	if rand(0, 100) < streetev_bf and pcs_lover < 3 and streetbfhour ! hour:
+	if rand(0, 100) < streetev_bf and pcs_lover < 3 and streetbfhour ! hour and random_bf_gf_cheat = 0:
 		streetbfhour = hour
 		vnerand = rand(0, 1200)
-		!! 5% chance to meet a girl if no previous lesbian experience, up to a max of 25% with lots of experience
 		lesbian_lover = (rand(1,100) <= 25 - (20/(lesbian + 1)))
 		if vnerand <= pcs_apprnc and lesbian_lover:
 			gt 'dateF', 'start'

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