Decorations

* Added naughty list decor
* Added window decor
* Added garland decor
* Improved poster enlarging
This commit is contained in:
LoafyLemon 2022-12-17 21:52:44 +00:00
parent badfe74d8e
commit 04fa574b29
14 changed files with 130 additions and 14 deletions

Binary file not shown.

BIN
game/images/rooms/objects/decorations/xmas_garland.webp (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
game/images/ui/naughty_list/naughty_list scroll.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/images/ui/naughty_list/naughty_list spacer.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/interface/icons/santas_naughty_list.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/interface/icons/xmas_garland.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/interface/icons/xmas_window_santa.webp (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -11,6 +11,7 @@ default harlot_poster_ITEM = Decoration("harlot_poster", "decoration", "Hogwarts
default stripper_poster_ITEM = Decoration("stripper_poster", "decoration", "Stripper Poster", poster_OBJ, 2, "Hermione showing off how to work the pole... illusion charm included...") default stripper_poster_ITEM = Decoration("stripper_poster", "decoration", "Stripper Poster", poster_OBJ, 2, "Hermione showing off how to work the pole... illusion charm included...")
default wanted_poster_ITEM = Decoration("wanted_poster", "decoration", "Wanted Poster", poster_OBJ, 2, "A Wild West styled Wanted poster depicting our dear headmaster...") default wanted_poster_ITEM = Decoration("wanted_poster", "decoration", "Wanted Poster", poster_OBJ, 2, "A Wild West styled Wanted poster depicting our dear headmaster...")
default tonks_poster_ITEM = Decoration("tonks_poster", "decoration", "Tonks Poster", poster_OBJ, 2, "Professor Tonks in her early twenties.") default tonks_poster_ITEM = Decoration("tonks_poster", "decoration", "Tonks Poster", poster_OBJ, 2, "Professor Tonks in her early twenties.")
default naughty_list_ITEM = Decoration("santas_naughty_list", "decoration", "Santa's Naughty List", poster_OBJ, 2, "See who was a bad boy, or a bad girl this year!", replace_action=Jump("naughty_list"))
default stag_trophy_ITEM = Decoration("stag_trophy", "decoration", "Stag Trophy", trophy_OBJ, 3, "A perfect decoration over your mantelpiece to add a sense of masculinity to the office.") default stag_trophy_ITEM = Decoration("stag_trophy", "decoration", "Stag Trophy", trophy_OBJ, 3, "A perfect decoration over your mantelpiece to add a sense of masculinity to the office.")
default crest_trophy_ITEM = Decoration("crest_trophy", "decoration", "Hogwarts Crest", trophy_OBJ, 3, "A perfect decoration for the headmaster.") default crest_trophy_ITEM = Decoration("crest_trophy", "decoration", "Hogwarts Crest", trophy_OBJ, 3, "A perfect decoration for the headmaster.")
@ -44,3 +45,5 @@ default small_owl_ITEM = Decoration("small_owl", "decoration", "Small Owl", owl_
default xmas_lights_ITEM = Decoration("xmas_lights", "decoration", "Christmas Lights", chandelier_OBJ, 5, "A programmable set of LED lights. Remote control batteries not included.", replaces=True, room_image="xmas_lights_alternate", replace_action=Jump("xmas_lights_settings"), replace_anchor=(0.0, 0.0), replace_pos=(0, 0)) default xmas_lights_ITEM = Decoration("xmas_lights", "decoration", "Christmas Lights", chandelier_OBJ, 5, "A programmable set of LED lights. Remote control batteries not included.", replaces=True, room_image="xmas_lights_alternate", replace_action=Jump("xmas_lights_settings"), replace_anchor=(0.0, 0.0), replace_pos=(0, 0))
default xmas_wreaths_ITEM = Decoration("xmas_wreaths", "decoration", "Christmas Wreaths", door_OBJ, 5, "Chrismtas Wreaths to spread the christmas cheer.", room_image="xmas_wreaths") default xmas_wreaths_ITEM = Decoration("xmas_wreaths", "decoration", "Christmas Wreaths", door_OBJ, 5, "Chrismtas Wreaths to spread the christmas cheer.", room_image="xmas_wreaths")
default xmas_giftchair_ITEM = Decoration("xmas_giftchair", "decoration", "Christmas Wreaths", chair_OBJ, 5, "A baby-sized gift-wrapped box. I wonder what's inside?", room_image="xmas_giftchair") default xmas_giftchair_ITEM = Decoration("xmas_giftchair", "decoration", "Christmas Wreaths", chair_OBJ, 5, "A baby-sized gift-wrapped box. I wonder what's inside?", room_image="xmas_giftchair")
default xmas_garland_ITEM = Decoration("xmas_garland", "decoration", "Christmas Garland", chandelier_OBJ, 5, "A ever-so-green enchanted garland to get you into christmas spirit!", replace_anchor=(0.0, 0.0), replace_pos=(0, 0))
default xmas_window_santa_ITEM = Decoration("xmas_window_santa", "decoration", "Christmas Window Enchantement", window_OBJ, 5, "A window enchantment that will make you think twice before saying \"I don't believe in Santa\" ever again.", room_image="xmas_window_santa", replace_anchor=(0.0, 0.0), replace_pos=(0,0))

View File

@ -5,7 +5,12 @@ label genies_christmas_wish_rewards:
call unlock_clothing(text=">New clothing items for Cho have been unlocked!", item=cho_outfit_reindeer) call unlock_clothing(text=">New clothing items for Cho have been unlocked!", item=cho_outfit_reindeer)
call unlock_clothing(text=">New clothing items for Luna have been unlocked!", item=lun_outfit_reindeer) call unlock_clothing(text=">New clothing items for Luna have been unlocked!", item=lun_outfit_reindeer)
# TODO: Add Decoration rewards python:
naughty_list_ITEM.owned = 1
xmas_garland_ITEM.owned = 1
xmas_window_santa_ITEM.owned = 1
call give_reward(text=">You have received a bunch of new room decorations!", gift="interface/icons/santas_naughty_list.webp")
return return
@ -15,10 +20,10 @@ label genies_christmas_wish:
#TODO Add decorations #TODO Add decorations
# $ fireplace_OBJ.foreground = "fireplace_fire" $ fireplace_OBJ.foreground = "fireplace_fire"
# $ phoenix_OBJ.decoration = xmas_phoenix_ITEM $ window_OBJ.decoration = xmas_window_santa_ITEM
# $ owl_OBJ.decoration = xmas_owl_ITEM $ chandelier_OBJ.decoration = xmas_garland_ITEM
# $ fireplace_OBJ.decoration = xmas_fireplace_ITEM $ poster_OBJ.decoration = naughty_list_ITEM
$ hermione.equip(her_outfit_reindeer) $ hermione.equip(her_outfit_reindeer)
$ cho.equip(cho_outfit_reindeer) $ cho.equip(cho_outfit_reindeer)
$ luna.equip(lun_outfit_reindeer) $ luna.equip(lun_outfit_reindeer)
@ -117,6 +122,7 @@ label genies_christmas_wish:
gen "No I'm not!" ("base", xpos="far_left", ypos="head") gen "No I'm not!" ("base", xpos="far_left", ypos="head")
show screen blkfade show screen blkfade
with d3
play sound "sounds/woosh.ogg" play sound "sounds/woosh.ogg"
nar "His eyes now shut, as they had been sprayed by magic sand." nar "His eyes now shut, as they had been sprayed by magic sand."

View File

@ -668,3 +668,29 @@ image xmas_giftchair:
pos (35, 108) pos (35, 108)
"images/rooms/objects/decorations/xmas_giftchair.webp" "images/rooms/objects/decorations/xmas_giftchair.webp"
image xmas_window_santa_doodle:
size (2160, 1200)
contains:
animation
size (240, 108)
subpixel True
offset (640, 460)
contains:
fit "fill"
"xmas_window_santa_base"
contains:
animation
fit "fill"
"xmas_window_santa_light"
linear 0.5 alpha 0.1
linear 0.5 alpha 1.0
repeat
linear 10.0 xoffset 1000
pause 10.0
repeat
image xmas_window_santa = AlphaMask("xmas_window_santa_doodle", "xmas_window_santa_mask")

View File

@ -1,18 +1,69 @@
label enlarge_poster: label enlarge_poster:
show screen blktone show image "#00000080" as underlay
show screen poster $ renpy.show(name="poster", what=Image(poster_OBJ.decoration.image), zorder=25, at_list=[truecenter])
with d3
call ctc call ctc
hide screen blktone hide poster
hide screen poster hide underlay
with d3 with d3
jump main_room_menu jump main_room_menu
screen poster(): # Xmas 2022 - Decoration
zorder 25
tag poster
add poster_OBJ.decoration.image align (0.5, 0.5) default naughty_list_commentary = False
label naughty_list:
python:
_username = None
_d = [(i, get_character_progression(i)) for i in CHARACTERS if get_character_unlock(i)]
_d.append(["Snape", sna_friendship])
try:
_username = os.getlogin().split(" ")[0].capitalize()
_d.append([_username, 999])
except:
_d.append(["Genie", 999])
_d.sort(key=lambda x: x[1], reverse=True)
show screen naughty_list(_d)
with d3
if not naughty_list_commentary:
$ naughty_list_commentary = True
pause 1.0
if _username:
gen "List checks out... But who the fuck is [_username]?" ("base", xpos="far_left", ypos="head")
else:
gen "I'm on the first place, nice!" ("base", xpos="far_left", ypos="head")
call ctc
hide screen naughty_list
with d3
jump main_room_menu
screen naughty_list(d):
zorder 25
add "#00000080"
add "naughty_list scroll" fit "cover" at truecenter
vbox:
align (0.51, 0.66)
spacing 2
for i, (name, _) in enumerate(d, start=1):
fixed:
fit_first True
add "naughty_list spacer" size (156, 21)
text "[i]" pos (6, 3)
text "[name]" xalign 0.5 yoffset 3