Refactor variables - Part 2

* Finished refactoring quest and character vars
* Removed quest class (superseded)

game/scripts/characters/astoria/events/imperio_practice.rpy

@@ -36,7 +36,7 @@ label end_ag_se_imperio_sb:
     $ astoria.equip(ast_outfit_last) # Equip player outfit.
 
     $ states.ast.busy = True
-    $ susan_busy = True
+    $ states.sus.busy = True
 
     call music_block
     jump main_room_menu
@@ -1017,8 +1017,8 @@ label ag_se_imperio_sb_E3:
 
     if states.ast.level < 24:
         $ states.ast.level = 24
-        $ sus_whoring = 24
+        $ states.sus.level = 24
-        $ susan_wardrobe_unlocked = True
+        $ states.sus.wardrobe_unlocked = True
 
         call end_of_content
 

game/scripts/characters/astoria/events/imperio_training.rpy

@@ -69,7 +69,7 @@ label ag_st_imperio:
     $ ag_st_imperio.inProgress = True
 
     $ states.ast.busy = True
-    $ tonks_busy = True
+    $ states.ton.busy = True
 
     call music_block
     jump main_room_menu
@@ -83,7 +83,7 @@ label end_ag_st_imperio:
     $ tonks.equip(ton_outfit_last) # Equip player outfit.
     $ astoria.equip(ast_outfit_last) # Equip player outfit.
 
-    $ tonks_busy = True
+    $ states.ton.busy = True
     $ states.ast.busy = True
 
     call music_block
@@ -1772,8 +1772,8 @@ label ag_st_imperio_E5:
 
     nar "Astoria has \"mastered\" the imperio curse!"
 
-    $ snape_busy = True
+    $ states.sna.busy = True
-    $ tonks_busy = True
+    $ states.ton.busy = True
     $ states.ast.busy = True
 
     $ tonks.wear("all") # Wear all stripped clothing

game/scripts/characters/astoria/events/intro.rpy

@@ -7,9 +7,6 @@
 # You need to ask Snape and Hermione to help find the student.
 
 label astoria_intro_E1:
-    if "poster_1_store" not in tonks_mail_list:
-        $ tonks_mail_list.append("poster_1_store")
-
     stop music fadeout 1.0
     play sound "sounds/knocking.ogg"
     "*knock-knock-knock*"
@@ -172,6 +169,8 @@ label astoria_intro_E1:
                 #    ton "But right now we simply don't have time to fool around I'm afraid..." ("base", "base", "base", "mid")
 
                 "\"Send Nudes.\"":
+                    $ letter_nt_1.send()
+
                     ton "Nudes, [name_genie_tonks]?" ("annoyed", "base", "raised", "mid")
                     gen "Yes! Send me some nude pictures of yourself!" ("grin", xpos="far_left", ypos="head")
                     gen "A poster, maybe?" ("grin", xpos="far_left", ypos="head")
@@ -190,10 +189,6 @@ label astoria_intro_E1:
                     gen "Sweet!" ("grin", xpos="far_left", ypos="head")
                     ton "Now, here is what I'll require your help with..." ("open", "closed", "base", "mid")
 
-                    if "poster_1_gift" not in tonks_mail_list:
-                        $ tonks_mail_list.append("poster_1_gift")
-                        $ tonks_mail_list.remove("poster_1_store")
-
     ton "This girl I've told you about, Susan Bones?" ("soft", "base", "shocked", "mid")
     ton "The one with--" ("base", "base", "base", "R")
     gen "With the giant tits!" ("grin", xpos="far_left", ypos="head")
@@ -263,7 +258,7 @@ label astoria_intro_E1:
     gen "(Or I could jerk off instead!)" ("grin", xpos="far_left", ypos="head")
     gen "(Yes, that seems like a good idea right now!)" ("grin", xpos="far_left", ypos="head")
 
-    $ tonks_busy = True
+    $ states.ton.busy = True
     $ states.ast.ev.intro.e1_complete = True
 
     call music_block
@@ -343,13 +338,13 @@ label astoria_intro_E2_hermione:
     call her_walk(action="leave")
 
     call bld
