From d8ac9bed1b779213b1eab5feb642d5e4492c8fc7 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 9 May 2017 19:46:09 -0400 Subject: [PATCH] Fixes. --- compile | 8 +++++++ devNotes/beauty-test | 27 ++++++++++++++--------- src/init/storyInit.tw | 5 ++++- src/uncategorized/newGamePlus.tw | 4 +--- src/uncategorized/peConcubineInterview.tw | 4 ++-- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/compile b/compile index 1ae24f69d1f..0d66b27b74e 100755 --- a/compile +++ b/compile @@ -1,5 +1,10 @@ #!/bin/bash +# Find and insert current commit +COMMIT=$(git rev-list HEAD --count) +sed -i "s/COMMIT/$COMMIT/" ./src/init/storyInit.tw + + # Will add all *.tw files to StoryIncludes. ./sanityCheck rm -f src/config/start.tw @@ -21,4 +26,7 @@ fi #Make the output prettier, replacing \t with a tab and \n with a newline sed -i -e '/^.*<div id="store-area".*$/s/\\t/\t/g' -e '/^.*<div id="store-area".*$/s/\\n/\n/g' bin/FC_pregmod.html +# Revert ./src/init/storyInit.tw for next compilation +git checkout -- ./src/init/storyInit.tw + rm -f src/config/start.tw diff --git a/devNotes/beauty-test b/devNotes/beauty-test index e0f08b3d86f..6d3923098e9 100644 --- a/devNotes/beauty-test +++ b/devNotes/beauty-test @@ -370,25 +370,30 @@ <</if>> <<if $arcologies[0].FSTransformationFetishist > 20>> <<if ($arcologies[0].FSSlimnessEnthusiast > 20)>> - <<if $args[0].boobsImplant/$args[0].boobs < .75>> - <<set $beauty -= ((0.05*($args[0].boobs))+10)>> /*25*/ + <<if $args[0].boobs >= 400>> + <<if $args[0].boobsImplant/$args[0].boobs < .5>> + <<set $beauty -= ((0.05*($args[0].boobs))+10)>> + <</if>> <</if>> - <<if $args[0].buttImplant/$args[0].butt < .75>> - <<set $beauty -= ((2*($args[0].butt-1))+10)>> + <<if $args[0].butt >= 3>> + <<if $args[0].buttImplant/$args[0].butt < .5>> + <<set $beauty -= ((2*($args[0].butt-1))+10)>> + <</if>> <</if>> <<else>> - <<if $args[0].buttImplant/$args[0].butt < .75>> - <<set $beauty -= ((1.5*$args[0].butt)+6)>> /* will get nasty at huge sizes */ + <<if $args[0].butt >= 6>> + <<if $args[0].buttImplant/$args[0].butt < .75>> + <<set $beauty -= ((1.5*$args[0].butt)+6)>> /* will get nasty at huge sizes */ + <</if>> <</if>> - <<if $args[0].boobsImplant/$args[0].boobs < .75>> - <<set $beauty -= ((1.5*$args[0].butt)+6)>> /* will get nasty at huge sizes */ + <<if $args[0].boobs >= 600>> + <<if $args[0].boobsImplant/$args[0].boobs < .75>> + <<set $beauty -= 30+(0.005*($args[0].boobs))>> /* will get nasty at huge sizes */ + <</if>> <</if>> <</if>> <</if>> - -/* other */ - <<if ($arcologies[0].FSTransformationFetishist > 20)>> <<if $args[0].hips >= 3>> <<set $beauty += 1>> diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index d699f1ebbbe..cde5d499283 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1,6 +1,6 @@ :: init [nobr] -<<set $ver = "0.10.0", $releaseID = 1006>> +<<set $ver = "0.10.0", $releaseID = COMMIT>> /* This needs to be broken down into individual files that can be added to StoryInit instead. */ @@ -271,6 +271,9 @@ <<else>> <<if $freshPC == 0>> + <<if def $arcologies[0].prosperity>> + <<set $cash += 250*$arcologies[0].prosperity*$arcologies[0].ownership>> + <</if>> <<set $cash = Math.clamp(1000*Math.trunc($cash/100000), 5000, 1000000)>> <<if $retainCareer == 0>> <<set $PC.career = "arcology owner">> diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw index 0a6d0738193..f2049d40d8f 100644 --- a/src/uncategorized/newGamePlus.tw +++ b/src/uncategorized/newGamePlus.tw @@ -6,9 +6,7 @@ <<set $slavesToImportMax = 5>> <</if>> -<<if $releaseID > 1000>><<else>> - <<silently>><<include "Backwards Compatibility">><</silently>> -<</if>> +<<silently>><<include "Backwards Compatibility">><</silently>> You have decided to start over. You'll be able to take a few things with you: a few slaves, a small fraction of your current reserves of money, and possibly even your experience as an arcology owner, which will give you a very powerful career background. Many of your other customizations and settings will be carried over as the defaults for your new game, but can be revised freely. <br><br> diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw index 99dfc45b879..1f0ec722648 100644 --- a/src/uncategorized/peConcubineInterview.tw +++ b/src/uncategorized/peConcubineInterview.tw @@ -112,7 +112,7 @@ You receive an official communication from a popular talk show hosted in one of <<else>> giving it a good feel. <</if>> - "Now I'm sure our viewers are wondering," He says, patting the firm dome. "Is it $playerName's?" + "Now I'm sure our viewers are wondering," He says, patting the firm dome. "Is it $PCName's?" <<if $activeSlave.pregSource == -1>> <<if hyperPregBellyTwo($activeSlave)>> "Of cour<<s>>e they are!" She proclaims proudly as she runs her hands across her quivering mass. "All $activeSlave.pregType of them!" @@ -129,7 +129,7 @@ You receive an official communication from a popular talk show hosted in one of "That'<<s>> for me and my <<Master>> only," she teases, sticking out her tongue. <</if>> <</if>> - <<if $acitveSlave.pregType == 50 && $activeSlave.preg > 30>> + <<if $activeSlave.pregType == 50 && $activeSlave.preg > 30>> She grunts and struggles to spread her legs. "I'm <<s>>orry, another one is coming out right now..." she says, turning red. The host, at a loss for words, can only watch as <<if $activeSlave.clothes == "none">> a child is born into the world, live on screen. -- GitLab