followup

SPLURT Specific content
SPLURT-Station · Jun 4, 2024 · d8788c8 · d8788c8
1 parent 46665d5
commit d8788c8
Show file tree

Hide file tree

Showing 3 changed files with 116 additions and 4 deletions.
diff --git a/tgui/packages/tgui/interfaces/MobInteraction/tabs/CharacterPrefsTab.tsx b/tgui/packages/tgui/interfaces/MobInteraction/tabs/CharacterPrefsTab.tsx
@@ -6,6 +6,7 @@ type CharacterPrefsInfo = {
   noncon_pref: number,
   vore_pref: number,
   extreme_pref: number,
+  unholy_pref: number,
   extreme_harm: boolean,
 }
 
@@ -15,6 +16,7 @@ export const CharacterPrefsTab = (props, context) => {
     erp_pref,
     noncon_pref,
     vore_pref,
+    unholy_pref,
     extreme_pref,
     extreme_harm,
   } = data;
@@ -90,6 +92,29 @@ export const CharacterPrefsTab = (props, context) => {
               value: 0,
             })} />
         </LabeledList.Item>
+        <LabeledList.Item label="Unholy Preference">
+          <Button
+            icon={"check"}
+            color={unholy_pref === 1 ? "green" : "default"}
+            onClick={() => act('char_pref', {
+              char_pref: 'unholy_pref',
+              value: 1,
+            })} />
+          <Button
+            icon={"question"}
+            color={unholy_pref === 2 ? "yellow" : "default"}
+            onClick={() => act('char_pref', {
+              char_pref: 'unholy_pref',
+              value: 2,
+            })} />
+          <Button
+            icon={"times"}
+            color={unholy_pref === 0 ? "red" : "default"}
+            onClick={() => act('char_pref', {
+              char_pref: 'unholy_pref',
+              value: 0,
+            })} />
+        </LabeledList.Item>
         <LabeledList.Item label="Extreme Preference">
           <Button
             icon={"check"}

diff --git a/tgui/packages/tgui/interfaces/MobInteraction/tabs/ContentPreferencesTab.tsx b/tgui/packages/tgui/interfaces/MobInteraction/tabs/ContentPreferencesTab.tsx
@@ -18,10 +18,15 @@ type ContentPrefsInfo = {
   breast_enlargement: boolean,
   penis_enlargement: boolean,
   butt_enlargement: boolean,
+  belly_inflation: boolean,
   never_hypno: boolean,
   no_aphro: boolean,
   no_ass_slap: boolean,
   no_auto_wag: boolean,
+  chastity_pref: boolean,
+  stimulation_pref: boolean,
+  edging_pref: boolean,
+  cum_onto_pref: boolean,
 }
 
 export const ContentPreferencesTab = (props, context) => {
@@ -43,10 +48,15 @@ export const ContentPreferencesTab = (props, context) => {
     breast_enlargement,
     penis_enlargement,
     butt_enlargement,
+    belly_inflation,
     never_hypno,
     no_aphro,
     no_ass_slap,
     no_auto_wag,
+    chastity_pref,
+    stimulation_pref,
+    edging_pref,
+    cum_onto_pref,
   } = data;
   return (
     <Stack vertical fill>
@@ -242,6 +252,18 @@ export const ContentPreferencesTab = (props, context) => {
           })}
         />
       </Stack.Item>
+      <Stack.Item>
+        <Button
+          fluid
+          mb={-0.7}
+          content="Belly inflation"
+          icon={belly_inflation ? "toggle-on" : "toggle-off"}
+          selected={belly_inflation}
+          onClick={() => act('pref', {
+            pref: 'belly_inflation',
+          })}
+        />
+      </Stack.Item>
       <Stack.Item>
         <Button
           fluid
@@ -290,6 +312,54 @@ export const ContentPreferencesTab = (props, context) => {
           })}
         />
       </Stack.Item>