-    if states.ast.ev.intro.e2_deadend:
+    if states.ast.ev.intro.e2_ask_snape:
         gen "I wonder if she'll find her before Snape..." ("base", xpos="far_left", ypos="head")
     else:
         gen "I should probably tell Snape as well..." ("base", xpos="far_left", ypos="head")
 
     $ states.her.busy = True
-    $ states.ast.ev.intro.e2_complete = True
+    $ states.ast.ev.intro.e2_ask_hermione = True
 
     call music_block
     jump main_room_menu
@@ -398,7 +393,7 @@ label astoria_intro_E2_snape:
     sna "I'll start the search immediately. In the meantime, just stay here and keep yourself busy." ("snape_10")
     gen "You don't want my help?" ("base", xpos="far_left", ypos="head")
     sna "Not really... I'll get this situation under control on my own." ("snape_02")
-    if states.ast.ev.intro.e2_complete:
+    if states.ast.ev.intro.e2_ask_hermione:
         gen "And with Miss Granger's help..." ("base", xpos="far_left", ypos="head")
         sna "Have you told her about this?!" ("snape_03")
         gen "Sure... She seemed eager to help." ("base", xpos="far_left", ypos="head")
@@ -411,13 +406,13 @@ label astoria_intro_E2_snape:
 
     call sna_walk(action="leave")
 
-    if states.ast.ev.intro.e2_complete:
+    if states.ast.ev.intro.e2_ask_hermione:
         gen "(I wonder if he'll find her before Miss Granger...)" ("base", xpos="far_left", ypos="head")
     else:
         gen "(I should probably ask Miss Granger as well...)" ("base", xpos="far_left", ypos="head")
 
-    $ snape_busy = True
+    $ states.sna.busy = True
-    $ states.ast.ev.intro.e2_deadend = True
+    $ states.ast.ev.intro.e2_ask_snape = True
 
     call music_block
     jump main_room_menu
@@ -842,8 +837,8 @@ label astoria_intro_E3:
     $ tonks.equip(ton_outfit_last)
 
     $ states.her.busy = True
-    $ snape_busy = True
+    $ states.sna.busy = True
-    $ tonks_busy = True
+    $ states.ton.busy = True
 
     $ states.ast.ev.intro.e3_complete = True
 
@@ -948,7 +943,7 @@ label nt_he_astoria_E1:
     nar "You ask Tonks to explain asexuality to you some more..."
     nar "You still can't wrap your mind around the fact that such a horrible thing exists..."
 
-    $ nt_he.astoria_E1 = True
+    $ states.ton.ev.hangouts.astoria_e1 = True
 
     call music_block
     jump end_tonks_hangout_points

game/scripts/characters/astoria/summon.rpy

@@ -42,12 +42,12 @@ label summon_astoria:
             jump astoria_requests
 
         # Wardrobe
-        "-Wardrobe-" (icon="interface/icons/small/wardrobe.webp") if astoria_wardrobe_unlocked:
+        "-Wardrobe-" (icon="interface/icons/small/wardrobe.webp") if states.ast.wardrobe_unlocked:
             hide astoria_main with d1
             call wardrobe
             jump astoria_requests
 
-        "-Hidden-" (style="disabled") if not astoria_wardrobe_unlocked:
+        "-Hidden-" (style="disabled") if not states.ast.wardrobe_unlocked:
             nar "You haven't unlocked this feature yet."
             jump astoria_requests
 
@@ -79,7 +79,7 @@ label astoria_spells:
 
         for i in ag_spell_list:
             if not i.is_complete(): # Not trained yet.
-                if game.daytime and not tonks_busy:
+                if game.daytime and not states.ton.busy:
                     spell_menu.append(i.get_menu_item())
                 else:
                     spell_menu.append(i.get_menu_item(disabled=True))
@@ -109,7 +109,7 @@ label astoria_spells:
 label block_spell_training:
     if not game.daytime:
         gen "It's too late for that..." ("base", xpos="far_left", ypos="head")
