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

locations/bank.qsrc

@@ -20,11 +20,12 @@ if $ARGS[0] = 'start':
 		'Do you want to open an account?'
 		if money > 50:
 			act 'Open account':
+				cla
 				bankAccount = 1
 				bankDebtLimit = 5000
 				'You are led to on open office and a member of the bank staff goes through your details and ID, then takes 50 <b>₽</b> from you before setting up your account'
-				'"Your account is now open with your 50 <b>₽</b> and an overdraft of 5,000 <b>₽</b>"'
-				act 'Continue': gt 'bank'
+				'"Your account is now open with your 50 <b>₽</b> and an overdraft protection of 5,000 <b>₽</b>"'
+				act 'Continue': gt 'bank', 'start'
 			end
 		else
 			'You require 50 <b>₽</b> in cash to be able to open an account.'

locations/gschool_events.qsrc

@@ -1107,7 +1107,7 @@ if $ARGS[0] = 'break_events':
 			'You see Christina walk past Mr Nikolaevich and as she does, she briefly flips up the back of her skirt to show off her panty clad ass. Mr Nikolaevich gives her a stern look but otherwise doesn''t say anything. You follow behind her until he is out of sight, then grab her arm and drag her into the nearest girls bathroom.'
 			'"What did I say about panties, Christina?" Looking at you fearfully, she says "No panties, wear a buttplug." "And are you wearing panties without your plug in?" You ask sweetly. When she shakes her head no, you sigh theatrically. "Lying now, too. Ok, bend over and show me."'
 			'Trembling, she bends over and flips her skirt up, showing you the panties you already knew she was wearing. "Drop them, buttslut, and grab your ankles." Whimpering, she does as she is told. Lining yourself up, you spank her, hard, on each cheek. "That''s for lying!" You do it again, "That''s for wearing panties!" Then a third time, "That''s for not wearing your plug!"'
-			'Reaching into her purse, you dig around until you find her plug, and shove it in her mouth. "Suck on it, slut. And consider yourself lucky I don''t make you wear it dry!" Grimacing, she does as she is told. Popping it out of her mouth, youspread her reddened cheeks and push it into her asshole. Giving her one more smak, you tell her not to let this happen again, before leaving the room.'
+			'Reaching into her purse, you dig around until you find her plug, and shove it in her mouth. "Suck on it, slut. And consider yourself lucky I don''t make you wear it dry!" Grimacing, she does as she is told. Popping it out of her mouth, you spread her reddened cheeks and push it into her asshole. Giving her one more smack, you tell her not to let this happen again, before leaving the room.'
 			gs 'arousal', 'erotic', 1, 'dom'
 			gs 'arousal', 'end'
 			gs 'stat'

locations/purses.qsrc

@@ -45,6 +45,14 @@ if $ARGS[0] = 'view_purse_list':
 
 	'<center><img src="images/locations/city/citycenter/mall/fashionista.png"></center>'
 
+	i = 1
+	:loopbomba_purses
+	if bomba_purses[i] = 1 and bomba_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'', ''<<$ARGS[1]>>'', ''bomba'', <<i>>"><img src="images/pc/items/bomba/purses/<<i>>.jpg" 	height="300" /></a>'
+	i += 1
+	if i <= ARRSIZE('bomba_purses'):jump 'loopbomba_purses'
+
+	'<center><img src="images/locations/city/citycenter/mall/fashionista.png"></center>'
+
 	i = 1
 	:loopfashionistapurses
 	if fashionista_purses[i] = 1 and fashionista_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'',  ''<<$ARGS[1]>>'', ''fashionista'', <<i>>"><img src="images/pc/items/fashionista/purses/<<i>>.jpg" 	height="300" /></a>'
@@ -69,6 +77,30 @@ if $ARGS[0] = 'view_purse_list':
 
 	'<center><img src="images/locations/city/citycenter/mall/moncheri.png"></center>'
 
