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

Recalculate explicit integer positions for dolls

Browse Source
This commit is contained in:
LoafyLemon 2024-05-16 16:55:02 +01:00
parent 249a04fd29
commit f947d80e2a
16 changed files with 108 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/scripts/characters/astoria/events/intro.rpy
View File

@ -614,7 +614,7 @@ label astoria_intro_E3:
play music "music/Dark Fog.ogg" fadein 1 if_changed
ast "" ("annoyed", "base", "worried", "R")
sna "You wanted to see me?" ("snape_09", xpos=600, ypos="base")
sna "You wanted to see me?" ("snape_09", xpos=1467, ypos="base")
ast "..." ("annoyed", "narrow", "worried", "L")
sna "Astoria?!" ("snape_05")
sna "Why is one of my students in your office? Don't tell me you..." ("snape_03")

8
game/scripts/characters/astoria/events/spells/imperio_tonks.rpy
View File

@ -1523,7 +1523,7 @@ label ag_st_imperio_E5:
pause.2
play music "music/Dark Fog.ogg" fadein 1 if_changed
sna "What on Earth is going on here?!" ("snape_08", xpos=580 ,ypos="base")
sna "What on Earth is going on here?!" ("snape_08", xpos=1431 ,ypos="base")
sna "You two better explain to me what I just witnessed!" ("snape_32")
ton @ hair angry "Stop being such a wuss, Severus!" ("mad", "base", "angry", "L", xpos="mid", flip=True)
ton @ hair upset "We were just practising some spells with Miss Greengrass." ("annoyed", "base", "base", "R")
@ -1534,7 +1534,7 @@ label ag_st_imperio_E5:
sna "Don't tell me you--" ("snape_36") # Shocked
ton @ cheeks blush "The Imperius Curse." ("soft", "closed", "base", "mid")
sna "I can't believe you two..." ("snape_08")
ast "Am I in trouble now, Professor?" ("annoyed", "base", "base", "L", xpos=10) # Asking Snape
ast "Am I in trouble now, Professor?" ("annoyed", "base", "base", "L", xpos=418) # Asking Snape
sna "Keep quiet, girl!" ("snape_34")
sna "............" ("snape_04") # Snape sees the wand.
@ -1581,8 +1581,8 @@ label ag_st_imperio_E5:
call ton_walk(550,"base")
pause.8
ton "" ("annoyed", "base", "annoyed", "L", xpos=275, ypos="base", flip=True)
sna "........................." ("snape_05", xpos=580 ,ypos="base")
ton "" ("annoyed", "base", "annoyed", "L", xpos=889, ypos="base", flip=True)
sna "........................." ("snape_05", xpos=1431 ,ypos="base")
play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
ton @ hair horny "Like what you see?" ("upset", "base", "raised", "L") # Bit flirty, maybe just to calm Snape down.

64
game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy
View File

File diff suppressed because it is too large Load Diff

48
game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy
View File

File diff suppressed because it is too large Load Diff

2
game/scripts/characters/cho/events/intro.rpy
View File

@ -897,7 +897,7 @@ label cho_intro_E3:
play music "music/deadly-roulette-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
cho "Hello, Sir.{w=0.6} You've called for me?" ("soft", "narrow", "raised", "L", xpos="base", ypos="base")
her "" ("normal", "closed", "base", "mid", xpos=450, ypos="base")
her "" ("normal", "closed", "base", "mid", xpos=1200, ypos="base")
cho "Granger..." ("soft", "narrow", "angry", "L")
her "Chang..." ("annoyed", "narrow", "angry", "R")
gen "Go on, girl. Tell her." ("base", xpos="far_left", ypos="head")

30
game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
View File

File diff suppressed because it is too large Load Diff

10
game/scripts/characters/cho/events/quidditch/intros.rpy
View File

