瀏覽代碼

Merge remote-tracking branch 'master/master'

anjuna krokus 6 月之前
父節點
當前提交
ec45a2db9c
共有 1 個文件被更改,包括 10 次插入6 次删除
  1. 10 6
      locations/stat_display.qsrc

+ 10 - 6
locations/stat_display.qsrc

@@ -1268,13 +1268,17 @@ if cheatStatusIcons = 0:
 		end
 	end
 
-	if mc_inventory['makeup_wipes'] > 0:
-		if stat_cumloc_check = 1 and menu_off = 0:
-			$statusIconBarTab += '<td><a href="exec:dynamic $d_salf"><img title="Click to use your wipes." height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
-		elseif stat_cumloc_check = 1 and menu_off = 1:
+	if mc_inventory['makeup_wipes'] > 0 and $stat_cum_msg ! '' and $stat_cum_msg ! 'Your mouth has the tangy aftertaste of sperm.':
+		if menu_off = 1:
 			$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
-		elseif stat_cumloc_check = 2:
-			$statusIconBarTab += '<td><a href="exec:msg $stat_private_msg"><img title="<<$stat_private_msg>>" height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
+		else
+			if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0 or cumloc[9] > 0 or cumloc[10] > 0 or  cumloc[11] > 0 or cumloc[13] > 0 or  cumloc[14] > 0 or cumloc[16] > 0:
+				$statusIconBarTab += '<td><a href="exec:dynamic $d_salf"><img title="Click to use your wipes." height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
+			elseif FUNC('Cum_Manage', 'check_private') = 1 and (cumloc[1] + cumloc[4] > 0 or FUNC('Cum_Manage', 'check_innards', 0) = 1 or FUNC('Cum_Manage', 'check_innards', 3) = 1) or (FUNC('Cum_Manage', 'check_private', 15) = 1 and cumloc[15] > 0) : 
+				$statusIconBarTab += '<td><a href="exec:dynamic $d_salf"><img title="Click to use your wipes." height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
+			else
+				$statusIconBarTab += '<td><a href="exec:msg $stat_private_msg"><img title="<<$stat_private_msg>>" height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
+			end
 		end
 	end