Explorar o código

Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

Gwen %!s(int64=2) %!d(string=hai) anos
pai
achega
6ca1820e18

+ 2 - 38
locations/ApperanceSystem.qsrc

@@ -34,29 +34,13 @@ if $args[0] = 'UpdateBaseAppearnce':
 			vidage, skin, body shape (fat and strength), face (lip size, eyes size, and eyelashes)
 			attributes (endurance and agility)
 	}
-	faceBonus = func($this, 'CalcFaceBonus')
 	attributeBonus = func($this, 'CalcAttributeBonus')
-
-	!!	Setting vidageBonus
-	if vidage < 20: 
-		vidageBonus = 60 + (2 * vidage)
-	elseif vidage > 30: 
-		vidageBonus = 160 - (2 * vidage)
-	else
-		vidageBonus = 100
-	end
-
-	skinBonus = (pcs_skin * 2 / 5)
+	skinBonus = pcs_skin / 10
 	bodyShapeBonus = func($this, 'SetBodyShapeBonus')
 
 	! Calculte base appearance
-	pcs_apprncbase = (vidageBonus * (skinBonus + bodyShapeBonus + faceBonus + attributeBonus) / 100) + supnatvnesh
+	pcs_apprncbase = skinBonus + bodyShapeBonus + attributeBonus + supnatvnesh
 
-	killvar 'vidageBonus'
-	killvar 'skinBonus'
-	killvar 'bodyShapeBonus'
-	killvar 'faceBonus'
-	killvar 'attributeBonus'
 end 
 
 if $ARGS[0] = 'CalcFaceBonus':
@@ -106,9 +90,6 @@ if $ARGS[0] = 'CalcFaceBonus':
 
 	result = eyelashesBonus + eyeSizeBonus + lipBonus
 
-	killvar 'eyelashesBonus'
-	killvar 'eyeSizeBonus'
-	killvar 'lipBonus'
 end
 
 if $ARGS[0] = 'CalcAttributeBonus':
@@ -230,10 +211,6 @@ if $ARGS[0] = 'CalcAccessoriesBonus':
 
 	result = coatQualityBonus + shoesQualityBonus + pantyBonus + braBonus
 
-	killvar 'coatQualityBonus'
-	killvar 'shoesQualityBonus'
-	killvar 'pantyBonus'
-	killvar 'braBonus'
 end
 
 if $ARGS[0] = 'CalcGroomingBonus':
@@ -260,11 +237,6 @@ if $ARGS[0] = 'CalcGroomingBonus':
 	!result = tempGroomingBonus
 	result = func($this, 'AdjustFromBMI', tempGroomingBonus)
 
-	killvar 'lipBalmBonus'
-	killvar 'makeupBonus'
-	killvar 'hairBonus'
-	killvar 'breathBonus'
-	killvar 'tempGroomingBonus'
 end
 
 if $ARGS[0] = 'CalcGroomingPenalty':
@@ -311,12 +283,6 @@ if $ARGS[0] = 'CalcGroomingPenalty':
 
 	result = sweatPenalty + glassesPenalty + hairDyePenalty + buzzCutPenalty + legPenalty
 
-
-	killvar 'sweatPenalty'
-	killvar 'glassesPenalty'
-	killvar 'hairDyePenalty'
-	killvar 'buzzCutPenalty'
-	killvar 'legPenalty'
 end
 
 
@@ -331,8 +297,6 @@ if $ARGS[0] = 'CalcAppearance':
 	!Any super natural bonuses are allowed to go above the max scale
 	result = temp_apprnc + superNaturalBonus
 	
-	killvar 'superNaturalBonus'
-	killvar 'temp_apprnc'
 end
 
 if $ARGS[0] = 'ConvertToHotcat':

+ 86 - 11
locations/KatjaHomeTalk.qsrc

@@ -130,6 +130,8 @@ if $ARGS[0] = '':
 		!!Friday and Sturday evening Katja goes to the disco, if the player is talking to when this happens she asks them to go with. Alternatively the can just leave.
 		'"Let''s go to the disco!" Katja suggests with a smile.'
 		if money >= 25:act 'Go to the disco':money -= 25 & minut += 10 & gt 'pav_disco'
+	elseif locat['katja'] = 9:
+		'Katja notices how late it is and politely asks you to leave.'
 	else
 		if pcs_sweat >= 20:
 			!katja doesn''t like stinky people so if the player is sveaty she will ask the player to take a bath. The player can leave instead.
@@ -139,7 +141,7 @@ if $ARGS[0] = '':
 		else
 			!!not sweaty
 
-			if katjaQW['QWstage'] = 6 and katjaQW['anal_ques'] >= 3 and katjaQW['slut'] > 100 and katjaQW['horny'] > 60:
+			if katjaQW['QWstage'] = 6 and katjaQW['anal_quest'] >= 3 and katjaQW['slut'] > 100 and katjaQW['horny'] > 60:
 				!!If Katja have had sex with both marcus and Ivan and have been corrupted enough. Then she will when she is horny ask about trying sex with other boys. 
 				gt 'KatjaHomeTalk', 'random_park_sex_talk'
 			
@@ -876,16 +878,7 @@ if $ARGS[0] = 'Sextalk':
 		end
 
 		if stat['bj'] > 0:
-			act 'Talk about blowjobs':
-				cls
-				katjaQW['horny'] += 5
-				katjaQW['knows_BJ'] = 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You tell Katja how you''ve sucked dick and what it feels like. She blushes and bites her lip.'
-
-				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
-			end
+			gs'KatjaHomeTalk','bj_talk1'
 		else
 			act 'You''ve never given a blowjob':
 				cls
