Pārlūkot izejas kodu

[Added] New Variable for Plasma TV
[Fixed] Old variables

Awesome 8 mēneši atpakaļ
vecāks
revīzija
be01cfdfcd

+ 2 - 2
locations/Komp.qsrc

@@ -334,7 +334,7 @@ if $ARGS[0] = 'kabtv':
 			msg 'Your subscription has been cancelled and you can no longer watch the extra channels. The cable firm charges a one-time fee of 300 <b>₽</b> for disconnecting you.'
 			gt 'komp', 'browse'
 		end
-	elseif kabel = 0 and mc_inventory['tech_tv'] = 1:
+	elseif kabel = 0 and mc_inventory['tech_tv'] >= 1:
 		'You currently do not have a cable subscription for your TV.'
 
 		act 'Get cable services for your TV':
@@ -342,7 +342,7 @@ if $ARGS[0] = 'kabtv':
 			msg 'Unfortunately your TV is too old and crap for cable. You''ll have to get a modern TV first.'
 			gt 'komp', 'browse'
 		end
-	elseif kabel = 0 and mc_inventory['tech_tv'] >= 2:
+	elseif kabel = 0 and mc_inventory['plasma_tv'] >= 1:
 		'You currently do not have a cable subscription for your TV.'
 
 		act 'Get cable services for your TV (300 <b>₽</b> per month)':

+ 2 - 2
locations/TV.qsrc

@@ -6,8 +6,8 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 	'You turn on the TV and settle comfortably on the couch.'
 
-	if mc_inventory['tech_tv'] = 1:'Your ancient TV warms up, and you''re greeted by adverts. The sound is terrible.'
-	if mc_inventory['tech_tv'] = 2:'Your huge plasma comes to life, and you hear the crisp sound of some advert. It looks great in HD.'
+	if mc_inventory['tech_tv'] = 1 and mc_inventory['plasma_tv'] = 0:'Your ancient TV warms up, and you''re greeted by adverts. The sound is terrible.'
+	if mc_inventory['plasma_tv'] >= 1:'Your huge plasma comes to life, and you hear the crisp sound of some advert. It looks great in HD.'
 
 	if kabel = 0:
 		'You do not have cable, so it shows only one channel that''s just constant advertising and news.'

+ 1 - 1
locations/city_mansion_entrance.qsrc

@@ -248,7 +248,7 @@ if $ARGS[0] = '':
 					cls
 					karta -= 250000
 					ymanrem[7] = 2
-					if mc_inventory['tech_tv'] < 2: mc_inventory['tech_tv'] = 2
+					if mc_inventory['plasma_tv'] < 1: mc_inventory['plasma_tv'] = 1
 					minut += 5
 					menu_off = 1
 					gs 'stat'

+ 1 - 1
locations/divan.qsrc

@@ -36,7 +36,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	act 'wait':gs 'obj_din', 'wait'
 
-	if mc_inventory['tech_tv'] > 0 and $loc ! 'dachain':
+	if mc_inventory['tech_tv'] >= 1 or mc_inventory['plasma_tv'] >= 1 and $loc ! 'dachain':
 		act 'Watch TV':
 			cla
 			gt 'TV', 'start'

+ 18 - 8
locations/item_stock_db.qsrc

@@ -322,13 +322,23 @@ end
 !!wip
 if $ARGS[0] = 'chemist':
 	item_idx = 1
-	$item_curr_aisle['<<item_idx>>'] = 'Condoms' 
-	$var_curr_aisle['<<item_idx>>'] = 'equipped_condoms'
-	$desc_curr_aisle['<<item_idx>>'] = 'Male contraceptive'
-	quantity_curr_aisle['<<item_idx>>'] = 5 
-	max_curr_aisle['<<item_idx>>'] = 0 
-	cost_curr_aisle['<<item_idx>>'] = 500
-	$img_curr_aisle['<<item_idx>>'] = ''
+	if preziktype = 0:
+		$item_curr_aisle['<<item_idx>>'] = 'Condoms' 
+		$var_curr_aisle['<<item_idx>>'] = 'equipped_condoms'
+		$desc_curr_aisle['<<item_idx>>'] = 'Male contraceptive'
+		quantity_curr_aisle['<<item_idx>>'] = 5 
+		max_curr_aisle['<<item_idx>>'] = 0 
+		cost_curr_aisle['<<item_idx>>'] = 500
+		$img_curr_aisle['<<item_idx>>'] = ''
+	elseif preziktype = 1 or preziktype = 2:
+		$item_curr_aisle['<<item_idx>>'] = 'Condoms' 
+		$var_curr_aisle['<<item_idx>>'] = 'normal_condoms'
+		$desc_curr_aisle['<<item_idx>>'] = 'Male contraceptive'
+		quantity_curr_aisle['<<item_idx>>'] = 5 
+		max_curr_aisle['<<item_idx>>'] = 0 
+		cost_curr_aisle['<<item_idx>>'] = 500
+		$img_curr_aisle['<<item_idx>>'] = ''
+	end
 
 	item_idx = 2
 	if therapistFuckedPussyStage < 2:
@@ -716,7 +726,7 @@ if $ARGS[0] = 'tech':
 
 	item_idx = 2
 	$item_curr_aisle['<<item_idx>>'] = 'Large Plasma TV'
-	$var_curr_aisle['<<item_idx>>'] = 'tech_tv'
+	$var_curr_aisle['<<item_idx>>'] = 'plasma_tv'
 	$desc_curr_aisle['<<item_idx>>'] = 'An expansive plasma television with stunning picture quality.'
 	quantity_curr_aisle['<<item_idx>>'] = 1
 	max_curr_aisle['<<item_idx>>'] = 1

+ 1 - 1
locations/korr2x.qsrc

@@ -13,7 +13,7 @@ $location_type = 'private'
 killvar '$locclass'
 clr
 !!have to give Sveta ownership of plasma tv so she can get cable
-mc_inventory['tech_tv'] = 2
+mc_inventory['plasma_tv'] = 1
 popolaini = 0
 saunaYouRoom = 0
 boycherdaksex = 0

+ 10 - 10
locations/pav_pharmacy.qsrc

@@ -597,12 +597,12 @@ if $ARGS[0] = 'buy_preg_test':
 	if pharmacyfirstpregtest = 0:
 		pharmacyfirstpregtest = 1
 		if preziktype = 0:
-			prezik += 5
+			mc_inventory['equipped_condoms'] += 5
 		elseif preziktype = 1 or preziktype = 2:
-			prezikcount += 5
+			mc_inventory['normal_condoms'] += 5
 		end
 		minut += 2
-		prezikcount += 5
+		mc_inventory['normal_condoms'] += 5
 		if fame['pav_slut'] > 150:
 			'"Aunt Luda... I need... I need a pregnancy test."'
 			'You glance up expecting an explosive reaction of surprise but are surprised yourself when you see her looking at you with what appeared to be disappointed resignation.'
@@ -636,7 +636,7 @@ if $ARGS[0] = 'buy_preg_test':
 		end
 	else
 		minut += rand(2, 5)
-		prezikcount += 5
+		mc_inventory['normal_condoms'] += 5
 		act'Meekly ask':
 			cla & *nl
 			'"I need... I need another pregnancy test, Aunt Luda" you stammer.'
@@ -1055,9 +1055,9 @@ if $ARGS[0] = 'morning_after_warning':
 	else
 		act'I prefer condoms':
 			if preziktype = 0:
-				prezik += 5
+				mc_inventory['equipped_condoms'] += 5
 			elseif preziktype = 1 or preziktype = 2:
-				prezikcount += 5
+				mc_inventory['normal_condoms'] += 5
 			end
 			cla & *nl
 			'"I actually prefer using condoms," you say.'
@@ -1351,9 +1351,9 @@ end
 if $ARGS[0] = 'luda_free_condoms_give':
 	LudaQW['condom_give_day'] = daystart
 	if preziktype = 0:
-		prezik += 10
+		mc_inventory['equipped_condoms'] += 10
 	elseif preziktype = 1 or preziktype = 2:
-		prezikcount += 10
+		mc_inventory['normal_condoms'] += 10
 	end
 	morning_after_pill += 1
 end
@@ -1686,9 +1686,9 @@ if $ARGS[0] = 'condom_addon':
 			LudaQW['knows_sex'] = 1
 			money -= 300
 			if preziktype = 0:
-				prezik += 5
+				mc_inventory['equipped_condoms'] += 5
 			elseif preziktype = 1 or preziktype = 2:
-				prezikcount += 5
+				mc_inventory['normal_condoms'] += 5
 			end
 			cla & *clr
 			'<center><B><font color="maroon">Pharmacy</font></B></center>'

+ 2 - 2
locations/pav_shared_apt.qsrc

@@ -722,8 +722,8 @@ if $ARGS[0] = 'pcsRoom':
 	*nl
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	*nl
-	if mc_inventory['tech_tv'] = 0:$TV = 'a great place for a TV, if you had one'
-	if mc_inventory['tech_tv'] = 1:$TV = 'an old CRT <a href="exec:gt ''TV'', ''start''">TV</a> sits on the shelf'
+	if mc_inventory['tech_tv'] = 0 & mc_inventory['plasma_tv'] = 0:$TV = 'a great place for a TV, if you had one'
+	if mc_inventory['tech_tv'] >= 1:$TV = 'an old CRT <a href="exec:gt ''TV'', ''start''">TV</a> sits on the shelf'
 	'There is an wall unit at the other side of the room, <<$TV>>. Everyone in the household spends their time in their own rooms, so there was never a reason to use the living room for its intended purpose.'
 	*nl
 	if stol = 0:$stol = 'an old scratched <a href="exec:gt ''stol'', ''start''">table</a>'

+ 3 - 1
locations/saveupdater.qsrc

@@ -2057,7 +2057,9 @@ if temp_current_save_version < 00090003:
 	if cltarelka > 0:		 mc_inventory['dish_plates']	= cltarelka 	  &killvar'cltarelka'
 	if tkan > 0:			 mc_inventory['sewing_fabric']	= tkan 			  &killvar'tkan'
 	if sewing_kit > 0:		 mc_inventory['sewing_kit']		= sewing_kit	  &killvar'sewing_kit'
-	if TV > 0:	 		 	 mc_inventory['tech_tv']		= TV	  		  &killvar'TV'
+	if TV = 1:	 		 	 mc_inventory['tech_tv']		= 1	  		  	  &killvar'TV'
+	if TV >= 2:	 		 	 mc_inventory['plasma_tv']		= 1	  		 	  &killvar'TV'
+	if mc_inventory['tech_tv'] >= 2: mc_inventory['plasma_tv'] = 1
 	if komp > 0:			 mc_inventory['tech_computer']	= komp	 		  &killvar'komp'
 	if GameCD2 > 0:			 mc_inventory['tech_game_ds']	= GameCD2		  &killvar'GameCD2'
 	if posudomashina > 0:	 mc_inventory['tech_dishwasher']= posudomashina	  &killvar'posudomashina'

+ 4 - 4
locations/sitr.qsrc

@@ -15,7 +15,7 @@ gs 'themes', 'indoors'
 '<center><b><font color="maroon">Living room</font></b></center>'
 
 if remsitr = 0:
-	if mc_inventory['tech_tv'] = 0 or mc_inventory['tech_computer'] = 0:
+	if mc_inventory['tech_tv'] = 0 and mc_inventory['plasma_tv'] = 0 or mc_inventory['tech_computer'] = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sitr.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sitr1.jpg"></center>'
@@ -28,9 +28,9 @@ elseif remsitr = 1:
 	$zal = 'A modern, bright room'
 	$zal2 = 'papered walls'
 end
-if mc_inventory['tech_tv'] = 0: $TV = 'a great place for a TV, if you had one.'
-if mc_inventory['tech_tv'] = 1: $TV = 'an old CRT <a href="exec:gt ''TV'', ''start''">television</a>'
-if mc_inventory['tech_tv'] = 2: $TV = 'a huge plasma <a href="exec:gt ''TV'', ''start''">TV</a>'
+if mc_inventory['tech_tv'] = 0 & mc_inventory['plasma_tv'] = 0: $TV = 'a great place for a TV, if you had one.'
+if mc_inventory['tech_tv'] >= 1: $TV = 'an old CRT <a href="exec:gt ''TV'', ''start''">television</a>'
+if mc_inventory['plasma_tv'] >= 1: $TV = 'a huge plasma <a href="exec:gt ''TV'', ''start''">TV</a>'
 ! WD: Missing Code to buy / Upgrade Sofa, Uninitialised ~ 'divan'
 if divan = 0:$divan = '<a href="exec:gt ''divan'', ''start''">An old sofa</a>'
 if divan = 1:$divan = '<a href="exec:gt ''divan'', ''start''">A luxurious leather sofa</a>'