+      <Stack.Item>
+        <Button
+          fluid
+          mb={-0.7}
+          content="Chastity Interactions"
+          icon={chastity_pref ? "toggle-on" : "toggle-off"}
+          selected={chastity_pref}
+          onClick={() => act('pref', {
+            pref: 'chastity_pref',
+          })}
+        />
+      </Stack.Item>
+      <Stack.Item>
+        <Button
+          fluid
+          mb={-0.7}
+          content="Genital Stimulation Modifiers"
+          icon={stimulation_pref ? "toggle-on" : "toggle-off"}
+          selected={stimulation_pref}
+          onClick={() => act('pref', {
+            pref: 'stimulation_pref',
+          })}
+        />
+      </Stack.Item>
+      <Stack.Item>
+        <Button
+          fluid
+          mb={-0.7}
+          content="Edging"
+          icon={edging_pref ? "toggle-on" : "toggle-off"}
+          selected={edging_pref}
+          onClick={() => act('pref', {
+            pref: 'edging_pref',
+          })}
+        />
+      </Stack.Item>
+      <Stack.Item>
+        <Button
+          fluid
+          mb={-0.7}
+          content="Receive Cum Covering"
+          icon={cum_onto_pref ? "toggle-on" : "toggle-off"}
+          selected={cum_onto_pref}
+          onClick={() => act('pref', {
+            pref: 'cum_onto_pref',
+          })}
+        />
+      </Stack.Item>
     </Stack>
   );
 };
diff --git a/tgui/packages/tgui/interfaces/MobInteraction/tabs/InteractionsTab.tsx b/tgui/packages/tgui/interfaces/MobInteraction/tabs/InteractionsTab.tsx
@@ -21,13 +21,16 @@ type InteractionData = {
 const INTERACTION_NORMAL = 0;
 const INTERACTION_LEWD = 1;
 const INTERACTION_EXTREME = 2;
+const INTERACTION_UNHOLY = 3; // SPLURT EDIT
 
 const INTERACTION_FLAG_ADJACENT = (1<<0);
 const INTERACTION_FLAG_EXTREME_CONTENT = (1<<1);
 const INTERACTION_FLAG_OOC_CONSENT = (1<<2);
 const INTERACTION_FLAG_TARGET_NOT_TIRED = (1<<3);
 const INTERACTION_FLAG_USER_IS_TARGET = (1<<4);
 const INTERACTION_FLAG_USER_NOT_TIRED = (1<<5);
+const INTERACTION_FLAG_UNHOLY_CONTENT = (1<<6);
+const INTERACTION_FLAG_REQUIRE_BONDAGE = (1<<7);
 
 export const InteractionsTab = (props, context) => {
   const { act, data } = useBackend<ContentInfo>(context);
@@ -92,11 +95,14 @@ export const sortInteractions = (interactions, searchText = '', data) => {
     interaction => interaction.desc);
   const {
     extreme_pref,
+    unholy_pref,
     isTargetSelf,
     target_has_active_player,
     target_is_blacklisted,
     theyAllowExtreme,
     theyAllowLewd,
+    theyAllowUnholy,
+    theyHaveBondage,
     user_is_blacklisted,
     verb_consent,
 
@@ -126,8 +132,11 @@ export const sortInteractions = (interactions, searchText = '', data) => {
       (interaction.type === INTERACTION_NORMAL ? true
         // Lewd interaction
         : interaction.type === INTERACTION_LEWD ? verb_consent
-          // Extreme interaction
-          : verb_consent && extreme_pref)),
+          // Unholy interaction
+          : interaction.type === INTERACTION_UNHOLY
+            ? verb_consent && unholy_pref
+            // Extreme interaction
+            : verb_consent && extreme_pref)),
 
     // Filter off interactions depending on target's pref
     filter(interaction =>
@@ -137,8 +146,11 @@ export const sortInteractions = (interactions, searchText = '', data) => {
         : interaction.type === INTERACTION_NORMAL ? true
           // Lewd interaction
           : interaction.type === INTERACTION_LEWD ? theyAllowLewd
-          // Extreme interaction
-            : theyAllowLewd && theyAllowExtreme)),
+            // Unholy interaction
+            : interaction.type === INTERACTION_UNHOLY
+              ? theyAllowLewd && theyAllowUnholy
+              // Extreme interaction
+              : theyAllowLewd && theyAllowExtreme)),
 
     // Is self
     filter(interaction =>
@@ -212,6 +224,11 @@ export const sortInteractions = (interactions, searchText = '', data) => {
     filter(interaction => interaction.target_num_feet
       ? (interaction.target_num_feet <= target_num_feet) : true),
 
+    // SPLURT EDIT - Target requires bondage
+    filter(interaction =>
+      interaction.interactionFlags & INTERACTION_FLAG_REQUIRE_BONDAGE
+        ? interaction.theyHaveBondage : true),
+
     // Searching by "desc"
     sortBy(interaction => interaction.desc),
     // Searching by type