From 6f67404cc6bf0ce3249b911a49997e289712c962 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 5 Aug 2018 00:35:07 -0500
Subject: [PATCH] Maybe
---
devNotes/AnatomyOfAFreeCitiesEvent.txt | 10 +++++-----
devNotes/scene-guide.txt | 2 +-
src/{uncategorized => facilities/arcade}/arcade.tw | 0
.../arcade}/arcadeReport.tw | 0
.../arcade}/reBusyArcade.tw | 0
src/{uncategorized => facilities/brothel}/brothel.tw | 0
.../brothel}/brothelAdvertisement.tw | 0
.../brothel}/brothelReport.tw | 0
.../brothel}/reBrothelFunction.tw | 0
.../brothel}/reBusyBrothel.tw | 0
src/{uncategorized => facilities/club}/club.tw | 0
.../club}/clubAdvertisement.tw | 0
src/{uncategorized => facilities/club}/clubReport.tw | 0
src/{uncategorized => facilities/club}/reBusyClub.tw | 0
src/{uncategorized => facilities/dairy}/dairy.tw | 0
src/{uncategorized => facilities/dairy}/dairyReport.tw | 0
.../dairy}/freeRangeDairyAssignmentScene.tw | 0
src/{uncategorized => facilities/dairy}/reBusyDairy.tw | 0
src/{uncategorized => facilities/pit}/pePitFight.tw | 0
.../pit}/pePitFightInvite.tw | 0
src/{uncategorized => facilities/pit}/pit.tw | 0
src/{uncategorized => facilities/pit}/seLethalPit.tw | 0
.../pit}/seNonlethalPit.tw | 0
.../schoolroom}/schoolroom.tw | 0
.../schoolroom}/schoolroomReport.tw | 0
src/{uncategorized => facilities/spa}/spa.tw | 0
src/{uncategorized => facilities/spa}/spaReport.tw | 0
.../chattel}/seNicaeaAnnouncement.tw | 0
.../chattel}/seNicaeaCouncil.tw | 0
.../chattel}/seNicaeaPreperation.tw | 0
.../egyptian}/reFSEgyptianRevivalistAcquisition.tw | 0
.../reFSEgyptianRevivalistAcquisitionWorkaround.tw | 0
32 files changed, 6 insertions(+), 6 deletions(-)
rename src/{uncategorized => facilities/arcade}/arcade.tw (100%)
rename src/{uncategorized => facilities/arcade}/arcadeReport.tw (100%)
rename src/{uncategorized => facilities/arcade}/reBusyArcade.tw (100%)
rename src/{uncategorized => facilities/brothel}/brothel.tw (100%)
rename src/{uncategorized => facilities/brothel}/brothelAdvertisement.tw (100%)
rename src/{uncategorized => facilities/brothel}/brothelReport.tw (100%)
rename src/{uncategorized => facilities/brothel}/reBrothelFunction.tw (100%)
rename src/{uncategorized => facilities/brothel}/reBusyBrothel.tw (100%)
rename src/{uncategorized => facilities/club}/club.tw (100%)
rename src/{uncategorized => facilities/club}/clubAdvertisement.tw (100%)
rename src/{uncategorized => facilities/club}/clubReport.tw (100%)
rename src/{uncategorized => facilities/club}/reBusyClub.tw (100%)
rename src/{uncategorized => facilities/dairy}/dairy.tw (100%)
rename src/{uncategorized => facilities/dairy}/dairyReport.tw (100%)
rename src/{uncategorized => facilities/dairy}/freeRangeDairyAssignmentScene.tw (100%)
rename src/{uncategorized => facilities/dairy}/reBusyDairy.tw (100%)
rename src/{uncategorized => facilities/pit}/pePitFight.tw (100%)
rename src/{uncategorized => facilities/pit}/pePitFightInvite.tw (100%)
rename src/{uncategorized => facilities/pit}/pit.tw (100%)
rename src/{uncategorized => facilities/pit}/seLethalPit.tw (100%)
rename src/{uncategorized => facilities/pit}/seNonlethalPit.tw (100%)
rename src/{uncategorized => facilities/schoolroom}/schoolroom.tw (100%)
rename src/{uncategorized => facilities/schoolroom}/schoolroomReport.tw (100%)
rename src/{uncategorized => facilities/spa}/spa.tw (100%)
rename src/{uncategorized => facilities/spa}/spaReport.tw (100%)
rename src/{uncategorized => societies/chattel}/seNicaeaAnnouncement.tw (100%)
rename src/{uncategorized => societies/chattel}/seNicaeaCouncil.tw (100%)
rename src/{uncategorized => societies/chattel}/seNicaeaPreperation.tw (100%)
rename src/{uncategorized => societies/egyptian}/reFSEgyptianRevivalistAcquisition.tw (100%)
rename src/{uncategorized => societies/egyptian}/reFSEgyptianRevivalistAcquisitionWorkaround.tw (100%)
diff --git a/devNotes/AnatomyOfAFreeCitiesEvent.txt b/devNotes/AnatomyOfAFreeCitiesEvent.txt
index f7fc0426ea8..4fe5f98833a 100644
--- a/devNotes/AnatomyOfAFreeCitiesEvent.txt
+++ b/devNotes/AnatomyOfAFreeCitiesEvent.txt
@@ -24,7 +24,7 @@ Most events have some kind of precondition for when they happen. Scheduled event
<<goto "Nonrandom Event">>
<</if>>
-If it is week fourteen and the player player hasn't ready seen the event, a check is then made for slaves that either are on curatives or have their implants filled by curatives. If it was sucessful then load the "bad curatives" generic event, if unsucessful set the flag anyway and read from the Nonrandom Event passage.
+If it is week fourteen and the player hasn't ready seen the event, a check is then made for slaves that either are on curatives or have their implants filled by curatives. If it was successful then load the "bad curatives" generic event, if unsuccessful set the flag anyway and read from the Nonrandom Event passage.
Immediate effects
@@ -58,7 +58,7 @@ A slave can be linked with the macro <<EventNameLink _Slave>>. This allows the p
<<SlaveTitle _Slave>> sets $desc (which ends up being a string like "slavegirl", "MILF", "futanari" and so on, depending on slave).
<<SlavePronouns _Slave>> allows you to use the variables $pronoun ("she"/"he"/"it"), $pronounCap ("She"/"He"/"It"), $possessive ("her"/"his"/"its"), $possessiveCap ("Her"/"His"/"Its") and $object ("her"/"him"/"it"). There is NO variable for self-possession ("hers"/"his"/"its") and for "herself", you need to use <<= $object>>self.
-One more macro initialises several others and is required when you have a slave speak and want to use direct quotes: <<Enunciate _Slave>> allows you to use <<Master>>, <<WrittenMaster>>, <<says>> (which turns into "lisps" when that's the case) and the lisping replacers <<s>>, <<ss>>, <<S>>, <<c>> and <<z>>.
+One more macro initializes several others and is required when you have a slave speak and want to use direct quotes: <<Enunciate _Slave>> allows you to use <<Master>>, <<WrittenMaster>>, <<says>> (which turns into "lisps" when that's the case) and the lisping replacers <<s>>, <<ss>>, <<S>>, <<c>> and <<z>>.
The text should be about large enough to fit on the screen assuming typical monitor sizes. In terms of visible text, about 1000 words are a fine limit to aim for. There's a lot to keep in mind in terms of different appearances and circumstances, so keep your document with slave variables as a reference nearby.
@@ -118,7 +118,7 @@ A choice doesn't need to have a specific effect. If your event has an immediate
<<if $cash >= 2000>>
<br><<link "Take the poor slave girl into your custody">>
<<replace "#result">>
- Confronting the citizen is simplicity in itself, he would not dare defy you under threat of arrest by your security drones and is unlikely to garner any sympathy from the public for his degradationist behaviors. As such, you are able to take civil ownership over the poor slave girl and take her into your care with only minimal compensation to the citizen. As you stride away from her former owner with the girl in your arms, she leans over to plant a chaste kiss of thanks on your cheek.
+ Confronting the citizen is simplicity in itself; he would not dare defy you under threat of arrest by your security drones and is unlikely to garner any sympathy from the public for his degradationist behaviors. As such, you are able to take civil ownership over the poor slave girl and take her into your care with only minimal compensation to the citizen. As you stride away from her former owner with the girl in your arms, she leans over to plant a chaste kiss of thanks on your cheek.
<<set $cash -= 2000>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<include "Generate New Slave">>
@@ -136,10 +136,10 @@ A choice doesn't need to have a specific effect. If your event has an immediate
<</if>>
<br><<link "Publicly confront the citizen">>
<<replace "#result">>
- Your walk up to the citizen is not accompanied by shaking ground or tumultuous fanfare, yet the citizen looks as if death itself has come before him. You don't hurt him physically, instead chastising him publicly in front of his fellow peers who begin to cheer their agreement. You end your tirade of verbal abuse with a reminder that although the man is a citizen of your arcology, that does not give him the impunity to shirk the law. To make it clear his next offense will be his last, a brace of your security drones hover behind you threateningly. The crowd that gathered @@.green;approve of your rebuke of the citizen@@.
+ Your walk up to the citizen is not accompanied by shaking ground or tumultuous fanfare, yet the citizen looks as if death itself has come before him. You don't hurt him physically, instead chastising him publicly in front of his fellow peers who begin to cheer their agreement. You end your tirade of verbal abuse with a reminder that although the man is a citizen of your arcology, that does not give him the impunity to shirk the law. To make it clear his next offense will be his last, a brace of your security drones hover behind you threateningly. The crowd that gathered @@.green;approves of your rebuke of the citizen@@.
<<set $rep += 500>>
<</replace>>
<</link>>
</span>
- So here the results of the choices are, A) nothing, B) reduce cash by 2000 but acquire the slave C) chastise the citizen for plus 500 rep.
\ No newline at end of file
+ So here the results of the choices are, A) nothing, B) reduce cash by 2000 but acquire the slave C) chastise the citizen for plus 500 rep.
diff --git a/devNotes/scene-guide.txt b/devNotes/scene-guide.txt
index adc85a7038e..ee0859f2bdf 100644
--- a/devNotes/scene-guide.txt
+++ b/devNotes/scene-guide.txt
@@ -107,7 +107,7 @@ TODO
<</if>>
And then fill it in later than it is to end up with a situation where you have a dozen unclosed tags and you can't remember where they are or what they do.
-2. For very simple stuff, its fine to "inline" your stuff. For example, when penetrating a slave, doing "you fuck her <<if $activeSlave.vagina > -1>>pussy<<else>>ass<</if>>" to show "pussy" or "ass" as necessary. However, if you need to do the same comparison a bunch of times, do something like
+2. For very simple stuff, it's fine to "inline" your stuff. For example, when penetrating a slave, doing "you fuck her <<if $activeSlave.vagina > -1>>pussy<<else>>ass<</if>>" to show "pussy" or "ass" as necessary. However, if you need to do the same comparison a bunch of times, do something like
<<if $activeSlave.vagina > -1>>
<<set _targetOrifice = "vagina">>
<<else>>
diff --git a/src/uncategorized/arcade.tw b/src/facilities/arcade/arcade.tw
similarity index 100%
rename from src/uncategorized/arcade.tw
rename to src/facilities/arcade/arcade.tw
diff --git a/src/uncategorized/arcadeReport.tw b/src/facilities/arcade/arcadeReport.tw
similarity index 100%
rename from src/uncategorized/arcadeReport.tw
rename to src/facilities/arcade/arcadeReport.tw
diff --git a/src/uncategorized/reBusyArcade.tw b/src/facilities/arcade/reBusyArcade.tw
similarity index 100%
rename from src/uncategorized/reBusyArcade.tw
rename to src/facilities/arcade/reBusyArcade.tw
diff --git a/src/uncategorized/brothel.tw b/src/facilities/brothel/brothel.tw
similarity index 100%
rename from src/uncategorized/brothel.tw
rename to src/facilities/brothel/brothel.tw
diff --git a/src/uncategorized/brothelAdvertisement.tw b/src/facilities/brothel/brothelAdvertisement.tw
similarity index 100%
rename from src/uncategorized/brothelAdvertisement.tw
rename to src/facilities/brothel/brothelAdvertisement.tw
diff --git a/src/uncategorized/brothelReport.tw b/src/facilities/brothel/brothelReport.tw
similarity index 100%
rename from src/uncategorized/brothelReport.tw
rename to src/facilities/brothel/brothelReport.tw
diff --git a/src/uncategorized/reBrothelFunction.tw b/src/facilities/brothel/reBrothelFunction.tw
similarity index 100%
rename from src/uncategorized/reBrothelFunction.tw
rename to src/facilities/brothel/reBrothelFunction.tw
diff --git a/src/uncategorized/reBusyBrothel.tw b/src/facilities/brothel/reBusyBrothel.tw
similarity index 100%
rename from src/uncategorized/reBusyBrothel.tw
rename to src/facilities/brothel/reBusyBrothel.tw
diff --git a/src/uncategorized/club.tw b/src/facilities/club/club.tw
similarity index 100%
rename from src/uncategorized/club.tw
rename to src/facilities/club/club.tw
diff --git a/src/uncategorized/clubAdvertisement.tw b/src/facilities/club/clubAdvertisement.tw
similarity index 100%
rename from src/uncategorized/clubAdvertisement.tw
rename to src/facilities/club/clubAdvertisement.tw
diff --git a/src/uncategorized/clubReport.tw b/src/facilities/club/clubReport.tw
similarity index 100%
rename from src/uncategorized/clubReport.tw
rename to src/facilities/club/clubReport.tw
diff --git a/src/uncategorized/reBusyClub.tw b/src/facilities/club/reBusyClub.tw
similarity index 100%
rename from src/uncategorized/reBusyClub.tw
rename to src/facilities/club/reBusyClub.tw
diff --git a/src/uncategorized/dairy.tw b/src/facilities/dairy/dairy.tw
similarity index 100%
rename from src/uncategorized/dairy.tw
rename to src/facilities/dairy/dairy.tw
diff --git a/src/uncategorized/dairyReport.tw b/src/facilities/dairy/dairyReport.tw
similarity index 100%
rename from src/uncategorized/dairyReport.tw
rename to src/facilities/dairy/dairyReport.tw
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/facilities/dairy/freeRangeDairyAssignmentScene.tw
similarity index 100%
rename from src/uncategorized/freeRangeDairyAssignmentScene.tw
rename to src/facilities/dairy/freeRangeDairyAssignmentScene.tw
diff --git a/src/uncategorized/reBusyDairy.tw b/src/facilities/dairy/reBusyDairy.tw
similarity index 100%
rename from src/uncategorized/reBusyDairy.tw
rename to src/facilities/dairy/reBusyDairy.tw
diff --git a/src/uncategorized/pePitFight.tw b/src/facilities/pit/pePitFight.tw
similarity index 100%
rename from src/uncategorized/pePitFight.tw
rename to src/facilities/pit/pePitFight.tw
diff --git a/src/uncategorized/pePitFightInvite.tw b/src/facilities/pit/pePitFightInvite.tw
similarity index 100%
rename from src/uncategorized/pePitFightInvite.tw
rename to src/facilities/pit/pePitFightInvite.tw
diff --git a/src/uncategorized/pit.tw b/src/facilities/pit/pit.tw
similarity index 100%
rename from src/uncategorized/pit.tw
rename to src/facilities/pit/pit.tw
diff --git a/src/uncategorized/seLethalPit.tw b/src/facilities/pit/seLethalPit.tw
similarity index 100%
rename from src/uncategorized/seLethalPit.tw
rename to src/facilities/pit/seLethalPit.tw
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/facilities/pit/seNonlethalPit.tw
similarity index 100%
rename from src/uncategorized/seNonlethalPit.tw
rename to src/facilities/pit/seNonlethalPit.tw
diff --git a/src/uncategorized/schoolroom.tw b/src/facilities/schoolroom/schoolroom.tw
similarity index 100%
rename from src/uncategorized/schoolroom.tw
rename to src/facilities/schoolroom/schoolroom.tw
diff --git a/src/uncategorized/schoolroomReport.tw b/src/facilities/schoolroom/schoolroomReport.tw
similarity index 100%
rename from src/uncategorized/schoolroomReport.tw
rename to src/facilities/schoolroom/schoolroomReport.tw
diff --git a/src/uncategorized/spa.tw b/src/facilities/spa/spa.tw
similarity index 100%
rename from src/uncategorized/spa.tw
rename to src/facilities/spa/spa.tw
diff --git a/src/uncategorized/spaReport.tw b/src/facilities/spa/spaReport.tw
similarity index 100%
rename from src/uncategorized/spaReport.tw
rename to src/facilities/spa/spaReport.tw
diff --git a/src/uncategorized/seNicaeaAnnouncement.tw b/src/societies/chattel/seNicaeaAnnouncement.tw
similarity index 100%
rename from src/uncategorized/seNicaeaAnnouncement.tw
rename to src/societies/chattel/seNicaeaAnnouncement.tw
diff --git a/src/uncategorized/seNicaeaCouncil.tw b/src/societies/chattel/seNicaeaCouncil.tw
similarity index 100%
rename from src/uncategorized/seNicaeaCouncil.tw
rename to src/societies/chattel/seNicaeaCouncil.tw
diff --git a/src/uncategorized/seNicaeaPreperation.tw b/src/societies/chattel/seNicaeaPreperation.tw
similarity index 100%
rename from src/uncategorized/seNicaeaPreperation.tw
rename to src/societies/chattel/seNicaeaPreperation.tw
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/societies/egyptian/reFSEgyptianRevivalistAcquisition.tw
similarity index 100%
rename from src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
rename to src/societies/egyptian/reFSEgyptianRevivalistAcquisition.tw
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw b/src/societies/egyptian/reFSEgyptianRevivalistAcquisitionWorkaround.tw
similarity index 100%
rename from src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
rename to src/societies/egyptian/reFSEgyptianRevivalistAcquisitionWorkaround.tw
--
GitLab