Merge pull request #2 from Zt-freak/blahajgift

Blahajgift
Zt-freak · Jan 19, 2023 · a086fb3 · a086fb3
2 parents e9f660c + bf4e179
commit a086fb3
Show file tree

Hide file tree

Showing 8 changed files with 109 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,7 @@
+*.beh linguist-language=XML
+*.bfmat linguist-language=XML
+*.tsk linguist-language=XML
+*.txtkeys linguist-language=XML
+*.zt2 linguist-language=XML
+
+*.fx linguist-language=C++
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,10 @@
+{
+    "files.associations": {
+        "beh": "xml",
+        "bfmat": "xml",
+        "tsk": "xml",
+        "txtkeys": "xml",
+        "zt2": "xml",
+        "fx ": "cpp"
+    }
+}
diff --git a/README.md b/README.md
@@ -8,9 +8,10 @@ Trans rights are human rights!
 This mod adds Trans pride paths, a flag, a HRT.CAFE sign and estrogen and testosterone to the game. Includes Mjmannella's same-sex mating mod.
 
 # Additional dependencies
-If you want the estrogen and testosterone to work, you need Arluq version 2.7 or higher.
+If you want the estrogen and testosterone to work, you need Arluq version 2.7 or higher. Additionally, If you want Guests to buy BLÅHAJ plushies, you need Buffzoo's Blahaj animal.
 
 [Arluq releases](https://github.com/ZtModArchive/ArluqTools/releases)
+[Buffzoo's Blahaj](https://www.nexusmods.com/zootycoon2/mods/209)
 
 ## Credits
 - Apodemus
@@ -22,6 +23,3 @@ If you want the estrogen and testosterone to work, you need Arluq version 2.7 or
 - IKEA of Sweden - BLÅHAJ zoopedia entry
 - Wikipedia - Estrogen and testosterone zoopedia entry
 - Nederlandse Spoorwegen - Gladde vloer sign design
-
-## Cut content
-- Gender dysphoria is no more :) It was supposed to be a custom disease, but due to needing to override game files, it is not implemented.
diff --git a/ai/Tasks/guests/gift/Guest_SharkIKEA.beh b/ai/Tasks/guests/gift/Guest_SharkIKEA.beh
@@ -0,0 +1,12 @@
+<BehaviorSets>
+   <BuySharkIKEAGift>
+      <subjects>
+         <Guest/>
+      </subjects>
+      <behaviors>
+         <BFBehPlaySet behSet="DockGiftCart"/>
+         <BFBehAttachObject attachEntity="Blahaj_Gift" subjectNode="Bip01 L Finger0" detachAction="inventory"/>
+         <BFBehAnimate targetAnim="Stand_Turn180"/>
+      </behaviors>
+   </BuySharkIKEAGift>
+</BehaviorSets>
diff --git a/ai/Tasks/guests/gift/Guest_SharkIKEA_B.tsk b/ai/Tasks/guests/gift/Guest_SharkIKEA_B.tsk
@@ -0,0 +1,34 @@
+<BFAITaskTemplateList>
+    <BFAITaskTemplate Name="BuySharkIKEAGift" CursorTask="false" reserveTag="Use_Cart"
+        TaskDelayMin="1000000000" TaskDelayMax="1000000001" UniqueID="gift:BuySharkIKEAGift">
+        <BFAICreateData>
+            <Subjects>
+                <Guest />
+                <Qualifiers inWater_OR_onLand="true" />
+            </Subjects>
+            <Targets>
+                <giftcart_mm />
+            </Targets>
+            <Objects>
+                <t_BlahajGift />
+            </Objects>
+        </BFAICreateData>
+        <BFAIEvalData>
+            <BFAIAttributeFloatMap hunger="-100" thirst="-100" dessert="-100" rest="-100"
+                social="-100" amusement="-100" gift="-100" bathroom="-100" viewanimals="-100" />
+        </BFAIEvalData>
+        <BFBehExecTask>
+            <BFBehPlaySet behSet="BuySharkIKEAGift" />
+            <ZTBehFeedback>
+                <ZTFeedbackData>
+                    <ZTThoughtInfo locID="guestthoughts:BuyGift" priority="1" timeout="60"
+                        global="false" />
+                </ZTFeedbackData>
+            </ZTBehFeedback>
+        </BFBehExecTask>
+        <BFAICompletionData>
+            <BFAIAttributeFloatMap gift="-50" />
+            <BFAISubjectData happiness="price_effect(-5,0,5)" />
+        </BFAICompletionData>
+    </BFAITaskTemplate>
+</BFAITaskTemplateList>
diff --git a/entities/objects/items/ai/Blahaj_Gift.xml b/entities/objects/items/ai/Blahaj_Gift.xml
@@ -0,0 +1,31 @@
+
+<BFTypedBinder binderType="Blahaj_Gift">
+    <types>
+       <entity>
+          <item>
+             <Blahaj_Gift/>
+          </item>
+       </entity>
+    </types>
+    <instance>
+       <BFGEntity entityVersion="1"/>
+    </instance>
+    <shared>
+       <UIToggleButton template="adopt">
+          <UIAspect>
+             <default image="ui/infopan/icon_Blahaj_Gift.dds"/>
+          </UIAspect>
+          <UIHelpInfo name="" short="" long="" help="" ids="entityname:Blahaj_Gift"/>
+       </UIToggleButton>
+       <BFAIEntityDataShared b_MarineGift="true" b_Puppet="true"/>
+    </shared>
+    <binder>
+       <BFNamedBinder binderName="mainObj">
+          <instance>
+             <BFPhysObj>
+                <BFSimpleLODComponent isBFR="true" modelfile="entities\objects\enrichment\BlahajDummy\BlahajDummy" scale="1.0" switch="0 36"/>
+             </BFPhysObj>
+          </instance>
+       </BFNamedBinder>
+    </binder>
+ </BFTypedBinder>
diff --git a/lang/1033/BlahajGift_name.xml b/lang/1033/BlahajGift_name.xml
@@ -0,0 +1,13 @@
+<ZT2Strings>
+    <entityname>
+        <Blahaj_Gift>BLÅHAJ</Blahaj_Gift>
+        <Blahaj_Gift_stt>BLÅHAJ</Blahaj_Gift_stt>
+        <Blahaj_Gift_lower>the BLÅHAJ</Blahaj_Gift_lower>
+        <Blahaj_Gift_ltt>
+            <color r="255" g="248" b="178">
+                <b>BLÅHAJ</b>
+            </color>
+            <br /> Guests who enjoy watching Buffzoo's Blahaj will buy this gift.
+        </Blahaj_Gift_ltt>
+    </entityname>
+</ZT2Strings>
diff --git a/ui/infopan/icon_Blahaj_Gift.dds b/ui/infopan/icon_Blahaj_Gift.dds