@ -660,7 +660,7 @@ label cho_quid_E7:
call chibi_emote("hide", "hermione")
with d3
her "" ("annoyed", "base", "angry", "R", xpos=270, ypos="base", flip=True)
her "" ("annoyed", "base", "angry", "R", xpos=880, ypos="base", flip=True)
cho "Hello, Sir." ("base", "base", "base", "mid", xpos="close", ypos="base")
cho "Granger." ("soft", "narrow", "base", "L")
her @ cheeks blush "..." ("annoyed", "base", "angry", "mid")
@ -1163,7 +1163,7 @@ label cho_quid_E12:
call gen_walk(xpos="mid")
gen "Alright then, let's find you a broom to use so we can finally be done--" ("base", xpos="far_left", ypos="head")
cho "Where have you been?" ("disgust", "base", "angry", "mid", xpos=460, ypos="base", trans=d3)
cho "Where have you been?" ("disgust", "base", "angry", "mid", xpos=1218, ypos="base", trans=d3)
gen "*Err*...{w=0.4} In my office?" ("base", xpos="far_left", ypos="head")
cho "It's ten AM! I've already been here for the past five hours!" ("soft", "base", "angry", "mid")
gen "You've been here since six AM?" ("angry", xpos="far_left", ypos="head")
@ -1216,7 +1216,7 @@ label cho_quid_E12:
play music "music/march-of-the-spoons-by-kevin-macleod-from-filmmusic-io.ogg" fadein 1 fadeout 1 if_changed
#Hooch doll fades in
hoo "Professor Dumbledore, Miss Chang, what can I do you for?" ("base", "base", "base", "L", xpos=100, ypos="base", flip=True, trans=d3) # "what can I do you for" is a form of a joke, fits next line perfectly.
hoo "Professor Dumbledore, Miss Chang, what can I do you for?" ("base", "base", "base", "L", xpos=578, ypos="base", flip=True, trans=d3) # "what can I do you for" is a form of a joke, fits next line perfectly.
gen "Me..." ("base", xpos="far_left", ypos="head")
hoo "Sorry?" ("open", "base", "base", "L")
gen "Oh...{w=0.4} *Err*...{w=0.4} Miss Chang here is looking for a broom to use for the final Quidditch match." ("base", xpos="far_left", ypos="head")
@ -1517,8 +1517,8 @@ label cho_quid_E12:
call gen_chibi("stand", "mid", 470, flip=False)
chibi hooch place ((450, 500))
hoo @ cheeks blush "" ("base", "narrow", "base", "R", xpos=100, ypos="base", flip=True)
cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "mid", xpos=460, ypos="base", flip=False)
hoo @ cheeks blush "" ("base", "narrow", "base", "R", xpos=578, ypos="base", flip=True)
cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "mid", xpos=1218, ypos="base", flip=False)
play background "sounds/outskirts.ogg" fadein 2
play music "music/march-of-the-spoons-by-kevin-macleod-from-filmmusic-io.ogg" fadein 1 fadeout 1 if_changed

12
game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
View File

