Dialogue updates with dynamic facial expressions and defeated character portraits (#175)

* WIP portrait faces

* character expressions for dialogue in first 3 stages (wip)

* dialog: simplified face system, new faces, script revisions (wip)

* fix wrong face name in reimu script

* cirno angry face; elly beaten variant

* render_character_portrait(): fix garbage bg and filter-bleeding

* workaround for incorrect face blending on dialog fade

* render_character_portrait(): fix bogus debug labels

* Replace sprite offsets with the more powerful paddings

* new faces for youmu, wriggle, kurumi; dialogue updates

* fix release build

* Update portraits; add Iku faces and Elly shouting face

* Add Reimu sigh face and Marisa sweat_smile face

* Add Kurumi dissatisfied face

* update Hina
This commit is contained in:
Andrei Alexeyev 2019-08-22 22:43:34 +03:00 committed by GitHub
parent f15270219a
commit 80fda75ffb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
237 changed files with 2034 additions and 453 deletions

View file

@ -43,7 +43,7 @@ atlases = [
['common_ui', ['--width=1024', '--height=1024']],
['gray16', [preset_png]],
['huge', []],
['portraits', ['--width=3600', '--height=4096']],
['portraits', ['--width=4096', '--height=4096']],
]
atlas_profiles = [

View file

@ -1,5 +1,7 @@
w = 326
h = 477.5
offset_x = 0
offset_y = 0
padding_top = 0
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -0,0 +1,7 @@
w = 124
h = 117
padding_top = 5.5
padding_bottom = 355
padding_left = 8
padding_right = 194

View file

@ -0,0 +1,7 @@
w = 100.5
h = 97
padding_top = 24.5
padding_bottom = 356
padding_left = 74
padding_right = 151.5

View file

@ -0,0 +1,7 @@
w = 57
h = 56.5
padding_top = 64.5
padding_bottom = 356.5
padding_left = 75
padding_right = 194

View file

@ -0,0 +1,7 @@
w = 326
h = 477.5
padding_top = 0
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -1,5 +1,7 @@
w = 386
w = 310.5
h = 500
offset_x = 0
offset_y = 0
padding_top = 0
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -0,0 +1,7 @@
w = 59
h = 52.5
padding_top = 58.5
padding_bottom = 389
padding_left = 57.5
padding_right = 194

View file

@ -0,0 +1,7 @@
w = 61.5
h = 56
padding_top = 55
padding_bottom = 389
padding_left = 57
padding_right = 192

View file

@ -0,0 +1,7 @@
w = 57.5
h = 61.5
padding_top = 53
padding_bottom = 385.5
padding_left = 59
padding_right = 194

View file

@ -0,0 +1,7 @@
w = 310.5
h = 499
padding_top = 1
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -1,5 +1,7 @@
w = 337.5
h = 492.5
offset_x = 0
offset_y = 0
padding_top = 0
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -0,0 +1,7 @@
w = 64.5
h = 51
padding_top = 61.5
padding_bottom = 380
padding_left = 93.5
padding_right = 179.5

View file

@ -0,0 +1,7 @@
w = 69.5
h = 55.5
padding_top = 61
padding_bottom = 376
padding_left = 95.5
padding_right = 172.5

View file

@ -0,0 +1,5 @@
w = 69.5
h = 55.5
offset_x = -38.5
offset_y = -157.5

View file

@ -0,0 +1,7 @@
w = 65
h = 50.5
padding_top = 61
padding_bottom = 381
padding_left = 93
padding_right = 179.5

View file

@ -0,0 +1,7 @@
w = 60
h = 51
padding_top = 61
padding_bottom = 380.5
padding_left = 98
padding_right = 179.5

View file

@ -0,0 +1,7 @@
w = 337.5
h = 492.5
padding_top = 0
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -1,5 +1,7 @@
w = 339
h = 512.5
offset_x = 0
offset_y = 0
padding_top = 0
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -0,0 +1,7 @@
w = 60.5
h = 45
padding_top = 85.5
padding_bottom = 382
padding_left = 144
padding_right = 134.5

View file

@ -0,0 +1,7 @@
w = 50
h = 40
padding_top = 88.5
padding_bottom = 384
padding_left = 142.5
padding_right = 146.5

View file

@ -0,0 +1,7 @@
w = 56
h = 49.5
padding_top = 81.5
padding_bottom = 381.5
padding_left = 146.5
padding_right = 136.5

View file

@ -0,0 +1,7 @@
w = 52
h = 48
padding_top = 81.5
padding_bottom = 383
padding_left = 144.5
padding_right = 142.5

View file

@ -0,0 +1,7 @@
w = 60.5
h = 46
padding_top = 84
padding_bottom = 382.5
padding_left = 144
padding_right = 134.5

View file

@ -0,0 +1,7 @@
w = 339
h = 501.5
padding_top = 11
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -1,5 +1,7 @@
w = 400.5
h = 477
offset_x = 0
offset_y = 0
padding_top = 0
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -0,0 +1,7 @@
w = 145.5
h = 66.5
padding_top = 47.5
padding_bottom = 363
padding_left = 72
padding_right = 183

View file

@ -0,0 +1,7 @@
w = 62
h = 57
padding_top = 49.5
padding_bottom = 370.5
padding_left = 158
padding_right = 180.5

View file

@ -0,0 +1,7 @@
w = 57
h = 54
padding_top = 51.5
padding_bottom = 371.5
padding_left = 157.5
padding_right = 186

View file

@ -0,0 +1,7 @@
w = 54.5
h = 61.5
padding_top = 46
padding_bottom = 369.5
padding_left = 158
padding_right = 188

View file

@ -0,0 +1,7 @@
w = 62
h = 61.5
padding_top = 46
padding_bottom = 369.5
padding_left = 158
padding_right = 180.5

View file

@ -0,0 +1,7 @@
w = 400.5
h = 477
padding_top = 0
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -1,5 +1,7 @@
w = 256
h = 497.5
offset_x = 0
offset_y = 0
padding_top = 0
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -0,0 +1,7 @@
w = 102
h = 71.5
padding_top = 67.5
padding_bottom = 358.5
padding_left = 33.5
padding_right = 120.5

View file

@ -1,5 +1,7 @@
w = 57
h = 50.5
offset_x = -22
offset_y = -134
w = 56
h = 49
padding_top = 91
padding_bottom = 357.5
padding_left = 78.5
padding_right = 121.5

View file

@ -0,0 +1,7 @@
w = 116
h = 108.5
padding_top = 27
padding_bottom = 362
padding_left = 78
padding_right = 62

View file

@ -1,5 +1,7 @@
w = 57
h = 50
offset_x = -24
offset_y = -134.25
h = 41.5
padding_top = 95
padding_bottom = 361
padding_left = 75.5
padding_right = 123.5

View file

@ -1,5 +1,7 @@
w = 138
h = 103.5
offset_x = 16.5
offset_y = -160
h = 101.5
padding_top = 39
padding_bottom = 357
padding_left = 75.5
padding_right = 42.5

View file

@ -0,0 +1,7 @@
w = 83.5
h = 50.5
padding_top = 88.5
padding_bottom = 358.5
padding_left = 74
padding_right = 98.5

View file

@ -1,5 +1,7 @@
w = 130
h = 94
offset_x = 11
offset_y = -156.25
h = 93
padding_top = 45.5
padding_bottom = 359
padding_left = 74
padding_right = 52

View file

@ -1,5 +1,7 @@
w = 310
w = 310.5
h = 491
offset_x = 0
offset_y = 0
padding_top = 0
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -0,0 +1,7 @@
w = 167.5
h = 64
padding_top = 65.5
padding_bottom = 361.5
padding_left = 94.5
padding_right = 48.5

View file

@ -1,5 +1,7 @@
w = 62.5
h = 57.5
offset_x = 23.25
offset_y = -155.75
padding_top = 61
padding_bottom = 372.5
padding_left = 147
padding_right = 101

View file

@ -0,0 +1,7 @@
w = 136
h = 89
padding_top = 29.5
padding_bottom = 372.5
padding_left = 73.5
padding_right = 101

View file

@ -0,0 +1,7 @@
w = 130.5
h = 71.5
padding_top = 68
padding_bottom = 351.5
padding_left = 79
padding_right = 101

View file

@ -1,5 +1,7 @@
w = 63
h = 64
offset_x = 22
offset_y = -157
h = 53
padding_top = 67.5
padding_bottom = 370.5
padding_left = 145.5
padding_right = 102

View file

@ -1,5 +1,7 @@
w = 132.5
h = 107
offset_x = -11.75
offset_y = -179
padding_top = 13
padding_bottom = 371
padding_left = 77
padding_right = 101

View file

@ -1,5 +1,7 @@
w = 100.5
h = 61.5
offset_x = 41.75
offset_y = -157.25
padding_top = 57.5
padding_bottom = 372
padding_left = 146.5
padding_right = 63.5

View file

@ -1,5 +1,7 @@
w = 262.5
h = 473.5
offset_x = -16
offset_y = 0
padding_top = 0
padding_bottom = 0
padding_left = -16
padding_right = 16

View file

@ -0,0 +1,7 @@
w = 43.5
h = 52.5
padding_top = 29.5
padding_bottom = 391.5
padding_left = 128
padding_right = 91

View file

@ -1,5 +1,7 @@
w = 321
w = 313.5
h = 544.5
offset_x = 0
offset_y = 0
padding_top = 0
padding_bottom = 0
padding_left = 0
padding_right = 0

View file

@ -0,0 +1,7 @@
w = 60.5
h = 58.5
padding_top = 115
padding_bottom = 371
padding_left = 117
padding_right = 136

View file

@ -0,0 +1,7 @@
w = 62
h = 59
padding_top = 115
padding_bottom = 370.5
padding_left = 117
padding_right = 134.5

View file

@ -0,0 +1,7 @@
w = 64
h = 57.5
padding_top = 116.5
padding_bottom = 370.5
padding_left = 115.5
padding_right = 134

View file

@ -0,0 +1,7 @@
w = 97
h = 79.5
padding_top = 97
padding_bottom = 368
padding_left = 120
padding_right = 96.5

View file

@ -0,0 +1,7 @@
w = 97
h = 79.5
padding_top = 97
padding_bottom = 368
padding_left = 120
padding_right = 96.5

View file

@ -0,0 +1,7 @@
w = 62.5
h = 65
padding_top = 109.5
padding_bottom = 370
padding_left = 117
padding_right = 134

View file

@ -0,0 +1,7 @@
w = 259
h = 474
padding_top = 70.5
padding_bottom = 0
padding_left = 54.5
padding_right = 0

View file

@ -1,5 +1,7 @@
w = 286
h = 490
offset_x = 32
offset_y = 0
padding_top = 0
padding_bottom = 0
padding_left = 32
padding_right = -32

View file

@ -0,0 +1,7 @@
w = 93.5
h = 98.5
padding_top = 6.5
padding_bottom = 385
padding_left = 111
padding_right = 81.5

View file

@ -0,0 +1,7 @@
w = 126
h = 96.5
padding_top = 6.5
padding_bottom = 387
padding_left = 47
padding_right = 113

View file

@ -1,5 +1,7 @@
w = 65.5
h = 60.5
offset_x = -0.75
offset_y = -173.75
padding_top = 41
padding_bottom = 388.5
padding_left = 109.5
padding_right = 111

View file

@ -0,0 +1,7 @@
w = 100.5
h = 97
padding_top = 5
padding_bottom = 388
padding_left = 74.5
padding_right = 111

View file

@ -0,0 +1,7 @@
w = 61.5
h = 55.5
padding_top = 46
padding_bottom = 388.5
padding_left = 113.5
padding_right = 111

View file

@ -0,0 +1,7 @@
w = 75.5
h = 86
padding_top = 49.5
padding_bottom = 354.5
padding_left = 95
padding_right = 115.5

View file

@ -1,5 +1,7 @@
w = 58
h = 56
offset_x = -2.5
offset_y = -171.5
padding_top = 45.5
padding_bottom = 388.5
padding_left = 111.5
padding_right = 116.5

View file

@ -1,5 +1,7 @@
w = 119
h = 95.5
offset_x = -27.5
offset_y = -190.25
padding_top = 7
padding_bottom = 387.5
padding_left = 56
padding_right = 111

View file

@ -1,5 +1,7 @@
w = 116.5
h = 106
offset_x = -27.75
offset_y = -196.5
padding_top = -4.5
padding_bottom = 388.5
padding_left = 57
padding_right = 112.5

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 241 KiB

After

Width:  |  Height:  |  Size: 231 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 KiB

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 190 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 190 KiB

After

Width:  |  Height:  |  Size: 181 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 221 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 KiB

After

Width:  |  Height:  |  Size: 212 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 264 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 189 KiB

After

Width:  |  Height:  |  Size: 185 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 KiB

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