Browse Source

[Added] preparation to add the kiosk and the sex shop to the new shop system.

Awesome 8 months ago
parent
commit
bb60000f84
5 changed files with 246 additions and 25 deletions
  1. 2 2
      locations/abduction.qsrc
  2. 2 2
      locations/din_bad.qsrc
  3. 217 16
      locations/item_stock_db.qsrc
  4. 24 4
      locations/saveupdater.qsrc
  5. 1 1
      locations/stol.qsrc

+ 2 - 2
locations/abduction.qsrc

@@ -51,9 +51,9 @@ if $ARGS[0] = 'abdRoomFirstChaining':
 	kosmetica_bak = mc_inventory['cosmetics']
 	lipbalm_bak = mc_inventory['lipbalm']
 	tampon_bak = mc_inventory['tampons']
-	shampoo_bak = shampoo
+	shampoo_bak = mc_inventory['shampoo']
 	stanok_bak = mc_inventory['razor']
-	deodorant_bak = deodorant
+	deodorant_bak = mc_inventory['deodorant']
 
 	mc_inventory['painkillers'] = 0
 	prezik = 0

+ 2 - 2
locations/din_bad.qsrc

@@ -128,9 +128,9 @@ if $ARGS[0] = 'd_bag':
 		'You have <b><<mc_inventory[''painkillers'']>></b> painkiller'+iif(mc_inventory['painkillers'] > 1, 's ', ' ')+'left in your purse.'
 	end
 	if mc_inventory['mouthwash'] > 0 and (pcs_breath = 0 or cumloc[12] = 1): 
-		'There''s mouthwash in your purse. <b><<mouthwash>></b> uses remaining. <a href="exec:dynamic $d_mouthwash">Use mouthwash</a>'
+		'There''s mouthwash in your purse. <b><<mc_inventory[''mouthwash'']>></b> uses remaining. <a href="exec:dynamic $d_mouthwash">Use mouthwash</a>'
 	elseif mc_inventory['mouthwash'] > 0 and pcs_breath = 1 and cumloc[12] = 0:
-		'There''s mouthwash in your purse. <b><<mouthwash>></b> uses remaining.'
+		'There''s mouthwash in your purse. <b><<mc_inventory[''mouthwash'']>></b> uses remaining.'
 	end
 	if mc_inventory['travel_mirror'] =  1: 
 		'You have a <a href="exec: cla & gt ''mirror'', ''d_bag_mirror''">compact mirror</a> in your purse'+iif(mc_inventory['travel_makeup']  >0, ' and some portable makeup.', '.')

+ 217 - 16
locations/item_stock_db.qsrc

@@ -9,16 +9,21 @@
 !! Each section refers to shop aisle.
 
 !! Item template to C&P
-!! item_idx = ''
-!! $item_curr_aisle['<<item_idx>>'] = '' 
-!! $var_curr_aisle['<<item_idx>>'] = ''
-!! $desc_curr_aisle['<<item_idx>>'] = ''
-!! quantity_curr_aisle['<<item_idx>>'] = ''
-!! max_curr_aisle['<<item_idx>>'] = ''
-!! cost_curr_aisle['<<item_idx>>'] = ''
-!! $img_curr_aisle['<<item_idx>>'] = ''
-
-
+!!	item_idx = 
+!!	$item_curr_aisle['<<item_idx>>'] = '' 
+!!	$var_curr_aisle['<<item_idx>>'] = ''
+!!	$desc_curr_aisle['<<item_idx>>'] = ''
+!!	quantity_curr_aisle['<<item_idx>>'] = 
+!!	max_curr_aisle['<<item_idx>>'] = 
+!!	cost_curr_aisle['<<item_idx>>'] = 
+!!	$img_curr_aisle['<<item_idx>>'] = ''
+
+!!	Category template
+!!	if $ARGS[0] = '':
+!!	end
+
+!! possible imagepath? would need some changes to the current images but makes it easier to add new items later on
+!! $img_curr_aisle['<<item_idx>>'] = 'images/pc/items/<<$ARGS[0]>>/<<item_idx>>.jpg'
 
 if $ARGS[0] = 'beauty':
     !! Stock Item construct