@@ -1073,6 +1066,88 @@ if $ARGS[0] = 'Sextalk':
 	end
 end
 
+if $ARGS[0] = 'bj_talk1':
+	if katjaQW['knows_BJ'] > 0:
+		'"<<$pcs_nickname>>!" she says, a sparkle in her eye. "Tell me what it''s like to sucking dick again."'
+	elseif katjaQW['knows_BJ']= 0:
+		'"<<$pcs_nickname>>, have you ever given a guy a blowjob?"'
+	end
+
+	if stat['bj'] > 0:
+		if katjaQW['knows_BJ'] = 0:
+			act 'No (lie)':
+				cla & *clr
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'"No," you shake your head before shamelessly lying through your teeth. "I''ve never given a blowjob before."'
+				'"Oh." She sits back, looking disappointed for some reason.'
+				act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+			end
+			act'Yes':
+				cla & *clr
+				katjaQW['horny'] += 5
+				katjaQW['knows_BJ'] = 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'"Yeah. I''ve given a few," you admit.'
+				'"What''s it like?" Katja asks, eyes wide with excitement.'
+				gs'KatjaHomeTalk','bj_talk2'
+			end
+		elseif stat['bj'] > 0:
+			katjaQW['horny'] += 5
+			gs'KatjaHomeTalk','bj_talk2'
+		end
+	else
+		act 'No':
+			cla & *clr
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+			'"No," you shake your head. "I''ve never given a blowjob before."'
+			'"Oh." She sits back, looking disappointed for some reason. "Guess we''re both clueless then, huh?"'
+			act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+		end
+		!!act'I''ve given a few (lie)':
+	end
+end
+
+if $ARGS[0] = 'bj_talk2':
+	act'It tastes funny':
+		cla & *nl
+		'"It tastes funny," you wrinkle your nose. "It''s like, kinda salty? But also sort of... musty? I don''t think I mind the act itself that much, but dick has a weird flavor."'
+		'Katja seems taken aback, almost disappointed. You guess this isn''t the answer she was hoping for.'
+		act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+	end
+	
+	act'It''s fun':
+		cla & *nl
+		'"It''s fun!" you grin. "I''m not really sure what it is, but something about having a dick in your mouth is really entertaining. It''s like, totally alive! And you can feel it making all these tiny movements when it''s on your tongue. I really like giving head."'
+		'Katja hangs on your every word, nodding excitedly for you to keep describing your experiences with oral sex to her.'
+		act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+	end
+	
+	act'It''s whatever':
+		cla & *nl
+		'"I don''t mind doing it but I don''t love it either," you say. "Dick doesn''t really taste like anything if it''s clean. Kinda salty if it isn''t. I don''t know. It''s whatever I guess."'
+		'You shrug.'
+		'Katja seems taken aback, almost disappointed. You guess this isn''t the answer she was hoping for.'
+		act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+	end
+	
+	act'It''s boring':
+		cla & *nl
+		'"It''s boring," you roll your eyes. "You have to keep sucking the whole time and after a while my jaw just starts to ache with the motion. It''s a dick in your mouth, I don''t know what to tell you.'
+		'Katja seems taken aback, looking almost worried. You guess you just shattered some impressions she had about giving head.'
+		act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+	end
+	
+	act'It turns me on':
+		cla & *nl
+		'"It turns me on so much," you admit, biting your lip in a lusty smile. "When someone''s in your mouth, you can make them feel <i>really</i> good. And they''ll respond to what you do. If you take their whole length, they''ll squirm. If you lick the head, it''ll twitch under your touch. Just knowing you can make someone else feel that way... Ugh, just <i>thinking</i> about it gets me wet!"'
+		'Katja hangs on your every word, nodding along with wide eyes as you describe what it is you love so much about giving head. A faint blush also comes to her cheeks and you notice her unconsciously rubbing her thighs together.'
+		act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+	end	
+end
+
 if $ARGS[0] = 'hornykiss':
 	'Katja brings her face so close to yours that you can feel her hot breath on your skin.'
 

+ 2 - 1
locations/_attributes_scandalicious_outfits.qsrc

@@ -210,7 +210,8 @@ elseif ARGS[1] = 29:
 	CloPanties = 1
 	CloStyle = 4
 	
-elseCloQuality = 4
+else
+	CloQuality = 4
 	CloThinness = 5
 	CloBra = 1
 	CloPanties = 1

+ 1 - 0
locations/bed2.qsrc

@@ -280,6 +280,7 @@ if $ARGS[0] = 'sleep':
 	if pcs_makeup > 1 and cosmetic_tattoo = 0:
 		pcs_makeup = 0
 		vidageday -= 1
+		gs 'body', 'SkinLoss', 'MakeUpSleep'
 		*nl
 		'You went to bed wearing your makeup, which will smear your face as you sleep; your skin will age faster from this!'
 	end

+ 31 - 0
locations/beverage.qsrc

@@ -181,6 +181,37 @@ if $ARGS[0] = 'bev_tea':
 	end
 end
 
