|
@@ -1383,16 +1383,16 @@ if cheatStatusIcons = 0:
|
|
|
|
|
|
!!Row 5: Drugs and other short term stuff
|
|
|
|
|
|
- if siga > 0:
|
|
|
- $stat_smoker_msg = 'You have <<siga>> cigarette'+iif(siga = 1, '', 's')+iif(smokerNeed > 0 and NarkImmune = 0, ' and you want to smoke.' , '.')
|
|
|
+ if mc_inventory['cigarettes'] > 0:
|
|
|
+ $stat_smoker_msg = 'You have <<mc_inventory[''cigarettes'']>> cigarette'+iif(mc_inventory['cigarettes'] = 1, '', 's')+iif(smokerNeed > 0 and NarkImmune = 0, ' and you want to smoke.' , '.')
|
|
|
$statusIconBarTab += '<td><a href="exec:msg $stat_smoker_msg"><img title="<<$stat_smoker_msg>>" height = <<set_siconht>> src="images/system/icons/status/cigarettes.png"></a></td>'
|
|
|
end
|
|
|
|
|
|
- if smoker >= 20 and NarkImmune = 0 and smokerNeed > 20 and siga > 0:
|
|
|
+ if smoker >= 20 and NarkImmune = 0 and smokerNeed > 20 and mc_inventory['cigarettes'] > 0:
|
|
|
$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="You really need to smoke, click to smoke a cigarette." height = <<set_siconht>> src="images/system/icons/status/craving_nicotine.png"></a></td>'
|
|
|
- elseif smoker >= 20 and NarkImmune = 0 and smokerNeed > 20 and siga <= 0:
|
|
|
+ elseif smoker >= 20 and NarkImmune = 0 and smokerNeed > 20 and mc_inventory['cigarettes'] <= 0:
|
|
|
$statusIconBarTab += '<td><a href="exec:msg ''You really need to smoke, but you have no cigarettes.''"><img title="You really need to smoke, but you have no cigarettes." height = <<set_siconht>> src="images/system/icons/status/craving_nicotine.png"></a></td>'
|
|
|
- elseif siga > 0:
|
|
|
+ elseif mc_inventory['cigarettes'] > 0:
|
|
|
$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="Click to smoke a cigarette." height = <<set_siconht>> src="images/system/icons/status/smoke_cigarette.png"></a></td>'
|
|
|
end
|
|
|
|
|
@@ -1854,20 +1854,20 @@ if enable_extra_msg = 1:
|
|
|
|
|
|
if smoker >= 20 and NarkImmune = 0:
|
|
|
if smokerNeed > 0:
|
|
|
- if siga > 0:
|
|
|
- $stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color="red"><b>You want to smoke. You have <<siga>> cigarettes left.</b></font></a><BR>'
|
|
|
+ if mc_inventory['cigarettes'] > 0:
|
|
|
+ $stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color="red"><b>You want to smoke. You have <<mc_inventory[''cigarettes'']>> cigarettes left.</b></font></a><BR>'
|
|
|
else
|
|
|
$stat_msg += '<BR><font color="red"><b>You want to smoke, but you have no cigarettes left.</b></font><BR>'
|
|
|
end
|
|
|
else
|
|
|
- if siga > 0:
|
|
|
- $stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color=#0064FF><b>You have <<siga>> cigarettes left.</b></font></a><BR>'
|
|
|
+ if mc_inventory['cigarettes'] > 0:
|
|
|
+ $stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color=#0064FF><b>You have <<mc_inventory[''cigarettes'']>> cigarettes left.</b></font></a><BR>'
|
|
|
else
|
|
|
$stat_msg += '<BR><font color=#0064FF><b>You feel like you should get some cigarettes.</b></font><BR>'
|
|
|
end
|
|
|
end
|
|
|
- elseif siga > 0:
|
|
|
- $stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color=#0064FF><b>You have <<siga>> cigarettes.</b></font></a><BR>'
|
|
|
+ elseif mc_inventory['cigarettes'] > 0:
|
|
|
+ $stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color=#0064FF><b>You have <<mc_inventory[''cigarettes'']>> cigarettes.</b></font></a><BR>'
|
|
|
end
|
|
|
|
|
|
if smokeHour = hour and smokeday = daystart and smokeminut >= minut: $stat_msg += '<BR><font color="green">You are smoking a cigarette.</font><BR>'
|