Эх сурвалжийг харах

[Fixed] Old variables spotted by Skylah

Awesome 8 сар өмнө
parent
commit
6dec07f141

+ 1 - 1
locations/bedrPar.qsrc

@@ -237,7 +237,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 							act'Start a new tapestry':
 								*clr & cla
 								menu_off = 1
-								tkan -= 1
+								mc_inventory['sewing_fabric'] -= 1
 								newgobelen = 1
 								minut += 15
 								gs 'stat'

+ 2 - 2
locations/city_house_res_kitch.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'kitch':
 	'A well stocked kitchen containing all the necessities to make whatever meal you please.'
 
 	if mc_inventory['dish_plates'] > 0:
-		'You have <b><<cltarelka>></b> clean plates left.'
+		'You have <b><<mc_inventory[''dish_plates'']>></b> clean plates left.'
 	else
 		'<b><font color="red">You don''t have any clean plates left.</font></b>'
 	end
@@ -30,7 +30,7 @@ if $ARGS[0] = 'kitch':
 	if dirttarelka > 0:'There are <b><<dirttarelka>></b> dirty dishes in the sink. <a href="exec:dynamic $dirtarm">Wash the dishes</a>.'
 
 	if mc_inventory['dish_soap'] > 0:
-		'Under the sink is some dishwashing detergent, which is enough for <b><<mc_inventory[''dish_soap'']>></b> ' + iif(fairy = 1, 'time.', 'times.')
+		'Under the sink is some dishwashing detergent, which is enough for <b><<mc_inventory[''dish_soap'']>></b> ' + iif(mc_inventory['dish_soap'] = 1, 'time.', 'times.')
 	else
 		'<b><font color="red">You have nothing to wash dishes with. You should buy some detergent.</font></b>'
 	end

+ 1 - 1
locations/city_house_res_misc.qsrc

@@ -181,7 +181,7 @@ if $ARGS[0] = 'livroom':
 					act'Start a new tapestry (00:15)':
 						*clr & cla
 						menu_off = 1
-						tkan -= 1
+						mc_inventory['sewing_fabric'] -= 1
 						newgobelen = 1
 						minut += 15
 						gs'stat'

+ 2 - 2
locations/city_mansion_residence_1.qsrc

@@ -180,7 +180,7 @@ if $ARGS[0] = 'ykitchen':
 		'A well stocked kitchen containing all the necessities to make whatever meal you please.'
 
 		if mc_inventory['dish_plates'] > 0:
-			'You have <b><<cltarelka>></b> clean plates left.'
+			'You have <b><<mc_inventory[''dish_plates'']>></b> clean plates left.'
 		else
 			'<b><font color="red">You don''t have any clean plates left.</font></b>'
 		end
@@ -188,7 +188,7 @@ if $ARGS[0] = 'ykitchen':
 		if dirttarelka > 0:'There are <b><<dirttarelka>></b> dirty dishes in the sink. <a href="exec:dynamic $dirtarm">Wash the dishes</a>.'
 
 		if mc_inventory['dish_soap'] > 0:
-			'Under the sink is some dishwashing detergent, which is enough for <b><<mc_inventory[''dish_soap'']>></b> ' + iif(fairy = 1, 'time.', 'times.')
+			'Under the sink is some dishwashing detergent, which is enough for <b><<mc_inventory[''dish_soap'']>></b> ' + iif(mc_inventory['dish_soap'] = 1, 'time.', 'times.')
 		else
 			'<b><font color="red">You have nothing to wash dishes with. You should buy some detergent.</font></b>'
 		end

+ 1 - 1
locations/city_mansion_residence_2.qsrc

@@ -76,7 +76,7 @@ if $ARGS[0] = 'ylounge':
 						act'Start a new tapestry (00:15)':
 							*clr & cla
 							menu_off = 1
-							tkan -= 1
+							mc_inventory['sewing_fabric'] -= 1
 							newgobelen = 1
 							minut += 15
 							gs'stat'

+ 6 - 6
locations/clothing.qsrc

@@ -118,7 +118,7 @@ end
 
 if $ARGS[0] = 'qresize':
 	*clr
-	tkan -= 1
+	mc_inventory['sewing_fabric'] -= 1
 	minut += 30
 	dynamic '<<$ARGS[2]>>_b[<<ARGS[3]>>] = pcs_hips'
 	gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
@@ -127,11 +127,11 @@ end
 if $ARGS[0] = 'qrepair':
 	*clr
 	if rand (1, 100) < 30:
-		tkan -= 1
+		mc_inventory['sewing_fabric'] -= 1
 		minut += 30
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] += 30'
 	else
-		tkan += 3
+		mc_inventory['sewing_fabric'] += 3
 		minut += 30
 		dynamic $ARGS[2] + '[<<ARGS[3]>>] = 0'
 	end
@@ -1476,7 +1476,7 @@ if $ARGS[0] = 'view_clothing_item':
 						if rand (1, 100) < 30:
 							*clr
 							cla
-							tkan -= 1
+							mc_inventory['sewing_fabric'] -= 1
 							minut += 30
 							dynamic $ARGS[1] + '_h[<<ARGS[2]>>] += 30'
 							'<center><img <<$set_imgh>> src="images/pc/activities/sewing/fix' + rand(1,2) + '.jpg"></center>'
@@ -1485,7 +1485,7 @@ if $ARGS[0] = 'view_clothing_item':
 						else
 							*clr
 							cla
-							tkan += 3
+							mc_inventory['sewing_fabric'] += 3
 							minut += 30
 							dynamic $ARGS[1] + '[<<ARGS[2]>>] = 0'
 							'<center><img <<$set_imgh>> src="images/pc/activities/sewing/fix' + rand(1,2) + '.jpg"></center>'
@@ -1515,7 +1515,7 @@ if $ARGS[0] = 'view_clothing_item':
 						'You can resize this thanks to your sewing skill.'
 						act 'Resize item':
 							cla
-							tkan -= 1
+							mc_inventory['sewing_fabric'] -= 1
 							minut += 30
 							dynamic $ARGS[1] + '_b[<<ARGS[2]>>] = pcs_hips'
 							'You spend 30 minutes resizing the outfit.'

+ 1 - 1
locations/dachain.qsrc

@@ -87,7 +87,7 @@ if $args[0] = 'dachakit':
 	act 'Go into the main room': gt 'dachain', 'start'
 
 	if mc_inventory['dish_plates'] > 0:
-		'<b><<cltarelka>></b> clean plates are stored in the cupboard.'
+		'<b><<mc_inventory[''dish_plates'']>></b> clean plates are stored in the cupboard.'
 	else
 		'<b><font color="red">You have no clean dishes left.</font></b>'
 	end

+ 4 - 4
locations/din_van.qsrc

@@ -1388,7 +1388,7 @@ if $ARGS[0] = 'misery':
 	if mc_inventory['tech_washing_machine'] > 0:
 		if husband > 0 and husbanday > 0 and husporday ! daystart and mc_inventory['laundry_soap'] >= 1:
 			husband += 5
-			poroshok -= 1
+			mc_inventory['laundry_soap'] -= 1
 			husporday = daystart
 			'The washing machine washed your husband''s dirty laundry.'
 		elseif mc_inventory['laundry_soap'] < 1:
@@ -1400,7 +1400,7 @@ if $ARGS[0] = 'misery':
 		act 'Wash your husband''s clothes (2 units of washing powder) (1:00)':
 			*clr & cla
 			husband += 5
-			poroshok -= 2
+			mc_inventory['laundry_soap'] -= 2
 			minut += 60
 			husporday = daystart
 			pcs_mood -= 20
@@ -1434,7 +1434,7 @@ if $ARGS[0] = 'misery_2':
 	if mc_inventory['tech_washing_machine'] > 0:
 		if husband > 0 and husbanday > 0 and husporday ! daystart and mc_inventory['laundry_soap'] >= 1:
 			husband += 5
-			poroshok -= 1
+			mc_inventory['laundry_soap'] -= 1
 			husporday = daystart
 			'The washing machine washed your husband''s dirty laundry.'
 		elseif mc_inventory['laundry_soap'] < 1:
@@ -1446,7 +1446,7 @@ if $ARGS[0] = 'misery_2':
 		act 'Wash your husband''s clothes (2 units of washing powder) (1:00)':
 			*clr & cla
 			husband += 5
-			poroshok -= 2
+			mc_inventory['laundry_soap'] -= 2
 			minut += 60
 			husporday = daystart
 			pcs_mood -= 20

+ 1 - 1
locations/gadhouse.qsrc

@@ -471,7 +471,7 @@ if $ARGS[0] = 'main':
 			act'Start a new tapestry':
 				*clr & cla
 				menu_off = 1
-				tkan -= 1
+				mc_inventory['sewing_fabric'] -= 1
 				newgobelen = 1
 				minut += 15
 				gs'stat'

+ 6 - 6
locations/intro_city_select.qsrc

@@ -44,10 +44,10 @@ if $ARGS[0] = 'start':
 	pcs_comphckng = 10
 	pcs_chess = 15
 	pcs_danc = 30
-	cltarelka = 1
-	fairy = 10
+	mc_inventory['dish_plates'] = 1
+	mc_inventory['dish_soap'] = 10
 	mc_inventory['food_basic'] = 5
-	poroshok = 5
+	mc_inventory['laundry_soap'] = 5
 	mc_inventory['shampoo'] =  20
 	mc_inventory['sanitary_pads'] = 10
 	mc_inventory['tampons'] =  15
@@ -1485,10 +1485,10 @@ if $ARGS[0] = 'sg_settings':
 	gm_school[6] = 1
 	sisboyday = -2
 	gs 'homes_properties', 'block_access', 'city_apartment'
-	cltarelka = 0
-	fairy = 0
+	mc_inventory['dish_plates'] = 0
+	mc_inventory['dish_soap'] = 0
 	mc_inventory['food_basic'] = 0
-	poroshok = 0
+	mc_inventory['laundry_soap'] = 0
 	mc_inventory['shampoo'] =  0
 
 	hcolmotherremember = pcs_haircol

+ 3 - 3
locations/intro_sg_select.qsrc

@@ -1666,10 +1666,10 @@ if $ARGS[0] = 'sg_settings':
 	gm_school[6] = 1
 	sisboyday = -2
 	gs 'homes_properties', 'block_access', 'city_apartment'
-	cltarelka = 0
-	fairy = 0
+	mc_inventory['dish_plates'] = 0
+	mc_inventory['dish_soap'] = 0
 	mc_inventory['food_basic'] = 0
-	poroshok = 0
+	mc_inventory['laundry_soap'] = 0
 	mc_inventory['shampoo'] =  0
 
 	hcolmotherremember = pcs_haircol

+ 2 - 2
locations/kit_din.qsrc

@@ -355,9 +355,9 @@ $santehnik = {
 $dirtarm = {
 	if mc_inventory['dish_soap'] > 0:
 		*clr & cla
-		fairy -= 1
+		mc_inventory['dish_soap'] -= 1
 		minut += dirttarelka * 3
-		cltarelka += dirttarelka
+		mc_inventory['dish_plates'] += dirttarelka
 		dirttarelka = 0
 		pcs_mood -= 5
 		gs 'stat'

+ 1 - 1
locations/krupo.qsrc

@@ -29,7 +29,7 @@ if pcs_sewng >= 40:
 		'You can''t do your lesson without fabric so there is nothing you can do here now.'
 	else
 		minut += 60
-		tkan -= 1
+		mc_inventory['sewing_fabric'] -= 1
 		gs 'exp_gain', 'sewng', rand(pcs_intel/20, pcs_intel/10)
 		'For an hour you learn more advanced techniques and practice cutting and sewing the fabric you purchased.'
 

+ 1 - 1
locations/kuhr.qsrc

@@ -42,7 +42,7 @@ if rand(0, 50) = 50 and santehnikDolg = 0 and remkuhr = 0 and daystart > kranslo
 end
 
 if mc_inventory['dish_plates'] > 0:
-	'<b><<cltarelka>></b> clean plates are stored in the cupboard.'
+	'<b><<mc_inventory[''dish_plates'']>></b> clean plates are stored in the cupboard.'
 else
 	'<b><font color="red">You have no clean dishes left.</font></b>'
 end

+ 1 - 1
locations/kuhr2x.qsrc

@@ -41,7 +41,7 @@ if rand(0, 50) = 50 and santehnikDolg = 0 and daystart > kransloman[1] + 90:
 end
 
 if mc_inventory['dish_plates'] > 0:
-	'<b><<cltarelka>></b> clean plates are stored in the cupboard.'
+	'<b><<mc_inventory[''dish_plates'']>></b> clean plates are stored in the cupboard.'
 else
 	'<b><font color = red>You have no clean dishes left.</font></b>'
 end

+ 3 - 3
locations/pav_shared_apt.qsrc

@@ -624,7 +624,7 @@ if $ARGS[0] = 'kitchen':
 
 	! dishes
 	if mc_inventory['dish_plates'] > 0:
-		'Above the sink are <b><<cltarelka>></b> the clean plates'
+		'Above the sink are <b><<mc_inventory[''dish_plates'']>></b> the clean plates'
 	else
 		'<b><font color = red>You have no clean dishes left.</font></b>'
 	end
@@ -684,7 +684,7 @@ if $ARGS[0] = 'cleanForGuys':
 	cla
 	*clr
 	minut += 60
-	poroshok -= 3
+	mc_inventory['laundry_soap'] -= 3
 	pcs_mood -= 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stir.jpg"></center>'
@@ -775,7 +775,7 @@ if $ARGS[0] = 'pcsRoom':
 		if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0:
 			act'Start a new tapestry':
 				cls
-				tkan -= 1
+				mc_inventory['sewing_fabric'] -= 1
 				newgobelen = 1
 				minut += 15
 				gs'stat'