From 40335c5fa465e107779fa7d8bc8a6b0619b4896b Mon Sep 17 00:00:00 2001 From: Gouvernathor <44340603+Gouvernathor@users.noreply.github.com> Date: Mon, 1 Apr 2024 22:35:46 +0200 Subject: [PATCH] Rename some parameters to avoid shadowing builtin names --- game/scripts/cg/pov.rpy | 8 ++++---- game/scripts/characters/astoria/chibi.rpy | 4 ++-- game/scripts/characters/cho/chibi.rpy | 4 ++-- .../cho/events/favors/inspect_her_body_tier2.rpy | 3 +-- .../cho/events/quidditch/hufflepuff_match.rpy | 2 +- .../characters/cho/events/quidditch/intros.rpy | 2 +- .../characters/cho/events/quidditch/screens.rpy | 4 ++-- .../cho/events/quidditch/slytherin_match.rpy | 2 +- game/scripts/characters/tonks/chibi.rpy | 4 ++-- game/scripts/chibis/transforms.rpy | 4 ++-- game/scripts/events/labels.rpy | 16 ++++++++-------- .../mirror/events/not_so_great_escape.rpy | 2 +- 12 files changed, 27 insertions(+), 28 deletions(-) diff --git a/game/scripts/cg/pov.rpy b/game/scripts/cg/pov.rpy index 54e31557..8f42654e 100644 --- a/game/scripts/cg/pov.rpy +++ b/game/scripts/cg/pov.rpy @@ -18,7 +18,7 @@ init python: renpy.show_screen(controller, focused) -screen cho_dual_cg(focused, _layer="screens", bubble="cho_handjob_bubble", mask="cho_handjob_bubble_mask"): +screen cho_dual_cg(focused, _layer="screens", bubble_="cho_handjob_bubble", mask="cho_handjob_bubble_mask"): tag switcher zorder 300 @@ -27,12 +27,12 @@ screen cho_dual_cg(focused, _layer="screens", bubble="cho_handjob_bubble", mask= if d: $ btn = AlphaMask(Fixed(Transform(d, align=( (1.0, 0.05) if flip else (0.0, 0.05) ), zoom=0.5, xzoom=flip)), Transform(mask, zoom=0.25)) - $ btn = Fixed(Transform(bubble, zoom=0.25), btn) - + $ btn = Fixed(Transform(bubble_, zoom=0.25), btn) + imagebutton: idle Transform(btn, alpha=0.75) hover Transform(btn, alpha=1.0) action Function(cg_pov_switch, layer=_layer) focus_mask True at transform: - xzoom flip \ No newline at end of file + xzoom flip diff --git a/game/scripts/characters/astoria/chibi.rpy b/game/scripts/characters/astoria/chibi.rpy index 998d3804..a0f3f8f0 100644 --- a/game/scripts/characters/astoria/chibi.rpy +++ b/game/scripts/characters/astoria/chibi.rpy @@ -50,10 +50,10 @@ label ast_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path= return # Screens -screen ast_cloth_pile(position=(440, 425)): # Default position: Right of desk, below feet. +screen ast_cloth_pile(pos=(440, 425)): # Default position: Right of desk, below feet. tag ast_cloth_pile zorder astoria_chibi.zorder - add "characters/chibis/cloth_pile_r.webp" pos position zoom 0.5 + add "characters/chibis/cloth_pile_r.webp" pos pos zoom 0.5 # Chibi definition default astoria_chibi = Chibi("astoria", ["fix", "base", "bottom", "shoes", "top", "robe", "gloves"], update_astoria_chibi) diff --git a/game/scripts/characters/cho/chibi.rpy b/game/scripts/characters/cho/chibi.rpy index 95f68bab..0b3dc7ef 100644 --- a/game/scripts/characters/cho/chibi.rpy +++ b/game/scripts/characters/cho/chibi.rpy @@ -50,10 +50,10 @@ label cho_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path= return # Screens -screen cho_cloth_pile(position=(440, 425)): # Default position: Right of desk, below feet. +screen cho_cloth_pile(pos=(440, 425)): # Default position: Right of desk, below feet. tag cho_cloth_pile zorder cho_chibi.zorder - add "characters/chibis/cloth_pile_r.webp" pos position zoom 0.5 + add "characters/chibis/cloth_pile_r.webp" pos pos zoom 0.5 # Chibi definition default cho_chibi = Chibi("cho", ["fix", "base", "bottom", "shoes", "top", "robe", "gloves"], update_cho_chibi) diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy index aa0b5ab1..717d59f2 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy @@ -910,7 +910,7 @@ label cc_pf_strip_T2_intro_E3: hide screen bld1 hide screen blkfade with d3 - call teleport(position="cho", effect=False) + call teleport(position_="cho", effect=False) pause .5 call bld @@ -1239,4 +1239,3 @@ label cc_pf_strip_T2_E3_fail_repeat: call cho_walk(action="leave") jump end_cho_event - diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy index 47c3d906..144a22e8 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy @@ -101,7 +101,7 @@ label hufflepuff_match: with d3 call gen_chibi("stand", "door", "base") - call teleport(position="genie", effect=False) + call teleport(position_="genie", effect=False) pause .5 call gen_chibi("stand", "door", "base", flip=False) diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index e85b83ad..2d90876e 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -1680,7 +1680,7 @@ label cho_quid_E14: play sound "sounds/kick.ogg" call gen_chibi("stand", 430, "base") - call teleport(position="genie", effect=False) + call teleport(position_="genie", effect=False) cho @ cheeks blush "Whoa! I didn't know you could apparate at Hogwarts!" ("angry", "narrow", "base", "mid") gen "Appa--{w=0.4} What?" ("base", xpos="far_left", ypos="base") diff --git a/game/scripts/characters/cho/events/quidditch/screens.rpy b/game/scripts/characters/cho/events/quidditch/screens.rpy index 103156de..2127ab4a 100644 --- a/game/scripts/characters/cho/events/quidditch/screens.rpy +++ b/game/scripts/characters/cho/events/quidditch/screens.rpy @@ -31,9 +31,9 @@ style meter_text: align (0.0, 0.5) xoffset 5 -screen swear_bubble(type): +screen swear_bubble(kind): tag bubble zorder 30 - add "interface/meter/bubble/"+str(type)+".webp" ypos 100 xpos 100 + add "interface/meter/bubble/[kind].webp" ypos 100 xpos 100 timer 1.0 action Hide("swear_bubble") diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy index 1b98e2cd..8910643b 100644 --- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy @@ -146,7 +146,7 @@ label slytherin_match: with d3 call gen_chibi("stand", "door", "base") - call teleport(position="genie", effect=False) + call teleport(position_="genie", effect=False) pause .2 call ton_chibi("stand", "desk", "base", flip=True) diff --git a/game/scripts/characters/tonks/chibi.rpy b/game/scripts/characters/tonks/chibi.rpy index e86c9a66..744cf4ed 100644 --- a/game/scripts/characters/tonks/chibi.rpy +++ b/game/scripts/characters/tonks/chibi.rpy @@ -50,10 +50,10 @@ label ton_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path= return # Screens -screen ton_cloth_pile(position=(440, 425)): # Default position: Right of desk, below feet. +screen ton_cloth_pile(pos=(440, 425)): # Default position: Right of desk, below feet. tag ton_cloth_pile zorder tonks_chibi.zorder - add "characters/chibis/cloth_pile_r.webp" pos position zoom 0.5 + add "characters/chibis/cloth_pile_r.webp" pos pos zoom 0.5 label ton_sit(xpos=nxpos, ypos=nypos, flip=None, chair=True): # TODO: replace this with the regular chibi call and add a sitting pose/action -- call ton_chibi("sit", chair=False) diff --git a/game/scripts/chibis/transforms.rpy b/game/scripts/chibis/transforms.rpy index 3254e62c..dcd4d7b5 100644 --- a/game/scripts/chibis/transforms.rpy +++ b/game/scripts/chibis/transforms.rpy @@ -5,8 +5,8 @@ transform combine_transforms(one, two): one two -transform chibi_base(position, flip, scale): - pos position +transform chibi_base(pos, flip, scale): + pos pos anchor (0.0, 1.0) xzoom (-1 if flip else 1) zoom (0.5 * scale) diff --git a/game/scripts/events/labels.rpy b/game/scripts/events/labels.rpy index 885bb60a..f8326e9d 100644 --- a/game/scripts/events/labels.rpy +++ b/game/scripts/events/labels.rpy @@ -103,31 +103,31 @@ label increase_house_points(house, points): return #TODO Check and fix teleport/heal effect position (chibis are now anchored bottom-left) -label teleport(position=None,effect=True,poof_label=None): +label teleport(position_=None, effect=True, poof_label=None): python: - if position == "genie": + if position_ == "genie": teleport_xpos = genie_chibi.pos[0]+75 teleport_ypos = genie_chibi.pos[1] teleport_zorder = 3 - elif position == "hermione": + elif position_ == "hermione": teleport_xpos = hermione_chibi.pos[0]+45 teleport_ypos = hermione_chibi.pos[1] teleport_zorder = 3 - elif position == "cho": + elif position_ == "cho": teleport_xpos = cho_chibi.pos[0]+45 teleport_ypos = cho_chibi.pos[1] teleport_zorder = 3 - elif position == "astoria": + elif position_ == "astoria": teleport_xpos = astoria_chibi.pos[0]+45 teleport_ypos = astoria_chibi.pos[1] teleport_zorder = 3 - elif position == "desk": + elif position_ == "desk": teleport_xpos = 320 teleport_ypos = 450 teleport_zorder = 5 else: - teleport_xpos = position[0] - teleport_ypos = position[1] + teleport_xpos = position_[0] + teleport_ypos = position_[1] teleport_zorder = 2 if effect == True: diff --git a/game/scripts/minigames/mirror/events/not_so_great_escape.rpy b/game/scripts/minigames/mirror/events/not_so_great_escape.rpy index 8e9de292..0a059b21 100644 --- a/game/scripts/minigames/mirror/events/not_so_great_escape.rpy +++ b/game/scripts/minigames/mirror/events/not_so_great_escape.rpy @@ -426,7 +426,7 @@ label not_so_great_escape: play sound "sounds/magic4.ogg" call gen_chibi("stand", 370, 295) - call teleport(position="genie", effect=False) + call teleport(position_="genie", effect=False) stop music fadeout 3 gen "You'll never catch me alive!" ("angry", xpos="far_left", ypos="head")