@@ -180,7 +185,7 @@ if $ARGS[0] = 'beauty':
     $var_curr_aisle['<<item_idx>>'] = 'comb'
     $desc_curr_aisle['<<item_idx>>'] = 'Prevents you getting entangled in your hair, and other hair disasters.'
     quantity_curr_aisle['<<item_idx>>'] = 1
-	max_curr_aisle['<<item_idx>>'] = 0
+	max_curr_aisle['<<item_idx>>'] = 1
     cost_curr_aisle['<<item_idx>>'] = 150
     $img_curr_aisle['<<item_idx>>'] = ''
 
@@ -189,7 +194,7 @@ if $ARGS[0] = 'beauty':
     $var_curr_aisle['<<item_idx>>'] = 'travel_mirror'
     $desc_curr_aisle['<<item_idx>>'] = 'For when you need touch up your make up, spy or send an SOS.'
     quantity_curr_aisle['<<item_idx>>'] = 1 
-	max_curr_aisle['<<item_idx>>'] = 0
+	max_curr_aisle['<<item_idx>>'] = 1
     cost_curr_aisle['<<item_idx>>'] = 1150
     $img_curr_aisle['<<item_idx>>'] = ''
 end
@@ -245,7 +250,7 @@ if $ARGS[0] = 'food':
     $var_curr_aisle['<<item_idx>>'] = 'food_wine'
     $desc_curr_aisle['<<item_idx>>'] = 'A cheap bottle of wine.'
     quantity_curr_aisle['<<item_idx>>'] = 1
-    max_curr_aisle['<<item_idx>>'] = 0
+    max_curr_aisle['<<item_idx>>'] = 1
     cost_curr_aisle['<<item_idx>>'] = 200
     $img_curr_aisle['<<item_idx>>'] = ''
 
@@ -355,7 +360,7 @@ if $ARGS[0] = 'chemist':
     item_idx = 13 
     $item_curr_aisle['<<item_idx>>'] = 'Sanitary napkins' 
     $var_curr_aisle['<<item_idx>>'] = 'sanitary_pads'
-    $desc_curr_aisle['<<item_idx>>'] = 'Cheap product that helps with that time of month.'
+    $desc_curr_aisle['<<item_idx>>'] = 'Cheap product that helps with that time of the month.'
     quantity_curr_aisle['<<item_idx>>'] = 20
 	max_curr_aisle['<<item_idx>>'] = 0
     cost_curr_aisle['<<item_idx>>'] = 100
@@ -396,13 +401,13 @@ if $ARGS[0] = 'chemist':
     $item_curr_aisle['<<item_idx>>'] = 'Nipple Cream' 
     $var_curr_aisle['<<item_idx>>'] = 'nipple_cream'
     $desc_curr_aisle['<<item_idx>>'] = 'to reduce the pain from breastfeeding'
-    quantity_curr_aisle['<<item_idx>>'] = 
+    quantity_curr_aisle['<<item_idx>>'] = 20
     max_curr_aisle['<<item_idx>>'] = 0
     cost_curr_aisle['<<item_idx>>'] = 600
     $img_curr_aisle['<<item_idx>>'] = ''
     item_idx = 19
     $item_curr_aisle['<<item_idx>>'] = 'Thrush medication' 
-    $var_curr_aisle['<<item_idx>>'] = 'thrush'
+    $var_curr_aisle['<<item_idx>>'] = 'thrush_meds'
     $desc_curr_aisle['<<item_idx>>'] = 'To treat vaginal infections'
     quantity_curr_aisle['<<item_idx>>'] = 1
     max_curr_aisle['<<item_idx>>'] = 0
@@ -410,5 +415,201 @@ if $ARGS[0] = 'chemist':
     $img_curr_aisle['<<item_idx>>'] = ''
 
 end
