[changed] layout change

locations/costuming_outfits1.qsrc

@@ -4,118 +4,130 @@ if $ARGS[0] = 'start':
 	if acting['costume_unique'] = 1:
 
 		!! ----- extra roles -------------------
-		if $acting['role'] = 'Spring Break Flasher':gs 'costuming_outfits', 'SpringBreakFlasher'
-	!!	if $acting['role'] = 'Vera':gs 'costuming_outfits', 'HotBartender'
-	!!	if $acting['role'] = 'Vera':gs 'costuming_outfits', 'HotBartender'
-	!!	if $acting['role'] = 'Vera':gs 'costuming_outfits', 'HotBartender'
+		if $acting['role'] = 'Spring Break Flasher': gs 'costuming_outfits', 'SpringBreakFlasher'
+	!!	if $acting['role'] = 'Vera': gs 'costuming_outfits', 'HotBartender'
+	!!	if $acting['role'] = 'Vera': gs 'costuming_outfits', 'HotBartender'
+	!!	if $acting['role'] = 'Vera': gs 'costuming_outfits', 'HotBartender'
 		!! ----- minor roles ------------------
-		if $acting['role'] = 'Diner Waitress':gs 'costuming_outfits', 'DinerWaitress'
-		if $acting['role'] = 'Slutty Club Girl':gs 'costuming_outfits', 'SluttyClubGirl'
-		if $acting['role'] = 'Vera':gs 'costuming_outfits', 'HotBartender'
-		
-		
+		if $acting['role'] = 'Diner Waitress': gs 'costuming_outfits', 'DinerWaitress'
+		if $acting['role'] = 'Slutty Club Girl': gs 'costuming_outfits', 'SluttyClubGirl'
+		if $acting['role'] = 'Vera': gs 'costuming_outfits', 'HotBartender'
+
 	else
 		!! if there is no specific outfit assigned, player will be given a random one from a corresponding shop
-		
+
+		!! Why not use:
+		!!	gs 'clothing', 'totals', $acting['outfit_type']
+		!!	gs 'clothing', 'wear', $acting['outfit_type'], rand(1, total)
+
 		if $acting['outfit_type'] = 'gm_outfits':
-			gs 'clothing', 'wear', 'gm_outfits', rand(1,150)
+			gs 'clothing', 'wear', 'gm_outfits', rand(1, 150)
 			'Put you in some cheap casual clothes'
-			
+
 		elseif $acting['outfit_type'] = 'gm_dress':
 			gs 'clothing', 'wear', 'gm_dress', rand(1,50)
 			'Put you in a cheap casual outfit with a skirt'
+
 		elseif $acting['outfit_type'] = 'cats_outfits':
 			gs 'clothing', 'wear', 'cats_outfits', rand(1,100)
 			'They give you some girly clothes to wear with tight pants that really emphasize your ass.'
+
 		elseif $acting['outfit_type'] = 'cats_dress':
 			gs 'clothing', 'wear', 'cats_dress', rand(1,110)
 			'They give you a girly outfit with a skirt to wear.'
+
 		elseif $acting['outfit_type'] = 'coco_outfits':
 			gs 'clothing', 'wear', 'coco_outfits', rand(1,90)
 			'They give you a trendy outfit to wear.'
+
 		elseif $acting['outfit_type'] = 'coco_dress':
 			gs 'clothing', 'wear', 'coco_dress', rand(1,100)
 			'They give you a trendy outfit with a skirt to wear.'
+
 		elseif $acting['outfit_type'] = 'bomba_outfits':
 			gs 'clothing', 'wear', 'bomba_outfits', rand(1,50)
 			'They give you a goth girl outfit to wear.'
+
 		elseif $acting['outfit_type'] = 'bomba_dress':
 			gs 'clothing', 'wear', 'bomba_dress', rand(1,70)
 			'They give you a goth girl outfit with a skirt to wear.'
+
 		elseif $acting['outfit_type'] = 'dolls_outfits':
 			gs 'clothing', 'wear', 'dolls_outfits', rand(1,50)
-			
+
 		elseif $acting['outfit_type'] = 'dolls_dress':
 			gs 'clothing', 'wear', 'dolls_dress', rand(1,110)
-			
+
 		elseif $acting['outfit_type'] = 'eroto_outfits':
 			gs 'clothing', 'wear', 'eroto_outfits', rand(1,100)
-			
+
 		elseif $acting['outfit_type'] = 'eroto_dress':
 			gs 'clothing', 'wear', 'eroto_dress', rand(1,120)
-			
+
 		elseif $acting['outfit_type'] = 'flamingos_outfits':
 			gs 'clothing', 'wear', 'flamingos_outfits', rand(1,50)
-			
+
 		elseif $acting['outfit_type'] = 'flamingos_dress':
 			gs 'clothing', 'wear', 'flamingos_dress', rand(1,90)
-			
+
 		elseif $acting['outfit_type'] = 'moncheri_dress':
 			gs 'clothing', 'wear', 'moncheri_dress', rand(1,80)
-		
+
 		elseif $acting['outfit_type'] = 'moncheri_gown':
 			gs 'clothing', 'wear', 'moncheri_gown', rand(1,160)
