Skip to content
Snippets Groups Projects
Commit d8ac9bed authored by Pregmodder's avatar Pregmodder
Browse files

Fixes.

parent 8deeb0f8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
compile
+ 8
− 0
View file @ d8ac9bed
#!/bin/bash #!/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. # Will add all *.tw files to StoryIncludes.
./sanityCheck ./sanityCheck
rm -f src/config/start.tw rm -f src/config/start.tw
...@@ -21,4 +26,7 @@ fi ...@@ -21,4 +26,7 @@ fi
#Make the output prettier, replacing \t with a tab and \n with a newline #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 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 rm -f src/config/start.tw
devNotes/beauty-test
+ 16
− 11
View file @ d8ac9bed
...@@ -370,25 +370,30 @@ ...@@ -370,25 +370,30 @@
<</if>> <</if>>
<<if $arcologies[0].FSTransformationFetishist > 20>> <<if $arcologies[0].FSTransformationFetishist > 20>>
<<if ($arcologies[0].FSSlimnessEnthusiast > 20)>> <<if ($arcologies[0].FSSlimnessEnthusiast > 20)>>
<<if $args[0].boobsImplant/$args[0].boobs < .75>> <<if $args[0].boobs >= 400>>
<<set $beauty -= ((0.05*($args[0].boobs))+10)>> /*25*/ <<if $args[0].boobsImplant/$args[0].boobs < .5>>
<<set $beauty -= ((0.05*($args[0].boobs))+10)>>
<</if>>
<</if>> <</if>>
<<if $args[0].buttImplant/$args[0].butt < .75>> <<if $args[0].butt >= 3>>
<<set $beauty -= ((2*($args[0].butt-1))+10)>> <<if $args[0].buttImplant/$args[0].butt < .5>>
<<set $beauty -= ((2*($args[0].butt-1))+10)>>
<</if>>
<</if>> <</if>>
<<else>> <<else>>
<<if $args[0].buttImplant/$args[0].butt < .75>> <<if $args[0].butt >= 6>>
<<set $beauty -= ((1.5*$args[0].butt)+6)>> /* will get nasty at huge sizes */ <<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>>
<<if $args[0].boobsImplant/$args[0].boobs < .75>> <<if $args[0].boobs >= 600>>
<<set $beauty -= ((1.5*$args[0].butt)+6)>> /* will get nasty at huge sizes */ <<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>> <</if>>
<</if>> <</if>>
/* other */
<<if ($arcologies[0].FSTransformationFetishist > 20)>> <<if ($arcologies[0].FSTransformationFetishist > 20)>>
<<if $args[0].hips >= 3>> <<if $args[0].hips >= 3>>
<<set $beauty += 1>> <<set $beauty += 1>>
......
src/init/storyInit.tw
+ 4
− 1
View file @ d8ac9bed
:: init [nobr] :: 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. */ /* This needs to be broken down into individual files that can be added to StoryInit instead. */
...@@ -271,6 +271,9 @@ ...@@ -271,6 +271,9 @@
<<else>> <<else>>
<<if $freshPC == 0>> <<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)>> <<set $cash = Math.clamp(1000*Math.trunc($cash/100000), 5000, 1000000)>>
<<if $retainCareer == 0>> <<if $retainCareer == 0>>
<<set $PC.career = "arcology owner">> <<set $PC.career = "arcology owner">>
......
src/uncategorized/newGamePlus.tw
+ 1
− 3
View file @ d8ac9bed
...@@ -6,9 +6,7 @@ ...@@ -6,9 +6,7 @@
<<set $slavesToImportMax = 5>> <<set $slavesToImportMax = 5>>
<</if>> <</if>>
<<if $releaseID > 1000>><<else>> <<silently>><<include "Backwards Compatibility">><</silently>>
<<silently>><<include "Backwards Compatibility">><</silently>>
<</if>>
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. 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> <br><br>
......
src/uncategorized/peConcubineInterview.tw
+ 2
− 2
View file @ d8ac9bed
...@@ -112,7 +112,7 @@ You receive an official communication from a popular talk show hosted in one of ...@@ -112,7 +112,7 @@ You receive an official communication from a popular talk show hosted in one of
<<else>> <<else>>
giving it a good feel. giving it a good feel.
<</if>> <</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 $activeSlave.pregSource == -1>>
<<if hyperPregBellyTwo($activeSlave)>> <<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!" "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 ...@@ -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. "That'<<s>> for me and my <<Master>> only," she teases, sticking out her tongue.
<</if>> <</if>>
<</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 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">> <<if $activeSlave.clothes == "none">>
a child is born into the world, live on screen. a child is born into the world, live on screen.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment