Bug fixes
* Fixed Cho nickname scope * Another attempt at fixing chibi positions and scale
This commit is contained in:
parent
2cd6237811
commit
1cccaaeb8d
@ -73,6 +73,8 @@ image emo_hearts:
|
||||
|
||||
# Not an emote...
|
||||
image notes:
|
||||
zoom 2.0
|
||||
|
||||
"images/animation/notes_01.webp"
|
||||
pause.08
|
||||
"images/animation/notes_02.webp"
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -82,7 +82,7 @@ init python in character:
|
||||
show()
|
||||
|
||||
# Figure out nickname
|
||||
if name_cho_genie != "Cho":
|
||||
if renpy.store.name_cho_genie != "Cho":
|
||||
name_prefix = "Cho {size=-20}\""
|
||||
name_suffix = "\"{/size}"
|
||||
else:
|
||||
|
@ -265,11 +265,10 @@ init -1 python:
|
||||
|
||||
def position(self, x=None, y=None, flip=None):
|
||||
"""Set the position to be used on next update."""
|
||||
# TODO: TEMPORARY FIX FOR SCALING; TO BE REPLACED BY NEW CHIBI IMPLEMENTATION IN THE FUTURE
|
||||
(x,y) = self.resolve_position(x,y)
|
||||
if flip is not None:
|
||||
self.flip = flip
|
||||
self.pos = (x*2,y*2)
|
||||
self.pos = (x,y)
|
||||
|
||||
def resolve_position(self, x=None, y=None):
|
||||
"""Compute new position from place keywords (or just ints) for one or both of the coordinates."""
|
||||
@ -366,6 +365,7 @@ init -1 python:
|
||||
def place(place, position, room=None):
|
||||
"""Resolve place coordinates in the current room, or a given room (by name)."""
|
||||
chibi_room = ChibiRoom.get(room)
|
||||
x = chibi_room.resolve(place[0], position[0], False)
|
||||
y = chibi_room.resolve(place[1], position[1], True)
|
||||
# TODO: TEMPORARY FIX FOR SCALING; TO BE REPLACED BY NEW CHIBI IMPLEMENTATION IN THE FUTURE
|
||||
x = chibi_room.resolve(place[0], position[0], False) * 2
|
||||
y = chibi_room.resolve(place[1], position[1], True) * 2
|
||||
return (x,y)
|
||||
|
@ -1,5 +1,5 @@
|
||||
init python:
|
||||
ChibiRoom("main_room", 1.0, {
|
||||
ChibiRoom("main_room", 2.0, {
|
||||
"base": (None, 430),
|
||||
"back": (None, 400),
|
||||
"mid": (540, None),
|
||||
@ -19,7 +19,7 @@ init python:
|
||||
"desk_close": (425, 435),
|
||||
})
|
||||
|
||||
ChibiRoom("quidditch_pitch", 1.4, {
|
||||
ChibiRoom("quidditch_pitch", 2.8, {
|
||||
"base": (None, 500),
|
||||
"left": (300, None),
|
||||
"mid": (450, None),
|
||||
@ -28,26 +28,26 @@ init python:
|
||||
"stairs_up": (1000, 370),
|
||||
})
|
||||
|
||||
ChibiRoom("quidditch_stands", 1.0, {})
|
||||
ChibiRoom("quidditch_stands2", 1.0, {})
|
||||
ChibiRoom("quidditch_stands", 2.0, {})
|
||||
ChibiRoom("quidditch_stands2", 2.0, {})
|
||||
|
||||
ChibiRoom("room_of_requirement", 1.0, {
|
||||
ChibiRoom("room_of_requirement", 2.0, {
|
||||
"door": (750, None),
|
||||
"left": (200, None),
|
||||
"base": (None, 430),
|
||||
})
|
||||
|
||||
ChibiRoom("weasley_store", 1.0, {
|
||||
ChibiRoom("weasley_store", 2.0, {
|
||||
"left": (100, None),
|
||||
"base": (None, 430),
|
||||
})
|
||||
|
||||
ChibiRoom("clothing_store", 1.0, {
|
||||
ChibiRoom("clothing_store", 2.0, {
|
||||
"left": (100, None),
|
||||
"base": (None, 430),
|
||||
})
|
||||
|
||||
ChibiRoom("seventh_floor", 1.0, {
|
||||
ChibiRoom("seventh_floor", 2.0, {
|
||||
"base": (None, 430),
|
||||
"right": (750, None),
|
||||
"left_mid": (200, None),
|
||||
@ -55,7 +55,7 @@ init python:
|
||||
"door": (-100, None),
|
||||
})
|
||||
|
||||
ChibiRoom("snape_office", 1.0, {
|
||||
ChibiRoom("snape_office", 2.0, {
|
||||
"base": (None, 430),
|
||||
"mid": (450, None),
|
||||
"desk": (465, None),
|
||||
@ -68,7 +68,7 @@ init python:
|
||||
"beside_chair": (695, 460)
|
||||
})
|
||||
|
||||
ChibiRoom("boxing_ring", 1.0, {
|
||||
ChibiRoom("boxing_ring", 2.0, {
|
||||
"base": (None, 445),
|
||||
"left": (400, None),
|
||||
"right": (550, None),
|
||||
|
@ -94,7 +94,7 @@ screen main_room():
|
||||
if room_menu_active and states.env.day > 1 and not renpy.android:
|
||||
use hotkeys_main
|
||||
|
||||
add "weather [states.env.weather]" xycenter (430, 218)
|
||||
add "weather [states.env.weather]" xycenter (860, 436) zoom 2.0
|
||||
|
||||
# Walls
|
||||
if states.env.daytime:
|
||||
|
Loading…
Reference in New Issue
Block a user