Gouvernathor/WTS
1
0
Fork 0
forked from SilverStudioGames/WTS
Code Pull Requests Activity

Bug fixes

Browse Source 
* Fixed missed or overlooked changes
This commit is contained in:
LoafyLemon 2023-04-01 00:28:37 +01:00
parent b28a3e250d
commit 3df4778fca
13 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
game/scripts/characters/astoria/gifts.rpy
View File

File diff suppressed because it is too large Load Diff

2
game/scripts/characters/cho/events/quidditch/intros.rpy
View File

@ -331,7 +331,7 @@ label cho_quid_E3:
"\"Hermione\"":
pass
"\"Astoria\"" if astoria_unlocked and not _selected[0]:
"\"Astoria\"" if states.ast.unlocked and not _selected[0]:
$ _selected[0] = True
cho "That mischievous little..." ("clench", "wide", "raised", "mid")

2
game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
View File

@ -1615,7 +1615,7 @@ label slytherin_match_return:
cho "Want to give this snatch a little lick?" ("soft", "narrow", "base", "mid")
gen "!!!" ("angry", xpos="far_left", ypos="head")
if astoria_unlocked:
if states.ast.unlocked:
# Tonks turns into Astoria
play sound "sounds/magic4.ogg"
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed

4
game/scripts/characters/hermione/events/favors/talk_to_me.rpy
View File

@ -953,7 +953,7 @@ label hg_pf_talk_tonks:
her "I know!" ("disgust", "narrow", "base", "down")
her "Even then, that doesn't compare to the things those Slytherins have been doing." ("angry", "narrow", "angry", "down")
block weight 0.9 if astoria_unlocked: # After Astoria got caught.
block weight 0.9 if states.ast.unlocked: # After Astoria got caught.
her "That Astoria girl, casting imperio on a student, and making her lift her top..." ("soft", "narrow", "angry", "R")
ton "Ah, yes that was unfortunate..." ("normal", "base", "worried", "R", hair="basic")
if states.gen.masturbating:
@ -970,7 +970,7 @@ label hg_pf_talk_tonks:
her "Anyway..." ("open", "closed", "base", "mid")
her "She's not even the worst person amongst the Slytherins." ("angry", "narrow", "angry", "down")
block if not any(((states.cho.tier >= 2), (cc_pf_strip.counter >= 2), astoria_unlocked)):
block if not any(((states.cho.tier >= 2), (cc_pf_strip.counter >= 2), states.ast.unlocked)):
her "..." ("annoyed", "narrow", "worried", "down", cheeks="blush")
ton "Miss Granger?" ("normal", "base", "raised", "L")
her "*Ehm*..." ("annoyed", "base", "base", "R", cheeks="blush")

2
game/scripts/events/ending.rpy
View File

@ -2676,7 +2676,7 @@ label ball_ending_E2:
gen "Goodbye, smart cumslut Hermione..." ("base", xpos="far_left", ypos="head")
if states.cho.unlocked:
gen "and my token asian Cho..." ("base", xpos="far_left", ypos="head")
if astoria_unlocked:
if states.ast.unlocked:
gen "and my sassy blonde Astoria..." ("base", xpos="far_left", ypos="head")
if luna_unlocked:
gen "and my {i}wackspit-sucking{/i} queen Luna..." ("base", xpos="far_left", ypos="head")

4
game/scripts/events/event_class.rpy
View File

@ -155,8 +155,8 @@ init python:
return status_list
def is_complete(self, ignore_in_progress=False):
is_lstates.ast.tier = (self._tier == self._max_tiers - 1)
return is_lstates.ast.tier and self.is_tier_complete(ignore_in_progress=ignore_in_progress)
is_last_tier = (self._tier == self._max_tiers - 1)
return is_last_tier and self.is_tier_complete(ignore_in_progress=ignore_in_progress)
def is_tier_complete(self, ignore_in_progress=False):
event_count = len(self.events[self._tier])

4
game/scripts/interface/cheats.rpy
View File