+	i = 1
+	:loop_coco_purses
+	if coco_purses[i] = 1 and coco_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'',  ''<<$ARGS[1]>>'', ''coco'', <<i>>"><img src="images/pc/items/coco/purses/<<i>>.jpg" 	height="300" /></a>'
+	i += 1
+	if i <= ARRSIZE('coco_purses'):jump 'loop_coco_purses'
+
+	'<center><img src="images/locations/city/citycenter/mall/moncheri.png"></center>'
+
+	i = 1
+	:loop_flamingos_purses
+	if flamingos_purses[i] = 1 and flamingos_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'',  ''<<$ARGS[1]>>'', ''flamingos'', <<i>>"><img src="images/pc/items/flamingos/purses/<<i>>.jpg" 	height="300" /></a>'
+	i += 1
+	if i <= ARRSIZE('flamingos_purses'):jump 'loop_flamingos_purses'
+
+	'<center><img src="images/locations/city/citycenter/mall/moncheri.png"></center>'
+
+	i = 1
+	:loop_danilovich_purses
+	if danilovich_purses[i] = 1 and danilovich_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'',  ''<<$ARGS[1]>>'', ''danilovich'', <<i>>"><img src="images/pc/items/danilovich/purses/<<i>>.jpg" 	height="300" /></a>'
+	i += 1
+	if i <= ARRSIZE('danilovich_purses'):jump 'loop_danilovich_purses'
+
+	'<center><img src="images/locations/city/citycenter/mall/moncheri.png"></center>'
+
 	i = 1
 	:loop_moncheri_purses
 	if moncheri_purses[i] = 1 and moncheri_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'', ''<<$ARGS[1]>>'', ''moncheri'', <<i>>"><img src="images/pc/moncheri/purses/<<i>>.jpg" 	height="300" /></a>'
@@ -187,12 +219,20 @@ end
 if $ARGS[0] = 'descriptions':
 	if $ARGS[1] = 'dolls':
 		'Let your freak flag fly with this perfect purse for the hot, independent girl that lives the alt lifestyle.'
+	elseif $ARGS[1] = 'bomba':
+		'Yeah you have attitude and with this bag everyone knows it.'
+	elseif $ARGS[1] = 'coco':
+		'A trendy bag for a young adult.'
+	elseif $ARGS[1] = 'flamingos':
+		'You look like the girl about town with this bag.'
+	elseif $ARGS[1] = 'danilovich':
+		'A sports bag for all your junk. Practical and durable but not fashionable'
 	elseif $ARGS[1] = 'fashionista':
 		'A stylish handbag for any fashion-forward female!'
 	elseif $ARGS[1] = 'gm':
 		'A functional, if not too fashionable, handbag for carrying all of the essentials.'
 	elseif $ARGS[1] = 'cats':
-		'A fun and flirty purse for any young lady looking for fun on a night out.'
+		'Is it a bag? Is it a pet? Is it a toy? Who cares you stand out and look cute.'
 	elseif $ARGS[1] = 'moncheri':
 		'A high-fashion handbag for ladies with discerning tastes. Show how classy you are with this expensive accessory.'
 	end

locations/shop_coco_carmen.qsrc

@@ -21,6 +21,8 @@ if $ARGS[0] = 'start':
 	act 'View dresses': minut += 5 & gt 'shop_coco_carmen', 'dress'
 
 	act 'View other outfits': minut += 5 & gt 'shop_coco_carmen', 'outfits'
+
+	act 'View purses': minut += 5 & gt 'shop_coco_carmen', 'purses'
 end
 
 if $ARGS[0] = 'dress':
@@ -145,5 +147,26 @@ if $ARGS[0] = 'shoes':
 	if i <= 37:jump 'loopcoco_shoes'
 end
 
+if $ARGS[0] = 'purses':
+	$loc_arg = 'purses'
+	$loc = 'shop_coco_carmen'
+	$menu_loc = 'shop_coco_carmen'
+	$menu_arg = 'purses'
+	menu_off = 0
+	*clr & cla
+	gs'stat'
+
+	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
+
+	i = 1
+
+	:loopcoco_purses
+		if bomba_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''purses2''"><img src="images/pc/items/coco/purses/<<i>>.jpg" 	height="150" /></a> '
+		i += 1
+	if i <= 20:jump 'loopcoco_purses'
+end
+
+if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'coco',i, 2000
+
 --- shop_coco_carmen ---------------------------------
 

locations/shop_dolls.qsrc

@@ -220,12 +220,12 @@ if $ARGS[0] = 'purses':
 	i = 1
 
 	:loopdolls_purses
-		if dolls_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''purses2''"><img src="images/pc/items/purses/dolls/<<i>>.jpg" height="250" /></a>'
+		if dolls_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''purses2''"><img src="images/pc/items/dolls/purses/<<i>>.jpg" height="250" /></a>'
 		i += 1
 	if i <= 20:jump 'loopdolls_purses'
 end
 
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'shop_dolls',i, 2000
+if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'dolls',i, 2000
 
 if $ARGS[0] = 'savva':
 	*clr & cla

