Ver código fonte

Var Changes Autoapply

Stephan Fuchs 1 ano atrás
pai
commit
e48418bd98
2 arquivos alterados com 124 adições e 18 exclusões
  1. 22 18
      sugarcube/src/autogenerated/unsorted/stat.tw
  2. 102 0
      tw_update.py

+ 22 - 18
sugarcube/src/autogenerated/unsorted/stat.tw

@@ -641,6 +641,7 @@
 
 	<</if>>
 <</if>>
+<<if !$sucexcess>><<set $sucexcess = 0>><</if>>
 <!-- !! Hourly Changes-->
 <<for ;$time.minutes >= 60;>>
 	<<info "Executing hourly calculations">>
@@ -663,13 +664,14 @@
 		<<set $scpopt = 0>>
 
 	<</if>>
+	<<if !$amphetamineBonus>><<set $amphetamineBonus = 1>><</if>>
 	<<if getvar("$insleep") == 1>>
 		<<if getvar("$amphHigh") > 0>>
-			<<set $pc.pcs_energy -= (4 / $amphetamineBonus + $succublvl / 2)>>
-			<<set $pc.pcs_hydra -= (8 / $amphetamineBonus + $succublvl / 2)>>
+			<<set $pc.pcs_energy -= (4 / $amphetamineBonus + getvar('$succublvl') / 2)>>
+			<<set $pc.pcs_hydra -= (8 / $amphetamineBonus + getvar('$succublvl') / 2)>>
 		<<else>>
-			<<set $pc.pcs_energy -= (4 * $amphetamineBonus + $succublvl / 2)>>
-			<<set $pc.pcs_hydra -= (8 * $amphetamineBonus + $succublvl / 2)>>
+			<<set $pc.pcs_energy -= (4 * $amphetamineBonus + getvar('$succublvl') / 2)>>
+			<<set $pc.pcs_hydra -= (8 * $amphetamineBonus + getvar('$succublvl') / 2)>>
 		<</if>>
 		<<set $pcs_stam += $stammax / 10>>
 		<<set $pc.pcs_sleep -= 4>>
@@ -682,11 +684,13 @@
 		<<set $pc.pcs_willpower_feeder = $pc.pcs_willpower_feeder % 100>>
 	<<else>>
 		<<if getvar("$amphHigh") > 0>>
-			<<set $pc.pcs_energy -= (8 / $amphetamineBonus + $succublvl)>>
-			<<set $pc.pcs_hydra -= (16 / $amphetamineBonus + $succublvl)>>
+			<<set $pc.pcs_energy -= (8 / $amphetamineBonus + getvar('$succublvl'))>>
+			<<set $pc.pcs_hydra -= (16 / $amphetamineBonus + getvar('$succublvl'))>>
 		<<else>>
-			<<set $pc.pcs_energy -= (8 * $amphetamineBonus + $succublvl)>>
-			<<set $pc.pcs_hydra -= (16 * $amphetamineBonus + $succublvl)>>
+			<<warn 'HERE'>>
+			<<warn $amphetamineBonus>>
+			<<set $pc.pcs_energy -= (8 * $amphetamineBonus + getvar('$succublvl'))>>
+			<<set $pc.pcs_hydra -= (16 * $amphetamineBonus + getvar('$succublvl'))>>
 		<</if>>
 		<<set $pcs_stam += $stammax / 20>>
 		<<set $pc.pcs_sleep -= 4>>
@@ -1271,13 +1275,13 @@
 
 			<</if>>
 			<<if getvar("$pcs_horny") < 100>>
-				<<set $pcs_horny += $succublvl>>
+				<<set $pcs_horny += getvar('$succublvl')>>
 
 			<</if>>
 			<<if getvar("$succhungry") > 0>>
