-
Notifications
You must be signed in to change notification settings - Fork 126
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This PR closes #576. I started this as draft because I think the team feedback is important before I head to writing the cannon itself. There are many `.yaml` fields that are used only when holding the kickbomb, and I wonder if I should delete these from the cannonball (as it will only work at the lit state) or just leave it there because the game would just crash if the cannonball is used as non-lit. I also used `.clone()` while dealing with `SVec<>` and animations in `kick_bomb.rs` because I think it was the only option, but using `.clone()` is quite inefficient so I wonder if there's another way of doing that.
- Loading branch information
Showing
22 changed files
with
505 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.