@ -290,7 +290,7 @@ label slytherin_match:
# Podium: call gen_chibi("stand", flip=True, 280, 400)
### Hermione Postions ###
## Sprite: her "" (flip=True, xpos=290, ypos="base")
## Sprite: her "" (flip=True, xpos=916, ypos="base")
# 2nd Step Mid: call her_chibi("stand", 40, 295, flip=True)
# Floor Mid: call her_chibi("stand", flip=True, 180, 400)
# Podium: call her_chibi("stand", 300, 400, flip=True)
@ -434,7 +434,7 @@ label slytherin_match:
with d3
pause .5
her "" ("open", "base", "worried", "mid", flip=True, xpos=290, ypos="base", trans=d5)
her "" ("open", "base", "worried", "mid", flip=True, xpos=916, ypos="base", trans=d5)
pause .8
play sound "sounds/microphone_feedback.ogg"
@ -480,7 +480,7 @@ label slytherin_match:
with d3
pause .5
her "I know the weather might not be optimal, but the games must go on." ("soft", "closed", "base", "mid", flip=True, xpos=290, ypos="base", trans=d3)
her "I know the weather might not be optimal, but the games must go on." ("soft", "closed", "base", "mid", flip=True, xpos=916, ypos="base", trans=d3)
her "Therefore, let me now welcome onto the pitch..." ("open", "base", "base", "down")
her "The team known for their technical prowess and... lately... unconventional tactics..." ("disgust", "base", "worried", "down")
her "Team Ravenclaw!" ("open", "base", "base", "mid")
@ -1018,7 +1018,7 @@ label slytherin_match:
pause .5
play sound "sounds/microphone_feedback.ogg"
her "*Ahem*..." ("base", "base", "base", "mid", xpos=290, ypos="base", flip=True, trans=dissolve)
her "*Ahem*..." ("base", "base", "base", "mid", xpos=916, ypos="base", flip=True, trans=dissolve)
her @ cheeks blush "{size=-4}Oh, these boobs are so heavy...{/size}" ("disgust", "base", "worried", "down")
her @ cheeks blush "{size=-4}And why is this shirt so hot...{/size}" ("soft", "base", "base", "down")
@ -1313,7 +1313,7 @@ label slytherin_match:
# Stop Prediction
$ renpy.stop_predict("images/CG/cho_quidditch/*.*")
her "Oh... it looks like things are heating up!{w=0.5} Malfoy has finally realised Chang is going for the Snitch..." ("open", "base", "angry", "L", flip=True, xpos=290, ypos="base", trans=d3)
her "Oh... it looks like things are heating up!{w=0.5} Malfoy has finally realised Chang is going for the Snitch..." ("open", "base", "angry", "L", flip=True, xpos=916, ypos="base", trans=d3)
play sound "sounds/giggle2_loud.ogg"
her "*Giggles* Look at that girl fly! I didn't think you could grip a broom so tightly... maybe I could learn a thing or two from her." ("grin", "base", "angry", "L")
@ -1703,7 +1703,7 @@ label slytherin_match_return:
call sus_chibi("hide")
call lun_chibi("hide")
call sna_chibi("stand",410,177+250, flip=False)
sna "Want some of this, Genie?" ("snape_clown", xpos=320, ypos="base", flip=False, trans=morph)
sna "Want some of this, Genie?" ("snape_clown", xpos=967, ypos="base", flip=False, trans=morph)
play sound "sounds/MaleGasp.ogg"
with hpunch

4
game/scripts/characters/hermione/events/favors/talk_to_me.rpy
View File

@ -456,7 +456,7 @@ label hg_pf_talk_T2_repeat:
# Favours can revolve around Cho, Luna, Tonks
label hg_pf_talk_T3_intro_E1:
call start_hg_pf_talk
gen "Let's have another chat, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
@ -763,7 +763,7 @@ label hg_pf_talk_tonks:
play sound "sounds/door.ogg"
call ton_walk(500,"base")
ton @ hair basic "" ("base", "base", "base", "mid", xpos=600, ypos="base", trans=d3)
ton @ hair basic "" ("base", "base", "base", "mid", xpos=1467, ypos="base", trans=d3)
her "" ("base", "base", "base", "mid", xpos="right", ypos="base", trans=d3)
if states.env.daytime:
gen "Good day, Miss Tonks." ("base", xpos="far_left", ypos="head")

4
game/scripts/characters/luna/events/intro.rpy
View File

@ -286,7 +286,7 @@ label luna_intro_E1:
call her_walk("mid", action="enter")
gen "Ah, Miss Granger..." ("base", xpos="far_left", ypos="head")
her "[name_genie_hermione]... do you know what time it--" ("normal", "happyCl", "base", "down", xpos=500, ypos="base", trans=dissolve)
her "[name_genie_hermione]... do you know what time it--" ("normal", "happyCl", "base", "down", xpos=1289, ypos="base", trans=dissolve)
her "..." ("normal", "narrow", "base", "L")
her "Luna? what are you doing here?!?" ("angry", "base", "worried", "L") #shocked
@ -434,7 +434,7 @@ label luna_intro_E1:
call her_walk("door")
her @ cheeks blush "Good night then..." ("normal", "squint", "base", "R", xpos="base", ypos="base") #annoyed, flipped
ton "Sleep tight, Miss Granger..." ("horny", "narrow", "base", "R", xpos=400, ypos="base", trans=dissolve) # Tongue in cheek
ton "Sleep tight, Miss Granger..." ("horny", "narrow", "base", "R", xpos=1111, ypos="base", trans=dissolve) # Tongue in cheek
call her_walk(action="leave")

2
game/scripts/events/final_events.rpy
View File

