1
0
Просмотр исходного кода

[change/fix] Changed shoe_description2 to a function and removed the *nl that was creating many blank lines above the table

Kevin_Smarts 2 лет назад
Родитель
Сommit
50b18da456
4 измененных файлов с 66 добавлено и 68 удалено
  1. 1 1
      glife.qproj
  2. 61 0
      locations/_shoe_description2.qsrc
  3. 0 63
      locations/shoe_description2.qsrc
  4. 4 4
      locations/shoes.qsrc

+ 1 - 1
glife.qproj

@@ -151,8 +151,8 @@
 		<Location name="shoes"/>
 		<Location name="$shoe_image"/>
 		<Location name="$shoe_description"/>
+		<Location name="$shoe_description2"/>
 		<Location name="shoe_attributes"/>
-		<Location name="shoe_description2"/>
 		<Location name="$attributes_cats_shoes"/>
 		<Location name="$attributes_bomba_shoes"/>
 		<Location name="$attributes_danilovich_shoes"/>

+ 61 - 0
locations/_shoe_description2.qsrc

@@ -0,0 +1,61 @@
+# $shoe_description2
+
+
+if ShoQuality = 1:
+   $RESULT = 'This is a crappy cheap '
+elseif ShoQuality = 2:
+   $RESULT = 'This is a low quality '
+elseif ShoQuality = 3:
+   $RESULT = 'This is an average quality '
+elseif ShoQuality = 4:
+   $RESULT = 'This is a reasonable quality '
+elseif ShoQuality = 5:
+   $RESULT = 'This is a high quality '
+elseif ShoQuality = 6:
+   $RESULT = 'This is a very well made '
+elseif ShoQuality = 7:
+   $RESULT = 'This is a beautifully made '
+end
+
+if $ARGS[0] = 'danilovich':
+	$RESULT += 'training shoe.'
+else
+	if ShoHeels = 1:
+	   $RESULT += 'flat '
+	elseif ShoHeels = 2:
+	   $RESULT += 'low heel '
+	elseif ShoHeels = 3:
+	   $RESULT += 'mid heel '
+	elseif ShoHeels = 4:
+	   $RESULT += 'high heel '
+	elseif ShoHeels = 5:
+	   $RESULT += 'ultra high heel '
+	elseif ShoHeels = 6:
+	   $RESULT += 'fetish heel '
+	end
+
+	if ShoCut = 1:
+	   $RESULT += 'shoe.'
+	elseif ShoCut = 2:
+	   $RESULT += 'ankle boot.'
+	elseif ShoCut = 3:
+	   $RESULT += 'calf high boot.'
+	elseif ShoCut = 4:
+	   $RESULT += 'knee high boot.'
+	elseif ShoCut = 5:
+	   $RESULT += 'thigh high boot.'
+	elseif ShoCut = 6:
+	   $RESULT += 'groin high boot.'
+	end
+end
+
+if ShoStyle = 1:
+	$RESULT += ' These shoes are considered stripper shoes.'
+elseif ShoStyle = 2:
+	$RESULT += ' These shoes are considered bimbo shoes.'
+elseif ShoStyle = 3:
+	$RESULT += ' These shoes are considered alternative shoes.'
+end
+
+--- $shoe_description2 ---------------------------------
+

+ 0 - 63
locations/shoe_description2.qsrc

@@ -1,63 +0,0 @@
-# shoe_description2
-
-$description = ''
-if ShoQuality = 1:
-   $description = 'This is a crappy cheap '
-elseif ShoQuality = 2:
-   $description = 'This is a low quality '
-elseif ShoQuality = 3:
-   $description = 'This is an average quality '
-elseif ShoQuality = 4:
-   $description = 'This is a reasonable quality '
-elseif ShoQuality = 5:
-   $description = 'This is a high quality '
-elseif ShoQuality = 6:
-   $description = 'This is a very well made '
-elseif ShoQuality = 7:
-   $description = 'This is a beautifully made '
-end
-
-if $ARGS[0] = 'danilovich':
-	$description += 'training shoe.'
-else
-	if ShoHeels = 1:
-	   $description += 'flat '
-	elseif ShoHeels = 2:
-	   $description += 'low heel '
-	elseif ShoHeels = 3:
-	   $description += 'mid heel '
-	elseif ShoHeels = 4:
-	   $description += 'high heel '
-	elseif ShoHeels = 5:
-	   $description += 'ultra high heel '
-	elseif ShoHeels = 6:
-	   $description += 'fetish heel '
-	end
-
-	if ShoCut = 1:
-	   $description += 'shoe.'
-	elseif ShoCut = 2:
-	   $description += 'ankle boot.'
-	elseif ShoCut = 3:
-	   $description += 'calf high boot.'
-	elseif ShoCut = 4:
-	   $description += 'knee high boot.'
-	elseif ShoCut = 5:
-	   $description += 'thigh high boot.'
-	elseif ShoCut = 6:
-	   $description += 'groin high boot.'
-	end
-end
-
-*nl
-
-if ShoStyle = 1:
-	$description += 'These shoes are considered stripper shoes.'
-elseif ShoStyle = 2:
-	$description += 'These shoes are considered bimbo shoes.'
-elseif ShoStyle = 3:
-	$description += 'These shoes are considered alternative shoes.'
-end
-
---- shoe_description2 ---------------------------------
-

+ 4 - 4
locations/shoes.qsrc

@@ -21,8 +21,8 @@ $shoe_list_line = {
 	killvar 'shoe_temp'
 	gs 'shoe_attributes', $ARGS[1], ARGS[2]
 
-	gs 'shoe_description2', $ARGS[2]
-	$RESULT += '<TD><<FUNC(''$shoe_description'', $ARGS[1])>> <<ARGS[2]>></TD><TD><<$description>></TD>'
+	$RESULT += '<TD><<FUNC(''$shoe_description'', $ARGS[1])>> <<ARGS[2]>></TD>'
+	$RESULT += '<TD><<FUNC(''$shoe_description2'', $ARGS[1])>></TD>'
 
 	if ShoStyle = 2:
 		$RESULT += '<TD>Yes</TD>'
@@ -39,8 +39,8 @@ $shoe_list_line = {
 	$RESULT += '<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a></TD>'
 
 	$RESULT += '<TD>'
-	if sloc ! 1:$RESULT += ' <a href="exec:gt ''shoes'', ''dest1'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Storage</a><BR>'
-	if sloc ! 0:$RESULT += ' <a href="exec:gt ''shoes'', ''dest0'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Wardrobe</a><BR>'
+	if sloc ! 1:$RESULT += ' <a href="exec:gt ''shoes'', ''dest1'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Storage</a>'
+	if sloc ! 0:$RESULT += ' <a href="exec:gt ''shoes'', ''dest0'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Wardrobe</a>'
 	if sloc ! 2:$RESULT += ' <a href="exec:gt ''shoes'', ''dest2'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Unwanted</a>'
 	$RESULT += '</TD>'
 }