浏览代码

[change] switch code chunk order to make it more logical

KevinSmarts 4 年之前
父节点
当前提交
e525196fc7
共有 1 个文件被更改,包括 37 次插入38 次删除
  1. 37 38
      locations/fame.qsrc

+ 37 - 38
locations/fame.qsrc

@@ -8,8 +8,44 @@
 !!ARGS[2] is the value of the increase and should be an integer, its hard to put a value on fame but lets go with:
 !! 1-5 for small regular stuff and 10-50 for things with big impact like modelling
 
-if $ARGS[0] ! 'deg':
+if $ARGS[0] = 'deg':
+!!degradation calculation applied overnight 
+	$fametown = 'pav'
+
+	:famedegloop
+
+	if dyneval('RESULT = <<$fametown>>_acting') > 2: dynamic '<<$fametown>>_acting -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_dance') > 2: dynamic '<<$fametown>>_dance -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_painting') > 2: dynamic '<<$fametown>>_painting -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_music') > 2: dynamic '<<$fametown>>_music -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_ballet') > 2: dynamic '<<$fametown>>_ballet -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_modelling') > 2: dynamic '<<$fametown>>_modelling -= rand(-1,3)'
+
+	if dyneval('RESULT = <<$fametown>>_porn') > 2: dynamic '<<$fametown>>_porn -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_stripping') > 2: dynamic '<<$fametown>>_stripping -= rand(-1,3)'
+
+	if dyneval('RESULT = <<$fametown>>_sex') > 2: dynamic '<<$fametown>>_sex -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_prostitute') > 2: dynamic '<<$fametown>>_prostitute -= rand(-1,3)'
+
+	if dyneval('RESULT = <<$fametown>>_kickboxing') > 2: dynamic '<<$fametown>>_kickboxing -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_running') > 2: dynamic '<<$fametown>>_running -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_volleyball') > 2: dynamic '<<$fametown>>_volleyball -= rand(-1,3)'
+
+	if dyneval('RESULT = <<$fametown>>_chess') > 2: dynamic '<<$fametown>>_chess -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_teaching') > 2: dynamic '<<$fametown>>_teaching -= rand(-1,3)'
+
+	if dyneval('RESULT = <<$fametown>>_media') > 2: dynamic '<<$fametown>>_media -= rand(-1,3)'
+
 
+	if $fametown = 'pav':
+		$fametown = 'city'
+		jump 'famedegloop'
+	elseif $fametown = 'city':
+		$fametown = 'village'
+		jump 'famedegloop'
+	end
+else
+!!main fame calculation
 	dynamic '<<$ARGS[0]>>_<<$ARGS[1]>> += <<ARGS[2]>>'
 
 	fame_performer = 0
@@ -141,42 +177,5 @@ if $ARGS[0] ! 'deg':
 	end
 end
 
-if $ARGS[0] = 'deg':
-	$fametown = 'pav'
-
-	:famedegloop
-
-	if dyneval('RESULT = <<$fametown>>_acting') > 2: dynamic '<<$fametown>>_acting -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_dance') > 2: dynamic '<<$fametown>>_dance -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_painting') > 2: dynamic '<<$fametown>>_painting -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_music') > 2: dynamic '<<$fametown>>_music -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_ballet') > 2: dynamic '<<$fametown>>_ballet -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_modelling') > 2: dynamic '<<$fametown>>_modelling -= rand(-1,3)'
-
-	if dyneval('RESULT = <<$fametown>>_porn') > 2: dynamic '<<$fametown>>_porn -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_stripping') > 2: dynamic '<<$fametown>>_stripping -= rand(-1,3)'
-
-	if dyneval('RESULT = <<$fametown>>_sex') > 2: dynamic '<<$fametown>>_sex -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_prostitute') > 2: dynamic '<<$fametown>>_prostitute -= rand(-1,3)'
-
-	if dyneval('RESULT = <<$fametown>>_kickboxing') > 2: dynamic '<<$fametown>>_kickboxing -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_running') > 2: dynamic '<<$fametown>>_running -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_volleyball') > 2: dynamic '<<$fametown>>_volleyball -= rand(-1,3)'
-
-	if dyneval('RESULT = <<$fametown>>_chess') > 2: dynamic '<<$fametown>>_chess -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_teaching') > 2: dynamic '<<$fametown>>_teaching -= rand(-1,3)'
-
-	if dyneval('RESULT = <<$fametown>>_media') > 2: dynamic '<<$fametown>>_media -= rand(-1,3)'
-
-
-	if $fametown = 'pav':
-		$fametown = 'city'
-		jump 'famedegloop'
-	elseif $fametown = 'city':
-		$fametown = 'village'
-		jump 'famedegloop'
-	end
-end
-
 --- fame ---------------------------------