@ -342,7 +342,7 @@ label ball_quest_E1:
with hpunch
with kissiris
$ hermione.set_pose("hand_on_pussy")
her "" ("open", "squint", "worried", "mid", xpos=270)
her "" ("open", "squint", "worried", "mid", xpos=880)
hide screen blkfade
with d5

2
game/scripts/minigames/mirror/events/a_white_christmas.rpy
View File

@ -153,7 +153,7 @@ label a_white_christmas:
nar "In a wrestling ring, with his cock out... Everyone checking out his wood."
nar "Frozen on the spot, the only thing he could do was shout."
gen "I'll kill you for this!" (face="open", base="hard", xpos=100, trans=d3)
gen "I'll kill you for this!" (face="open", base="hard", xpos=578, trans=d3)
nar "The match now beginning."
nar "The opponents, walking out."

2
game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
View File

@ -151,7 +151,7 @@ label genies_christmas_wish:
cho "How did I get here?" ("angry", "wide", "base", "stare", xpos="mid", ypos="base", trans=d5)
nar "Said one."
cho "" ("annoyed", "base", "base", "R")
her "I was just with my mum and dad." ("mad", "base", "base", "stare", xpos=500, ypos="base", trans=d5)
her "I was just with my mum and dad." ("mad", "base", "base", "stare", xpos=1289, ypos="base", trans=d5)
nar "Said the second, sounding confused, and a bit sad."
her "" ("annoyed", "base", "base", "R")

14
game/scripts/minigames/mirror/events/not_so_great_escape.rpy
View File

@ -207,7 +207,7 @@ label not_so_great_escape:
with d3
cho @ cheeks blush "Miss! He's gone!" ("angry", "base", "base", "mid", flip=True, trans=d3)
ton "Yes, I can see that rookie..." ("open", "narrow", "base", "L", xpos=500, ypos="base", trans=d5)
ton "Yes, I can see that rookie..." ("open", "narrow", "base", "L", xpos=1288, ypos="base", trans=d5)
call ton_walk("mid", "base")
call cho_chibi(flip=False)
@ -226,7 +226,7 @@ label not_so_great_escape:
call cho_chibi(flip=True)
with d3
cho "What was that?" ("soft", "base", "base", "mid", xpos=500, ypos="base", trans=d5)
cho "What was that?" ("soft", "base", "base", "mid", xpos=1288, ypos="base", trans=d5)
lun "Huh?" ("mad", "narrow", "base", "L")
cho "Never mind, must have been the wind..." ("annoyed", "base", "base", "mid")
#
@ -247,7 +247,7 @@ label not_so_great_escape:
lun "If I can't see him then I'll have to search for him some other way!" ("mad", "base", "base", "L", xpos="mid", ypos="base", flip=True, trans=d5)
cho "*Sigh*..." ("disgust", "base", "base", "mid")
ton "Well he's here somewhere, that's for sure." ("base", "narrow", "base", "L", xpos=500, ypos="base", trans=d5)
ton "Well he's here somewhere, that's for sure." ("base", "narrow", "base", "L", xpos=1288, ypos="base", trans=d5)
cho "Really?" ("angry", "base", "base", "mid")
gen "(How does she know?)" ("angry", xpos="far_left", ypos="head")
cho "How do you know, miss?" ("angry", "base", "base", "mid")
@ -258,7 +258,7 @@ label not_so_great_escape:
call ton_chibi(flip=False)
with d3
ton "Why don't you help your partner to search the place?" ("open", "base", "base", "R", xpos=450, ypos="base", flip=False, trans=d5)
ton "Why don't you help your partner to search the place?" ("open", "base", "base", "R", xpos=1200, ypos="base", flip=False, trans=d5)
ton "I'm sure the chief would be really happy if we brought that scumbag in." ("soft", "base", "base", "R")
gen "(Now that's just rude...)" ("base", xpos="far_left", ypos="head")
@ -319,7 +319,7 @@ label not_so_great_escape:
lun "Wow! Was he in there this entire time?" ("angry", "wide", "base", "mid", trans=d5)
cho @ cheeks blush "How did you know, miss?" ("mad", "base", "base", "mid", trans=d5)
ton "Years of experience, girls... You'll get there some day..." ("base", "wink", "base", "mid", xpos=500, ypos="base", flip=True, trans=d5)
ton "Years of experience, girls... You'll get there some day..." ("base", "wink", "base", "mid", xpos=1288, ypos="base", flip=True, trans=d5)
ton "Now... Time to put this filth where it belongs..." ("mad", "narrow", "annoyed", "mid")
gen "No, wait!" ("angry", xpos="far_left", ypos="head")
@ -335,9 +335,9 @@ label not_so_great_escape:
call lun_chibi("hide")
# pre-sets expressions for later #
lun @ cheeks blush "" ("soft", "narrow", "base", "mid", xpos=400, ypos="base", flip=False)
lun @ cheeks blush "" ("soft", "narrow", "base", "mid", xpos=1111, ypos="base", flip=False)
cho @ cheeks blush "" ("smile", "base", "base", "mid")
ton "" ("grin", "base", "base", "mid", xpos=500, ypos="base", flip=False)
ton "" ("grin", "base", "base", "mid", xpos=1288, ypos="base", flip=False)
# Hides decorations
$ halloween_rug_ITEM.use()