-			
+
 		elseif $acting['outfit_type'] = 'nerdvana_outfits':
 			gs 'clothing', 'wear', 'nerdvana_outfits', rand(1,60)
-			
+
 		elseif $acting['outfit_type'] = 'fashionista_dress':
 			gs 'clothing', 'wear', 'bomba_outfits', rand(1,200)
-			
+
 		elseif $acting['outfit_type'] = 'danilovich_outfits':
 			gs 'clothing', 'wear', 'bomba_outfits', rand(1,170)
-			
+
 		elseif $acting['outfit_type'] = 'salacious_outfits':
 			gs 'clothing', 'wear', 'flamingos_outfits', rand(1,20)
-			
+
 		elseif $acting['outfit_type'] = 'salacious_dress':
 			gs 'clothing', 'wear', 'flamingos_dress', rand(1,150)
-		
+
 		elseif $acting['outfit_type'] = 'scandalicious_outfits':
 			gs 'clothing', 'wear', 'flamingos_outfits', rand(1,20)
-			
+
 		elseif $acting['outfit_type'] = 'scandalicious_dress':
 			gs 'clothing', 'wear', 'flamingos_dress', rand(1,50)
-		
-		
+
+
 		!!REMINDER: add swimwear
-		
-		
+
+
 		end
-		
-!!{		
-		if $acting['costume_underwear'] = 'none':
-			
-		elseif $acting['costume_underwear'] = 'braless':
-			if $braworntype ! 'none':
-				gs 'bras','remove'
-				
-			else
-				if $costuming['panties'] = 'fashionista':
-			
-			end
-		elseif $acting['costume_underwear'] = 'pantyless':
-		
+	end
+!!{
+	if $acting['costume_underwear'] = 'none':
+
+	elseif $acting['costume_underwear'] = 'braless':
+		if $braworntype ! 'none':
+			gs 'bras','remove'
+
 		else
-		
+			if $costuming['panties'] = 'fashionista':
+
+			end
+
 		end
-		
+	elseif $acting['costume_underwear'] = 'pantyless':
+
+	else
+
 	end
 }
-	
+
 	costuming['check'] = acting['scene_outfit']
 end
+
 !! ------------------------------------------- Extra Roles -------------------------------------------
+
 if $ARGS[0] = 'SpringBreakFlasher':
 	gs 'clothing', 'wear', 'gm_outfits', 149
 	gs 'bras','remove'
@@ -139,7 +151,9 @@ if $ARGS[0] = 'UndressingLockerGirl':
 	end
 end
 
+
 !! ------------------------------------------- Minor Roles -------------------------------------------
+
 if $ARGS[0] = 'DinerWaitress':
 	gs 'clothing', 'wear', 'nerdvana_outfits', 17
 	acting['scene_makeup'] = 3
@@ -153,12 +167,12 @@ if $ARGS[0] = 'HotBartender':
 		acting['scene_makeup'] = 4
 		costuming['check'] = acting['scene_outfit']
 	elseif acting['scene_outfit'] = 3:
-		
+
 	else
 		gs 'clothing', 'wear', 'gm_dress', 38
 		acting['scene_makeup'] = 4
 		costuming['check'] = acting['scene_outfit']
-		
+
 	end
 end
 
@@ -178,4 +192,4 @@ end
 
 
 
---- costuming_outfits1 ---------------------------------
+--- costuming_outfits1 ---------------------------------

locations/hourly_events.qsrc

@@ -291,28 +291,21 @@ if insleep = 0:
 end
 
 ! Leg and pubes hair growth
-if lashair ! 1:
-	if pcs_traits['jungle_jane'] = 0:
-		if stat['leg_hair_growth_timer'] < totminut - 1440:
-			stat['leg_hair_growth_timer'] = totminut
-			pcs_leghair += 1
-		end
-		if stat['pube_growth_timer'] < totminut - 2880:
-			stat['pube_growth_timer'] = totminut
-			pcs_pubes += 1
-		end
-		!!Pubic hair growth at 1/2 per night
-	else
-		!! if trait is active, growth speed is doubled
-		if stat['leg_hair_growth_timer'] < totminut - 720:
-			stat['leg_hair_growth_timer'] = totminut
-			pcs_leghair += 1
-		end
-		if stat['pube_growth_timer'] < totminut - 1440:
-			stat['pube_growth_timer'] = totminut
-			pcs_pubes += 1
-		end
+if lashair = 1:
+	pcs_bubes = 0
+	pcs_leghair = 0
+	gs 'body_desc', 'pube_desc_update'
+else
+	!! if jungle_jane trait is active, growth speed is doubled
+	if totminut > stat['leg_hair_growth_timer'] + iif(pcs_traits['jungle_jane'] = 0, 1440, 720):
+		stat['leg_hair_growth_timer'] = totminut
+		pcs_leghair += 1
 	end
+	if totminut > stat['pube_growth_timer'] + iif(pcs_traits['jungle_jane'] = 0, 2880, 1440):
+		stat['pube_growth_timer'] = totminut
+		pcs_pubes += 1
+	end
+		!!Pubic hair growth at 1/2 per night
 	gs 'body_desc', 'pube_desc_update'
 end