-    elif tonks_busy:
+    elif states.ton.busy:
         gen "I don't think Tonks has time for that right now..." ("base", xpos="far_left", ypos="head")
     return
 

game/scripts/characters/astoria/vars.rpy

@@ -13,6 +13,7 @@ default states.ast.favors_unlocked = False # TODO: Not in use.
 default states.ast.wardrobe_unlocked = False
 default states.ast.wardrobe_scheduling = True
 default states.ast.chatted = False
+default states.ast.map_location = "room_s"
 
 # Sexual activity states
 
@@ -26,12 +27,14 @@ default states.ast.status.anal = False
 # Event flags
 
 default states.ast.ev.intro.e1_complete = False # Tonks visits.
-default states.ast.ev.intro.e2_complete = False # Tell Hermione to look for her.
+default states.ast.ev.intro.e2_ask_hermione = False # Tell Hermione to look for her.
-default states.ast.ev.intro.e2_deadend = False # Tell Snape to look for her. He fails.
+default states.ast.ev.intro.e2_ask_snape = False # Tell Snape to look for her. He fails.
+default states.ast.ev.intro.e2_complete = False # Asked both.
 default states.ast.ev.intro.e3_complete = False # Hermione finds her.
 default states.ast.ev.intro.e4_complete = False # Astoria unlocked.
 
 # Names
+
 default name_astoria_genie = "Astoria"
 default name_genie_astoria = "Sir"
 default name_susan_astoria = "Cow"

game/scripts/characters/astoria/wardrobe_reactions.rpy

@@ -235,7 +235,7 @@ label ast_reaction_equip_outfit_fail(item):
 
     ast "That's way beyond what I would consider dignified." ("annoyed", "narrow", "angry", "R")
 
-    if susan_unlocked:
+    if states.sus.unlocked:
         ast "Consider asking Susan instead." ("base", "narrow", "base", "mid")
         ast "I'm sure she'd enjoy wearing it for you, that cow." ("smile", "narrow", "base", "R")
 
@@ -258,7 +258,7 @@ label ast_reaction_blacklist(item):
 
     ast "This is stupid..." ("base", "base", "base", "mid")
 
-    if susan_unlocked:
+    if states.sus.unlocked:
         gen "Perhaps I'll ask Susan instead--" ("base", xpos="far_left", ypos="head")
 
     ast "J-Just give me that!" ("annoyed", "base", "base", "L")

game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy

@@ -1025,8 +1025,8 @@ label cc_pf_strip_T3_intro_E2:
     $ cho.equip(cho_outfit_last)
     $ tonks.equip(ton_outfit_last)
 
-    $ tonks_busy = True
+    $ states.ton.busy = True
-    $ snape_busy = True
+    $ states.sna.busy = True
 
     # End event.
     jump end_cho_strip_event
@@ -3041,7 +3041,7 @@ label cc_pf_strip_T3_intro_E3:
     $ tonks.equip(ton_outfit_last)
     $ hermione.equip(her_outfit_last)
 
-    $ tonks_busy = True
+    $ states.ton.busy = True
 
     # End event.
     jump end_cho_strip_event

game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy

@@ -1447,7 +1447,7 @@ label .end_event:
     $ tonks.equip(ton_outfit_last)
     $ hermione.equip(her_outfit_last)
 
-    $ tonks_busy = True
+    $ states.ton.busy = True
 
     # End event.
     jump end_cho_strip_event

game/scripts/characters/cho/events/intro.rpy

@@ -496,7 +496,7 @@ label cho_intro_E2:
     gen "Who am I even kidding..." ("base", xpos="far_left", ypos="head")
 
     $ states.her.busy = True
-    $ snape_busy = False
+    $ states.sna.busy = False
 
     $ states.cho.ev.intro.e2_complete = True
 
@@ -682,7 +682,7 @@ label ss_he_cho_E1:
     nar "You spend the rest of the evening in Snape's company, talking about Cho's impressive thighs."
 
 
-    $ ss_he.cho_E1 = True
+    $ states.sna.ev.hangouts.cho_e1 = True
 
     jump end_snape_hangout_points
 
