From db5e4347f74f7c94bd8c6d44edc9c04125e3c605 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Mon, 3 Apr 2023 17:57:14 +0100 Subject: [PATCH] Adjust event name for clarity --- .../characters/cho/events/requests/spy_on_the_girls.rpy | 2 +- game/scripts/characters/hermione/events/jobs.rpy | 8 ++++---- game/scripts/characters/hermione/talk.rpy | 8 ++++---- game/scripts/minigames/cardgame/_hermione_card_game_.rpy | 4 ++-- game/scripts/shops/item/room.rpy | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/game/scripts/characters/cho/events/requests/spy_on_the_girls.rpy b/game/scripts/characters/cho/events/requests/spy_on_the_girls.rpy index 7394e295..fc5f4744 100644 --- a/game/scripts/characters/cho/events/requests/spy_on_the_girls.rpy +++ b/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 states.her.ev.sell_cards.first_time: + if not states.her.ev.promote_cardgame.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") diff --git a/game/scripts/characters/hermione/events/jobs.rpy b/game/scripts/characters/hermione/events/jobs.rpy index eb50eae0..0188f42c 100644 --- a/game/scripts/characters/hermione/events/jobs.rpy +++ b/game/scripts/characters/hermione/events/jobs.rpy @@ -673,7 +673,7 @@ label slytherin_cheer_responses: label job_5: - if states.her.ev.sell_cards.first_time: + if states.her.ev.promote_cardgame.first_time: gen "Alright then, I think it's time you go help the twins with their shop." ("base", xpos="far_left", ypos="head") her "Sir... Why do you want me to help them exactly?" ("annoyed", "closed", "base", "mid") gen "That is my business." ("grin", xpos="far_left", ypos="head") @@ -748,8 +748,8 @@ label hermione_helping_selling_cards: call her_walk(action="enter", xpos="mid", ypos="base") - if states.her.ev.sell_cards.first_time: - $ states.her.ev.sell_cards.first_time = False + if states.her.ev.promote_cardgame.first_time: + $ states.her.ev.promote_cardgame.first_time = False gen "Hello, [name_hermione_genie], how was your day?" ("base", xpos="far_left", ypos="head") her "Good..." ("normal", "happy", "base", "mid") her "I'm still not that comfortable wearing the outfit you provided though so I just stood behind the shop counter today." ("open", "closed", "base", "mid") @@ -918,7 +918,7 @@ label hermione_helping_selling_cards: $ hermione.equip(her_outfit_last) $ hermione.set_cum(None) - $ states.her.ev.sell_cards.helped = True + $ states.her.ev.promote_cardgame.helped = True call music_block jump main_room_menu diff --git a/game/scripts/characters/hermione/talk.rpy b/game/scripts/characters/hermione/talk.rpy index 2ad0f53e..3dcf2049 100644 --- a/game/scripts/characters/hermione/talk.rpy +++ b/game/scripts/characters/hermione/talk.rpy @@ -36,20 +36,20 @@ label hermione_talk: #"This job is only available during the day." #jump working_menu - "-Hidden-" (style="disabled") if not states.her.ev.sell_cards.offered or not poker_outfit_ITEM.unlocked: + "-Hidden-" (style="disabled") if not states.her.ev.promote_cardgame.offered or not poker_outfit_ITEM.unlocked: "You haven't unlocked this job opportunity yet." jump working_menu - "-Work by advertising the card game-" (style="disabled") if states.her.ev.sell_cards.offered and poker_outfit_ITEM.unlocked and not her_outfit_poker.unlocked: + "-Work by advertising the card game-" (style="disabled") if states.her.ev.promote_cardgame.offered and poker_outfit_ITEM.unlocked and not her_outfit_poker.unlocked: gen "(I'll need an outfit for Hermione if I want her to work.)" ("base", xpos="far_left", ypos="head") gen "(Maybe the twins have something fitting for her in their stock.)" ("base", xpos="far_left", ypos="head") jump working_menu - "-Work by advertising the card game-" (style="disabled") if not game.daytime and states.her.ev.sell_cards.offered and her_outfit_poker.unlocked: + "-Work by advertising the card game-" (style="disabled") if not game.daytime and states.her.ev.promote_cardgame.offered and her_outfit_poker.unlocked: "This job is only available during the day." jump working_menu - "-Work by advertising the card game-" if game.daytime and states.her.ev.sell_cards.offered and her_outfit_poker.unlocked: + "-Work by advertising the card game-" if game.daytime and states.her.ev.promote_cardgame.offered and her_outfit_poker.unlocked: jump job_5 "-Never mind-": diff --git a/game/scripts/minigames/cardgame/_hermione_card_game_.rpy b/game/scripts/minigames/cardgame/_hermione_card_game_.rpy index 7310e383..a518624f 100644 --- a/game/scripts/minigames/cardgame/_hermione_card_game_.rpy +++ b/game/scripts/minigames/cardgame/_hermione_card_game_.rpy @@ -271,8 +271,8 @@ label hermione_random_duel: gen "Well, in that case..." ("base", xpos="far_left", ypos="head") menu: - "-Send Hermione to work, promoting the card game-" if not states.her.ev.sell_cards.offered: - $ states.her.ev.sell_cards.offered = True + "-Send Hermione to work, promoting the card game-" if not states.her.ev.promote_cardgame.offered: + $ states.her.ev.promote_cardgame.offered = True gen "In that case, I think I have a good idea for a job..." ("grin", xpos="far_left", ypos="head") her "A job?" ("open", "happy", "base", "mid") gen "Yes, I'd like you to start helping the twins promote the card game..." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/shops/item/room.rpy b/game/scripts/shops/item/room.rpy index 18a85a56..f1713fe8 100644 --- a/game/scripts/shops/item/room.rpy +++ b/game/scripts/shops/item/room.rpy @@ -49,10 +49,10 @@ label item_store: twi "Of course!" $ her_help = 0 - if states.her.ev.sell_cards.helped: + if states.her.ev.promote_cardgame.helped: ger "Miss Granger has helped us with promotions this week so that means more profits." $ her_help = 200 - $ states.her.ev.sell_cards.helped = False + $ states.her.ev.promote_cardgame.helped = False $ shop_profit = renpy.random.randint(50+her_help, 300) ger "Here, your weekly cut."