+if $ARGS[0] = 'bev_energy_drink':
+	*clr & cla
+	frost = 1
+	if alko > 0: alko -= 1
+	minut += 5
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 10
+	pcs_mood += 20
+	pcs_energy += 20
+	fat += 3
+	if pcs_hydra >= 100:
+		pcs_hydra += 25
+	else
+		pcs_hydra += 50
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'beverage', 'afterdrink'
+	'<center><img <<$set_imgh>> src="images/shared/drinks/energy_drink.jpg"></center>'
+	'You enjoy an energy drink, and<<$mtxt>>'
+	gs 'stat'
+	killvar '$_drink'
+
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $loc_arg
+	end
+end
+
 if $ARGS[0] = 'bev_vod':
 	if pcs_health > 20:
 		*clr & cla

+ 44 - 6
locations/body.qsrc

@@ -34,12 +34,9 @@ if $ARGS[0] = 'RegularUpdate':
 		pcs_weight = func($this, 'CalcWeight')
 		pcs_bmi = func($this, 'CalcBMI')
 	end
-
-	if pcs_skin > 100:
-		pcs_skin = 100
-	elseif pcs_skin < 0:
-		pcs_skin = 0
-	end
+	
+	!!Since "musle" is used all over the place
+	musle = strenbuf
 end
 
 if $ARGS[0] = 'DailyUpdate':
@@ -138,6 +135,23 @@ if $ARGS[0] = 'DailyUpdate':
 	end
 	
 	if age < 18 and rand (0,2) = 0 and pcs_leghair > 0: pcs_leghair -= 1
+
+	if pcs_skin <= 200:
+		pcs_skin += min(skinDailyGain * 2, 20) - skinDailyPenalty - 1
+	elseif pcs_skin <= 400:
+		pcs_skin += min(skinDailyGain, 10) - skinDailyPenalty - 1
+	elseif pcs_skin <= 600:
+		pcs_skin += min(skinDailyGain/2, 5) - skinDailyPenalty - 1
+	elseif pcs_skin <= 800:
+		pcs_skin += min(skinDailyGain/3, 3) - skinDailyPenalty - 1
+	elseif pcs_skin <= 900:
+		pcs_skin += min(skinDailyGain/5, 2) - skinDailyPenalty - 1
+	end
+
+	!skin variable reset
+	killvar 'moisturizerDailyCount'
+	killvar 'skinDailyGain'
+	killvar 'skinDailyPenalty'
 end
 
 if $ARGS[0] = '':
@@ -463,6 +477,30 @@ if $ARGS[0] = 'CalcBMI':
 	result = 10000 * (30 + salo / 2 + (pcs_hgt - 170) * 7 / 10) / (pcs_hgt * pcs_hgt)
 end
 
+if $ARGS[0] = 'SkinGain':
+	if $ARGS[1] = 'CleanSelf' and lastShowerSkinGain ! daystart:
+		lastShowerSkinGain = daystart
+		skinDailyGain += 5
+		if bathLuffa = 1: skinDailyGain += 3
+	end
+
+	if $ARGS[1] = 'Moisturizer':
+		moisturizerDailyCount += 1
+		if moisturizerDailyCount <= 2: skinDailyGain += 3
+	end
+end
+
+if $ARGS[0] = 'SkinLoss':
+	if $ARGS[1] = 'Smoke' and lastSmokeSkinPenalty ! daystart:
+		lastSmokeSkinPenalty = daystart
+		skinDailyPenalty += 1
+	end
+
+	if $ARGs[1] = 'MakeUpSleep':
+		skinDailyPenalty += 10
+	end
+end
+
 if $ARGS[0] = 'softreset':
 	!!This is for use in immediately updating shape if something has caused a large change in salo, primarily fat burners and plastic surgery
 	sftrstflag = 1

+ 15 - 5
locations/din_van.qsrc

