diff --git a/player/main/assets/effects/win_indicator/win_indicator.atlas.yaml b/player/main/assets/effects/win_indicator/win_indicator.atlas.yaml new file mode 100644 index 0000000000..5cf757f985 --- /dev/null +++ b/player/main/assets/effects/win_indicator/win_indicator.atlas.yaml @@ -0,0 +1,4 @@ +image: ./win_indicator.png +tile_size: [32, 32] +columns: 1 +rows: 1 diff --git a/player/main/assets/effects/win_indicator/win_indicator.attachment.yaml b/player/main/assets/effects/win_indicator/win_indicator.attachment.yaml new file mode 100644 index 0000000000..ac628f744e --- /dev/null +++ b/player/main/assets/effects/win_indicator/win_indicator.attachment.yaml @@ -0,0 +1,8 @@ +name: win_indicator +atlas: ./win_indicator.atlas.yaml +offset: [0, 40] +animation: + fps: 1 + frames: + - 0 +attachment_easing: ./win_indicator.attachment_easing.yaml diff --git a/player/main/assets/effects/win_indicator/win_indicator.attachment_easing.yaml b/player/main/assets/effects/win_indicator/win_indicator.attachment_easing.yaml new file mode 100644 index 0000000000..9ed1525f53 --- /dev/null +++ b/player/main/assets/effects/win_indicator/win_indicator.attachment_easing.yaml @@ -0,0 +1,6 @@ +delta_offset: [0,60] +offset_ease_duration: 3s +ease: + ease_in: true + ease_out: false + function: Quadratic diff --git a/player/main/assets/effects/win_indicator/win_indicator.ogg b/player/main/assets/effects/win_indicator/win_indicator.ogg new file mode 100644 index 0000000000..485312296e Binary files /dev/null and b/player/main/assets/effects/win_indicator/win_indicator.ogg differ diff --git a/player/main/assets/effects/win_indicator/win_indicator.png b/player/main/assets/effects/win_indicator/win_indicator.png new file mode 100644 index 0000000000..a35187d066 Binary files /dev/null and b/player/main/assets/effects/win_indicator/win_indicator.png differ diff --git a/player/main/assets/effects/win_indicator/win_indicator.yaml b/player/main/assets/effects/win_indicator/win_indicator.yaml new file mode 100644 index 0000000000..99e505c7f4 --- /dev/null +++ b/player/main/assets/effects/win_indicator/win_indicator.yaml @@ -0,0 +1,3 @@ +attachment: ./win_indicator.attachment.yaml +sound: ./win_indicator.ogg +volume: 0.5 diff --git a/player/main/assets/game.yaml b/player/main/assets/game.yaml index 3d402e730f..c82a108660 100644 --- a/player/main/assets/game.yaml +++ b/player/main/assets/game.yaml @@ -250,6 +250,10 @@ theme: core: config: respawn_invincibility_time: 2s + # How long after 1 or less players live until score is applied + round_end_score_time: 3s + # How long after scoring to wait before transitioning out of round + round_end_post_score_linger_time: 3s camera: default_height: 448 @@ -305,6 +309,8 @@ core: - /player/hats/viking/viking.hat.yaml - /player/hats/water_lily/water_lily.hat.yaml + player_win_indicator: /effects/win_indicator/win_indicator.yaml + stable_maps: - /map/levels/level_1.map.yaml - /map/levels/level_2.map.yaml diff --git a/player/main/jumpy.js b/player/main/jumpy.js index b5198ec11e..bacc622f09 100644 --- a/player/main/jumpy.js +++ b/player/main/jumpy.js @@ -1939,52 +1939,52 @@ function __wbg_get_imports() { imports.wbg.__wbg_addListener_143ad0a501fabc3a = function() { return handleError(function (arg0, arg1) { getObject(arg0).addListener(getObject(arg1)); }, arguments) }; - imports.wbg.__wbindgen_closure_wrapper20312 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1536, __wbg_adapter_34); + imports.wbg.__wbindgen_closure_wrapper20375 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1538, __wbg_adapter_34); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper20313 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1536, __wbg_adapter_34); + imports.wbg.__wbindgen_closure_wrapper20376 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1538, __wbg_adapter_34); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper20314 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1536, __wbg_adapter_34); + imports.wbg.__wbindgen_closure_wrapper20377 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1538, __wbg_adapter_34); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper20315 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1536, __wbg_adapter_34); + imports.wbg.__wbindgen_closure_wrapper20378 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1538, __wbg_adapter_34); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper20316 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1536, __wbg_adapter_34); + imports.wbg.__wbindgen_closure_wrapper20379 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1538, __wbg_adapter_34); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper20320 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1536, __wbg_adapter_34); + imports.wbg.__wbindgen_closure_wrapper20383 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1538, __wbg_adapter_34); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper20321 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1536, __wbg_adapter_34); + imports.wbg.__wbindgen_closure_wrapper20384 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1538, __wbg_adapter_34); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper20322 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1536, __wbg_adapter_34); + imports.wbg.__wbindgen_closure_wrapper20385 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1538, __wbg_adapter_34); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper20362 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1536, __wbg_adapter_51); + imports.wbg.__wbindgen_closure_wrapper20425 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1538, __wbg_adapter_51); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper20535 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1536, __wbg_adapter_34); + imports.wbg.__wbindgen_closure_wrapper20598 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1538, __wbg_adapter_34); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper22576 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1536, __wbg_adapter_51); + imports.wbg.__wbindgen_closure_wrapper22639 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1538, __wbg_adapter_51); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper28568 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1536, __wbg_adapter_34); + imports.wbg.__wbindgen_closure_wrapper28635 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1538, __wbg_adapter_34); return addHeapObject(ret); }; diff --git a/player/main/jumpy_bg.wasm b/player/main/jumpy_bg.wasm index e82e4e63ad..5aa59459cd 100644 Binary files a/player/main/jumpy_bg.wasm and b/player/main/jumpy_bg.wasm differ