locations/beverage.qsrc

@@ -415,6 +415,7 @@ if $ARGS[0] = 'coffee':
 	*clr & cla
 	frost = 0
 	if alko > 0: alko -= 1
+	if pcs_sleep <= 20: pcs_sleep += 5
 	pcs_health += 5
 	pcs_mood += 20
 	pcs_energy += 15

locations/body.qsrc

@@ -450,7 +450,7 @@ if $ARGS[0] = 'UpdateBodyImage':
 		end
 	elseif (knowpreg = 1 or (preg = 1 and thinkpreg = 1) or (preg = 1 and PregChem > 3600)) and bodet ! 3 and bdsetlock = 0:
 		bodset = 3
-	elseif preg = 0 and bodset = 3 and bdsetlock = 0:
+	elseif preg = 0 and bdsetlock = 0:
 		if strenbuf >= 70:
 			bodset = 2
 		elseif strenbuf <= 40:
@@ -577,9 +577,10 @@ if $ARGS[0] = 'initial':
 	killvar 'gmstrtflag'
 	newbdsp = 1
 	!!	This does all the body shape setting before the first stat call
-	gs $this, 'UpdateBodyMeasurement'
+	gs 'body', 'UpdateBodyMeasurement'
 	pcs_weight = func($this, 'CalcWeight')
 	pcs_bmi = func($this, 'CalcBMI')
+	gs 'body', 'UpdateBodyImage'
 	gs 'body_desc', 'BMI'
 end
 

locations/igorhome.qsrc

@@ -115,7 +115,7 @@ if $ARGS[0] = 'igorroom':
 	if lernHome > 0:
 		act 'Do your homework togheter': gt 'igorhome','study'
 	end
-	act 'Chat': gt 'igorhome','Chat'
+	act 'Chat': gt 'igorhome','chat'
 	if hour = 23:
 		if IgorLoverQW = 1:
 			*clr & cla
@@ -253,7 +253,6 @@ if $ARGS[0] = 'chat':
 		end
 	end
 	if strapon > 0 and igorstrap = 1:
-		*clr & cla
 		act 'Be my bitch': gt 'igorev', 'strap on'
 	end
 	!!this only shows up if Sveta knows Igor cross dresses.

locations/intro_city_tg.qsrc

@@ -322,7 +322,61 @@ if $ARGS[0] = 'tatianaPRE':
 									'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
 									'"There must be another way!" you panic while tugging at the restraints on the bed.'
 									'Tatiana''s face turns serious. "Do not argue. It''s the only way available to me. You''ll need to use a new name, so think it over in your dreams and tell me when you wake up, otherwise I''ll give you a pretty name. Now go to sleep." She puts her hand on your chest and your vision immediately fades. You dream about a girl you never knew and what she did at school...'
-									act 'Dream': gt 'intro_city_select', 'start'
+									act 'Dream':
+										age = 18
+										month = 5
+										$month = 'May'
+										day = 4
+										week = 3
+										hour = 13
+
+									!!		Body
+										pcs_hgt = 170
+										salo = 60
+										dick = 0
+									!!		Stats
+										pcs_stren = 20
+										strenbuf = 20
+										pcs_agil = 15
+										agilbuf = 15
+										pcs_vital = 25
+										vitalbuf = 25
+										pcs_intel = 30
+										pcs_sprt = 25
+										pcs_react = 25
+										pcs_chrsm = 15
+										pcs_prcptn = 40
+										money = 13000
+										pcs_pubes = 30
+										pcs_leghair = 12
+										pcs_makeup = 5
+										gm_purses[7] = 1
+										$currentpursetype = 'gm'
+										currentpursenumber = 7
+										bag = 1
+										home_owned[1] = 1
+
+										pcs_inhib = 15
+										pcs_heels = 20
+										pcs_makupskl = 15
+										pcs_artskls = 15
+										pcs_compskl = 20
+										pcs_comphckng = 10
+										pcs_chess = 15
+										pcs_danc = 30
+										cltarelka = 1
+										fairy = 10
+										eda = 5
+										poroshok = 5
+										shampoo = 20
+										tampon = 15
+										pcs_energy = 100
+										pcs_hydra = 100
+										pcs_sleep = 100
+										willpowermax = 100
+										pcs_hairlng = 100
+										gt 'intro_city_select', 'start'
+									end
 								end
 							end
 						end
@@ -358,59 +412,6 @@ if $ARGS[0] = 'sleepPRE':
     $OpenInnerThought = '<i><font color=''magenta''>'
     $CloseInnerThought = '</font></i>'
 
-	age = 18
-	month = 5
-	$month = 'May'
-	day = 4
-	week = 3
-	hour = 13
-
-!!		Body
-	pcs_hgt = 170
-	salo = 60
-	dick = 0
-!!		Stats
-	pcs_stren = 20
-	strenbuf = 20
-	pcs_agil = 15
-	agilbuf = 15
-	pcs_vital = 25
-	vitalbuf = 25
-	pcs_intel = 30
-	pcs_sprt = 25
-	pcs_react = 25
-	pcs_chrsm = 15
-	pcs_prcptn = 40
-	money = 13000
-	pcs_pubes = 30
-	pcs_leghair = 12
-	pcs_makeup = 5
-	gm_purses[7] = 1
-	$currentpursetype = 'gm'
-	currentpursenumber = 7
-	bag = 1
-	home_owned[1] = 1
-
-	pcs_inhib = 15
-	pcs_heels = 20
-	pcs_makupskl = 15
-	pcs_artskls = 15
-	pcs_compskl = 20
-	pcs_comphckng = 10
-	pcs_chess = 15
-	pcs_danc = 30
-	cltarelka = 1
-	fairy = 10
-	eda = 5
-	poroshok = 5
-	shampoo = 20
-	tampon = 15
-	pcs_energy = 100
-	pcs_hydra = 100
-	pcs_sleep = 100
-	willpowermax = 100
-	pcs_hairlng = 100
-
 	gs 'set_home', 1
 	
 	killobj

locations/intro_customization.qsrc

@@ -242,7 +242,10 @@ if $ARGS[0] = 'modpur':
 		'<center><img <<$set_imgh>> src="images/pc/items/<<$currentpursetype>>/purses/<<currentpursenumber>>.jpg"></center>'
 		'Your current purse is <<$currentpursetype>>_<<currentpursenumber>>.'
 	end
-	act 'Return': gt'intro_customization','start'
+	act 'Return':
+		dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
+		gt'intro_customization','start'
+	end
 	act 'Get G&M':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'

locations/intro_initialization.qsrc

@@ -90,8 +90,103 @@ oldsavepcs_haircol = 1
 
 gs 'body', 'initial'
 