locations/shop_flamingos.qsrc

@@ -21,6 +21,8 @@ if $ARGS[0] = 'start':
 	act 'View dresses': minut += 5 & gt 'shop_flamingos', 'dresses'
 
 	act 'View other clothing': minut += 5 & gt 'shop_flamingos', 'clothes'
+
+	act 'View purses': minut += 5 & gt 'shop_flamingos', 'purses'
 end
 
 if $ARGS[0] = 'dresses':
@@ -122,5 +124,30 @@ if $ARGS[0] = 'flamingos_outfit':
 
 end
 
+if $ARGS[0] = 'purses':
+	$loc_arg = 'purses'
+	$loc = 'shop_flamingos'
+	$menu_arg = 'purses'
+	$menu_loc = 'shop_flamingos'
+	menu_off = 0
+	*clr & cla
+	gs'stat'
+
+	act 'Return':
+		cla
+		minut += 5
+		gt 'shop_flamingos', 'start'
+	end
+
+	i = 1
+
+	:loopflamingos_purses
+		if flamingos_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''purses2''"><img src="images/pc/items/flamingos/purses/<<i>>.jpg" height="250" /></a>'
+		i += 1
+	if i <= 20:jump 'loopflamingos_purses'
+end
+
+if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'flamingos',i, 2000
+
 --- shop_flamingos ---------------------------------
 

locations/shop_tsar_bomba.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 
 	act 'View other outfits': minut += 5 & gt 'shop_tsar_bomba', 'clothes'
 
-!!	act 'View purses': minut += 5 & gt 'shop_tsar_bomba', 'purses'
+	act 'View purses': minut += 5 & gt 'shop_tsar_bomba', 'purses'
 
 end
 
@@ -139,12 +139,12 @@ if $ARGS[0] = 'purses':
 	i = 1
 
 	:loopbomba_purses
-		if bomba_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''purses2''"><img src="images/pc/purses/bomba/<<i>>.jpg" 	height="150" /></a> '
+		if bomba_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''purses2''"><img src="images/pc/items/bomba/purses/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 17:jump 'loopbomba_purses'
+	if i <= 20:jump 'loopbomba_purses'
 end
 
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'bomba',i, 4000
+if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'bomba',i, 2000
 
 --- shop_tsar_bomba ---------------------------------
 

locations/sportShop.qsrc

@@ -17,41 +17,19 @@ if $ARGS[0] = 'start':
 		'The shop sells high-quality water bottles for 1,000 <b>₽</b>. You could carry one around in '+iif(bag > 0, 'your', 'a')+' purse.'
 	end
 	
-	act 'Leave':
-		cla
-		minut += 3
-		gt 'torgcentr'
-	end
-
-	act 'View sports clothing':
-		cla
-		minut += 5
-		gt 'sportshop', 'clo'
-	end
+	act 'Leave':minut += 3 & gt 'torgcentr'
 
-	act 'View sports bras':
-		cla
-		minut += 5
-		gt 'sportshop', 'bras'
-	end
+	act 'View sports clothing':minut += 5 & gt 'sportshop', 'clo'
 
+	act 'View sports bras':minut += 5 & gt 'sportshop', 'bras'
 	
-	act 'View sports panties':
-		cla
-		minut += 5
-		gt 'sportshop', 'panties'
-	end
+	act 'View sports panties':minut += 5 & gt 'sportshop', 'panties'
 	
-	act 'View exercise shoes':
-		minut += 5
-		gt 'sportshop', 'trainers'
-	end
+	act 'View exercise shoes':minut += 5 & gt 'sportshop', 'trainers'
 
-	act 'View swimwear':
-		cla
-		minut += 5
-		gt 'sportshop', 'swim'
-	end
+	act 'View swimwear':minut += 5 & gt 'sportshop', 'swim'
+
+	act 'View purses': minut += 5 & gt 'sportshop', 'purses'
 
 	if skak = 0 and money >= 500:
 		act 'Buy a skipping rope (500 <b>₽</b>)':
@@ -280,5 +258,28 @@ if $ARGS[0] = 'bras2':
 
 end
 
