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

Compare commits

base: SilverStudioGames:7071d30b82becfc3ec3ea50fb02d68b1bb0aac6b
Branches Tags
SilverStudioGames:main
SilverStudioGames:Wardrobe
SilverStudioGames:interface2
SilverStudioGames:kinetic_text
SilverStudioGames:interface
SilverStudioGames:chinese-tl-dev
SilverStudioGames:dev
SilverStudioGames:gouv-chibi
SilverStudioGames:gouv-6
SilverStudioGames:gouv-5
SilverStudioGames:gouv-4
SilverStudioGames:gouv-eventqueue-fix
SilverStudioGames:gouv-diary
SilverStudioGames:gouv-cds
SilverStudioGames:gouv-unpunk
SilverStudioGames:gouv-3
SilverStudioGames:chinese-tl
SilverStudioGames:new-achievement
SilverStudioGames:gouv-2
SilverStudioGames:current
SilverStudioGames:1.46.1
SilverStudioGames:1.46.0
SilverStudioGames:1.45.3
SilverStudioGames:1.45.2
SilverStudioGames:1.45.1
SilverStudioGames:1.44.4
SilverStudioGames:1.44.3
SilverStudioGames:1.44.2
SilverStudioGames:1.44.1
SilverStudioGames:1.44.0
SilverStudioGames:1.43.3
SilverStudioGames:1.43.2
SilverStudioGames:1.43.1
SilverStudioGames:1.43.0
..
compare: SilverStudioGames:fbbb7f566599ec9b8212dd48bc2d050e65e08d84
Branches Tags
SilverStudioGames:Wardrobe
SilverStudioGames:interface2
SilverStudioGames:kinetic_text
SilverStudioGames:interface
SilverStudioGames:chinese-tl-dev
SilverStudioGames:dev
SilverStudioGames:main
SilverStudioGames:gouv-chibi
SilverStudioGames:gouv-6
SilverStudioGames:gouv-5
SilverStudioGames:gouv-4
SilverStudioGames:gouv-eventqueue-fix
SilverStudioGames:gouv-diary
SilverStudioGames:gouv-cds
SilverStudioGames:gouv-unpunk
SilverStudioGames:gouv-3
SilverStudioGames:chinese-tl
SilverStudioGames:new-achievement
SilverStudioGames:gouv-2
SilverStudioGames:current
SilverStudioGames:1.46.1
SilverStudioGames:1.46.0
SilverStudioGames:1.45.3
SilverStudioGames:1.45.2
SilverStudioGames:1.45.1
SilverStudioGames:1.44.4
SilverStudioGames:1.44.3
SilverStudioGames:1.44.2
SilverStudioGames:1.44.1
SilverStudioGames:1.44.0
SilverStudioGames:1.43.3
SilverStudioGames:1.43.2
SilverStudioGames:1.43.1
SilverStudioGames:1.43.0

No commits in common. "7071d30b82becfc3ec3ea50fb02d68b1bb0aac6b" and "fbbb7f566599ec9b8212dd48bc2d050e65e08d84" have entirely different histories.
7071d30b82 ... fbbb7f5665

109 changed files with 1407 additions and 1294 deletions
Show Stats Expand all files Collapse all files

0
game/images/characters/genie/genie_face_angry.webp → game/characters/genie/angry.webp
View File

0
game/images/characters/genie/genie_bbase.webp → game/characters/genie/base.webp
View File

0
game/images/characters/genie/genie_goatee.webp → game/characters/genie/beard.webp
View File

0
game/images/characters/genie/genie_face_grin.webp → game/characters/genie/grin.webp
View File

0
game/images/characters/genie/genie_outfit_nude.webp → game/characters/genie/hair.webp
View File

0
game/images/characters/genie/genie_face_open.webp → game/characters/genie/open.webp
View File

0
game/images/characters/genie/genie_outfit_robes.webp → game/characters/genie/outfits/robes.webp
View File

BIN
game/characters/genie/outfits/robes_beard.webp (Stored with Git LFS) Normal file
View File

Binary file not shown.

0
game/images/characters/genie/genie_outfit_santa.webp → game/characters/genie/outfits/santa.webp
View File

0
game/images/characters/genie/genie_santa_beard_angry.webp → game/characters/genie/outfits/santa_beard_angry.webp
View File

0
game/images/characters/genie/genie_santa_beard_base.webp → game/characters/genie/outfits/santa_beard_base.webp
View File

0
game/images/characters/genie/genie_santa_beard_grin.webp → game/characters/genie/outfits/santa_beard_grin.webp
View File

0
game/images/characters/genie/genie_santa_beard_open.webp → game/characters/genie/outfits/santa_beard_open.webp
View File

0
game/images/characters/genie/genie_santa_beard_smile.webp → game/characters/genie/outfits/santa_beard_smile.webp
View File

0
game/images/characters/genie/genie_face_smile.webp → game/characters/genie/smile.webp
View File

