Skip to content

Commit

Permalink
Deploying to gh-pages from @ fe29788 🚀
Browse files Browse the repository at this point in the history
  • Loading branch information
github-merge-queue[bot] committed May 2, 2024
1 parent 6c51b18 commit c3e4fbd
Show file tree
Hide file tree
Showing 21 changed files with 99 additions and 14 deletions.
4 changes: 4 additions & 0 deletions player/main/assets/elements/item/cannon/cannon.atlas.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./cannon.png
tile_size: [60, 42]
rows: 1
columns: 4
3 changes: 2 additions & 1 deletion player/main/assets/elements/item/cannon/cannon.element.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
name: Canon
name: Cannon
category: Weapons
data: cannon.yaml
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions player/main/assets/elements/item/cannon/cannon.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
atlas: ./cannon.atlas.yaml
animation_fps: 12

max_ammo: 4
cooldown: 600ms
bullet_spawn_offset: [22, 2]

shoot_fps: 10
shoot_frames: 5
shoot_lifetime: 0.5
shoot_sound_volume: 0.1
shoot_sound: ./shoot/shoot.ogg
empty_shoot_sound_volume: 0.1
empty_shoot_sound: ./shoot/gun_empty.ogg
shoot_atlas: ./shoot/cannon_shoot.atlas.yaml

bomb_meta: ../cannonball/kick_bomb.yaml

bounciness: 0.3
can_rotate: true
fin_anim: grab_2
body_size: [32, 18]
angular_velocity: 0.1
throw_velocity: 360
grab_offset: [12, 0]
kickback: 0
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./cannon_fire.png
tile_size: [30, 48]
rows: 1
columns: 5
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./cannonball.png
tile_size: [17, 17]
rows: 1
columns: 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name: Cannonball
category: Weapons
data: kick_bomb.yaml
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./explosion.png
tile_size: [144, 112]
rows: 1
columns: 11
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
31 changes: 31 additions & 0 deletions player/main/assets/elements/item/cannonball/kick_bomb.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
fuse_time: 2s
kick_velocity: [0.0, 0.0]
kickable: false
throw_velocity: 800
damage_region_size: [70, 70]
damage_region_lifetime: 0.5

atlas: ./cannonball.atlas.yaml

explosion_atlas: ./explosion.atlas.yaml
explosion_lifetime: 1.0
explosion_frames: 12
explosion_fps: 8
explosion_sound: ./explosion.ogg
explosion_volume: 0.1
explode_on_contact: true

lit_frames_start: 0
lit_frames_end: 1
lit_fps: 1.0

fuse_sound: ./fuse.ogg
fuse_sound_volume: 0.1

body_diameter: 16
grab_offset: [0, -2]
fin_anim: grab_2
can_rotate: true
bounciness: 0.5
angular_velocity: 0.2
arm_delay: 500ms
6 changes: 6 additions & 0 deletions player/main/assets/elements/item/kick_bomb/kick_bomb.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
fuse_time: 4s
kick_velocity: [600.0, 120.0]
kickable: true
throw_velocity: 600
damage_region_size: [60, 60]
damage_region_lifetime: 0.6
Expand All @@ -12,6 +13,11 @@ explosion_frames: 12
explosion_fps: 8
explosion_sound: ./explosion.ogg
explosion_volume: 0.1
explode_on_contact: false

lit_frames_start: 3
lit_frames_end: 5
lit_fps: 8.0

fuse_sound_volume: 0.1
fuse_sound: ./fuse.ogg
Expand Down
2 changes: 2 additions & 0 deletions player/main/assets/game.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,8 @@ core:
- /elements/environment/slippery/slippery.element.yaml
- /elements/environment/slippery_seaweed/slippery_seaweed.element.yaml
- /elements/item/crate/crate.element.yaml
- /elements/item/cannon/cannon.element.yaml
- /elements/item/cannonball/cannonball.element.yaml
- /elements/item/grenade/grenade.element.yaml
- /elements/item/jellyfish/jellyfish.element.yaml
- /elements/item/kick_bomb/kick_bomb.element.yaml
Expand Down
2 changes: 1 addition & 1 deletion player/main/assets/map/levels/level_10.map.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,7 @@ layers:
- pos:
- 800.0
- 406.5
element: /elements/item/musket/musket.element.yaml
element: /elements/item/cannon/cannon.element.yaml
- pos:
- 64.0
- 406.5
Expand Down
24 changes: 12 additions & 12 deletions player/main/jumpy.js
Original file line number Diff line number Diff line change
Expand Up @@ -1939,51 +1939,51 @@ 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_wrapper20409 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper20429 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1539, __wbg_adapter_34);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper20410 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper20430 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1539, __wbg_adapter_34);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper20411 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper20431 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1539, __wbg_adapter_34);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper20412 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper20432 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1539, __wbg_adapter_34);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper20413 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper20433 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1539, __wbg_adapter_34);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper20417 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper20437 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1539, __wbg_adapter_34);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper20418 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper20438 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1539, __wbg_adapter_34);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper20419 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper20439 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1539, __wbg_adapter_34);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper20459 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper20479 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1539, __wbg_adapter_51);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper20632 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper20652 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1539, __wbg_adapter_34);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper22672 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper22693 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1539, __wbg_adapter_51);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper28671 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper28691 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 1539, __wbg_adapter_34);
return addHeapObject(ret);
};
Expand Down
Binary file modified player/main/jumpy_bg.wasm
Binary file not shown.

0 comments on commit c3e4fbd

Please sign in to comment.