+if $ARGS[0] = 'purses':
+	$loc_arg = 'purses'
+	$loc = 'sportShop'
+	menu_off = 1
+	*clr & cla
+	gs'stat'
+
+	act 'Return':
+		cla
+		minut += 1
+		gt 'sportShop', 'start'
+	end
+
+	i = 1
+
+	:loopshop_danilovich_purses
+		if shop_danilovich_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''purses2''"><img src="images/pc/items/danilovich/purses/<<i>>.jpg" 	height="150" /></a> '
+		i += 1
+	if i <= 20:jump 'loopshop_danilovich_purses'
+end
+
+if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'danilovich',i, 1500
+
 --- sportShop ---------------------------------
 

locations/treeCircActs.qsrc

@@ -5,7 +5,7 @@
 
 
 if $EntryPoint = $ARGS[0]:
-	act 'Leave the circle to <<$treeCircName[$ARGS[0]]>>':
+	act 'Leave the circle':
 		if $treeCircArg['<<$ARGS[0]>>'] = '':
 			gt $treeCircLoc['<<$ARGS[0]>>']
 		else

locations/treeCircle.qsrc

@@ -43,13 +43,28 @@ $EntryPoint = $ARGS[0]
 '<center><h2>Mysterious Circle of Trees</h2></center>'
 '<center><img <<$set_imgh>> src="images/locations/shared/park/tree_circle.jpg"></center>'
 
-'The small clearing in the center of the tree circle is two body lengths wide.  The ground is covered with a soft, sponging moss.  Everything is surprisingly visible considering you cna barely see the sky through the overhead cover of leaves and branches.  As you look to the outside of the circle, everything seems to be vague and indistinct.  This makes it hard to comprehend what lies outside the ring.'
+'The small clearing in the center of the tree circle is two body lengths wide.  The ground is covered with a soft, spongy moss.  Everything is surprisingly visible considering you can barely see the sky through the overhead cover of leaves and branches.  As you look to the outside of the circle, everything seems to be vague and indistinct.  This makes it hard to comprehend what lies outside the ring.'
 *nl
 
+if pcs_inhib >= 30 and pcs_horny > 60:
+	act 'Masturbate to clear your head':
+		*nl
+		'<center><video autoplay loop src="images/locations/shared/park/tree_masturb.mp4"></center>'
+		*nl
+		'That''s better!'
+		$orgasm_or = 'yes'
+		gs 'arousal', 'masturbate', 15
+		gs 'arousal', 'end'
+		gs 'stat'
+		cla
+		act 'Head cleared': gt 'treeCircle', $EntryPoint
+	end
+end
+
 ! Determine if this user can teleport at all.
 canTeleport = 0
 if spellKnown['teleport'] = 1:
-	'You take the Fairy''s advice and get to know this Circle.'
+	'You take the fairy''s advice and get to know this circle.'
 	minut += 15
 	if pcs_mana > spellMana['teleport']:
 		canTeleport = 1
@@ -58,7 +73,7 @@ if spellKnown['teleport'] = 1:
 		'You feel too tired to pull off a shift right now.'
 	end
 else
-	'You can feel something strange and powerful in this place, but you can''t quite put your finger on it.  It is intriguing, though, so you take your time and loook the place over to try to understand it.'
+	'You can feel something strange and powerful in this place, but you can''t quite put your finger on it.  It is intriguing though, so you take your time and look the place over to try to understand it.'
 	minut += 15
 end
 
@@ -69,25 +84,13 @@ tpKnown[$EntryPoint] = 1
 i = 0
 :LocLoop
 if i < ARRSIZE('$tpLocations'):
-	gs 'treeCircActs', $tpLocations[i]
+	if $EntryPoint ! $tpLocations[i]:
+		gs 'treeCircActs', $tpLocations[i]
+	end
 	i += 1
 	jump 'LocLoop'
 end
 killvar 'i'
-
-if pcs_inhib >= 30 and pcs_horny > 60:
-	act 'Masturbate to clear your head.':
-		*nl
-		'<center><video autoplay loop src="images/locations/shared/park/tree_masturb.mp4"></center>'
-		*nl
-		'That''s better!'
-		$orgasm_or = 'yes'
-		gs 'arousal', 'masturbate', 15
-		gs 'arousal', 'end'
-		gs 'stat'
-		cla
-		act 'Head Cleared.': gt 'treeCircle', $EntryPoint
-	end
-end
+gs 'treeCircActs', $EntryPoint
 
 --- treeCircle ---------------------------------