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

locations/bras.qsrc

@@ -185,8 +185,10 @@ if $ARGS[0] = 'view_bra_item':
 		
 		if $ARGS[1] = 'store':
 			'This bra is in storage.'
+			gs 'bras', 'storage_options'
 		elseif $ARGS[1] = 'unwanted':
 			'This bra is unwanted.'
+			gs 'bras', 'storage_options'
 		else
 			if $braworntype = $ARGS[2] and brawornnumber = ARGS[3]:
 				'You are wearing this bra.'
@@ -332,24 +334,28 @@ if $ARGS[0] = 'view_bra_item':
 						end
 					end
 				end
-			end	
-			if $ARGS[1] ! 'store':
-				act 'Move to storage': gt 'bras', 'dest1', $ARGS[1], $ARGS[2], ARGS[3]
-			end
-			if $ARGS[1] ! 'unwanted':
-				act 'Move to unwanted': gt 'bras', 'dest2', $ARGS[1], $ARGS[2], ARGS[3]
-			end
-			if $ARGS[1] ! 'wardrobe':
-				act 'Move to wardrobe': gt 'bras', 'dest0', $ARGS[1], $ARGS[2], ARGS[3]
-			end
-			act '<font color="red">Throw this bra away</font>':
-				dynamic '<<$ARGS[2]>>_panties[<<ARGS[3]>>] = 0'
-				gt 'wardrobe', 'main'
 			end
+			gs 'bras', 'storage_options'
 		end
 	end
 end
 
+if $ARGS[0] = 'storage_options':
+	if $ARGS[1] ! 'store':
+		act 'Move to storage': gt 'bras', 'dest1', $ARGS[1], $ARGS[2], ARGS[3]
+	end
+	if $ARGS[1] ! 'unwanted':
+		act 'Move to unwanted': gt 'bras', 'dest2', $ARGS[1], $ARGS[2], ARGS[3]
+	end
+	if $ARGS[1] ! 'wardrobe':
+		act 'Move to wardrobe': gt 'bras', 'dest0', $ARGS[1], $ARGS[2], ARGS[3]
+	end
+	act '<font color="red">Throw this bra away</font>':
+		dynamic '<<$ARGS[2]>>_bras[<<ARGS[3]>>] = 0'
+		gt 'wardrobe', 'main'
+	end
+end
+
 if $ARGS[0] = 'dest0':
 	*clr
 	dynamic '<<$ARGS[2]>>_brasS[<<ARGS[3]>>] = 0'

locations/gschool_grounds.qsrc

@@ -191,7 +191,7 @@ if $ARGS[0] = 'main':
 
 	if week = 6 and hour = 8 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and detention_set = 1 and SchoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
 
-	if christinaQW['pre_fight'] = 1:
+	if christinaQW['pre_fight'] = 1 and week < 6 and hour = 14 and kanikuli = 0:
 		act 'Attack Christina':
 			gt 'Zvereva_events', 'KristinaFight'
 		end

locations/panties.qsrc

@@ -189,8 +189,10 @@ if $ARGS[0] = 'view_panty_item':
 		
 		if $ARGS[1] = 'store':
 			'These panties are in storage.'
+			gs 'panties', 'storage_options'
 		elseif $ARGS[1] = 'unwanted':
 			'These panties are unwanted.'
+			gs 'panties', 'storage_options'
 		else
 			if $pantyworntype = $ARGS[2] and pantywornnumber = ARGS[3]:
 				'You are wearing these panties.'
@@ -337,23 +339,27 @@ if $ARGS[0] = 'view_panty_item':
 					end
 				end
 			end
-			if $ARGS[1] ! 'store':
-				act 'Move to storage': gt 'panties', 'dest1', $ARGS[1], $ARGS[2], ARGS[3]
-			end
-			if $ARGS[1] ! 'unwanted':
-				act 'Move to unwanted': gt 'panties', 'dest2', $ARGS[1], $ARGS[2], ARGS[3]
-			end
-			if $ARGS[1] ! 'wardrobe':
-				act 'Move to wardrobe': gt 'panties', 'dest0', $ARGS[1], $ARGS[2], ARGS[3]
-			end
-			act '<font color="red">Throw these panties away</font>':
-				dynamic '<<$ARGS[2]>>_panties[<<ARGS[3]>>] = 0'
-				gt 'wardrobe', 'main'
-			end
+			gs 'panties', 'storage_options'
 		end
 	end
 end
 
+if $ARGS[0] = 'storage_options':
+	if $ARGS[1] ! 'store':
+		act 'Move to storage': gt 'panties', 'dest1', $ARGS[1], $ARGS[2], ARGS[3]
+	end
+	if $ARGS[1] ! 'unwanted':
+		act 'Move to unwanted': gt 'panties', 'dest2', $ARGS[1], $ARGS[2], ARGS[3]
+	end
+	if $ARGS[1] ! 'wardrobe':
+		act 'Move to wardrobe': gt 'panties', 'dest0', $ARGS[1], $ARGS[2], ARGS[3]
+	end
+	act '<font color="red">Throw these panties away</font>':
+		dynamic '<<$ARGS[2]>>_panties[<<ARGS[3]>>] = 0'
+		gt 'wardrobe', 'main'
+	end
+end
+
 if $ARGS[0] = 'dest0':
 	*clr
 	dynamic '<<$ARGS[2]>>_pantiesS[<<ARGS[3]>>] = 0'