SilverStudioGames/WTS
SilverStudioGames/WTS
2
0
Fork 1
Code Issues Pull Requests Wiki Activity

Main Room and Genie scaling

Browse Source 
* Fixed room scaling
* Fixed genie scaling
This commit is contained in:
LoafyLemon 2024-05-15 16:51:33 +01:00
parent 8d50133b79
commit 2cd6237811
6 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
game/scripts/animations/ani_emotes.rpy
View File

@ -2,6 +2,7 @@
# Emotes
image emo_exclaim:
zoom 2.0
"characters/emotes/animated/exlaim_01.webp"
pause.1
"characters/emotes/animated/exlaim_02.webp"

92
game/scripts/animations/ani_genie.rpy
View File

File diff suppressed because it is too large Load Diff

4
game/scripts/characters/snape/vars.rpy
View File

@ -9,11 +9,11 @@ default states.sna.map_location = "room_potions"
# Image states
default states.sna.image.xpos = 525
default states.sna.image.xpos = 1050
default states.sna.image.ypos = 0
default states.sna.image.zorder = 15
default states.sna.image.xzoom = 1
default states.sna.image.zoom = 0.5
default states.sna.image.zoom = 0.85
default states.sna.image.face = "snape_01"
default states.sna.image.animation = []

3
game/scripts/chibis/classes.rpy
View File

@ -265,10 +265,11 @@ 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,y)
self.pos = (x*2,y*2)
def resolve_position(self, x=None, y=None):
"""Compute new position from place keywords (or just ints) for one or both of the coordinates."""

38
game/scripts/rooms/main_room/images.rpy
View File

File diff suppressed because it is too large Load Diff

40
game/scripts/rooms/main_room/init.rpy
View File