@@ -29,6 +29,7 @@ $showerdin = {
 	else
 		killvar 'noShampoo'
 	end
+	gs 'body', 'SkinGain', 'CleanSelf'
 	if false_lashes >= 1:
 		if rand(0,4) <= 2:
 			'You''re careful enough that your false lashes make it through relatively unscathed.'
@@ -212,11 +213,7 @@ $bath = {
 		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
-		if bath_daystart ! daystart:
-			bath_daystart = daystart
-			pcs_skin += rand(1,2)
-			pcs_willpwr += 1
-		end
+		gs 'body', 'SkinGain', 'Bath'
 
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash4.jpg"></center>'
@@ -292,6 +289,17 @@ $bath = {
 	killvar 'noShampoo_tmp'
 }
 
+$SkinCare = {
+	if item_moisturizer ! 0:
+		act 'Apply Moisturizer':
+		! Add Description here
+
+		gs 'body', 'SkinGain', 'Moisturizer'
+		gs 'stat'
+		end
+	end
+}
+
 $brit = {
 	if shave_menu = 1 and stanok > 1:
 		if pcs_leghair > 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
@@ -1027,6 +1035,8 @@ if $ARGS[0] = 'private':
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 
+	dynamic $SkinCare
+
 	if painkiller > 0:
 		'You have <b><<painkiller>></b> painkiller'+iif(painkiller > 1, 's.', '.')
 		if pain['total'] > 0 and pain['killer'] = 0:

+ 1 - 1
locations/fight.qsrc

@@ -670,7 +670,7 @@ if $ARGS[0] = 'player':
 
 	!! If this is the Player character
 	if ARGS[2] = 0:
-		if pcs_magik > 0:
+		if $start_type[1] = 'magic':
 			act 'Cast a Spell': gs 'fight', 'spellcast'
 		end
 		if func('fight', 'AvailableTargets', 'opp') > 0:

+ 1 - 1
locations/gopnew.qsrc

@@ -537,7 +537,7 @@ if $ARGS[0] = 'bazar':
 	'Vasan roughly shakes you by the shoulders and says: "Well? What do you say?"'
 
 	! WD: Uninitialised ~ 'magic' use 'magik'
-	if pcs_magik > 0:'You sense a vague evil and powerful magic, that suppresses your own magical powers. You can''t use your spells against the Gopniks.'
+	if $start_type[1] = 'magic':'You sense a vague evil and powerful magic, that suppresses your own magical powers. You can''t use your spells against the Gopniks.'
 	act 'Agree to their demands':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/street/gopnews.jpg"></center>'

+ 2 - 2
locations/gschool_gopnik_chats.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'vitek':
 			npc_rel[$static_num] = 0
 			kotovLoveQW = -1
 			gs 'stat'
-			'You start yelling at Vitek that he has fucked other girls. Vitek starts yelling at you and suddenly, there is a ringing in your head and your vision goes blurry. You find you''re on the floor with Vitek standing over you. Your cheek burns with pain and it takes you a few moments to understand what happened. It seems he slapped you so hard it knocked you off your feet. "Stay away from me you fucking whore! It''s over between us!"'
+			'You start yelling at Vitek about him fucking other girls. Vitek starts yelling at you in return before there is a sudden ringing in your head and your vision goes blurry. You find you''re on the floor with Vitek standing over you. Your cheek burns with pain and it takes you a few seconds to understand what happened. It seems he slapped you so hard it knocked you off your feet. "Stay away from me, you fucking whore! It''s over between us!"'
 
 			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
@@ -27,7 +27,7 @@ if $ARGS[0] = 'vitek':
 				if fame['pav_sex'] > 75: gs 'fame', 'pav', 'sex', -75
 				if fame['pav_prostitute'] > 75: gs 'fame', 'pav', 'prostitute', -75
 				gs 'stat'
-				'It takes a bit, but you convince him that all this was just gossip and none of it was true. He frowns. "I''ll knock their teeth out if they whisper one more word about you then. Don''t worry baby. I will shut their yapping mouths."'
+				'It takes a while, but you convince him that all this was just gossip and none of it was true. He frowns. "I''ll knock their teeth out if they whisper one more word about you then. Don''t worry baby. I will shut their yapping mouths."'
 
 				act 'Continue': gt 'gschool_lessons', 'short_break'
 			end

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 672 - 225
locations/gschool_jock_chats.qsrc


+ 8 - 6
locations/hookup_talk.qsrc

@@ -279,12 +279,14 @@ if $ARGS[0] = 'sex_review':
 							gt'hookup_after','pre'
 						end
 						
-						act'If you''re offering...':
-							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
-							'"Well... if you''re seriously offering..."'
-							'<<$npc_firstname[$npclastsaved]>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.'
-							act'Get eaten out':gt'hookup','lick_pussy'
+						if hypnoHardToCum = 0:
+							act'If you''re offering...':
+								cla & *clr
+								$npc_apt_bedroom[$npclastsaved]
+								'"Well... if you''re seriously offering..."'
+								'<<$npc_firstname[$npclastsaved]>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.'
+								act'Get eaten out':gt'hookup','lick_pussy'
+							end
 						end
 					else
 						act'It was just boring':

+ 0 - 5
locations/intro_initialization.qsrc

@@ -463,11 +463,6 @@ else
 	cyccustom = 1
 end
 
-!!re-initialize appearance to get correct values
-gs 'AppearanceSystem', 'UpdateBaseAppearnce'
-gs 'body', 'RegularUpdate'
-gs 'AppearanceSystem'
-
 pcs_horny = 0
 killvar 'opPRE'
 killvar 'tgs_skipinto'

+ 5 - 5
locations/intro_initialization_city.qsrc

@@ -91,6 +91,11 @@ oldsavepcs_haircol = 1
 
 gs 'body', 'initial'
 
+!!re-initialize appearance to get correct values
+gs 'AppearanceSystem', 'UpdateBaseAppearnce'
+gs 'body', 'RegularUpdate'
+gs 'AppearanceSystem'
+
 !! Adding underwear and default shoes and assigning them
 
 cheap_panties[1] = 1
@@ -474,11 +479,6 @@ else
 	cyccustom = 1
 end
 
-!!re-initialize appearance to get correct values
-gs 'AppearanceSystem', 'UpdateBaseAppearnce'
-gs 'body', 'RegularUpdate'
-gs 'AppearanceSystem'
-
 pcs_horny = 0
 killvar 'opPRE'
 killvar 'tgs_skipinto'

+ 25 - 4
locations/intro_sg_select_custom.qsrc

@@ -100,33 +100,54 @@ if $ARGS[0] = 'modgrup':
 	act 'Nerd':
 		killvar 'grupvalue'
 		$soc_grup = 'Nerd'
-		grupvalue[3] = 600
+		grupvalue[1] = 200
+		grupvalue[2] = 100
+		grupvalue[3] = 800
+		grupvalue[4] = 100
+		grupvalue[6] = 600
 		grupTipe = 3
 		gt 'intro_sg_select_custom','modgrup'
 	end
 	act 'Jock':
 		killvar 'grupvalue'
 		$soc_grup = 'Jock'
-		grupvalue[2] = 600
+		grupvalue[1] = 400
+		grupvalue[2] = 800
+		grupvalue[3] = 100
+		grupvalue[4] = 200
+		grupvalue[6] = 400
 		grupTipe = 2
 		gt 'intro_sg_select_custom','modgrup'
 	end
 	act 'Popular':
 		killvar 'grupvalue'
 		$soc_grup = 'Cool'
-		grupvalue[1] = 600
+		grupvalue[1] = 800
+		grupvalue[2] = 400
+		grupvalue[3] = 200
+		grupvalue[4] = 100
+		grupvalue[6] = 400
 		grupTipe = 1
 		gt 'intro_sg_select_custom','modgrup'
 	end
 	act 'Gopnik':
 		killvar 'grupvalue'
 		$soc_grup = 'Gopnik'
-		grupvalue[4] = 600
+		grupvalue[1] = 200
+		grupvalue[2] = 300
+		grupvalue[3] = 100
+		grupvalue[4] = 800
+		grupvalue[6] = 100
 		grupTipe = 4
 		gt 'intro_sg_select_custom','modgrup'
 	end
 	act 'Outcast':
 		killvar 'grupvalue'
+		grupvalue[1] = 200
+		grupvalue[2] = 200
+		grupvalue[3] = 200
+		grupvalue[4] = 200
+		grupvalue[6] = 200
 		$soc_grup = 'Outcast'
 		grupTipe = 5
 		gt 'intro_sg_select_custom','modgrup'

+ 4 - 5
locations/intro_sg_tg.qsrc

@@ -286,7 +286,7 @@ end
 
 if $ARGS[0] = 'intro_6_looks':
 	$loc = 'intro_sg_tg'
-	$loc_arg = 'intro_7'
+	$loc_arg = 'intro_6_looks'
 	*clr & cla
 	if player_avatar = 1:
 		'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
@@ -302,15 +302,14 @@ if $ARGS[0] = 'intro_6_looks':
 
 	
 	act 'Meet her': gt 'intro_sg_tg', 'intro_7'
-	act 'Customise <<$pcs_firstname>>': $loc_arg = 'intro_7' & gt 'intro_customization', 'start'
+	act 'Customise <<$pcs_firstname>>': gt 'intro_customization', 'start'
 end
 
 
 if $ARGS[0] = 'intro_7':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-	'She''s shorter than you, but rather tall for a girl, with a body that is neither too fat nor especially skinny. On her chest rest a pair of decently-sized breasts. Her <<$curly>><<$pcdesc_hairlength>> hair is <<$pcs_haircol>>.'
-	'She has <<$pcs_eyecol>> eyes with <<$pcs_lashes>>'+iif(glass > 0, ' hidden behind a pair of cheap glasses.', '.')
+	'You couldn''t tell from her photo, but although shorter than you, she is rather tall for a girl.' 
 	'She looks like she''s spent some time in front of the mirror trying to pretty herself up, and her clothes are very clean. Despite that, she still looks rather average. Like she is the type of girl that would be a background character in another person''s life.'
 
 	act 'Go for a walk':
@@ -650,7 +649,7 @@ end
 if $ARGS[0] = 'gad_start':
 	*clr & cla
 	'<center><h2>Gadukino</h2></center>'
-	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_pavlovsk.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_gadukino.jpg"></center>'
 	*nl
 	'<center>A small farming village with just as many rickety wooden houses dot the landscape as ruins. The village has seen better days.</center>'
 

+ 1 - 1
locations/katjaEvDin.qsrc

@@ -451,7 +451,7 @@ if $ARGS[0] = 'sex':
 	end
 
 	!!This is for a scene of using a dildo on Katja. But such a scene is not yet written.
-	!!if (katjaQW['slut'] >= 20) and katjaQW['horny'] >= 30 and dildo > 0:
+	!!if (katjaQW['slut'] >= 30) and katjaQW['horny'] >= 30 and dildo > 0:
 	!!	act 'Grab a dildo': gt 'KatjaEvDin', 'dildo'
 	!!end
 

+ 1 - 1
locations/katja_sex.qsrc

@@ -152,7 +152,7 @@ if $ARGS[0] = 'park':
 	end
 end
 
-!!Sex with Ivan After School (should soon be redone to an anal only scene
+!!Sex with Ivan After School
 if $ARGS[0] = 'prohorov_sex':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tease.jpg"></center>'

+ 24 - 24
locations/obj_din.qsrc

@@ -10,13 +10,13 @@ if $ARGS[0] = 'chartabs':
 	!6: Renown
 	!7: Magic
 	'<center><b><table width="90%" cellspacing="0" cellpadding="0" valign="top"><tr>'
-	if menu_page = 0:'<th>Character</th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
-	if menu_page = 1:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th>Skills</th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
-	if menu_page = 2:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th>Statistics</th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
-	if menu_page = 3:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th>Pain</th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
-	if menu_page = 4:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th>Traits</th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
-	if menu_page = 5:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th>Renown</th>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
-	if menu_page = 6:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif(pcs_magik = 0,'','<th>Magic</th>')+''
+	if menu_page = 0:'<th>Character</th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
+	if menu_page = 1:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th>Skills</th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
+	if menu_page = 2:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th>Statistics</th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
+	if menu_page = 3:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th>Pain</th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
+	if menu_page = 4:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th>Traits</th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
+	if menu_page = 5:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th>Renown</th>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 6 & gs ''obj_din'', ''magic''">Magic</a></th>')+''
+	if menu_page = 6:'<th><a href="exec:menu_page = 0 & gs ''obj_din'', ''description''">Character</a></th><th><a href="exec:menu_page = 1 & gs ''obj_din'', ''skills''">Skills</a></th><th><a href="exec:menu_page = 2 & gs ''obj_din'', ''stats''">Statistics</a></th><th><a href="exec:menu_page = 3 & gs ''obj_din'', ''pain''">Pain</a></th><th><a href="exec:menu_page = 4 & gs ''traits'', ''menu''">Traits</a></th><th><a href="exec:menu_page = 5 & gs ''obj_din'', ''reputation''">Renown</a></th>'+iif($start_type[1] = 'nomagic','','<th>Magic</th>')+''
 	'</tr></table></b></center>'
 	act 'Exit the menu': killvar 'menu_page' & gt 'obj_din', 'menu_exit'
 end
@@ -93,20 +93,20 @@ if $ARGS[0] = 'cheattabs':
 	!12: ImageSets
 	!13: Items
 	'<center><b><table width="90%" cellspacing="0" cellpadding="10" align="center" valign="top"><tr>'
-	if menu_page = 0:'<th>Index</th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 1:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th>Recurrent</th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 2:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th>State</th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 3:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th>Appearance</th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 4:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th>Skill</th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 5:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th>Relationships</th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 6:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th>Documents</th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 7:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th>Magic</th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 8:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th>Time</th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 9:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th>NPC Editor</th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 10:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th>Pain</th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 11:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th>DNA</th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 12:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th>Image Sets</th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
-	if menu_page = 13:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif(pcs_magik = 0,'','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th>Image Sets</th></th><th>Items</th>'
+	if menu_page = 0:'<th>Index</th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 1:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th>Recurrent</th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 2:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th>State</th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 3:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th>Appearance</th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 4:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th>Skill</th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 5:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th>Relationships</th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 6:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th>Documents</th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 7:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th>Magic</th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 8:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th>Time</th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 9:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th>NPC Editor</th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 10:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th>Pain</th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 11:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th>DNA</th><th><a href="exec:menu_page = 12 & dynamic $cheatmenu[''bdimmain'']">Image Sets</a></th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 12:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th>Image Sets</th><th><a href="exec:menu_page = 13 & dynamic $cheatmenu[''items'']">Items</a></th>'
+	if menu_page = 13:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu">Index</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''permanent'']">Recurrent</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''state'']">State</a></th><th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''looks'']">Appearance</a></th><th><a href="exec:menu_page = 4 & dynamic $cheatmenu[''stats'']">Skill</a></th><th><a href="exec:menu_page = 5 & dynamic $cheatmenu[''reputation'']">Relationships</a></th><th><a href="exec:menu_page = 6 & dynamic $cheatmenu[''documents'']">Documents</a></th></tr><tr>'+iif($start_type[1] = 'nomagic','','<th><a href="exec:menu_page = 7 & dynamic $cheatmenu[''magic'']">Magic</a></th>')+'<th><a href="exec:menu_page = 8 & dynamic $cheatmenu[''time'']">Time</a></th><th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th><th><a href="exec:menu_page = 10 & dynamic $cheatmenu[''pain'']">Pain</a></th><th><a href="exec:menu_page = 11 & dynamic $cheatmenu[''DNA'']">DNA</a></th><th>Image Sets</th></th><th>Items</th>'
 	'</tr></table></b></center>'
 
 	act 'Settings menu': killvar 'menu_page' & gs '$menu_setting'
@@ -290,7 +290,7 @@ if $ARGS[0] = 'skills':
 	'Reaction - <<pcs_react>> / <<react_lvl>>'
 	'Charisma - <<pcs_chrsm>> / <<chrsm_lvl>>'
 	'Perception - <<pcs_prcptn>> / <<prcptn_lvl>>'
-	if pcs_magik > 0: 'Magic - <<pcs_magik>>'
+	if $start_type[1] = 'magic': 'Magic - <<pcs_magik>>'
 	'Attractiveness - <<pcs_apprnc>>'
 	!'Speed <<speed>>' - not used
 	*nl
@@ -1109,9 +1109,9 @@ if $ARGS[0] = 'magic':
 	'<center><h1>Magic</h1></center>'
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
-	if pcs_magik = 0:
+	if $start_type[1] = 'nomagic':
 		'You are unable to use magic.'
-	elseif pcs_magik > 0:
+	elseif $start_type[1] = 'magic':
 		'You have <<pcs_mana>> units of mana available to you.'
 		!!' Forces Rikudo available to you <<rikudo>> units'
 		*nl

+ 15 - 16
locations/pav_lake.qsrc

@@ -63,10 +63,10 @@ end
 
 if mid($start_type,1,2) = 'sg' and temper >= 20 and sunWeather = 1 and month >= 5 and month <= 9 and hour >= 12 and hour <= 14 and ((kanikuli = 0 and week = 7) or week mod 2 = 0):
 	if $clothingworntype = 'nude':
-		'As you walk down to the beach area of the lake you see a group of kids from your school hanging out on the beach. It looks like it is the jocks and cool kids. You hope none of them have seen you naked, it would be such a scandal if they seen you like this. You should put on a bikini before approaching them if you want to hang out, or just avoid them and do your own thing today.'
+		'As you walk down to the beach area of the lake, you see the jocks and cool kids hanging out and hope none of them have seen you naked. You should put on a bikini before approaching them if you want to hang out, or just avoid them and do your own thing today.'
 	else
-		'As you walk down to the beach area of the lake you see a group of kids from your school hanging out on the beach. It looks like it is the jocks and cool kids.'
-		act 'Head towards your class mates': gt 'pav_lake', 'school_mates'
+		'As you walk down to the beach area of the lake, you see the jocks and cool kids hanging out.'
+		act 'Approach them': gt 'pav_lake', 'school_mates'
 	end
 end
 
@@ -589,18 +589,18 @@ if $ARGS[0] = 'school_mates':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/beach_hangout/school_mates.jpg"></center>'
 	if fame['pav_slut'] >= 225:
-		'You start walking over to them and you start getting disgusted stares from several of them. Soon several are making rude comments, finally Dimka comes over with Svyatoslav. "Get lost slut, we don''t want you here." You sigh as it is obvious if you try and push this, nothing good will come of it. So you turn and walk away.'
+		'You start approaching them, but are immediately greeted with disgusted stares and rude comments before Dimka walks over with Svyatoslav. "Get lost slut! We don''t want you here." You sigh before turning and walking away.'
 		act 'Leave': gt'pav_lake'
 	elseif grupTipe = 1 or grupTipe = 2:
-		'You start walking over to them and most give you friendly smiles or waves, several wave you to come over and join them.'
+		'You start approaching them and are greeted with friendly smiles as several wave at you to come over and join them.'
 		act 'Leave': gt 'pav_lake'
 		act 'Join them': gt 'pav_lake', 'beach_hangout'
 	elseif grupTipe = 3 or grupTipe = 4:
-		'You start walking over to them and most just ignore you until you start to get close then several of them give you annoyed looks, making it clear you are not really welcome here, but none of them seem like they are going to stop you from joining them at least.'
+		'You start approaching them, but the group largely ignore you until you get close and several of them give you annoyed looks, making it clear you''re not welcome here, but make no effort to stop you from joining them at least.'
 		act 'Leave': gt 'pav_lake'
 		act 'Join them': gt 'pav_lake', 'beach_hangout'
 	else
-		'You start walking over to them and you start getting annoyed stares from several of them. Soon several are making rude comments, finally Dimka comes over with Svyatoslav. "Get lost loser, we don''t want you here." You sigh as it is obvious if you try and push this, nothing good will come of it. So you turn and walk away.'
+		'You start approaching them and are greeted with annoyed stares and rude comments before Dimka walks over with Svyatoslav. "Get lost loser! We don''t want you here." You sigh before turning and walking away.'
 		act 'Leave': gt'pav_lake'
 	end
 end
@@ -608,13 +608,13 @@ end
 if $ARGS[0] = 'beach_hangout':
 	*clr & cla
 	minut += 5
-	!!Cool kids aprove of high quality bikini or outfit and disaprove of low quality
+	!!Cool kids approve of high quality bikini or outfit and disapprove of low quality
 	if PCloQuality >= 4: 	
 		grupvalue[1] += 1
 	elseif PCloQuality  < 3: 	
 		grupvalue[1] -= 1
 	end
-	!!Cool kids and jocks aprove of somewhat revealing clothes or a little skimpy bikini and disaprove of conseravite clothes or bikinis and very revealing clothes or very skimpy bikini
+	!!Cool kids and jocks approve of somewhat revealing clothes or a little skimpy bikini and disapprove of conservative clothes or bikinis and very revealing clothes or very skimpy bikini
 	if PCloInhibit >= 35:
 		grupvalue[1] -= 1
 		grupvalue[2] -= 1
@@ -625,21 +625,20 @@ if $ARGS[0] = 'beach_hangout':
 		grupvalue[1] -= 1
 		grupvalue[2] -= 1
 	end
-	!!Jocks disaprove of a one piece swimsuite
+	!!Jocks disapprove of a one piece swimsuit
 	if PCloswimwear = 1 and PCloOnePiece = 1:
 		grupvalue[2] -= 1
 	end
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/beach_hangout/beach_hangout.jpg"></center>'
 	if grupTipe = 1 or grupTipe = 2:
-		'You smile to your friends and take a seat with them and soon are joining in on the variety of conversations going on. Some of them are tanning, others sitting around talking, while a few are just horsing around. You spend some time just talking to a few of them catching up. You could use this chance to get to know one of them better if you wanted to.'
-		act 'Leave': gt'pav_lake'
-		act 'Talk to one of them': gt 'pav_beach_chat', 'start'
+		'You smile at your friends and take a seat with them before joining in on the variety of conversations going on. Some are tanning, others sit around talking, and some horse around. You can use this opportunity to get to know one of them better if you want.'
 	else
-		'You smile and take a seat with them, you get a mix of responses. The ones you know better seem at least somewhat friendly, most of the rest range from looking annoyed that you are here to indifference, many just ignore you. Some of them are tanning, others sitting around talking, while a few are just horsing around. You spend some time trying to get involved in the varies conversations going on and meet limited success. You could use this chance to get to know one of them better if you wanted to.'
-		act 'Leave': gt'pav_lake'
-		act 'Talk to one of them': gt 'pav_beach_chat', 'beach_hangout'
+		'You smile and take a seat with them, but get mixed responses. The ones you know better seem somewhat friendly, but the others range from indifference to annoyance. Many choose just to ignore you.' 
+		'Some are tanning, others sit around talking, and some horse around. You spend some time trying to get involved in the conversations going on, but meet limited success. You can use this opportunity to get to know one of them better if you want.'
 	end
+	act 'Leave': gt'pav_lake'
+	act 'Talk to one of them': gt 'pav_beach_chat', 'beach_hangout'
 end
 
 

+ 2 - 2
locations/rex_party_sexEvents.qsrc

@@ -553,7 +553,7 @@ if $ARGS[0] = 'dj_boobs':
 	'"Like this boys?" you ask as you put your breasts on the turntable and move it a bit with your breasts.'
 	'Not much sound comes out from your attempt, but the guys seem to love it all the same.'
 	act 'Move away': gt $loc, $loc_arg
-	act 'Take off your top': gt 'rex_party_smallEvents', 'dj_cock'
+	act 'Take off your top': gt 'rex_party_sexEvents', 'dj_cock'
 end
 
 if $ARGS[0] = 'dj_cock':
@@ -566,7 +566,7 @@ if $ARGS[0] = 'dj_cock':
 	'Seeing the interest from the smiling guys watching you, you get rid of your top and bra and then place your naked breasts on the turntable, trying to play it topless. "I think I did better that time. What do you think?"'
 	'The guy pulls out his erection and says "Not bad. Maybe try this instead."'
 	act 'Move away': gt $loc, $loc_arg
-	act 'Give his dick a try': gt 'rex_party_smallEvents', 'dj_suck'
+	act 'Give his dick a try': gt 'rex_party_sexEvents', 'dj_suck'
 end
 
 if $ARGS[0] = 'dj_suck':

+ 1 - 0
locations/shop.qsrc

@@ -392,6 +392,7 @@ if $shoplocation= 'cosmetics':
 	end
 	*pl '<center><table align="center" width=80%>'
 	*p func ('$stock_item', 50, 'Cosmetics', 1300, 'kosmetica', $curloc)
+	*p func ('$stock_item', 50, 'Moisturizer', 1300, 'item_moisturizer', $curloc)
 	*P func ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', $curloc)
 	*p func ('$stock_item', 10, 'Plain false lashes', 1500, 'falselashesplain',$curloc)
 	*p func ('$stock_item', 3, 'Mink false lashes', 900, 'falselashesmink',$curloc)

+ 1 - 1
locations/stallion.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'rape':
 	stallionQ = 5
 	if MagikDostup = 0 and broodcurse = 0:
 		broodcurse = 1
-		if pcs_magik = 0:
+		if $start_type[1] = 'nomagic':
 			'You feel a tingling in your body. You are pretty sure it is something Stallion has done to you.'
 		elseif pcs_magik < 3:
 			'"Is that magic I feel in you, <<$pcs_nickname>>? It''s not going to protect you. I have some magic of my own."'

+ 1 - 1
locations/stat.qsrc

@@ -148,7 +148,7 @@ if pcs_horny < 50 and cheatHorny = 1: pcs_horny = 50
 boxing = pcs_jab + pcs_punch + pcs_kick + pcs_def
 if boxing > 100: boxing = 100
 
-if MagikDostup = 0:
+if $start_type[1] = 'magic':
 
 	if pcs_magik > magikhigh:
 		magikhigh += 1

+ 11 - 5
locations/talent_agency.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/front.jpg"></center>'
 	'"Hello, welcome to the Aurora Female Talent Agency! How may I help you?"'
 	if casting = 3 and hour <= 11 and SMTV_commercial = daystart:
-		room = 3
+		audition['room'] = 3
 		'"Oh? Are you here for the SMTV commercial? Please go to interview room <<room>>, they''re waiting for you inside.'
 	elseif casting = 3 and ((hour > 11 and SMTV_commercial = daystart) or SMTV_commercial < daystart):
 		'"You''re here for the SMTV commercial? Sorry, you''re late, and you''ve just cost the production tons of money. You''ve been fired. First rule of showbiz honey: show up on time.'
@@ -79,12 +79,18 @@ if $ARGS[0] = 'hallway':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/hallway.jpg"></center>'
 	act 'Leave':gt 'talent_agency','start'
+	if casting = 3:
+		act 'Room 3':gt 'talent_agency','room3'
+	end
+
+!!Block to stop rooms being accessible as they are not ready
+!{
 	act 'Room 1':gt 'talent_agency','room1'
 	act 'Room 2':gt 'talent_agency','room2'
-	act 'Room 3':gt 'talent_agency','room3'
 	act 'Room 4':gt 'talent_agency','room4'
 	act 'Room 5':gt 'talent_agency','room5'
 	act 'General Audition Room':gt 'talent_agency','room6'
+}
 end
 
 if $ARGS[0] = 'room1':
@@ -136,7 +142,7 @@ end
 
 if $ARGS[0] = 'room6':
 	*clr & cla
-	if room > 0 and room =< 5:
+	if audition['room'] > 0 and audition['room'] =< 5:
 		gt'talent_agency','wrong_room2'
 	elseif $audition['role'] = '':
 		gt'talent_agency','wrongday'
@@ -279,7 +285,7 @@ if $ARGS[0] = 'SMTV_shy':
 									'<i>Holy crap! Acting is some serious money!</i>'
 									inhib_exp += 20
 									casting = 1
-									room = 0
+									audition['room'] = 0
 									act'Leave':gt'talent_agency','end'
 								end
 							end
@@ -363,7 +369,7 @@ if $ARGS[0] = 'SMTV_confident':
 									'Looking over at the desk, you see a wad of cash lying there. You rush over, and when you finish counting, you realize that it''s <<actpayfin>> <b>₽</b>!'
 									'<i>Holy crap! Acting is some serious money!</i>'
 									casting = 1
-									room = 0
+									audition['room'] = 0
 									act'Leave':gt'talent_agency','end'
 								end
 							end

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio