Browse Source

[added] Delete option for clothing view in wardrobe and default outfits without main clothing part can now be worn and not tell you that you've lost the main item over and over again

Kevin_Smarts 2 years ago
parent
commit
a5f0bf3a5e
2 changed files with 13 additions and 3 deletions
  1. 11 1
      locations/clothing.qsrc
  2. 2 2
      locations/wardrobe.qsrc

+ 11 - 1
locations/clothing.qsrc

@@ -79,9 +79,13 @@ $clothing_list_line = {
 		else
 		else
 			$RESULT += '<TD><center><img src="images/system/icons/clothing/resize_off.png"></center></TD>'
 			$RESULT += '<TD><center><img src="images/system/icons/clothing/resize_off.png"></center></TD>'
 		end
 		end
+		
+		if ($ARGS[1] ! 'gm_school' or ARGS[2] ! 6):
+			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''qdelete'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/delete_on.png"></a></center></TD>'
+		end	
 
 
 	else
 	else
-		$RESULT += '<TD></TD><TD></TD><TD></TD><TD></TD>'
+		$RESULT += '<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
 		if pcs_sewng >= 50 and tkan > 0 and (dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') < pcs_hips - 8 or dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') > pcs_hips + 8):
 		if pcs_sewng >= 50 and tkan > 0 and (dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') < pcs_hips - 8 or dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') > pcs_hips + 8):
 			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''tresize'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/resize.png"></a></center></TD>'
 			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''tresize'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/resize.png"></a></center></TD>'
 		else
 		else
@@ -134,6 +138,12 @@ if $ARGS[0] = 'qrepair':
 	gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 	gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 end
 end
 
 
+if $ARGS[0] = 'qdelete':
+	*clr
+	dynamic '<<$ARGS[2]>>[<<ARGS[3]>>] = 0'
+	gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
+end
+
 if $ARGS[0] = 'tresize':
 if $ARGS[0] = 'tresize':
 	*clr
 	*clr
 	minut += 5
 	minut += 5

+ 2 - 2
locations/wardrobe.qsrc

@@ -476,7 +476,7 @@ if $ARGS[0] = 'default_entry_wear':
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		act 'Return': gt 'wardrobe', $wloc
 		act 'Return': gt 'wardrobe', $wloc
 	!! do not own this clothing anymore
 	!! do not own this clothing anymore
-	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>[<<defclothingnumber[default_entry]>>]') = 0:
+	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>[<<defclothingnumber[default_entry]>>]') = 0 and defclothingnumber[default_entry] ! 0:
 		cls
 		cls
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
 		'As you go to pull your <<$def_clothing_name[default_entry]>> outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
 		'As you go to pull your <<$def_clothing_name[default_entry]>> outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
@@ -795,7 +795,7 @@ if $ARGS[0] = 'sports_entry_wear':
 	gs 'stat'
 	gs 'stat'
 
 
 	!! do not own this clothing anymore
 	!! do not own this clothing anymore
-	if dyneval('RESULT = danilovich_outfits[<<sportsclothingnumber[i]>>]') = 0:
+	if dyneval('RESULT = danilovich_outfits[<<sportsclothingnumber[i]>>]') = 0 and sportsclothingnumber[i] ! 0:
 		cls
 		cls
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
 		'As you go to pull your sports outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
 		'As you go to pull your sports outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'