@@ -759,7 +759,7 @@ label cho_intro_E3:
                 her "Well..." ("soft", "happy", "base", "R")
                 gen "Don't push your luck..." ("base", xpos="far_left", ypos="head")
                 her "No, I think that should do..." ("smile", "happyCl", "base", "mid")
-                if sna_friendship <= 30:
+                if states.sna.level <= 30:
                     gen "(I'm going to need to get real friendly with Snape to get those Slytherins in a steady lead...)" ("base", xpos="far_left", ypos="head")
                 gen "One hundred points to Gryffindor...{w=0.6} Happy?" ("base", xpos="far_left", ypos="head")
                 $ gryffindor += 100

game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy

@@ -1756,7 +1756,7 @@ label gryffindor_match_return:
     #Setup
     $ tonks.zorder = 18
     $ hooch.zorder = 17
-    $ snape_zorder = 16
+    $ states.sna.image.zorder = 16
     $ cho.zorder = 16 #Shows/Hides Cho doll on CG
 
     $ snape_chibi.zorder = 4
@@ -2603,16 +2603,16 @@ label gryffindor_match_return:
         $ states.cho.level = 24
         call end_of_content
 
-    $ tonks_busy = True
+    $ states.ton.busy = True
-    $ snape_busy = True
+    $ states.sna.busy = True
     $ states.her.busy = True
-    $ luna_busy = True
+    $ states.lun.busy = True
     $ states.cho.busy = True
 
     #Reset zorder
     $ tonks.zorder = 15
     $ hooch.zorder = 15
-    $ snape_zorder = 15
+    $ states.sna.image.zorder = 15
     $ cho.zorder = 15
 
     $ snape_chibi.zorder = 3

game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy

@@ -1144,7 +1144,7 @@ label hufflepuff_match_return:
     call popup("New favours for Cho have been unlocked!", "Congratulations!", "interface/icons/head/cho.webp")
 
     $ states.her.busy = True
-    $ snape_busy    = True
+    $ states.sna.busy = True
 
     # Reset Cho
     $ cho.equip(cho_outfit_last)

game/scripts/characters/cho/events/quidditch/intros.rpy

@@ -342,7 +342,7 @@ label cho_quid_E3:
 
             jump cho_quid_E3.choices
 
-        "\"Luna\"" if luna_unlocked and not _selected[1]:
+        "\"Luna\"" if states.lun.unlocked and not _selected[1]:
             $ _selected[1] = True
 
             cho "Luna? Luna Lovegood, [name_genie_cho]?" ("open", "narrow", "raised", "mid")
@@ -944,7 +944,7 @@ label cho_quid_E8:
     else:
         nar "You finish your drinks before calling it a night."
 
-    $ tonks_busy = True
+    $ states.ton.busy = True
     $ states.cho.ev.quidditch.e8_complete = True
     $ states.cho.ev.quidditch.lock_practice = False
     $ states.cho.ev.quidditch.slytherin_prepared = True # Unlocks practice match
@@ -992,7 +992,7 @@ label cho_quid_E9:
     nar "You feel a sense of remorse shortly after he's gone, realizing that you're both just parts of the same coin."
     nar "Your friendship level with him has not changed...{w=0.5} Probably..."
 
-    $ snape_busy = True
+    $ states.sna.busy = True
     $ ss_summon_pause = 5 # Snape can't be summoned for a couple of days. Can be set to 0 once you talked to Tonks.
 
     $ states.cho.ev.quidditch.e9_complete = True
@@ -1436,7 +1436,7 @@ label cho_quid_E12:
     gen "Makes perfect sense to me." ("base", xpos="far_left", ypos="head")
     cho "*Err*..." ("angry", "narrow", "base", "L")
 
-    if snape_picture_examined:
+    if states.map.snape_office.picture_examined:
         gen "That's why those portraits never keep quiet, isn't it?" ("base", xpos="far_left", ypos="head")
         hoo "Precisely... The portraits appear alive for this very reason." ("base", "base", "base", "mid", cheeks="blush")
         hoo "Every painting contains some characteristics from the artist who painted it." ("base", "shocked", "base", "L", cheeks="blush")