+	
+!!	**********
+
+gs 'daystart'
+gs 'din_pav'
+gs 'din_npc'
+gs 'dinSex2'
+gs 'dina'
+gs 'din_van'
+gs 'din_bad'
+gs 'dinSex'
+!! KEY! I merged 'dinBoroda' with 'clener' and removed the dynamics. This line was at the end of dinBoroda, so I moved it here just in case. Sicaa
+rikudootvet = 1415
+gs 'BanSexType'
+
+gs 'outdoors', 'weather'
+
+menoage = rand(40,50)
+temprand = rand(0,10)
+
+if temprand = 0:
+	menoage += rand(0,5)
+
+elseif temprand < 4:
+	menoage += rand(3,10)
+
+elseif temprand < 9:
+	menoage += rand(5,12)
+
+else
+	menoage += rand(7,13)
+
+end
+
+!!Setting up period start and turning on auto tracking if not on hardcore difficulty
+daylastperiod = daystart
+temprand = rand(1,3)
+if temprand = 1:
+	cycle = 1
+	EggRH = rand(1,149)
+	FocH = EggRH + 4*24
+	mesec = 0
+	unfertegg = 0
+	ferteggage = 0
+	Ovulate = 0
+	LutH = 0
+	daylastperiod -= FocH/24
+elseif temprand = 2:
+	lastovulation = daystart
+	cycle = 2
+	unfertegg = 1
+	ferteggage = rand(0,44)
+	Ovulate = (rand(24,44) - ferteggage)
+	if Ovulate <= 0: Ovulate = 1
+	mesec = 0
+	EggRH = 0
+	FocH = 0
+	LutH = 0
+	daylastperiod -= 10+(ferteggage/24)
+elseif temprand = 3:
+	cycle = 3
+	LutH = rand(0,300)
+	ferteggage = 36 + LutH
+	mesec = 0
+	EggRH = 0
+	FocH = 0
+	unfertegg = 0
+	Ovulate = 0
+	daylastperiod -= 10+(ferteggage/24)
+end
+
+if daylastperiod + 4 > daystart:
+	lastmens = daylastperiod - 20
+else
+	lastmens = daylastperiod+4
+end
+
+if difficulty = 4:
+	cyccustom = 0
+else
+	cyccustom = 1
+end
+
+pcs_horny = 0
+killvar 'opPRE'
+killvar 'tgs_skipinto'
+gs 'stat'
+showstat 0
+showobjs 0
+
+
+!! Clothing must go last so that hip size is set
 !! Adding underwear and default shoes and assigning them
 
+$coatworntype = 'none'
+coatwornnumber = 0
+
 if $ARGS[1] ! 'CSB' and goth_clothing ! 1:
 	cheap_panties[1] = 1
 	cheap_bras[1] = 1
@@ -380,95 +475,7 @@ sportspursenumber = currentpursenumber
 $sports_clothing_name = 'default sports outfit'
 
 killvar 'swim_start'
-	
-!!	**********
-
-gs 'daystart'
-gs 'din_pav'
-gs 'din_npc'
-gs 'dinSex2'
-gs 'dina'
-gs 'din_van'
-gs 'din_bad'
-gs 'dinSex'
-!! KEY! I merged 'dinBoroda' with 'clener' and removed the dynamics. This line was at the end of dinBoroda, so I moved it here just in case. Sicaa
-rikudootvet = 1415
-gs 'BanSexType'
-
-gs 'outdoors', 'weather'
-
-menoage = rand(40,50)
-temprand = rand(0,10)
-
-if temprand = 0:
-	menoage += rand(0,5)
-
-elseif temprand < 4:
-	menoage += rand(3,10)
-
-elseif temprand < 9:
-	menoage += rand(5,12)
-
-else
-	menoage += rand(7,13)
-
-end
-
-!!Setting up period start and turning on auto tracking if not on hardcore difficulty
-daylastperiod = daystart
-temprand = rand(1,3)
-if temprand = 1:
-	cycle = 1
-	EggRH = rand(1,149)
-	FocH = EggRH + 4*24
-	mesec = 0
-	unfertegg = 0
-	ferteggage = 0
-	Ovulate = 0
-	LutH = 0
-	daylastperiod -= FocH/24
-elseif temprand = 2:
-	lastovulation = daystart
-	cycle = 2
-	unfertegg = 1
-	ferteggage = rand(0,44)
-	Ovulate = (rand(24,44) - ferteggage)
-	if Ovulate <= 0: Ovulate = 1
-	mesec = 0
-	EggRH = 0
-	FocH = 0
-	LutH = 0
-	daylastperiod -= 10+(ferteggage/24)
-elseif temprand = 3:
-	cycle = 3
-	LutH = rand(0,300)
-	ferteggage = 36 + LutH
-	mesec = 0
-	EggRH = 0
-	FocH = 0
-	unfertegg = 0
-	Ovulate = 0
-	daylastperiod -= 10+(ferteggage/24)
-end
-
-if daylastperiod + 4 > daystart:
-	lastmens = daylastperiod - 20
-else
-	lastmens = daylastperiod+4
-end
-
-if difficulty = 4:
-	cyccustom = 0
-else
-	cyccustom = 1
-end
 
