Browse Source

[fixed] Use of $loc_arg in customisation overwriting return code

Kevin_Smarts 2 years ago
parent
commit
ccf48e20bc
1 changed files with 12 additions and 12 deletions
  1. 12 12
      locations/intro_customization.qsrc

+ 12 - 12
locations/intro_customization.qsrc

@@ -156,14 +156,14 @@ if $ARGS[0] = 'modrel_setup2':
 	dynamic 'if <<$ARGS[1]>> < 0: <<$ARGS[1]>> = 0'
 	dynamic 'if <<$ARGS[1]>> > 100: <<$ARGS[1]>> = 100'
 	dynamic 'x = <<$ARGS[1]>>'
-	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $loc_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $loc_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $loc_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $loc_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $loc_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 100 & gt ''intro_customization'', $loc_arg">100</a></TD>'
+	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 100 & gt ''intro_customization'', $locM_arg">100</a></TD>'
 end
 
 if $ARGS[0] = 'modrel_setup3':
 	dynamic 'if <<$ARGS[1]>> < 50: <<$ARGS[1]>> = 50'
 	dynamic 'if <<$ARGS[1]>> > 200: <<$ARGS[1]>> = 200'
 	dynamic 'x = <<$ARGS[1]>>'
-	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/200)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $loc_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $loc_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $loc_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $loc_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $loc_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 200 & gt ''intro_customization'', $loc_arg">200</a></TD>'
+	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/200)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 200 & gt ''intro_customization'', $locM_arg">200</a></TD>'
 end
 
 !!Values reversed just for inhib use
@@ -171,11 +171,11 @@ if $ARGS[0] = 'modrel_setup4':
 	dynamic 'if <<$ARGS[1]>> < 0: <<$ARGS[1]>> = 0'
 	dynamic 'if <<$ARGS[1]>> > 100: <<$ARGS[1]>> = 100'
 	dynamic 'x = 100-<<$ARGS[1]>>'
-	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 100 & gt ''intro_customization'', $loc_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> += 10 & gt ''intro_customization'', $loc_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $loc_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $loc_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 10 & gt ''intro_customization'', $loc_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 0 & gt ''intro_customization'', $loc_arg">100</a></TD>'
+	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 100 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> += 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 0 & gt ''intro_customization'', $locM_arg">100</a></TD>'
 end
 
 if $ARGS[0] = 'modite_cos':
-	$loc_arg = 'modite_cos'
+	$locM_arg = 'modite_cos'
 	'<center><b>Cosmetic items</b></center>'
 	*nl
 	*nl
@@ -191,7 +191,7 @@ if $ARGS[0] = 'modite_cos':
 end
 
 if $ARGS[0] = 'modite_pha':
-	$loc_arg = 'modite_pha'
+	$locM_arg = 'modite_pha'
 	'<center><b>Pharmaceutical items</b></center>'
 	*nl
 	*nl
@@ -213,7 +213,7 @@ if $ARGS[0] = 'modite_pha':
 end
 
 if $ARGS[0] = 'modite_mis':
-	$loc_arg = 'modite_mis'
+	$locM_arg = 'modite_mis'
 	'<center><b>Misc items</b></center>'
 	*nl
 	*nl
@@ -403,7 +403,7 @@ end
 
 if $ARGS[0] = 'modatt':
 	*clr & cla
-	$loc_arg = 'modatt'
+	$locM_arg = 'modatt'
 	'<center><b>Attributes</b></center>'
 	*nl
 	*nl
@@ -441,7 +441,7 @@ end
 
 if $ARGS[0] = 'modskl_men':
 	*clr & cla
-	$loc_arg = 'modskl_men'
+	$locM_arg = 'modskl_men'
 	'<center><b>Mental Skills</b></center>'
 	*nl
 	*nl
@@ -460,7 +460,7 @@ end
 
 if $ARGS[0] = 'modskl_spo':
 	*clr & cla
-	$loc_arg = 'modskl_spo'
+	$locM_arg = 'modskl_spo'
 	'<center><b>Sport Skills</b></center>'
 	*nl
 	*nl
@@ -488,7 +488,7 @@ end
 
 if $ARGS[0] = 'modskl_bea':
 	*clr & cla
-	$loc_arg = 'modskl_bea'
+	$locM_arg = 'modskl_bea'
 	'<center><b>Beauty skills</b></center>'
 	*nl
 	*nl
@@ -509,7 +509,7 @@ end
 
 if $ARGS[0] = 'modskl_art':
 	*clr & cla
-	$loc_arg = 'modskl_art'
+	$locM_arg = 'modskl_art'
 	'<center><b>Artistic Skills</b></center>'
 	*nl
 	*nl
@@ -529,7 +529,7 @@ end
 
 if $ARGS[0] = 'modskl_job':
 	*clr & cla
-	$loc_arg = 'modskl_job'
+	$locM_arg = 'modskl_job'
 	'<center><b>Job Skills</b></center>'
 	*nl
 	*nl