+
+if $ARGS[0] = 'kiosk':
+
+	item_idx = 1
+	$item_curr_aisle['<<item_idx>>'] = 'Cigarettes' 
+	$var_curr_aisle['<<item_idx>>'] = 'cigarettes'
+	$desc_curr_aisle['<<item_idx>>'] = 'Paper-wrapped tobacco for smoking, containing nicotine and harmful chemicals.'
+	quantity_curr_aisle['<<item_idx>>'] = 1
+	max_curr_aisle['<<item_idx>>'] = 0
+	cost_curr_aisle['<<item_idx>>'] = 115
+	$img_curr_aisle['<<item_idx>>'] = ''
+	
+	item_idx = 2
+	$item_curr_aisle['<<item_idx>>'] = 'Fashion magazine' 
+	$var_curr_aisle['<<item_idx>>'] = 'mag_fashion'
+	$desc_curr_aisle['<<item_idx>>'] = 'Glossy publications showcasing the latest trends, clothing, accessories, beauty tips, and celebrity styles, offering inspiration and insights for fashion enthusiasts.'
+	quantity_curr_aisle['<<item_idx>>'] = 1
+	max_curr_aisle['<<item_idx>>'] = ''
+	cost_curr_aisle['<<item_idx>>'] = 150
+	$img_curr_aisle['<<item_idx>>'] = ''
+	
+	item_idx = 3
+	$item_curr_aisle['<<item_idx>>'] = 'Computer magazine' 
+	$var_curr_aisle['<<item_idx>>'] = 'mag_computer'
+	$desc_curr_aisle['<<item_idx>>'] = 'Trendy tech publications featuring hardware, software, and industry insights for tech enthusiasts.'
+	quantity_curr_aisle['<<item_idx>>'] = 1
+	max_curr_aisle['<<item_idx>>'] = 0
+	cost_curr_aisle['<<item_idx>>'] = 150
+	$img_curr_aisle['<<item_idx>>'] = ''
+	
+	item_idx = 4
+	$item_curr_aisle['<<item_idx>>'] = 'Biographical magazine' 
+	$var_curr_aisle['<<item_idx>>'] = 'mag_biography'
+	$desc_curr_aisle['<<item_idx>>'] = 'Publications featuring in-depth profiles and life stories of notable individuals, offering inspiration and insight into their lives.'
+	quantity_curr_aisle['<<item_idx>>'] = 1
+	max_curr_aisle['<<item_idx>>'] = 0
+	cost_curr_aisle['<<item_idx>>'] = 150
+	$img_curr_aisle['<<item_idx>>'] = ''
+		
+	item_idx = 5
+	$item_curr_aisle['<<item_idx>>'] = 'Cooking magazine' 
+	$var_curr_aisle['<<item_idx>>'] = 'mag_cooking'
+	$desc_curr_aisle['<<item_idx>>'] = 'Culinary publications filled with recipes, cooking tips, food photography, and gastronomic inspiration for home chefs and food enthusiasts.'
+	quantity_curr_aisle['<<item_idx>>'] = 1
+	max_curr_aisle['<<item_idx>>'] = 0
+	cost_curr_aisle['<<item_idx>>'] = 150
+	$img_curr_aisle['<<item_idx>>'] = ''
+		
+	item_idx = 6
+	$item_curr_aisle['<<item_idx>>'] = 'Knitting magazine' 
+	$var_curr_aisle['<<item_idx>>'] = 'mag_knitting'
+	$desc_curr_aisle['<<item_idx>>'] = 'A publication filled with knitting patterns, techniques, and creative ideas for knitting enthusiasts.'
+	quantity_curr_aisle['<<item_idx>>'] = 1
+	max_curr_aisle['<<item_idx>>'] = 0
+	cost_curr_aisle['<<item_idx>>'] = 150
+	$img_curr_aisle['<<item_idx>>'] = ''
+		
+	item_idx = 7
+	$item_curr_aisle['<<item_idx>>'] = 'Fitness magazine' 
+	$var_curr_aisle['<<item_idx>>'] = 'mag_fitness'
+	$desc_curr_aisle['<<item_idx>>'] = 'A publication offering workout routines, nutrition advice, and health tips for those seeking an active and healthy lifestyle.'
+	quantity_curr_aisle['<<item_idx>>'] = 1
+	max_curr_aisle['<<item_idx>>'] = 0
+	cost_curr_aisle['<<item_idx>>'] = 150
+	$img_curr_aisle['<<item_idx>>'] = ''
+		
+	item_idx = 8
+	$item_curr_aisle['<<item_idx>>'] = 'Umbrella' 
+	$var_curr_aisle['<<item_idx>>'] = 'umbrella'
+	$desc_curr_aisle['<<item_idx>>'] = 'Portable rain protection.'
+	quantity_curr_aisle['<<item_idx>>'] = 1
+	max_curr_aisle['<<item_idx>>'] = 1
+	cost_curr_aisle['<<item_idx>>'] = 1000
+	$img_curr_aisle['<<item_idx>>'] = ''
+	
+end
+	if $ARGS[0] = 'sexshop':
+	item_idx = 1
+	$item_curr_aisle['<<item_idx>>'] = 'Lubricant'
+	$var_curr_aisle['<<item_idx>>'] = 'lubricant'
+	$desc_curr_aisle['<<item_idx>>'] = 'A lubricant for personal use.'
+	$quantity_curr_aisle['<<item_idx>>'] = 30
+	$max_curr_aisle['<<item_idx>>'] = 0
+	$cost_curr_aisle['<<item_idx>>'] = 145
+	$img_curr_aisle['<<item_idx>>'] = ''
+
+	item_idx = 2
+	$item_curr_aisle['<<item_idx>>'] = 'Porn magazine'
+	$var_curr_aisle['<<item_idx>>'] = 'mag_porn'
+	$desc_curr_aisle['<<item_idx>>'] = 'An adult magazine for mature audiences.'
+	$quantity_curr_aisle['<<item_idx>>'] = 5
+	$max_curr_aisle['<<item_idx>>'] = 0
+	$cost_curr_aisle['<<item_idx>>'] = 400
+	$img_curr_aisle['<<item_idx>>'] = ''
+
+	item_idx = 3
+	$item_curr_aisle['<<item_idx>>'] = 'Vibrator'
+	$var_curr_aisle['<<item_idx>>'] = 'vibe'
+	$desc_curr_aisle['<<item_idx>>'] = 'A vibrating device for personal pleasure.'
+	$quantity_curr_aisle['<<item_idx>>'] = 1
+	$max_curr_aisle['<<item_idx>>'] = 1
+	$cost_curr_aisle['<<item_idx>>'] = 800
+	$img_curr_aisle['<<item_idx>>'] = ''
+
+	item_idx = 4
+	$item_curr_aisle['<<item_idx>>'] = 'Butt plug'
+	$var_curr_aisle['<<item_idx>>'] = 'buttplug'
+	$desc_curr_aisle['<<item_idx>>'] = 'A sex toy that is designed to be inserted into the rectum for sexual pleasure'
+	$quantity_curr_aisle['<<item_idx>>'] = 1
+	$max_curr_aisle['<<item_idx>>'] = 1
+	$cost_curr_aisle['<<item_idx>>'] = 800
+	$img_curr_aisle['<<item_idx>>'] = ''
+
+	item_idx = 5
+	$item_curr_aisle['<<item_idx>>'] = '15cm suction dildo'
+	$var_curr_aisle['<<item_idx>>'] = 'dildo_suction'
+	$desc_curr_aisle['<<item_idx>>'] = 'A suction-based dildo for intimate use.'
+	$quantity_curr_aisle['<<item_idx>>'] = 1
+	$max_curr_aisle['<<item_idx>>'] = 0
+	$cost_curr_aisle['<<item_idx>>'] = 1000
+	$img_curr_aisle['<<item_idx>>'] = ''
+
+	item_idx = 6
+	$item_curr_aisle['<<item_idx>>'] = 'Strap-on harness'
+	$var_curr_aisle['<<item_idx>>'] = 'harness'
+	$desc_curr_aisle['<<item_idx>>'] = 'A strap-on harness securely holds a dildo for hands-free pleasure.'
+	$quantity_curr_aisle['<<item_idx>>'] = 1
+	$max_curr_aisle['<<item_idx>>'] = 1
+	$cost_curr_aisle['<<item_idx>>'] = 500
+	$img_curr_aisle['<<item_idx>>'] = ''
+
+	item_idx = 7
+	$item_curr_aisle['<<item_idx>>'] = '10cm dildo'
+	$var_curr_aisle['<<item_idx>>'] = 'dildo_small'
+	$desc_curr_aisle['<<item_idx>>'] = 'A smaller-sized dildo.'
+	$quantity_curr_aisle['<<item_idx>>'] = 1
+	$max_curr_aisle['<<item_idx>>'] = 1
+	$cost_curr_aisle['<<item_idx>>'] = 800
+	$img_curr_aisle['<<item_idx>>'] = ''
+
+	item_idx = 8
+	$item_curr_aisle['<<item_idx>>'] = '15cm dildo'
+	$var_curr_aisle['<<item_idx>>'] = 'dildo_normal'
+	$desc_curr_aisle['<<item_idx>>'] = 'A standard-sized dildo.'
+	$quantity_curr_aisle['<<item_idx>>'] = 1
+	$max_curr_aisle['<<item_idx>>'] = 1
+	$cost_curr_aisle['<<item_idx>>'] = 850
+	$img_curr_aisle['<<item_idx>>'] = ''
+
+	item_idx = 9
+	$item_curr_aisle['<<item_idx>>'] = '20cm dildo'
+	$var_curr_aisle['<<item_idx>>'] = 'dildo_big'
+	$desc_curr_aisle['<<item_idx>>'] = 'A big-sized dildo.'
+	$quantity_curr_aisle['<<item_idx>>'] = 1
+	$max_curr_aisle['<<item_idx>>'] = 1
+	$cost_curr_aisle['<<item_idx>>'] = 900
+	$img_curr_aisle['<<item_idx>>'] = ''
+
+	item_idx = 10
+	$item_curr_aisle['<<item_idx>>'] = '25cm dildo'
+	$var_curr_aisle['<<item_idx>>'] = 'dildo_large'
+	$desc_curr_aisle['<<item_idx>>'] = 'A sizable dildo.'
+	$quantity_curr_aisle['<<item_idx>>'] = 1
+	$max_curr_aisle['<<item_idx>>'] = 1
+	$cost_curr_aisle['<<item_idx>>'] = 950
+	$img_curr_aisle['<<item_idx>>'] = ''
+
+	item_idx = 11
+	$item_curr_aisle['<<item_idx>>'] = '30cm dildo'
+	$var_curr_aisle['<<item_idx>>'] = 'dildo_huge'
+	$desc_curr_aisle['<<item_idx>>'] = 'A very large dildo.'
+	$quantity_curr_aisle['<<item_idx>>'] = 1
+	$max_curr_aisle['<<item_idx>>'] = 1
+	$cost_curr_aisle['<<item_idx>>'] = 1000
+	$img_curr_aisle['<<item_idx>>'] = ''
+
+	item_idx = 12
+	$item_curr_aisle['<<item_idx>>'] = '35cm dildo'
+	$var_curr_aisle['<<item_idx>>'] = 'dildo_enormous'
+	$desc_curr_aisle['<<item_idx>>'] = 'An enormous dildo.'
+	$quantity_curr_aisle['<<item_idx>>'] = 1
+	$max_curr_aisle['<<item_idx>>'] = 1
+	$cost_curr_aisle['<<item_idx>>'] = 1100
+	$img_curr_aisle['<<item_idx>>'] = ''
+
+	item_idx = 13
+	$item_curr_aisle['<<item_idx>>'] = '40cm dildo'
+	$var_curr_aisle['<<item_idx>>'] = 'dildo_gigantic'
+	$desc_curr_aisle['<<item_idx>>'] = 'A gigantic dildo.'
+	$quantity_curr_aisle['<<item_idx>>'] = 1
+	$max_curr_aisle['<<item_idx>>'] = 1
+	$cost_curr_aisle['<<item_idx>>'] = 1200
+	$img_curr_aisle['<<item_idx>>'] = ''
+end
+
+
 --- item_stock_db ---------------------------------
 

+ 24 - 4
locations/saveupdater.qsrc

@@ -2010,12 +2010,32 @@ if temp_current_save_version < 00090003:
 	if breastpump > 0:		 mc_inventory['breast_pump']   = breastpump		  &killvar'breastpump'
 	if bpbottles > 0:		 mc_inventory['bottle_s']	   = bpbottles		  &killvar'bpbottles'
 	if bpbottlem > 0:		 mc_inventory['bottle_m']	   = bpbottlem		  &killvar'bpbottlem'
-	if bpnipplebalm > 0:	 mc_inventory['nipple_cream']  = bpnipplebalm	  &killvar'bpnipplebalm'
-	!if Kandidoz > 0: 		 mc_inventory['thrush']		   = Kandidoz		  &killvar'Kandidoz'
+!	if bpnipplebalm > 0:	 mc_inventory['nipple_cream']  = bpnipplebalm	  &killvar'bpnipplebalm'
+!	if Kandidoz > 0: 		 mc_inventory['thrush_meds']   = Kandidoz		  &killvar'Kandidoz'
 	if fatdel > 0:			 mc_inventory['weight_loss_pill']= fatdel		  &killvar'fatdel'
 	if morning_after_pill > 0: mc_inventory['morning_after_pill'] = morning_after_pill &killvar'morning_after_pill'
