Browse Source

Merge remote-tracking branch 'Anjuna/master'

Kevin_Smarts 2 weeks ago
parent
commit
6caf12bf0b
2 changed files with 11 additions and 4 deletions
  1. 7 3
      locations/clothing.qsrc
  2. 4 1
      locations/wardrobe.qsrc

+ 7 - 3
locations/clothing.qsrc

@@ -217,15 +217,19 @@ end
 
 
 if $ARGS[0] = 'qrepair':
 if $ARGS[0] = 'qrepair':
 	*clr
 	*clr
-	if rand (1, 100) < 30:
+	minut += 30
+	temp_rand = rand(0, 99)
+	if temp_rand < pcs_sewng / 4:
 		mc_inventory['sewing_fabric'] -= 1
 		mc_inventory['sewing_fabric'] -= 1
-		minut += 30
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] += 30'
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] += 30'
+	elseif temp_rand < pcs_sewng / 2:
+		mc_inventory['sewing_fabric'] -= 1
+		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] += 15'
 	else
 	else
 		mc_inventory['sewing_fabric'] += 3
 		mc_inventory['sewing_fabric'] += 3
-		minut += 30
 		dynamic $ARGS[2] + '[<<ARGS[3]>>] = 0'
 		dynamic $ARGS[2] + '[<<ARGS[3]>>] = 0'
 	end
 	end
+	killvar 'temp_rand'
 	gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 	gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 end
 end
 
 

+ 4 - 1
locations/wardrobe.qsrc

@@ -609,7 +609,10 @@ if $ARGS[0] = 'default_entry_wear':
 		cla & *clr
 		cla & *clr
 		'<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.'
-		act 'Return': gt 'wardrobe', $wloc
+		act 'Return':
+			gs 'clothing', 'strip'
+			gt 'wardrobe', $wloc
+		end
 	!! strength of clothing is less than or equal to 0
 	!! strength of clothing is less than or equal to 0
 	elseif dyneval('RESULT = <<$temp1>>_h[<<temp2>>]') <= 0 and $temp1 ! 'nude':
 	elseif dyneval('RESULT = <<$temp1>>_h[<<temp2>>]') <= 0 and $temp1 ! 'nude':
 		cla & *clr
 		cla & *clr