game/scripts/characters/cho/events/quidditch/quiz.rpy

@@ -647,6 +647,6 @@ label ss_he_cho_E2:
     nar "You spend the rest of the evening in Snape's company once again talking about Cho's remarkable legs."
 
 
-    $ ss_he.cho_E2 = True
+    $ states.sna.ev.hangouts.cho_e2 = True
 
     jump end_snape_hangout_points

game/scripts/characters/cho/events/quidditch/slytherin_match.rpy

@@ -466,9 +466,9 @@ label slytherin_match:
 
     ton "Just ignore them sweetie, you're doing great." ("base", "happyCl", "base", "mid")
 
-    if ton_friendship > sna_friendship:
+    if states.ton.level > states.sna.level:
         gen "What she said." ("base", xpos="far_left", ypos="head")
-    elif ton_friendship == sna_friendship:
+    elif states.ton.level == states.sna.level:
         gen "What they said." ("base", xpos="far_left", ypos="head")
     else:
         gen "What he said." ("base", xpos="far_left", ypos="head")
@@ -1578,7 +1578,7 @@ label slytherin_match_return:
     ton "" ("horny", "base", "base", "mid", trans=d5)
     pause .8
 
-    if tonks_morph_known: #This wont be used if we make it so you learn it first time here and hangouts unlock after this
+    if states.gen.ev.tonks.metamorphmagi_aware: #This wont be used if we make it so you learn it first time here and hangouts unlock after this
         gen "It all makes sense now." ("base", xpos="far_left", ypos="head")
         ton "Hello sweet cheeks!" ("base", "base", "base", "mid")
         ton "Thought I was about to lose focus there for a second when you started going at it!" ("open", "base", "base", "R")
@@ -1590,7 +1590,7 @@ label slytherin_match_return:
         ton "Impressive, isn't it?" ("horny", "base", "base", "mid")
 
     else:
-        $ tonks_morph_known = True
+        $ states.gen.ev.tonks.metamorphmagi_aware = True
         gen "You were Miss Granger the whole time?" ("angry", xpos="far_left", ypos="head")
         gen "Plot twist of the fucking century." ("base", xpos="far_left", ypos="head")
         ton "Of course not, don't be silly..." ("open", "closed", "base", "mid")
@@ -1638,7 +1638,7 @@ label slytherin_match_return:
         gen "Tonks?" ("base", xpos="far_left", ypos="head")
         sus "Oh right...{w=0.3} Where was I?" ("smile", "happy", "low", "downL")
 
-    elif susan_unlocked:
+    elif states.sus.unlocked:
         # Tonks Turns into Susan
         play sound "sounds/magic4.ogg"
         play music "music/teddy-bear-waltz-by-kevin-macleod.ogg" fadein 1 if_changed
@@ -1654,7 +1654,7 @@ label slytherin_match_return:
         gen "Tonks?" ("base", xpos="far_left", ypos="head")
         sus "Oh right... Where was I?" ("base", "base", "base", "mid")
 
-    if luna_unlocked:
+    if states.lun.unlocked:
         #Tonks turns into Luna
         gen "Now do Luna!" ("grin", xpos="far_left", ypos="head")
 
@@ -1740,8 +1740,8 @@ label slytherin_match_return:
     gen "Corrupting... enticing..." ("angry", xpos="far_left", ypos="head")
     gen "I'd let her suck my life force any day." ("grin", xpos="far_left", ypos="head")
 
-    $ tonks_busy = True
+    $ states.ton.busy = True
-    $ snape_busy = True
+    $ states.sna.busy = True
     $ states.her.busy = True
     $ states.cho.busy = True
 

game/scripts/characters/cho/events/quidditch/slytherin_practice.rpy

@@ -154,8 +154,8 @@ label cc_st_return:
         $ cho.equip(cho_outfit_last) # Equip last worn clothes
 
         $ states.her.busy = True
