Browse Source

Fixes, thanks to doodab

KevinSmarts 8 năm trước cách đây
mục cha
commit
0721117709
2 tập tin đã thay đổi với 55 bổ sung76 xóa
  1. 7 7
      locations/Cheatmenu_din
  2. 48 69
      locations/portnoi2

+ 7 - 7
locations/Cheatmenu_din

@@ -724,13 +724,13 @@ $cheatmenu['week'] = {
 	pl'<center><a href="exec:dynamic $cheatmenu"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	pl''
 	pl'Right now <<$week>> <<day>> number, <<$month>>, <<year>> year.'
-	pl'<a href="exec:week = 1 & $week = 'Monday' & dynamic $cheatmenu[''time'']">Monday</a>'
-	pl'<a href="exec:week = 2 & $week = 'Tuesday' & dynamic $cheatmenu[''time'']">Tuesday</a>'
-	pl'<a href="exec:week = 3 & $week = 'Wednesday' & dynamic $cheatmenu[''time'']">Wednesday</a>'
-	pl'<a href="exec:week = 4 & $week = 'Thursday' & dynamic $cheatmenu[''time'']">Thursday</a>'
-	pl'<a href="exec:week = 5 & $week = 'Friday' & dynamic $cheatmenu[''time'']">Friday</a>'
-	pl'<a href="exec:week = 6 & $week = 'Saturday' & dynamic $cheatmenu[''time'']">Saturday</a>'
-	pl'<a href="exec:week = 7 & $week = 'Sunday' & dynamic $cheatmenu[''time'']">Sunday</a>'
+	pl'<a href="exec:week = 1 & $week = ''Monday'' & dynamic $cheatmenu[''time'']">Monday</a>'
+	pl'<a href="exec:week = 2 & $week = ''Tuesday'' & dynamic $cheatmenu[''time'']">Tuesday</a>'
+	pl'<a href="exec:week = 3 & $week = ''Wednesday'' & dynamic $cheatmenu[''time'']">Wednesday</a>'
+	pl'<a href="exec:week = 4 & $week = ''Thursday'' & dynamic $cheatmenu[''time'']">Thursday</a>'
+	pl'<a href="exec:week = 5 & $week = ''Friday'' & dynamic $cheatmenu[''time'']">Friday</a>'
+	pl'<a href="exec:week = 6 & $week = ''Saturday'' & dynamic $cheatmenu[''time'']">Saturday</a>'
+	pl'<a href="exec:week = 7 & $week = ''Sunday'' & dynamic $cheatmenu[''time'']">Sunday</a>'
 }
 
 $cheatmenu['month'] = {

+ 48 - 69
locations/portnoi2

@@ -3,79 +3,69 @@ poshvalldrop = 0
 
 i = 1
 :cheapmet
-	if cheap[i] = 1 and (cheapB[i] > bedra + 8) and (cheapB[i] < bedra - 8):poshvalldrop += 1
+	if cheap[i] = 1 and ((cheapB[i] > bedra + 8) or (cheapB[i] < bedra - 8)):poshvalldrop += 1
 	i += 1
 if i <= 85:jump 'cheapmet'
 
 i = 1
 :averagemet
-	if average[i] = 1 and (averageB[i] > bedra + 8) and (averageB[i] < bedra - 8):poshvalldrop += 1
+	if average[i] = 1 and ((averageB[i] > bedra + 8) or (averageB[i] < bedra - 8)):poshvalldrop += 1
 	i += 1
 if i <= 125:jump 'averagemet'
 
 i = 1
 :expensivemet
-	if expensive[i] = 1 and (expensiveB[i] > bedra + 8) and (expensiveB[i] < bedra - 8):poshvalldrop += 1
+	if expensive[i] = 1 and ((expensiveB[i] > bedra + 8) or (expensiveB[i] < bedra - 8)):poshvalldrop += 1
 	i += 1
 if i <= 147:jump 'expensivemet'
 
 i = 1
 :formalmet
-	if formal[i] = 1 and (formalB[i] > bedra + 8) and (formalB[i] < bedra - 8):poshvalldrop += 1
+	if formal[i] = 1 and ((formalB[i] > bedra + 8) or (formalB[i] < bedra - 8)):poshvalldrop += 1
 	i += 1
 if i <= 14:jump 'formalmet'
 
 i = 1
 :officemet
-	if office[i] = 1 and (officeB[i] > bedra + 8) and (officeB[i] < bedra - 8):poshvalldrop += 1
+	if office[i] = 1 and ((officeB[i] > bedra + 8) or (officeB[i] < bedra - 8)):poshvalldrop += 1
 	i += 1
 if i <= 30:jump 'officemet'
 
 i = 1
 :schoolmet
-	if school[i] = 1 and (schoolB[i] > bedra + 8) and (schoolB[i] < bedra - 8):poshvalldrop += 1
+	if school[i] = 1 and ((schoolB[i] > bedra + 8) or (schoolB[i] < bedra - 8)):poshvalldrop += 1
 	i += 1
 	if i = 6: i = 7
 if i <= 14:jump 'schoolmet'
 
-i = 1
-:exercisemet
-	if exercise[i] = 1 and (exerciseB[i] > bedra + 8) and (exerciseB[i] < bedra - 8):poshvalldrop += 1
-	i += 1
-if i <= 26:jump 'exercisemet'
-
 i = 1
 :naughtymet
-	if naughty[i] = 1 and (naughtyB[i] > bedra + 8) and (naughtyB[i] < bedra - 8):poshvalldrop += 1
+	if naughty[i] = 1 and ((naughtyB[i] > bedra + 8) or (naughtyB[i] < bedra - 8)):poshvalldrop += 1
 	i += 1
 if i <= 67:jump 'naughtymet'
 
 i = 1
 :exhibitmet
-	if exhibit[i] = 1 and (exhibitB[i] > bedra + 8) and (exhibitB[i] < bedra - 8):poshvalldrop += 1
+	if exhibit[i] = 1 and ((exhibitB[i] > bedra + 8) or (exhibitB[i] < bedra - 8)):poshvalldrop += 1
 	i += 1
 if i <= 30:jump 'exhibitmet'
 
 i = 1
 :uniformmet
-	if uniform[i] = 1 and (uniformB[i] > bedra + 8) and (uniformB[i] < bedra - 8):poshvalldrop += 1
+	if uniform[i] = 1 and ((uniformB[i] > bedra + 8) or (uniformB[i] < bedra - 8)):poshvalldrop += 1
 	i += 1
 if i <= 24:jump 'uniformmet'
 
-i = 1
-:coatmet
-	if coat[i] = 1 and (coatB[i] > bedra + 8) and (coatB[i] < bedra - 8):poshvalldrop += 1
-	i += 1
-if i <= 12:jump 'coatmet'
-
 i = 1
 :swimwearmet
-	if swimwear[i] = 1 and (swimwearB[i] > bedra + 8) and (swimwearB[i] < bedra - 8):poshvalldrop += 1
+	if swimwear[i] = 1 and ((swimwearB[i] > bedra + 8) or (swimwearB[i] < bedra - 8)):poshvalldrop += 1
 	i += 1
 if i <= 30:jump 'swimwearmet'
 
-if money < poshvalldrop * 500:
-	'You do not have enough money to resize all of your clothing. The total cost would be <<poshvalldrop * 500>> <b>₽</b>.'
+poshvalldrop *= 500
+
+if money < poshvalldrop:
+	'You do not have enough money to resize all of your clothing. The total cost would be <<poshvalldrop>> <b>₽</b>.'
 
 	if $loc = 'Gshveyfab':
 		act 'Leave':gt 'Gshveyfab', 'start'
@@ -84,82 +74,71 @@ if money < poshvalldrop * 500:
 	end
 
 	exit
-elseif money >= poshvalldrop * 500:
-	money -= poshvalldrop * 500
-
-	i = 1
-	:cheapmet
-		if cheap[i] = 1 and (cheapB[i] > bedra + 8) and (cheapB[i] < bedra - 8):cheapB[i] = bedra
-		i += 1
-	if i <= 85:jump 'cheapmet'
-
-	i = 1
-	:averagemet
-		if average[i] = 1 and (averageB[i] > bedra + 8) and (averageB[i] < bedra - 8):averageB[i] = bedra
-		i += 1
-	if i <= 125:jump 'averagemet'
+elseif money >= poshvalldrop:
+	money -= poshvalldrop
 
 	i = 1
-	:expensivemet
-		if expensive[i] = 1 and (expensiveB[i] > bedra + 8) and (expensiveB[i] < bedra - 8):expensiveB[i] = bedra
+	:xcheapmet
+		if cheap[i] = 1 and ((cheapB[i] > bedra + 8) or (cheapB[i] < bedra - 8)):cheapB[i] = bedra
 		i += 1
-	if i <= 147:jump 'expensivemet'
+	if i <= 85:jump 'xcheapmet'
 
 	i = 1
-	:formalmet
-		if formal[i] = 1 and (formalB[i] > bedra + 8) and (formalB[i] < bedra - 8):formalB[i] = bedra
+	:xaveragemet
+		if average[i] = 1 and ((averageB[i] > bedra + 8) or (averageB[i] < bedra - 8)):averageB[i] = bedra
 		i += 1
-	if i <= 14:jump 'formalmet'
+	if i <= 125:jump 'xaveragemet'
 
 	i = 1
-	:officemet
-		if office[i] = 1 and (officeB[i] > bedra + 8) and (officeB[i] < bedra - 8):officeB[i] = bedra
+	:xexpensivemet
+		if expensive[i] = 1 and ((expensiveB[i] > bedra + 8) or (expensiveB[i] < bedra - 8)):expensiveB[i] = bedra
 		i += 1
-	if i <= 30:jump 'officemet'
+	if i <= 147:jump 'xexpensivemet'
 
 	i = 1
-	:schoolmet
-		if school[i] = 1 and (schoolB[i] > bedra + 8) and (schoolB[i] < bedra - 8):schoolB[i] = bedra
+	:xformalmet
+		if formal[i] = 1 and ((formalB[i] > bedra + 8) or (formalB[i] < bedra - 8)):formalB[i] = bedra
 		i += 1
-	if i <= 14:jump 'schoolmet'
+	if i <= 14:jump 'xformalmet'
 
 	i = 1
-	:exercisemet
-		if exercise[i] = 1 and (exerciseB[i] > bedra + 8) and (exerciseB[i] < bedra - 8):exerciseB[i] = bedra
+	:xofficemet
+		if office[i] = 1 and ((officeB[i] > bedra + 8) or (officeB[i] < bedra - 8)):officeB[i] = bedra
 		i += 1
-	if i <= 26:jump 'exercisemet'
+	if i <= 30:jump 'xofficemet'
 
 	i = 1
-	:naughtymet
-		if naughty[i] = 1 and (naughtyB[i] > bedra + 8) and (naughtyB[i] < bedra - 8):naughtyB[i] = bedra
+	:xschoolmet
+		if school[i] = 1 and ((schoolB[i] > bedra + 8) or (schoolB[i] < bedra - 8)):schoolB[i] = bedra
 		i += 1
-	if i <= 67:jump 'naughtymet'
+		if i = 6: i = 7
+	if i <= 14:jump 'xschoolmet'
 
 	i = 1
-	:exhibitmet
-		if exhibit[i] = 1 and (exhibitB[i] > bedra + 8) and (exhibitB[i] < bedra - 8):exhibitB[i] = bedra
+	:xnaughtymet
+		if naughty[i] = 1 and ((naughtyB[i] > bedra + 8) or (naughtyB[i] < bedra - 8)):naughtyB[i] = bedra
 		i += 1
-	if i <= 30:jump 'exhibitmet'
+	if i <= 67:jump 'xnaughtymet'
 
 	i = 1
-	:uniformmet
-		if uniform[i] = 1 and (uniformB[i] > bedra + 8) and (uniformB[i] < bedra - 8):uniformB[i] = bedra
+	:xexhibitmet
+		if exhibit[i] = 1 and ((exhibitB[i] > bedra + 8) or (exhibitB[i] < bedra - 8)):exhibitB[i] = bedra
 		i += 1
-	if i <= 24:jump 'uniformmet'
+	if i <= 30:jump 'xexhibitmet'
 
 	i = 1
-	:coatmet
-		if coat[i] = 1 and (coatB[i] > bedra + 8) and (coatB[i] < bedra - 8):coatB[i] = bedra
+	:xuniformmet
+		if uniform[i] = 1 and ((uniformB[i] > bedra + 8) or (uniformB[i] < bedra - 8)):uniformB[i] = bedra
 		i += 1
-	if i <= 12:jump 'coatmet'
+	if i <= 24:jump 'xuniformmet'
 
 	i = 1
-	:swimwearmet
-		if swimwear[i] = 1 and (swimwearB[i] > bedra + 8) and (swimwearB[i] < bedra - 8):swimwearB[i] = bedra
+	:xswimwearmet
+		if swimwear[i] = 1 and ((swimwearB[i] > bedra + 8) or (swimwearB[i] < bedra - 8)):swimwearB[i] = bedra
 		i += 1
-	if i <= 30:jump 'swimwearmet'
+	if i <= 30:jump 'xswimwearmet'
 
-	'You resize all clothing for <<poshvalldrop*500>> <b>₽</b>.'
+	'You resize all clothing for <<poshvalldrop>> <b>₽</b>.'
 
 	if $loc = 'Gshveyfab':
 		act 'Leave':gt 'Gshveyfab', 'start'