From 2cd62378115ccbf5c67e6a14bfccc52d8c4c466e Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Wed, 15 May 2024 16:51:33 +0100 Subject: [PATCH] Main Room and Genie scaling * Fixed room scaling * Fixed genie scaling --- game/scripts/animations/ani_emotes.rpy | 1 + game/scripts/animations/ani_genie.rpy | 92 ++++++++++++++++--------- game/scripts/characters/snape/vars.rpy | 4 +- game/scripts/chibis/classes.rpy | 3 +- game/scripts/rooms/main_room/images.rpy | 38 +--------- game/scripts/rooms/main_room/init.rpy | 40 +++++------ 6 files changed, 89 insertions(+), 89 deletions(-) diff --git a/game/scripts/animations/ani_emotes.rpy b/game/scripts/animations/ani_emotes.rpy index 6c23f032..58db98d8 100644 --- a/game/scripts/animations/ani_emotes.rpy +++ b/game/scripts/animations/ani_emotes.rpy @@ -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" diff --git a/game/scripts/animations/ani_genie.rpy b/game/scripts/animations/ani_genie.rpy index af055844..9662d250 100644 --- a/game/scripts/animations/ani_genie.rpy +++ b/game/scripts/animations/ani_genie.rpy @@ -2,21 +2,33 @@ # Genie chibi images (one for each action) image ch_gen stand: + zoom 2.0 + "characters/genie/chibis/stand.webp" image ch_gen stand_alt: + zoom 2.0 + "characters/genie/chibis/stand_alt.webp" image ch_gen stand_by_desk: + zoom 2.0 + "characters/genie/chibis/stand_by_desk.webp" image ch_gen stand_shocked: + zoom 2.0 + "characters/genie/chibis/shocked/01.webp" image ch_gen sneeze: + zoom 2.0 + "characters/genie/chibis/sneeze.webp" image ch_gen walk: + zoom 2.0 + "characters/genie/chibis/walk_01.webp" pause.18 "characters/genie/chibis/walk_02.webp" @@ -28,6 +40,8 @@ image ch_gen walk: repeat image ch_gen rummage: + zoom 2.0 + "characters/genie/chibis/rummage/rum_01.webp" pause.3 "characters/genie/chibis/rummage/rum_02.webp" @@ -43,8 +57,6 @@ image ch_gen rummage: repeat image ch_gen sit_behind_desk: - zoom 0.5 - "characters/genie/chibis/idle/desk_01.webp" pause.1 "characters/genie/chibis/idle/desk_02.webp" @@ -68,17 +80,15 @@ image ch_gen sit_behind_desk: repeat image ch_gen sit_behind_desk_hover: - zoom 0.5 - "characters/genie/chibis/idle/desk_hover.webp" image ch_gen sit_in_chair: - zoom 0.5 - "characters/genie/chibis/sit.webp" # Working image ch_gen paperwork: + zoom 2.0 + "characters/genie/chibis/working/01.webp" pause.15 "characters/genie/chibis/working/02.webp" @@ -130,10 +140,13 @@ image ch_gen paperwork: repeat image ch_gen paperwork_idle: + zoom 2.0 + "characters/genie/chibis/working/01.webp" # Reading image ch_gen read: + zoom 2.0 xzoom -1 # Page flip direction matters! "characters/genie/chibis/reading/01.webp" @@ -153,6 +166,8 @@ image ch_gen read: repeat image ch_gen read_near_fire: + zoom 2.0 + # Page flip direction matters! "characters/genie/chibis/reading/01.webp" pause 2 @@ -171,16 +186,18 @@ image ch_gen read_near_fire: repeat image ch_gen read_done: + zoom 2.0 + xzoom -1 "characters/genie/chibis/reading/07.webp" image ch_gen read_near_fire_done: + zoom 2.0 + "characters/genie/chibis/reading/07.webp" # Drinking image ch_gen toast_goblet: - zoom 0.5 - "characters/genie/chibis/drinking/01.webp" pause 2 "characters/genie/chibis/drinking/02.webp" @@ -196,8 +213,6 @@ image ch_gen toast_goblet: repeat image ch_gen toast_goblet_daytime: - zoom 0.5 - "characters/genie/chibis/drinking/01_day.webp" pause 2 "characters/genie/chibis/drinking/02_day.webp" @@ -214,6 +229,8 @@ image ch_gen toast_goblet_daytime: # Masturbating behind desk image ch_gen jerk_off_behind_desk: + zoom 2.0 + "characters/genie/chibis/jerk_off_behind_desk/desk_01.webp" pause.2 "characters/genie/chibis/jerk_off_behind_desk/desk_02.webp" @@ -225,11 +242,11 @@ image ch_gen jerk_off_behind_desk: repeat image ch_gen cum_behind_desk: - size (608,524) + size (1216,1048) contains: "ch_gen jerk_off_behind_desk" contains: - zoom 2 + zoom 4 alpha 1 "characters/genie/chibis/jerk_off_behind_desk/desk_sperm_01.webp" pause.1 @@ -258,10 +275,11 @@ image ch_gen cum_behind_desk: repeat image ch_gen jerk_off_behind_desk_pause: + zoom 2.0 "characters/genie/chibis/jerk_off_behind_desk/desk_pause.webp" image ch_gen cum_behind_desk_done: - size (608,524) + size (1216,1048) contains: zoom 2 "ch_gen sit_behind_desk" @@ -270,20 +288,28 @@ image ch_gen cum_behind_desk_done: "characters/genie/chibis/jerk_off_behind_desk/desk_sperm_11.webp" image ch_gen dick_out: + zoom 2.0 + "characters/genie/chibis/jerk_off/dick_out.webp" image ch_gen dick_out_normal: + zoom 2.0 + "characters/genie/chibis/jerk_off/dick_out_normal.webp" image ch_gen dick_out_shocked: + zoom 2.0 + "characters/genie/chibis/jerk_off/dick_out_shocked.webp" # Masturbating while standing #TODO Genie's standing jerk off chibis don't stand level with the others. Fix this and check/correct relevant events image ch_gen hold_dick: + zoom 2.0 "characters/genie/chibis/jerk_off/03.webp" image ch_gen jerk_off: + zoom 2.0 "characters/genie/chibis/jerk_off/01.webp" pause.2 "characters/genie/chibis/jerk_off/02.webp" @@ -295,12 +321,12 @@ image ch_gen jerk_off: repeat image ch_gen cum: - size (300,500) + size (600,1000) contains: "ch_gen jerk_off" contains: - offset (-760, -370) - zoom 2 + offset (-1520, -740) + zoom 4 alpha 1 "characters/genie/chibis/jerk_off/sperm_wide_01.webp" pause.1 @@ -343,21 +369,21 @@ image ch_gen cum: repeat image ch_gen cum_done: - size (300,500) + size (600,1000) contains: "characters/genie/chibis/jerk_off/02.webp" contains: - offset (-760, -370) - zoom 2 + offset (-1520, -740) + zoom 4 "characters/genie/chibis/jerk_off/sperm_wide_18.webp" image ch_gen cum_close: - size (300,500) + size (600,1000) contains: "ch_gen jerk_off" contains: - offset (-760, -370) - zoom 2 + offset (-1520, -740) + zoom 4 alpha 1 "characters/genie/chibis/jerk_off/sperm_short_01.webp" pause.1 @@ -389,12 +415,12 @@ image ch_gen cum_close: repeat image ch_gen cum_close_bottomless: - size (300,500) + size (600,1000) contains: "ch_gen jerk_off" contains: - offset (-760, -370) - zoom 2 + offset (-1520, -740) + zoom 4 alpha 1 "characters/genie/chibis/jerk_off/sperm_short_bottomless_01.webp" pause.1 @@ -426,26 +452,27 @@ image ch_gen cum_close_bottomless: repeat image ch_gen cum_close_done: - size (300,500) + size (600,1000) contains: "characters/genie/chibis/jerk_off/02.webp" contains: - offset (-760, -370) - zoom 2 + offset (-1520, -740) + zoom 4 "characters/genie/chibis/jerk_off/sperm_short_13.webp" image ch_gen cum_close_bottomless_done: - size (300,500) + size (600,1000) contains: "characters/genie/chibis/jerk_off/02.webp" contains: - offset (-760, -370) - zoom 2 + offset (-1520, -740) + zoom 4 "characters/genie/chibis/jerk_off/sperm_short_bottomless_13.webp" # Grabbing #TODO Fix positions for grab and petting (make consistent with other images and adjust in events) image ch_gen grab_mid: + zoom 2.0 anchor (0.5, 0.5) # Workaround for position "characters/genie/chibis/grab/grab_01.webp" pause.5 @@ -458,6 +485,7 @@ image ch_gen grab_mid: "characters/genie/chibis/grab/grab_01.webp" image ch_gen grab_high: + zoom 2.0 anchor (0.5, 0.5) # Workaround for position (feeding bird) "characters/genie/chibis/grab/grab_01.webp" pause.5 @@ -476,6 +504,7 @@ image ch_gen grab_high: "characters/genie/chibis/grab/grab_01.webp" image ch_gen petting: + zoom 2.0 anchor (0.5, 0.5) # Workaround for position (petting bird) "characters/genie/chibis/petting/petting_01.webp" pause 1 @@ -510,6 +539,7 @@ image ch_gen petting: repeat image ch_gen grab_low: # Used in pizza mirror event + zoom 2.0 xzoom -1 # Flip fix offset (20, 58) # pos fix "characters/genie/chibis/grab/grab_01.webp" diff --git a/game/scripts/characters/snape/vars.rpy b/game/scripts/characters/snape/vars.rpy index e9d243a9..d5ddb13b 100644 --- a/game/scripts/characters/snape/vars.rpy +++ b/game/scripts/characters/snape/vars.rpy @@ -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 = [] diff --git a/game/scripts/chibis/classes.rpy b/game/scripts/chibis/classes.rpy index de3ea8d4..5b183729 100644 --- a/game/scripts/chibis/classes.rpy +++ b/game/scripts/chibis/classes.rpy @@ -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.""" diff --git a/game/scripts/rooms/main_room/images.rpy b/game/scripts/rooms/main_room/images.rpy index 8d5c30bc..0d30dc10 100644 --- a/game/scripts/rooms/main_room/images.rpy +++ b/game/scripts/rooms/main_room/images.rpy @@ -1,6 +1,7 @@ image fireplace_fire: animation + zoom 2.0 offset (-24, -6) "images/rooms/main_room/fireplace/fireplace_fire_01.webp" pause.1 @@ -45,7 +46,6 @@ image glow_effect: repeat image glow_effect_fireplace: - zoom 0.5 align (0.5, 0.5) offset (0, 30) alpha 0.5 @@ -54,6 +54,7 @@ image glow_effect_fireplace: image candle_fire_01: animation + zoom 2.0 "images/rooms/main_room/candles/fire_01.webp" pause.1 "images/rooms/main_room/candles/fire_02.webp" @@ -83,6 +84,7 @@ image candle_fire_01: image candle_fire_02: animation + zoom 2.0 "images/rooms/main_room/candles/fire_01.webp" pause.1 "images/rooms/main_room/candles/fire_04.webp" @@ -112,7 +114,6 @@ image candle_fire_02: image phoenix_idle: animation - zoom 0.5 "images/rooms/main_room/phoenix/phoenix_01.webp" pause 2 @@ -135,13 +136,11 @@ image phoenix_idle: repeat image phoenix_hover: - zoom 0.5 "images/rooms/main_room/phoenix/phoenix_hover.webp" image phoenix_feather: animation - zoom 0.5 pause 10 alpha 1.0 "images/rooms/main_room/phoenix/feather_ani/pho_01.webp" @@ -184,38 +183,31 @@ image phoenix_feather: repeat image phoenix_food: - zoom 0.5 "images/rooms/main_room/phoenix/food.webp" image door_idle: - zoom 0.5 "images/rooms/main_room/door/door_idle.webp" image door_hover: - zoom 0.5 "images/rooms/main_room/door/door_hover.webp" image fireplace_idle: - zoom 0.5 "images/rooms/main_room/fireplace/fireplace_idle.webp" image fireplace_idle_shadow: - zoom 0.5 "images/rooms/main_room/fireplace/fireplace_w_shadow.webp" image fireplace_hover: - zoom 0.5 "images/rooms/main_room/fireplace/fireplace_hover.webp" image owl_idle: animation - zoom 0.5 "images/rooms/main_room/mail/owl_idle_01.webp" pause.1 @@ -231,7 +223,6 @@ image owl_idle: image owl_letter: animation - zoom 0.5 "images/rooms/main_room/mail/owl_01.webp" pause.1 @@ -246,7 +237,6 @@ image owl_letter: repeat image owl_letter_hover: - zoom 0.5 "images/rooms/main_room/mail/owl_hover.webp" @@ -254,28 +244,22 @@ image parcel: "images/rooms/main_room/parcel/idle.webp" image cupboard_idle: - zoom 0.5 "images/rooms/main_room/cupboard/cupboard_w_shadow.webp" image cupboard_open: - zoom 0.5 "images/rooms/main_room/cupboard/cupboard_open.webp" image main_room_idle_day: - zoom 0.5 "images/rooms/main_room/bg_day.webp" image main_room_idle_night: - zoom 0.5 "images/rooms/main_room/bg_night.webp" image candle_left: - zoom 0.5 "images/rooms/main_room/candles/candleM.webp" image candle_right: - zoom 0.5 "images/rooms/main_room/candles/candle.webp" @@ -304,44 +288,36 @@ image candle_fire: #Candle fire. repeat image desk_empty: - zoom 0.5 "images/rooms/main_room/desk_empty.webp" image chair_right: - zoom 0.5 "images/rooms/main_room/chair_right.webp" image chair_left: - zoom 0.5 "images/rooms/main_room/chair_left.webp" image letter_on_desk: - zoom 0.5 "/images/rooms/main_room/desk/letter.webp" image plant_on_desk: - zoom 0.5 "/images/rooms/main_room/desk/plant.webp" image letter_and_plant_on_desk: contains: - zoom 0.5 "/images/rooms/main_room/desk/letter.webp" contains: - zoom 0.5 "/images/rooms/main_room/desk/plant.webp" image desk_dumbledore: - zoom 0.5 "images/rooms/main_room/dum.webp" @@ -416,7 +392,6 @@ image halloween_lamp_left: "images/rooms/main_room/decorations/halloween_lamp/left.webp" image halloween_lamp_left_glow: - zoom 0.5 offset (-111, -81) contains: @@ -439,7 +414,6 @@ image halloween_lamp_right: "images/rooms/main_room/decorations/halloween_lamp/right.webp" image halloween_lamp_right_glow: - zoom 0.5 offset (-111, -81) contains: @@ -464,7 +438,6 @@ image halloween_lamp_right_glow: "images/rooms/main_room/decorations/halloween_lamp/filament.webp" image snow_owl_idle: - zoom 0.5 offset (-3, -3) "images/rooms/main_room/decorations/snow_owl/idle_0.webp" @@ -480,7 +453,6 @@ image snow_owl_idle: repeat image snow_owl_letter: - zoom 0.5 offset (-3, -3) "images/rooms/main_room/decorations/snow_owl/letter_0.webp" @@ -496,13 +468,11 @@ image snow_owl_letter: repeat image snow_owl_letter_hover: - zoom 0.5 offset (-3, -3) "images/rooms/main_room/decorations/snow_owl/letter_hover.webp" image small_owl_idle: - zoom 0.5 offset (-1, -3) "images/rooms/main_room/decorations/small_owl/idle_0.webp" @@ -518,7 +488,6 @@ image small_owl_idle: repeat image small_owl_letter: - zoom 0.5 offset (-1, -3) "images/rooms/main_room/decorations/small_owl/letter_0.webp" @@ -534,7 +503,6 @@ image small_owl_letter: repeat image small_owl_letter_hover: - zoom 0.5 offset (-1, -3) "images/rooms/main_room/decorations/small_owl/letter_hover.webp" diff --git a/game/scripts/rooms/main_room/init.rpy b/game/scripts/rooms/main_room/init.rpy index 8bd832ef..7ca04fb3 100644 --- a/game/scripts/rooms/main_room/init.rpy +++ b/game/scripts/rooms/main_room/init.rpy @@ -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 \ No newline at end of file + jump night_resume