Bladeren bron

[fixed] string vs integer

Lusticon 5 maanden geleden
bovenliggende
commit
046c9ff872
3 gewijzigde bestanden met toevoegingen van 17 en 20 verwijderingen
  1. 15 15
      locations/goplust.qsrc
  2. 2 2
      locations/saveupdater.qsrc
  3. 0 3
      locations/spell.qsrc

+ 15 - 15
locations/goplust.qsrc

@@ -108,7 +108,7 @@ $namgop[0] = ''
 $gopnik = ''
 
 if gopV = 1:
-	$gopnik += '<<$gopV>>'
+	$gopnik += $gopV
 	if gopB + gopVi + gopK + gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopB + gopVi + gopK + gopU + gopS = 1:
@@ -117,7 +117,7 @@ if gopV = 1:
 end
 
 if $namgop[1] ! '':
-	$namgop[0] += '<<$namgop[1]>>'
+	$namgop[0] += $namgop[1]
 	if namgop[2] + namgop[3] + namgop[4] + namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[2] + namgop[3] + namgop[4] + namgop[5] + namgop[6] = 1:
@@ -126,7 +126,7 @@ if $namgop[1] ! '':
 end
 
 if gopB = 1:
-	$gopnik += '<<$gopB>>'
+	$gopnik += $gopB
 	if gopVi + gopK + gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopVi + gopK + gopU + gopS = 1:
@@ -135,7 +135,7 @@ if gopB = 1:
 end
 
 if $namgop[2] ! '':
-	$namgop[0] += '<<$namgop[2]>>'
+	$namgop[0] += $namgop[2]
 	if namgop[3] + namgop[4] + namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[3] + namgop[4] + namgop[5] + namgop[6] = 1:
@@ -144,7 +144,7 @@ if $namgop[2] ! '':
 end
 
 if gopVi = 1:
-	$gopnik += '<<$gopVi>>'
+	$gopnik += $gopVi
 	if gopK + gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopK + gopU + gopS = 1:
@@ -152,8 +152,8 @@ if gopVi = 1:
 	end
 end
 
-if namgop[3] ! '':
-	$namgop[0] += '<<$namgop[3]>>'
+if $namgop[3] ! '':
+	$namgop[0] += $namgop[3]
 	if namgop[4] + namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[4] + namgop[5] + namgop[6] = 1:
@@ -162,7 +162,7 @@ if namgop[3] ! '':
 end
 
 if gopK = 1:
-	$gopnik += '<<$gopK>>'
+	$gopnik += $gopK
 	if gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopU + gopS = 1:
@@ -170,8 +170,8 @@ if gopK = 1:
 	end
 end
 
-if namgop[4] ! '':
-	$namgop[0] += '<<$namgop[4]>>'
+if $namgop[4] ! '':
+	$namgop[0] += $namgop[4]
 	if namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[5] + namgop[6] = 1:
@@ -180,18 +180,18 @@ if namgop[4] ! '':
 end
 
 if gopU = 1:
-	$gopnik += '<<$gopU>>'
+	$gopnik += $gopU
 	if gopS = 1:$gopnik += ' and '
 end
 
-if namgop[5] ! '':
-	$namgop[0] += '<<$namgop[5]>>'
+if $namgop[5] ! '':
+	$namgop[0] += $namgop[5]
 	if namgop[6] = 1:$gopnik += ' and '
 end
 
-if gopS = 1:$gopnik += '<<$gopS>>'
+if gopS = 1:$gopnik += $gopS
 
-if namgop[6] ! '':$namgop[0] += '<<$namgop[6]>>'
+if $namgop[6] ! '':$namgop[0] += $namgop[6]
 
 $namgop[0] += ' strip off your clothes and get out their members'
 

+ 2 - 2
locations/saveupdater.qsrc

@@ -3057,12 +3057,12 @@ if temp_current_save_version < 00090204:
 		killvar 'addictive_cheat'
 		killvar 'cheataddictive'
 	end
-	if cumeater_cheat	! 0 or $cumeater_cheat		! '' or $cheatcumtrait	! '' or $cheatcumtrait	! 0:
+	if cumeater_cheat	! 0 or $cumeater_cheat		! '' or $cheatcumtrait	! '' or cheatcumtrait	! 0:
 		cheatVars['no_trait_cumeater']	= cumeater_cheat
 		killvar 'cumeater_cheat'
 		killvar 'cheatcumtrait'
 	end
-	if exhib_cheat		! 0 or $exhib_cheat			! '' or $cheatexhib		! '' or $cheatexhib		! 0:
+	if exhib_cheat		! 0 or $exhib_cheat			! '' or $cheatexhib		! '' or cheatexhib		! 0:
 		cheatVars['no_trait_exhib']		= exhib_cheat
 		killvar 'exhib_cheat'
 		killvar 'cheatexhib'

+ 0 - 3
locations/spell.qsrc

@@ -161,9 +161,6 @@ if $ARGS[0] = 'teleport':
 
 	killvar '$randomLoc'
 	killvar '$NewLocation'
-
-	result = ""
-
 end
 
 if $ARGS[0] = 'regenerate':