Sfoglia il codice sorgente

[fixed] gameovers through stat caused a crash + small layout changes

anjuna krokus 3 mesi fa
parent
commit
9f76cf674b
3 ha cambiato i file con 12 aggiunte e 13 eliminazioni
  1. 10 4
      locations/drugs.qsrc
  2. 1 4
      locations/gameover.qsrc
  3. 1 5
      locations/stat.qsrc

+ 10 - 4
locations/drugs.qsrc

@@ -39,7 +39,6 @@ elseif $ARGS[0] = 'stat':
 	gs 'drugs', 'cocaine', 'stat'
 	gs 'drugs', 'amphetamine', 'stat'
 
-
 elseif $ARGS[0] = 'pain_relief':
 	if alko > 9:
 		pain['relief'] = 70
@@ -332,6 +331,7 @@ elseif $ARGS[0] = 'mentats':
 		gs 'stat'
 	end
 
+
 elseif $ARGS[0] = 'steroids':
 	if $ARGS[1] = 'cikl':
 		if drugVars['steroids_dose'] >= 1:
@@ -390,6 +390,7 @@ elseif $ARGS[0] = 'breastcream':
 		gs 'stat'
 	end
 
+
 elseif $ARGS[0] = 'painkiller':
 	if ARGS[1] = 0 and $ARGS[1] = '':
 		mc_inventory['painkillers'] -= 1
@@ -400,6 +401,7 @@ elseif $ARGS[0] = 'painkiller':
 	pain['killer'] += 1
 	gs 'stat'
 
+
 elseif $ARGS[0] = 'alcohol':
 	if $ARGS[1] = 'stat':
 		if alko > 9:
@@ -463,7 +465,6 @@ elseif $ARGS[0] = 'alcohol':
 				end
 
 			elseif $ARGS[1] = 'vodka' or $ARGS[1] = 'whiskey' or $ARGS[1] = 'scotch' or $ARGS[1] = 'rum':
-				pcs_traits['alko_day'] += 3
 				if pcs_traits['alko_status'] = -1:
 					alko += rand(4,5)
 				elseif pcs_traits['alko_status'] = 1:
@@ -471,6 +472,7 @@ elseif $ARGS[0] = 'alcohol':
 				else
 					alko += 3
 				end
+				pcs_traits['alko_day'] += 3
 
 				fat += 6
 				if pcs_hydra >= 100:
@@ -509,6 +511,7 @@ elseif $ARGS[0] = 'alcohol':
 		gs 'stat'
 	end
 
+
 elseif $ARGS[0] = 'aphrodisiac':
 	if $ARGS[1] = 'cikl':
 		if drugVars['aphrodisiac_overdose'] = 1: drugVars['aphrodisiac_overdose'] = 0
@@ -570,6 +573,8 @@ elseif $ARGS[0] = 'aphrodisiac':
 		end
 		gs 'stat'
 	end
+
+
 elseif $ARGS[0] = 'hair_extensioncream':
 	if $ARGS[1] = 'cikl':
 		if drugVars['hair_extensioncream_dose'] >= 1:
@@ -597,6 +602,7 @@ elseif $ARGS[0] = 'hair_extensioncream':
 		gs 'stat'
 	end
 
+
 elseif $ARGS[0] = 'butt_injection':
 	if $ARGS[1] = 'cikl':
 		if drugVars['butt_injection_dose'] >= 1:
@@ -628,13 +634,13 @@ elseif $ARGS[0] = 'butt_injection':
 		gs 'stat'
 	end
 
+
 else
 	'<br><font color = red>Developer note: The type of drug is wrong or missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 end
 
 
-
-
 gs 'traits', 'addictive_personality'
 
+
 --- drugs ---------------------------------

+ 1 - 4
locations/gameover.qsrc

@@ -12,9 +12,8 @@ end
 
 
 if $ARGS[0] = 'screen':
+	cls
 	gs 'shortgs', 'setloc', 'gameover', 'screen'
-	menu_off = 0
-	gs 'stat'
 
 	'<center><b><font color="maroon">GAME OVER</font></b></center>'
 
@@ -89,8 +88,6 @@ if $ARGS[0] = 'screen':
 	end
 
 	dynamic 'act ''End?'': gt ''gameover'', ''endscreen'', ''<<$ARGS[1]>>'' '
-
-
 end
 
 if $ARGS[0] = 'endscreen':

+ 1 - 5
locations/stat.qsrc

@@ -748,11 +748,7 @@ elseif rape > 0 and rape ! rape_count and orgasm > 0 and orgasm ! orgasm_count:
 end
 
 !! Drug stats
-gs 'drugs', 'heroin', 'stat'
-gs 'drugs', 'alcohol', 'stat'
-gs 'drugs', 'cocaine', 'stat'
-gs 'drugs', 'amphetamine', 'stat'
-
+gs 'drugs', 'stat'
 
 !!Health, Willpower, Auto Birth Control pregnancy check
 gs 'body', 'RegularUpdate'