From 4c169016cb9104731fc5821553d75e47796efda9 Mon Sep 17 00:00:00 2001
From: Johnny28 <johnny281028@gmail.com>
Date: Sun, 15 Sep 2024 20:22:49 +0200
Subject: [PATCH] Achievement unlock, misc writing.

* Added achievement unlock for "daddy" nickname on all characters.
* Minor writing additions.
---
 game/scripts/characters/astoria/summon.rpy | 1 +
 game/scripts/characters/cho/talk.rpy       | 1 +
 game/scripts/characters/luna/summon.rpy    | 1 +
 game/scripts/characters/susan/summon.rpy   | 1 +
 game/scripts/characters/tonks/talk.rpy     | 1 +
 game/scripts/events/ending.rpy             | 7 ++++++-
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/game/scripts/characters/astoria/summon.rpy b/game/scripts/characters/astoria/summon.rpy
index 5cc5bfe7..fed85109 100644
--- a/game/scripts/characters/astoria/summon.rpy
+++ b/game/scripts/characters/astoria/summon.rpy
@@ -130,6 +130,7 @@ label astoria_talk:
                 "-Daddy-":
                     label .daddy:
                     $ name_genie_astoria = _("Daddy")
+                    $ achievements.unlock("daddy")
                     ast "Daddy? Don't you think that's a little weird?" ("clench", "narrow", "angry", "mid")
                     gen "Not at all!" ("base", xpos="far_left", ypos="head")
                     ast "*Hmph*..." ("upset", "narrow", "angry", "mid")
diff --git a/game/scripts/characters/cho/talk.rpy b/game/scripts/characters/cho/talk.rpy
index a19254de..0151c80e 100644
--- a/game/scripts/characters/cho/talk.rpy
+++ b/game/scripts/characters/cho/talk.rpy
@@ -92,6 +92,7 @@ label genie_cho_change:
         gen "Call me daddy..." ("base", xpos="far_left", ypos="head")
         cho @ cheeks blush "..." ("base", "narrow", "base", "downR")
         cho @ cheeks heavy_blush "Yes daddy..." ("base", "narrow", "base", "down")
+        $ achievements.unlock("daddy")
     else: #custom/fallback
         cho "Very well..." ("open", "narrow", "base", "mid")
     jump cho_talk
diff --git a/game/scripts/characters/luna/summon.rpy b/game/scripts/characters/luna/summon.rpy
index 31baded9..b27304ff 100644
--- a/game/scripts/characters/luna/summon.rpy
+++ b/game/scripts/characters/luna/summon.rpy
@@ -260,6 +260,7 @@ label genie_luna_change:
             lun "Okay, I'll call you [name_genie_luna] from now on." ("soft", "base", "base", "mid")
             gen "(Another confrontation expertly avoided...)" ("base", xpos="far_left", ypos="head")
     elif name_genie_luna == _("Daddy"):
+        $ achievements.unlock("daddy")
         lun "[name_genie_luna]?" ("open", "narrow", "base", "mid")
         gen "Yes..." ("base", xpos="far_left", ypos="head")
         lun "But won't that be confusing?" ("annoyed", "narrow", "base", "mid")
diff --git a/game/scripts/characters/susan/summon.rpy b/game/scripts/characters/susan/summon.rpy
index f0189f5a..dfae5263 100644
--- a/game/scripts/characters/susan/summon.rpy
+++ b/game/scripts/characters/susan/summon.rpy
@@ -123,6 +123,7 @@ label susan_talk:
                     sus @ cheeks blush "But that's!--" ("angry", "narrow", "sad", "mid")
                     sus @ cheeks blush "(This is wrong, Susan!)" ("angry", "closed", "sad", "mid")
                     gen "Miss Bones?" ("base", xpos="far_left", ypos="head")
+                    $ achievements.unlock("daddy")
                     sus @ cheeks blush "O--{w=0.2} Okay then... Professor-- *Ehm*... D-Daddy." ("annoyed", "happy", "worried", "stare")
                     jump susan_talk
                 "-Master-":
diff --git a/game/scripts/characters/tonks/talk.rpy b/game/scripts/characters/tonks/talk.rpy
index e3e05190..992f5ed4 100644
--- a/game/scripts/characters/tonks/talk.rpy
+++ b/game/scripts/characters/tonks/talk.rpy
@@ -138,6 +138,7 @@ label tonks_talk:
                     ton "Crazy to think you geezers get to bang all those young, sexy, innocent witches here..." ("open", "base", "base", "R")
                     gen "(Geezers?)" ("base", xpos="far_left", ypos="head")
                     gen "But I thought you didn't mind it?" ("base", xpos="far_left", ypos="head")
+                    $ achievements.unlock("daddy")
                     ton "Oh, I don't mind at all, [name_genie_tonks]!" ("horny", "base", "base", "mid")
 
                 "-Lover-" (style="disabled") if states.ton.level < 60:
diff --git a/game/scripts/events/ending.rpy b/game/scripts/events/ending.rpy
index defc03ee..08990ba5 100644
--- a/game/scripts/events/ending.rpy
+++ b/game/scripts/events/ending.rpy
@@ -2672,7 +2672,12 @@ label ball_ending_E2:
     if states.ast.unlocked:
         gen "And my sassy blonde Astoria..." ("base", xpos="far_left", ypos="head")
     if states.lun.unlocked:
-        gen "And my {i}wackspit-sucking{/i} queen Luna..." ("base", xpos="far_left", ypos="head")
+        if states.lun.status.blowjob:
+            gen "And my {i}wackspit-sucking{/i} queen Luna..." ("base", xpos="far_left", ypos="head")
+        elif states.lun.status.masturbating:
+            gen "And my {i}wackspit-squirting{/i} queen Luna..." ("base", xpos="far_left", ypos="head")
+        else:
+            gen "And my {i}wackspit-obsessed{/i} queen Luna..." ("base", xpos="far_left", ypos="head")
     if states.sus.unlocked:
         gen "And my big-titted redhead Susan..." ("base", xpos="far_left", ypos="head")
     gen "and of course, goodbye to my favourite nympho, Tonks..." ("base", xpos="far_left", ypos="head")