-        $ snape_busy = True #Set to busy since their hangouts are triggered after Hermione event next morning.
+        $ states.sna.busy = True #Set to busy since their hangouts are triggered after Hermione event next morning.
-        $ tonks_busy = True #Set to busy since their hangouts are triggered after Hermione event next morning.
+        $ states.ton.busy = True #Set to busy since their hangouts are triggered after Hermione event next morning.
         $ states.cho.mood += 6
         $ states.cho.ev.quidditch.lock_practice = True
         $ states.cho.ev.quidditch.slytherin_failed = True

game/scripts/characters/cho/events/requests/spy_on_the_girls.rpy

@@ -244,7 +244,7 @@ label cc_pr_spy_girls_T3_alicia:
     cho "The only reason she's assisting them, is because they promised they'd behave during Quidditch." ("open", "narrow", "raised", "mid")
 
     # Has player sent Hermione to work with the Twins, promoting the cardgame?
-    if not first_time_cardgame_work:
+    if not states.her.ev.sell_cards.first_time:
         gen "(I thought Hermione was helping them with that already...)" ("base", xpos="far_left", ypos="head")
 
     cho "And she sure doesn't seem to have any problems enticing people." ("soft", "narrow", "base", "mid")

game/scripts/characters/cho/events/summon.rpy

@@ -49,7 +49,7 @@ label cho_summon_setup:
 
     if states.cho.tier == 1:
         # Intro hints
-        if not ss_he.cho_E1 or not states.cho.ev.intro.e4_complete:
+        if not states.sna.ev.hangouts.cho_e1 or not states.cho.ev.intro.e4_complete:
 
             label .hint_menu:
 
@@ -60,7 +60,7 @@ label cho_summon_setup:
                     cho "Yes!" ("angry", "base", "base", "mid")
                     gen "Right..." ("base", xpos="far_left", ypos="head")
                     gen "(Hmm... I think I could use this tension between those two...)" ("base", xpos="far_left", ypos="head")
-                    if not ss_he.cho_E1:
+                    if not states.sna.ev.hangouts.cho_e1:
                         gen "(Better tell Snape about my plan before confronting Miss Granger...)" ("base", xpos="far_left", ypos="head")
                     elif not states.cho.ev.intro.e4_complete:
                         gen " (I should probably talk to Hermione...)" ("base", xpos="far_left", ypos="head")

game/scripts/characters/cho/vars.rpy

@@ -13,6 +13,7 @@ default states.cho.requests_unlocked = False
 default states.cho.wardrobe_unlocked = False
 default states.cho.wardrobe_scheduling = True
 default states.cho.chatted = False
+default states.cho.map_location = "training_grounds"
 
 # Sexual activity states
 

game/scripts/characters/genie/vars.rpy

@@ -23,6 +23,7 @@ default states.gen.ev.intro.desk_examined = False
 default states.gen.ev.intro.cupboard_examined = False
 default states.gen.ev.intro.door_examined = False
 default states.gen.ev.intro.fireplace_examined = False
+default states.gen.ev.tonks.metamorphmagi_aware = False # Genie knows about Tonks being a Metamorphmagus
 
 # Statistics
 
@@ -30,6 +31,7 @@ default states.gen.stats.quidditch_position = "Nobody"
 default states.gen.stats.masturbated_to_hermione = 0
 default states.gen.stats.masturbated_to_luna = 0
 default states.gen.stats.masturbated_to_cho = 0
+default states.gen.stats.hangouts_with_snape = 0
 
 # Names
 

game/scripts/characters/hermione/events/cardgame_wager.rpy

@@ -499,7 +499,7 @@ label hg_wager_bj:
                                         sna "Someone's a sore loser..." (face="snape_13")
                                         gen "Aching..." ("base", xpos="far_left", ypos="head")
                                         gen "Now get out..." ("base", xpos="far_left", ypos="head")
-                                        if sna_friendship >= 30:
+                                        if states.sna.level >= 30:
                                             sna "Fine, but next time I'm playing you for one of those bottles..." (face="snape_03")
                                         else:
                                             sna "Fine..." (face="snape_03")