-	!if prezik > 0:			 mc_inventory['contraceptive_condoms'] = prezik	  &killvar'prezik'
-	!if tabletki > 0:		 mc_inventory['contraceptive_pill'] = tabletki    &killvar'tabletki' 
+!	if prezik > 0:			 mc_inventory['contraceptive_condoms'] = prezik	  &killvar'prezik'
+!	if tabletki > 0:		 mc_inventory['contraceptive_pill'] = tabletki    &killvar'tabletki' 
+!	if siga > 0:			 mc_inventory['cigarettes']	    = siga			  &killvar'siga' 
+!	if fashmag > 0:			 mc_inventory['mag_fashion']	= fashmag		  &killvar'fashmag' 
+!	if compmag > 0:			 mc_inventory['mag_computer']	= compmag		  &killvar'compmag' 
+!	if biomag > 0:			 mc_inventory['mag_biography']	= biomag		  &killvar'biomag' 
+!	if cookmag > 0:			 mc_inventory['mag_cooking']	= cookmag		  &killvar'cookmag' 
+!	if knitmag > 0:			 mc_inventory['mag_knitting']	= knitmag		  &killvar'knitmag' 
+!	if fitmag > 0:			 mc_inventory['mag_fitness']	= fitmag		  &killvar'fitmag' 
+!	if umbrella > 0:		 mc_inventory['umbrella']		= umbrella		  &killvar'umbrella'
+!	if pornMagazine > 0:	 mc_inventory['mag_porn']		= pornMagazine	  &killvar'pornMagazine'
+!	if vibrator > 0:		 mc_inventory['vibe']			= vibrator		  &killvar'vibrator'
+!	if analplug > 0:		 mc_inventory['buttplug']		= analplug		  &killvar'analplug'
+!	if suction_dildo > 0:	 mc_inventory['dildo_suction']	= suction_dildo	  &killvar'suction_dildo'
+!	if strapon > 0:			 mc_inventory['harness']		= strapon		  &killvar'strapon'
+!	if dildo > 0:			 mc_inventory['dildo_small']	= dildo			  &killvar'dildo'
+!	if middildo > 0:		 mc_inventory['dildo_normal']	= middildo		  &killvar'middildo'
+!	if largedildo > 0:		 mc_inventory['dildo_big']		= largedildo	  &killvar'largedildo'
+!	if bigdildo > 0:		 mc_inventory['dildo_large']	= bigdildo		  &killvar'bigdildo'
+!	if extradildo > 0:		 mc_inventory['dildo_huge']		= extradildo	  &killvar'extradildo'
+!	if superdildo > 0:		 mc_inventory['dildo_enormous']	= superdildo	  &killvar'superdildo'
+!	if maddildo > 0:		 mc_inventory['dildo_gigantic']	= maddildo		  &killvar'maddildo'
 end
 	
 

+ 1 - 1
locations/stol.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'start':
 	'Bric-a-brac drawer.'
 
 	if lubri > 0:'Lubricant, enough for <<lubri>> time(s).'
-	if  mc_inventory['suncream'] > 0:'Sunblock, enough for <<krem>> more application(s).'
+	if  mc_inventory['suncream'] > 0:'Sunblock, enough for <<mc_inventory[''suncream'']>> more application(s).'
 	if abonement > 0:'Fitness center subscription, valid for <<abonement>> more visit(s)'
 	if dildo > 0:'Realistic Dildo.'