Browse Source

Fixes thanks to Acien

KevinSmarts 6 years ago
parent
commit
054d6a05e5
1 changed files with 18 additions and 51 deletions
  1. 18 51
      locations/Komp

+ 18 - 51
locations/Komp

@@ -706,32 +706,13 @@ end
 
 if $ARGS[0] = 'waitclients':
 	cls
-	minut = minut + RAND(1,4)
-	if mfccum = 0:
-		pcs_mood -= RAND(0,3)
-	elseif mfccum = 1:
-		mfcdaycum = daystart
-		pcs_mood -= RAND(1,3)
-	elseif mfccum = 2:
-		mfcdaycum = daystart
-		pcs_mood -= RAND(2,5)
-	elseif mfccum = 3:
-		mfcdaycum = daystart
-		pcs_mood -= RAND(5,8)
-	elseif mfccum = 4:
-		mfcdaycum = daystart
-		pcs_mood -= RAND(5,11)
-	elseif mfccum = 5:
-		mfcdaycum = daystart
-		pcs_mood -= RAND(7,12)
-	elseif mfccum > 5:
-		mfcdaycum = daystart
-		pcs_mood -= RAND(10,20)
-	end
+	minut += RAND(1,4)
+	if mfccum > 0: mfcdaycum = daystart
+
 	mfcclients += 1
 
-	if pcs_apprnc < 100:
-		if topmfc = 1 and backmfc = 1:
+	if topmfc = 1 and backmfc = 1:
+		if pcs_apprnc < 100:
 			if webpopular < 15:
 				if mfcclients > 3:
 					camclients -= RAND(1,3)
@@ -766,9 +747,7 @@ if $ARGS[0] = 'waitclients':
 					tokens += RAND(1,20)
 				end
 			end
-		end
-	else
-		if topmfc = 1 and backmfc = 1:
+		else
 			if webpopular < 15:
 				if mfcclients > 3:
 					camclients -= RAND(3,5)
@@ -804,9 +783,8 @@ if $ARGS[0] = 'waitclients':
 				end
 			end
 		end
-	end
-	if pcs_apprnc < 100:
-		if topmfc = 0 and backmfc = 1:
+	elseif topmfc = 0 and backmfc = 1:
+		if pcs_apprnc < 100:
 			if webpopular < 15:
 				if mfcclients > 3:
 					camclients -= RAND(1,3)
@@ -841,9 +819,7 @@ if $ARGS[0] = 'waitclients':
 					tokens += RAND(1,20)
 				end
 			end
-		end
-	else
-		if topmfc = 0 and backmfc = 1:
+		else
 			if webpopular < 15:
 				if mfcclients > 3:
 					camclients -= RAND(3,6)
@@ -879,9 +855,8 @@ if $ARGS[0] = 'waitclients':
 				end
 			end
 		end
-	end
-	if pcs_apprnc < 100:
-		if topmfc = 1 and backmfc = 0:
+	elseif topmfc = 1 and backmfc = 0:
+		if pcs_apprnc < 100:
 			if webpopular < 15:
 				if mfcclients > 3:
 					camclients -= RAND(1,3)
@@ -916,9 +891,7 @@ if $ARGS[0] = 'waitclients':
 					tokens += RAND(1,20)
 				end
 			end
-		end
-	else
-		if topmfc = 1 and backmfc = 0:
+		else
 			if webpopular < 15:
 				if mfcclients > 3:
 					camclients -= RAND(4,7)
@@ -954,9 +927,8 @@ if $ARGS[0] = 'waitclients':
 				end
 			end
 		end
-	end
-	if pcs_apprnc < 100:
-		if topmfc = 0 and backmfc = 0:
+	else
+		if pcs_apprnc < 100:
 			if webpopular < 15:
 				if mfcclients > 3:
 					camclients -= RAND(1,4)
@@ -991,9 +963,7 @@ if $ARGS[0] = 'waitclients':
 					tokens += RAND(5,25)
 				end
 			end
-		end 
-	else
-		if topmfc = 0 and backmfc = 0:
+		else
 			if webpopular < 15:
 				if mfcclients > 3:
 					camclients -= RAND(3,8)
@@ -1035,14 +1005,11 @@ if $ARGS[0] = 'waitclients':
 
 	if topmfc = 1 and backmfc = 1:
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore3.jpg"></center>'
-	end
-	if topmfc = 0 and backmfc = 1:
+	elseif topmfc = 0 and backmfc = 1:
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore4.jpg"></center>'
-	end
-	if topmfc = 1 and backmfc = 0:
+	elseif topmfc = 1 and backmfc = 0:
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore5.jpg"></center>'
-	end
-	if topmfc = 0 and backmfc = 0:
+	else
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/camwhore6.jpg"></center>'
 	end