2
game/scripts/minigames/mirror/events/suck_and_run.rpy
View File

@ -223,7 +223,7 @@ label suck_and_run:
gen "Tonks?!" ("open", xpos="far_left", ypos="head")
play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
ton "*Slurp* *Slurp* *Gulp*!" ("open_wide_tongue", "narrow", "shocked", "stare", xpos="far_right", ypos=200, trans=d3) # Explicit positions to avoid hiding the doll
ton "*Slurp* *Slurp* *Gulp*!" ("open_wide_tongue", "narrow", "shocked", "stare", xpos="far_right", ypos=360, trans=d3) # Explicit positions to avoid hiding the doll
call ton_chibi_scene("bj_desk")
gen "am I still dreaming?" ("angry", xpos="far_left", ypos="head")

10
game/scripts/minigames/mirror/events/whose_points.rpy
View File

@ -42,13 +42,13 @@ label whose_points:
gen "First, let me introduce today's contestants." ("base", xpos="far_left", ypos="head")
gen "The curly haired harlot we all know and love. Give it up for Hermione!" ("base", xpos="far_left", ypos="head")
play sound "sounds/applause01.ogg"
her @ cheeks blush "..." ("grin", "base", "worried", "mid", xpos=500, ypos="base")
her @ cheeks blush "..." ("grin", "base", "worried", "mid", xpos=1289, ypos="base")
play sound "sounds/wolf_whistle.ogg"
her @ cheeks blush "..." ("base", "base", "worried", "mid")
gen "The ravishing Ravenclaw who will rock your socks off... Luna!" ("base", xpos="far_left", ypos="head")
play sound "sounds/applause01.ogg"
lun "..." ("base", "wink", "base", "mid", xpos=650, ypos="base")
lun "..." ("base", "wink", "base", "mid", xpos=1556, ypos="base")
play sound "sounds/giggle2_loud.ogg"
lun "*heh*... hello." ("grin", "narrow", "base", "mid")
@ -56,7 +56,7 @@ label whose_points:
play sound "sounds/applause01.ogg"
gen "..." ("grin", xpos="far_left", ypos="head")
play sound "sounds/gasp3.ogg"
ast "Hey!" ("scream", "base", "angry", "mid", xpos=380, ypos="base")
ast "Hey!" ("scream", "base", "angry", "mid", xpos=1076, ypos="base")
pause.5
hide hermione_main
@ -219,9 +219,9 @@ label whose_points:
hide hermione_main
with d3
ast "Harlot! Harlot! Harlot!" ("grin", "closed", "base", "mid", xpos=400, ypos="base")
ast "Harlot! Harlot! Harlot!" ("grin", "closed", "base", "mid", xpos=1111, ypos="base")
lun "How do those points taste now?" ("silly", "narrow", "annoyed", "L", xpos=600, ypos="base")
lun "How do those points taste now?" ("silly", "narrow", "annoyed", "L", xpos=1467, ypos="base")
lun "The whole wizarding world is going to see your tits!" ("smile", "happyCl", "base", "mid")
hide luna_main
hide astoria_main