-				<<set $pc.pcs_energy -= $succhungry * $succublvl>>
-				<<set $pc.pcs_hydra -= $succhungry * $succublvl>>
-				<<set $pc.pcs_sleep -= $succhungry * $succublvl>>
+				<<set $pc.pcs_energy -= $succhungry * getvar('$succublvl')>>
+				<<set $pc.pcs_hydra -= $succhungry * getvar('$succublvl')>>
+				<<set $pc.pcs_sleep -= $succhungry * getvar('$succublvl')>>
 			<</if>>
 			<<if arrsize('sparrvol') > 0>>
 				<<set $suctempi =  - 1>>
@@ -1322,7 +1326,7 @@
 				<<setinit $cumloc[17] = 0>>
 			<</if>>
 			<<if $suclezsex < $lesbian>>
-				<<set $sexnutrition += $succublvl * 20>>
+				<<set $sexnutrition += getvar('$succublvl') * 20>>
 				<<set $suclezsex = $lesbian>>
 				<<set $succubxp += 5>>
 				<<set $sucabslez = 1>>
@@ -1403,19 +1407,19 @@
 				<<setn $pc.fat -= 2>>
 
 			<</if>>
-			<<set $pc.pcs_energy += 8 + $succublvl>>
+			<<set $pc.pcs_energy += 8 + getvar('$succublvl')>>
 		<<else>>
-			<<set $pc.pcs_energy += 8 + $succublvl>>
-			<<set $sucexcess -= (8 + $succublvl) * (6 - $succublvl)>>
+			<<set $pc.pcs_energy += 8 + getvar('$succublvl')>>
+			<<set $sucexcess -= (8 + getvar('$succublvl')) * (6 - getvar('$succublvl'))>>
 		<</if>>
 	<</if>>
 	<<if getvar("$pcs_health") < 0>>
 		<<set $pcs_health = 10>>
-		<<set $sucexcess -= 25 * (9 - $succublvl)>>
+		<<set $sucexcess -= 25 * (9 - getvar('$succublvl'))>>
 	<</if>>
 	<<if getvar("$pc.pcs_willpwr") < 0>>
 		<<set $pc.pcs_willpwr = 10>>
-		<<set $sucexcess -= 20 * (9 - $succublvl)>>
+		<<set $sucexcess -= 20 * (9 - getvar('$succublvl'))>>
 		<<set $sucpowzeroed = 4>>
 	<</if>>
 <</if>>

+ 102 - 0
tw_update.py

@@ -1,3 +1,105 @@
 #!/usr/bin/env python3
 
 # This script replaces in place.
+
+import os
+from glob import glob
+import fileinput
+import re
+
+variable_replacements = [
+    ['$pcs_firstname',  '$pc.name_first'],
+    ['$pcs_lastname',   '$pc.name_last'],
+    ['$pcs_nickname',   '$pc.name_nick'],
+    ['$genbsize',       '$pc.genbsize'],
+    ['$nbsize',         '$pc.nbsize'],
+    ['$wratio'      ,   '$pc.wratio'],
+    ['$bratio',         '$pc.bratio'],
+    ['$hratio',         '$pc.hratio'],
+    ['$fat',            '$pc.fat'],
+    ['$salo',           '$pc.salo'],
+    ['$salocatnow',           '$pc.salocatnow'],
+    ['$salolast',           '$pc.salolast'],
+    ['$salocatlast',           '$pc.salocatlast'],
+    ['$pcs_hips',           '$pc.pcs_hips'],
+    ['$pcs_waist',           '$pc.pcs_waist'],
+    ['$pcs_band',           '$pc.pcs_band'],
+    ['$pcs_bust',           '$pc.pcs_bust'],
+    ['$pcs_butt',           '$pc.pcs_butt'],
+    ['$pcs_cupsize',           '$pc.pcs_cupsize'],
+    ['$tits',           '$pc.tits'],
+    ['$titsize',           '$pc.titsize'],
+    ['$pcs_weight',           '$pc.pcs_weight'],
+    ['$pcs_bmi',           '$pc.pcs_bmi'],
+    ['$pcs_hgt',           '$pc.pcs_hgt'],
+    ['$pcs_hairlng',           '$pc.pcs_hairlng'],
+    ['$preg',           '$pc.preg'],
+    ['$knowpreg',           '$pc.knowpreg'],
+    ['$thinkpreg',           '$pc.thinkpreg'],
+    ['$PregChem',           '$pc.PregChem'],
+    ['$isPregnancyAware',           '$pc.isPregnancyAware'],
+    ['$bodset',           '$pc.bodset'],
+    ['$body',           '$pc.body'],
+    ['$pcs_teeth',           '$pc.pcs_teeth'],
+    ['$teeth',           '$pc.teeth'],
+    ['$moisturizerDailyCount',           '$pc.moisturizerDailyCount'],
+    ['$skinDailyGain',           '$pc.skinDailyGain'],
+    ['$skinDailyPenalty',           '$pc.skinDailyPenalty'],
+    ['$pcs_skin',           '$pc.pcs_skin'],
+    ['$pcs_agil',           '$pc.pcs_agil'],
+    ['$pcs_stren',           '$pc.pcs_stren'],
+    ['$pcs_vital',           '$pc.pcs_vital'],
+    ['$stren_deg',           '$pc.stren_deg'],
+    ['$vital_deg',           '$pc.vital_deg'],
+    ['$agilbuf',           '$pc.agilbuf'],
+    ['$strenbuf',           '$pc.strenbuf'],
+    ['$vitalbuf',           '$pc.vitalbuf'],
+    ['$vhips',           '$pc.vhips'],
+    ['$vhtmp',           '$pc.vhtmp'],
+    ['$pcs_pubes','$pc.pcs_pubes'],
+    ['$vidage','$pc.vidage'],
+    ['$pcs_missing_teeth','$pc.pcs_missing_teeth'],
+    ['$pcs_apprncbase','$pc.pcs_apprncbase'],
+    ['$pubestyle','$pc.pubestyle'],
+    ['$pcs_mood[','$pc.pcs_mood_type['],
+    ['$pcs_mood','$pc.pcs_mood'],
+    ['$pcs_willpwr','$pc.pcs_willpwr'],
+    ['$willpowermax','$pc.willpowermax'],
+    ['$pcs_willpower_feeder','$pc.pcs_willpower_feeder'],
+    ['$pcs_energy','$pc.pcs_energy'],
+    ['$pcs_hydra','$pc.pcs_hydra'],
+    ['$pcs_sleep','$pc.pcs_sleep'],
+
+
+    [r'\$(age[^\w])',           r'$pc.\1',1],
+
+
+    ['$minut','$time.minutes'],
+
+
+    ["<<gs 'body' 'initial'>>","<<run $pc.bodyInit()>>"],
+    ["<<gs 'body' 'RegularUpdate'>>",""],
+    ["<<gs 'body' 'DailyUpdate'>>","<<run $pc.bodyDailyUpdate()>>"],
+    ["<<gs 'body'>>","<<run $pc.bodySaloCalc()>>"],
+    ["<<$pcs_apprnc>>","<<body_desc_appearance>>"]
+]
+
+path = os.path.join("sugarcube","src")
+filesNames = [y for x in os.walk(path) for y in glob(os.path.join(x[0], '*.tw'))]
+
+for filesName in filesNames:
+    for line in fileinput.input(filesName, inplace=True):
+        output = line
+        for variable_replacement in variable_replacements:
+            if len(variable_replacement) > 2:
+                if variable_replacement[2] == 1:
+                    output = re.sub(variable_replacement[0],variable_replacement[1],output)
+                else:
+                    output = output.replace(variable_replacement[0],variable_replacement[1])
+            else:
+                output = output.replace(variable_replacement[0],variable_replacement[1])
+
+        print(output, end='')
+
+
+#print(result)