-pcs_horny = 0
-killvar 'opPRE'
-killvar 'tgs_skipinto'
-gs 'stat'
-showstat 0
-showobjs 0
 
 --- intro_initialization ---------------------------------
 

locations/intro_initialization_city.qsrc

@@ -91,6 +91,97 @@ oldsavepcs_haircol = 1
 
 gs 'body', 'initial'
 
+!!	**********
+
+gs 'daystart'
+gs 'din_pav'
+gs 'din_npc'
+gs 'dinSex2'
+gs 'dina'
+gs 'din_van'
+gs 'din_bad'
+gs 'dinSex'
+!! KEY! I merged 'dinBoroda' with 'clener' and removed the dynamics. This line was at the end of dinBoroda, so I moved it here just in case. Sicaa
+rikudootvet = 1415
+gs 'BanSexType'
+
+gs 'outdoors', 'weather'
+
+menoage = rand(40,50)
+temprand = rand(0,10)
+
+if temprand = 0:
+	menoage += rand(0,5)
+
+elseif temprand < 4:
+	menoage += rand(3,10)
+
+elseif temprand < 9:
+	menoage += rand(5,12)
+
+else
+	menoage += rand(7,13)
+
+end
+
+!!Setting up period start and turning on auto tracking if not on hardcore difficulty
+daylastperiod = daystart
+temprand = rand(1,3)
+if temprand = 1:
+	cycle = 1
+	EggRH = rand(1,149)
+	FocH = EggRH + 4*24
+	mesec = 0
+	unfertegg = 0
+	ferteggage = 0
+	Ovulate = 0
+	LutH = 0
+	daylastperiod -= FocH/24
+elseif temprand = 2:
+	lastovulation = daystart
+	cycle = 2
+	unfertegg = 1
+	ferteggage = rand(0,44)
+	Ovulate = (rand(24,44) - ferteggage)
+	if Ovulate <= 0: Ovulate = 1
+	mesec = 0
+	EggRH = 0
+	FocH = 0
+	LutH = 0
+	daylastperiod -= 10+(ferteggage/24)
+elseif temprand = 3:
+	cycle = 3
+	LutH = rand(0,300)
+	ferteggage = 36 + LutH
+	mesec = 0
+	EggRH = 0
+	FocH = 0
+	unfertegg = 0
+	Ovulate = 0
+	daylastperiod -= 10+(ferteggage/24)
+end
+
+if daylastperiod + 4 > daystart:
+	lastmens = daylastperiod - 20
+else
+	lastmens = daylastperiod+4
+end
+
+if difficulty = 4:
+	cyccustom = 0
+else
+	cyccustom = 1
+end
+
+pcs_horny = 0
+killvar 'opPRE'
+killvar 'tgs_skipinto'
+gs 'stat'
+showstat 0
+showobjs 0
+
+
+!!Clothing has to run last so that hip size is set
 !! Adding underwear and default shoes and assigning them
 
 cheap_panties[1] = 1
@@ -102,6 +193,10 @@ brawornnumber = 1
 gm_shoe[6] = 1
 $shoeworntype = 'gm'
 shoewornnumber = 6
+gm_coats[1] = 1
+$coatworntype = 'gm'
+coatwornnumber = 1
+
 
 !!	Starting clothing set
 cheap_panties[12] = 1
@@ -392,94 +487,6 @@ $sports_clothing_name = 'default sports outfit'
 
 killvar 'swim_start'
 	
-!!	**********
-
-gs 'daystart'
-gs 'din_pav'
-gs 'din_npc'
-gs 'dinSex2'
-gs 'dina'
-gs 'din_van'
-gs 'din_bad'
-gs 'dinSex'
-!! KEY! I merged 'dinBoroda' with 'clener' and removed the dynamics. This line was at the end of dinBoroda, so I moved it here just in case. Sicaa
-rikudootvet = 1415
-gs 'BanSexType'
-
-gs 'outdoors', 'weather'
-
-menoage = rand(40,50)
-temprand = rand(0,10)
-
-if temprand = 0:
-	menoage += rand(0,5)
-
-elseif temprand < 4:
-	menoage += rand(3,10)
-
-elseif temprand < 9:
-	menoage += rand(5,12)
-
-else
-	menoage += rand(7,13)
-
-end
-
-!!Setting up period start and turning on auto tracking if not on hardcore difficulty
-daylastperiod = daystart
-temprand = rand(1,3)
-if temprand = 1:
-	cycle = 1
-	EggRH = rand(1,149)
-	FocH = EggRH + 4*24
-	mesec = 0
-	unfertegg = 0
-	ferteggage = 0
-	Ovulate = 0
-	LutH = 0
-	daylastperiod -= FocH/24
-elseif temprand = 2:
-	lastovulation = daystart
-	cycle = 2
-	unfertegg = 1
-	ferteggage = rand(0,44)
-	Ovulate = (rand(24,44) - ferteggage)
-	if Ovulate <= 0: Ovulate = 1
-	mesec = 0
-	EggRH = 0
-	FocH = 0
-	LutH = 0
-	daylastperiod -= 10+(ferteggage/24)
-elseif temprand = 3:
-	cycle = 3
-	LutH = rand(0,300)
-	ferteggage = 36 + LutH
-	mesec = 0
-	EggRH = 0
-	FocH = 0
-	unfertegg = 0
-	Ovulate = 0
-	daylastperiod -= 10+(ferteggage/24)
-end
-
-if daylastperiod + 4 > daystart:
-	lastmens = daylastperiod - 20
-else
-	lastmens = daylastperiod+4
-end
-
-if difficulty = 4:
-	cyccustom = 0
-else
-	cyccustom = 1
-end
-
-pcs_horny = 0
-killvar 'opPRE'
-killvar 'tgs_skipinto'
-gs 'stat'
-showstat 0
-showobjs 0
 
 --- intro_initialization_city ---------------------------------
 

locations/shop_scandalicious.qsrc

@@ -184,7 +184,7 @@ if $ARGS[0] = 'shoes':
 	if i <= 30:jump 'loopscandalicious_shoes'
 end
 
-if $ARGS[0] = 'shoes2': gt 'shoes', 'view_shoe_item', 'shop', 'shop_scandalicious',i, 1500
+if $ARGS[0] = 'shoes2': gt 'shoes', 'view_shoe_item', 'shop', 'scandalicious',i, 1500
 
 if $ARGS[0] = 'swim':
 	$loc_arg = 'swim'

locations/stat.qsrc

@@ -148,8 +148,9 @@ 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 $start_type[1] = 'magic':
+manamax = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
 
+if $start_type[1] = 'magic':
 	if pcs_magik > magikhigh:
 		magikhigh += 1
 		rikudo += pcs_magik * 100
@@ -158,9 +159,8 @@ if $start_type[1] = 'magic':
 		if (pcs_magik mod 2 ! 0) and pcs_eyesize < 2: pcs_eyesize += 1
 		if (pcs_magik mod 2 = 0) and pcs_lashes < 2: pcs_lashes += 1
 	end
-
 else
-!!This is for error catching
+!!This is for error catching but also broke manamax calc which is why its now above this
 	killvar 'pcs_magik'
 	killvar 'rikudo'
 	killvar 'pcs_splcstng'
@@ -184,7 +184,6 @@ end
 
 healthmax = (pcs_vital * 10 + pcs_stren * 5)
 stammax = 5 * (2 * pcs_vital + pcs_agil + pcs_stren) / 2
-manamax = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
 speed = (2 * (pcs_stren + pcs_agil) + pcs_vital) / 5
 if healthmax < 1: healthmax = 1
 if willpowermax < 50: willpowermax = 50