@ -1,10 +1,10 @@
default main_room = Room("main_room", "main_room_menu")
default fireplace_OBJ = RoomObject(main_room, "fireplace", pos=(693, 277), idle="fireplace_idle_shadow", focus_mask="fireplace_hover", foreground=None, action=Jump("fireplace"), tooltip="Light/Extinguish")
default fireplace_OBJ = RoomObject(main_room, "fireplace", pos=(1386, 554), idle="fireplace_idle_shadow", focus_mask="fireplace_hover", foreground=None, action=Jump("fireplace"), tooltip="Light/Extinguish")
default cupboard_OBJ = RoomObject(
main_room,
"cupboard",
pos=(260, 280),
pos=(520, 560),
idle="cupboard_idle",
action={
"Open Inventory": (Text("🎒", align=(0.5, 0.5)), Jump("inventory"), "True"),
@ -15,7 +15,7 @@ default cupboard_OBJ = RoomObject(
)
default phoenix_OBJ = RoomObject(
main_room, "phoenix",
pos=(557, 272),
pos=(1114, 544),
idle="phoenix_idle",
hover="phoenix_hover",
focus_mask="phoenix_idle",
@ -29,7 +29,7 @@ default phoenix_OBJ = RoomObject(
default door_OBJ = RoomObject(
main_room,
"door",
pos=(898, 315),
pos=(1796, 630),
idle="door_idle",
focus_mask="door_hover",
action={
@ -44,12 +44,12 @@ default door_OBJ = RoomObject(
},
tooltip="Door"
)
default candleL_OBJ = RoomObject(main_room, "candle_left", pos=(350, 160), idle="candle_left", foreground=None, action=ToggleVariable("candleL_OBJ.foreground", "candle_fire", None), zorder=3)
default candleR_OBJ = RoomObject(main_room, "candle_right", pos=(833, 225), idle="candle_right", foreground=None, action=ToggleVariable("candleR_OBJ.foreground", "candle_fire", None), zorder=3)
default candleL_OBJ = RoomObject(main_room, "candle_left", pos=(700, 320), idle="candle_left", foreground=None, action=ToggleVariable("candleL_OBJ.foreground", "candle_fire", None), zorder=3)
default candleR_OBJ = RoomObject(main_room, "candle_right", pos=(1666, 450), idle="candle_right", foreground=None, action=ToggleVariable("candleR_OBJ.foreground", "candle_fire", None), zorder=3)
default desk_OBJ = RoomObject(
main_room,
"desk",
pos=(370, 336),
pos=(740, 672),
idle="ch_gen sit_behind_desk",
hover="ch_gen sit_behind_desk_hover",
focus_mask="ch_gen sit_behind_desk",
@ -63,25 +63,25 @@ default desk_OBJ = RoomObject(
hovered=Show(
"gui_tooltip",
img="emo_exclaim",
xx=335,
yy=210
xx=670,
yy=420
),
unhovered=Hide("gui_tooltip"),
tooltip="Desk",
zorder=1
)
default poster_OBJ = RoomObject(main_room, "poster", pos=(364, 285), idle=Null(127, 166), action=Jump("enlarge_poster"), zorder=-1)
default trophy_OBJ = RoomObject(main_room, "trophy", pos=(650, 120), idle=Null(), action=None, zorder=-1)
default chair_OBJ = RoomObject(main_room, "chair", pos=(793, 300), idle="chair_right", action=None, zorder=0)
default chair_left_OBJ = RoomObject(main_room, "chair", pos=(333, 300), idle="chair_left", action=None, zorder=0, hidden=True)
default poster_OBJ = RoomObject(main_room, "poster", pos=(728, 570), idle=Null(127, 166), action=Jump("enlarge_poster"), zorder=-1)
default trophy_OBJ = RoomObject(main_room, "trophy", pos=(1300, 240), idle=Null(), action=None, zorder=-1)
default chair_OBJ = RoomObject(main_room, "chair", pos=(1586, 600), idle="chair_right", action=None, zorder=0)
default chair_left_OBJ = RoomObject(main_room, "chair", pos=(666, 600), idle="chair_left", action=None, zorder=0, hidden=True)
default owl_OBJ = RoomObject(main_room, "owl", pos=(455, 289), idle="owl_letter", hover="owl_letter_hover", action=Jump("letter_open_all"), tooltip=_("Check Mail"), hidden=True, anchor=(0.5, 1.0))
default parcel_OBJ = RoomObject(main_room, "parcel", pos=(402, 290), idle="parcel", action=Jump("parcel_open_all"), tooltip=_("Check Parcel"), hidden=True, anchor=(0.5, 1.0))
default owl_OBJ = RoomObject(main_room, "owl", pos=(910, 578), idle="owl_letter", hover="owl_letter_hover", action=Jump("letter_open_all"), tooltip=_("Check Mail"), hidden=True, anchor=(0.5, 1.0))
default parcel_OBJ = RoomObject(main_room, "parcel", pos=(804, 580), idle="parcel", action=Jump("parcel_open_all"), tooltip=_("Check Parcel"), hidden=True, anchor=(0.5, 1.0))
default rug_OBJ = RoomObject(main_room, "rug", pos=(482, 392), idle=Null(), action=None, zorder=0)
default chandelier_OBJ = RoomObject(main_room, "chandelier", pos=(536, 24), idle=Null(), action=None, zorder=5)
default window_OBJ = RoomObject(main_room, "window", pos=(459, 192), idle=Null(), action=None, zorder=0)
default safe_OBJ = RoomObject(main_room, "safe", pos=(73, 324), idle=Text("Safe", color="#fff"), action=Jump("inventory"), zorder=0)
default rug_OBJ = RoomObject(main_room, "rug", pos=(964, 784), idle=Null(), action=None, zorder=0)
default chandelier_OBJ = RoomObject(main_room, "chandelier", pos=(1072, 48), idle=Null(), action=None, zorder=5)
default window_OBJ = RoomObject(main_room, "window", pos=(918, 384), idle=Null(), action=None, zorder=0)
default safe_OBJ = RoomObject(main_room, "safe", pos=(146, 648), idle=Text("Safe", color="#fff"), action=Jump("inventory"), zorder=0)
screen main_room():
tag room
@ -136,4 +136,4 @@ label main_room_menu:
if states.env.daytime:
jump day_resume
else:
jump night_resume
jump night_resume