@ -171,7 +171,7 @@ label cheats:
jump cheats.characters
jump cheats.luna
"-Astoria-" (icon="interface/icons/small/astoria.webp") if astoria_unlocked:
"-Astoria-" (icon="interface/icons/small/astoria.webp") if states.ast.unlocked:
label .astoria:
menu:
"-Reset mood-" if states.ast.mood != 0:
@ -336,7 +336,7 @@ label cheats:
$ tonks_unlocked = True
$ states.her.unlocked = True
$ states.cho.unlocked = True
$ astoria_unlocked = True
$ states.ast.unlocked = True
$ susan_unlocked = True
$ luna_unlocked = True
# ginny_unlocked = True

2
game/scripts/interface/door.rpy
View File

@ -21,7 +21,7 @@ label summon_menu(xx=723, yy=90):
"Hermione": {"ico": "hermione", "flag": states.her.unlocked, "busy": states.her.busy, "loc": her_map_location},
"Cho": {"ico": "cho", "flag": states.cho.unlocked, "busy": states.cho.busy, "loc": cho_map_location},
"Luna": {"ico": "luna", "flag": luna_unlocked, "busy": luna_busy, "loc": lun_map_location},
"Astoria": {"ico": "astoria", "flag": astoria_unlocked, "busy": states.ast.busy, "loc": ast_map_location},
"Astoria": {"ico": "astoria", "flag": states.ast.unlocked, "busy": states.ast.busy, "loc": ast_map_location},
"Susan": {"ico": "susan", "flag": susan_unlocked, "busy": susan_busy, "loc": sus_map_location}
}

2
game/scripts/interface/letter.rpy
View File

@ -206,7 +206,7 @@ label letter(text, label):
show screen letter(text)
with d3
$ states.menu_pos = 0.5, 0.9
$ states.menu_pos = (0.5, 0.9)
menu:
"-Done reading-":

2
game/scripts/interface/map.rpy
View File

@ -436,7 +436,7 @@ screen map_screen_characters():
action Return("luna")
#Astoria
if astoria_unlocked:
if states.ast.unlocked:
imagebutton:
xpos UI_xpos_offset +ast_map_xpos
ypos UI_ypos_offset +ast_map_ypos

2
game/scripts/interface/stats.rpy
View File

@ -92,7 +92,7 @@ label stats_menu(xx=150, yy=90):
"Hermione": {"ico": "hermione", "flag": states.her.unlocked, "name": "Hermione Granger", "sex": "Female", "height": "5.2ft", "weight": "126lb", "job": "Student", "hates": "Slytherin", "likes": "Books"},
"Cho": {"ico": "cho", "flag": states.cho.unlocked, "name": "Cho Chang", "sex": "Female", "height": "5.1ft", "weight": "122lb", "job": "Student", "hates": "Hermione", "likes": "Winning"},
"Luna": {"ico": "luna", "flag": luna_unlocked, "name": "Luna Lovegood", "sex": "Female", "height": "5.2ft", "weight": "117lb", "job": "Student", "hates": "Wrackspurts", "likes": "{size=-2}Magical creatures{/size}"},
"Astoria": {"ico": "astoria", "flag": astoria_unlocked, "name": "Astoria Greengrass", "sex": "Female", "height": "5.0ft", "weight": "102lb", "job": "Student", "hates": "Rules", "likes": "Breaking them"},
"Astoria": {"ico": "astoria", "flag": states.ast.unlocked, "name": "Astoria Greengrass", "sex": "Female", "height": "5.0ft", "weight": "102lb", "job": "Student", "hates": "Rules", "likes": "Breaking them"},
"Susan": {"ico": "susan", "flag": susan_unlocked, "name": "Susan Bones", "sex": "Female", "height": "5.1ft", "weight": "135lb", "job": "Student", "hates": "Chores", "likes": "You {size=-4}Secretly..{/size}"}
}

2
game/scripts/script.rpy
View File

@ -30,7 +30,7 @@ label start_dev:
tonks_unlocked = True
states.her.unlocked = True
states.cho.unlocked = True
astoria_unlocked = True
states.ast.unlocked = True
susan_unlocked = True
luna_unlocked = True
tonks_wardrobe_unlocked = True