BIN
game/images/rooms/main_room/weather/lightning_01.webp (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
game/images/rooms/main_room/weather/lightning_05.webp (Stored with Git LFS) Normal file
View File

Binary file not shown.

6
game/scripts/animations/ani_astoria.rpy
View File

@ -88,11 +88,11 @@ image ch_ast wand_imperio:
random_blink("characters/astoria/chibis/wand_imperio/ag_head_02.webp", "characters/astoria/chibis/wand_imperio/ag_head_01.webp") random_blink("characters/astoria/chibis/wand_imperio/ag_head_02.webp", "characters/astoria/chibis/wand_imperio/ag_head_01.webp")
contains: contains:
Null() "blank"
pause.12 pause.12
"characters/astoria/chibis/wand_imperio/ag_head_03.webp" "characters/astoria/chibis/wand_imperio/ag_head_03.webp"
pause 1 pause 1
Null() "blank"
contains: contains:
xpos 78 xpos 78
@ -113,7 +113,7 @@ image ch_ast wand_imperio:
alpha 1.0 alpha 1.0
"characters/astoria/chibis/wand_imperio/smoke.webp" "characters/astoria/chibis/wand_imperio/smoke.webp"
linear 1.0 xzoom 1.0 xpos -34 ypos 37 linear 1.0 xzoom 1.0 xpos -34 ypos 37
Null() "blank"
contains: contains:
xpos -34 xpos -34

20
game/scripts/animations/generator.rpy
View File

@ -1,6 +1,8 @@
image object:
Null()
transform OBJbutterfly(hue=random.randint(0, 359)): transform OBJbutterfly(hue=random.randint(0, 359)):
zoom random.uniform(0.4, 0.85) zoom random.uniform(0.4, 0.85)
matrixcolor HueMatrix(hue)
choice: choice:
pause random.randint(1, 7) pause random.randint(1, 7)
@ -20,13 +22,13 @@ transform OBJbutterfly(hue=random.randint(0, 359)):
ease_circ 1.0 rotate 15 ease_circ 1.0 rotate 15
repeat repeat
parallel: parallel:
"images/rooms/quidditch_pitch/butterfly/0.webp" with d3 im.MatrixColor("images/rooms/quidditch_pitch/butterfly/0.webp", im.matrix.hue(hue)) with d3
pause .3 pause .3
"images/rooms/quidditch_pitch/butterfly/1.webp" with d3 im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
pause .3 pause .3
"images/rooms/quidditch_pitch/butterfly/2.webp" with d3 im.MatrixColor("images/rooms/quidditch_pitch/butterfly/2.webp", im.matrix.hue(hue)) with d3
pause .3 pause .3
"images/rooms/quidditch_pitch/butterfly/1.webp" with d3 im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
pause .3 pause .3
repeat repeat
choice: choice:
@ -47,13 +49,13 @@ transform OBJbutterfly(hue=random.randint(0, 359)):
ease_circ 1.0 rotate -15 ease_circ 1.0 rotate -15
repeat repeat
parallel: parallel:
"images/rooms/quidditch_pitch/butterfly/0.webp" with d3 im.MatrixColor("images/rooms/quidditch_pitch/butterfly/0.webp", im.matrix.hue(hue)) with d3
pause .3 pause .3
"images/rooms/quidditch_pitch/butterfly/1.webp" with d3 im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
pause .3 pause .3
"images/rooms/quidditch_pitch/butterfly/2.webp" with d3 im.MatrixColor("images/rooms/quidditch_pitch/butterfly/2.webp", im.matrix.hue(hue)) with d3
pause .3 pause .3
"images/rooms/quidditch_pitch/butterfly/1.webp" with d3 im.MatrixColor("images/rooms/quidditch_pitch/butterfly/1.webp", im.matrix.hue(hue)) with d3
pause .3 pause .3
repeat repeat
repeat repeat

43
game/scripts/cg/common.rpy
View File

@ -1,3 +1,4 @@
init 5 python: init 5 python:
def her_cg_doll(st, at): def her_cg_doll(st, at):
return hermione.image, None return hermione.image, None
@ -24,21 +25,35 @@ image CG cho_doll = DynamicDisplayable(cho_cg_doll)
image CG ast_doll = DynamicDisplayable(ast_cg_doll) image CG ast_doll = DynamicDisplayable(ast_cg_doll)
image CG sus_doll = DynamicDisplayable(sus_cg_doll) image CG sus_doll = DynamicDisplayable(sus_cg_doll)
transform CG_masker(child): image CG luna = Fixed(
contains: "images/CG/common/bg.webp",
"images/CG/common/bg.webp" AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG lun_doll", zoom=1.2)), "images/CG/common/mask.webp"),
contains: )
AlphaMask(
Fixed(Transform(child, zoom=1.2, pos=(880, -180)), xfit=True, yfit=True),
"images/CG/common/mask.webp",
)
image CG luna = At("CG lun_doll", CG_masker) image CG hermione = Fixed(
image CG hermione = At("CG her_doll", CG_masker) "images/CG/common/bg.webp",
image CG tonks = At("CG ton_doll", CG_masker) AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG her_doll", zoom=1.2)), "images/CG/common/mask.webp"),
image CG cho = At("CG cho_doll", CG_masker) )
image CG astoria = At("CG ast_doll", CG_masker)
image CG susan = At("CG sus_doll", CG_masker) image CG tonks = Fixed(
"images/CG/common/bg.webp",
AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG ton_doll", zoom=1.2)), "images/CG/common/mask.webp"),
)
image CG cho = Fixed(
"images/CG/common/bg.webp",
AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG cho_doll", zoom=1.2)), "images/CG/common/mask.webp"),
)
image CG astoria = Fixed(
"images/CG/common/bg.webp",
AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG ast_doll", zoom=1.2)), "images/CG/common/mask.webp"),
)
image CG susan = Fixed(
"images/CG/common/bg.webp",
AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG sus_doll", zoom=1.2)), "images/CG/common/mask.webp"),
)
# Snape CG # Snape CG
screen snape_groping(): screen snape_groping():

Some files were not shown because too many files have changed in this diff Show More