Browse Source

[fixes] I made some mistakes and also made the code better

KevinSmarts 4 years ago
parent
commit
55029277fd
1 changed files with 28 additions and 23 deletions
  1. 28 23
      locations/preSYS2.qsrc

+ 28 - 23
locations/preSYS2.qsrc

@@ -38,7 +38,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'modapp':
-	cla & clr
+	cla & *clr
 	if genbsize = 0:genbsize = 12
 
 	'Choose base genetic breast size:'
@@ -239,7 +239,12 @@ if $ARGS[0] = 'modite_mis':
 end
 
 if $ARGS[0] = 'modpur':
-	clr & cla
+	*clr & cla
+	if $ARGS[1] ! '':
+		$currentpursetype = $ARGS[1]
+		currentpursenumber = ARGS[2]
+	end
+	*clr & cla
 	if $currentpursetype = '': 
 		'You do not own a purse.'
 	else
@@ -252,47 +257,47 @@ if $ARGS[0] = 'modpur':
 	end
 	act 'Return': gt'preSYS2','start'
 	act 'Get cheap':
-		clr & cla
+		*clr & cla
 		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
 		i = 1
 		:loopcheappurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'' & $currentpursetype = ''cheap'' & currentpursenumber = i"><img src="images/pc/purses/cheap/<<i>>.jpg" 	height="300" /></a>'
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''cheap'', <<i>>"><img src="images/pc/purses/cheap/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 14:jump 'loopcheappurses'
 	end	
 	act 'Get dolls':
-		clr & cla
+		*clr & cla
 		'<center><img src="images/locations/city/island/dolls.png"></center>'
 		i = 1
-		:loopcheappurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'' & $currentpursetype = ''cheap'' & currentpursenumber = i"><img src="images/pc/purses/cheap/<<i>>.jpg" 	height="300" /></a>'
+		:loopdollspurses
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''dolls'', <<i>>"><img src="images/pc/purses/cheap/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
-		if i <= 22:jump 'loopcheappurses'
+		if i <= 22:jump 'loopdollspurses'
 	end
 	act 'Get fashionista':
-		clr & cla
+		*clr & cla
 		'<center><img src="images/locations/city/citycenter/mall/fashionistat.png"></center>'
 		i = 1
 		:loopfashionistapurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'' & $currentpursetype = ''fashionista'' & currentpursenumber = i"><img src="images/pc/purses/fashionista/<<i>>.jpg" 	height="300" /></a>'
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''fashionista'', <<i>>"><img src="images/pc/purses/fashionista/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 15:jump 'loopfashionistapurses'
 	end
 	act 'Get kats':
-		clr & cla
+		*clr & cla
 		'<center><img src="images/locations/city/citycenter/mall/pussycat.png"></center>'
 		i = 1
 		:loopkatspurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'' & $currentpursetype = ''kats'' & currentpursenumber = i"><img src="images/pc/purses/kats/<<i>>.jpg" 	height="300" /></a>'
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''kats'', <<i>>"><img src="images/pc/purses/kats/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 14:jump 'loopkatspurses'
 	end
 	act 'Get moncheri':
-		clr & cla
+		*clr & cla
 		'<center><img src="images/locations/city/citycenter/mall/moncheri.png"></center>'
 		i = 1
 		:loopboutiquepurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'' & $currentpursetype = ''boutique'' & currentpursenumber = i"><img src="images/pc/purses/moncheri/<<i>>.jpg" 	height="300" /></a>'
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''boutique'', <<i>>"><img src="images/pc/purses/moncheri/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 17:jump 'loopboutiquepurses'
 	end
@@ -359,7 +364,7 @@ if $ARGS[0] = 'setval3':
 end
 
 if $ARGS[0] = 'setsalo':
-	clr & cla
+	*clr & cla
 	'20 = underweight, slight, wiry'
 	'40 = slender, skinny, lean'
 	'60 = healthy, toned, ripped'
@@ -385,7 +390,7 @@ if $ARGS[0] = 'setsalo':
 end
 
 if $ARGS[0] = 'modgrup':
-	clr & cla
+	*clr & cla
 	'Your current social group is <<$soc_grup>>.'
 	act 'Nerd, Geek, Student': $soc_grup = 'nerd'& gt 'preSYS2','modgrup'
 	act 'Athlete, Jock':$soc_grup = 'jock'& gt 'preSYS2','modgrup'
@@ -399,7 +404,7 @@ if $ARGS[0] = 'modgrup':
 end
 
 if $ARGS[0] = 'modatt':
-	clr & cla
+	*clr & cla
 	$metka = 'modatt'
 	'<center><b>Attributes</b></center>'
 	*nl
@@ -425,7 +430,7 @@ if $ARGS[0] = 'modatt':
 end
 
 if $ARGS[0] = 'modskl':
-	clr & cla
+	*clr & cla
 	act 'Mental skills':gt 'preSYS2','modskl_men'
 	act 'Sport skills':gt 'preSYS2','modskl_spo'
 	act 'Beauty skills':gt 'preSYS2','modskl_bea'
@@ -435,7 +440,7 @@ if $ARGS[0] = 'modskl':
 end
 
 if $ARGS[0] = 'modskl_men':
-	clr & cla
+	*clr & cla
 	$metka = 'modskl_men'
 	'<center><b>Mental Skills</b></center>'
 	*nl
@@ -452,7 +457,7 @@ if $ARGS[0] = 'modskl_men':
 end
 
 if $ARGS[0] = 'modskl_spo':
-	clr & cla
+	*clr & cla
 	$metka = 'modskl_spo'
 	'<center><b>Sport Skills</b></center>'
 	*nl
@@ -478,7 +483,7 @@ if $ARGS[0] = 'modskl_spo':
 end
 
 if $ARGS[0] = 'modskl_bea':
-	clr & cla
+	*clr & cla
 	$metka = 'modskl_bea'
 	'<center><b>Beauty skills</b></center>'
 	*nl
@@ -497,7 +502,7 @@ if $ARGS[0] = 'modskl_bea':
 end
 
 if $ARGS[0] = 'modskl_art':
-	clr & cla
+	*clr & cla
 	$metka = 'modskl_art'
 	'<center><b>Artistic Skills</b></center>'
 	*nl
@@ -515,7 +520,7 @@ if $ARGS[0] = 'modskl_art':
 end
 
 if $ARGS[0] = 'modskl_job':
-	clr & cla
+	*clr & cla
 	$metka = 'modskl_job'
 	'<center><b>Job Skills</b></center>'
 	*nl