Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: reimplement blunderbuss #952

Merged
merged 3 commits into from
Mar 30, 2024
Merged

feat: reimplement blunderbuss #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c928163
re-implementing blunderbuss
DRuppFv Mar 29, 2024
9698c12
spawn buss
DRuppFv Mar 29, 2024
c090490
cargo fmt
DRuppFv Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions assets/elements/item/buss/bullet/buss.bullet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
lifetime: 0.2
speed: 900
body_diameter: 15
atlas: ./buss_bullet.atlas.yaml

explosion_fps: 21
explosion_frames: 3
explosion_volume: 0.015
explosion_lifetime: 0.140
explosion_sound: ../explosion/bullet_hit_dull.ogg
explosion_atlas: ../explosion/explosion.atlas.yaml
4 changes: 4 additions & 0 deletions assets/elements/item/buss/bullet/buss_bullet.atlas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./buss_bullet.png
tile_size: [6, 6]
rows: 1
columns: 1
Binary file added assets/elements/item/buss/bullet/buss_bullet.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions assets/elements/item/buss/buss.atlas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./buss.png
tile_size: [62, 24]
rows: 1
columns: 1
3 changes: 3 additions & 0 deletions assets/elements/item/buss/buss.element.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name: Buss
category: Weapons
data: buss.yaml
Binary file added assets/elements/item/buss/buss.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions assets/elements/item/buss/buss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
atlas: ./buss.atlas.yaml

max_ammo: 2
cooldown: 1000ms
bullet_meta: ./bullet/buss.bullet.yaml
bullet_count: 10
bullet_spread: 0.3

shoot_fps: 15
shoot_frames: 3
shoot_lifetime: 0.3
shoot_sound_volume: 0.2
shoot_sound: ./shoot/shoot.ogg
empty_shoot_sound_volume: 0.1
empty_shoot_sound: ./shoot/gun_empty.ogg
shoot_atlas: ./shoot/buss_shoot.atlas.yaml

bounciness: 0.3
can_rotate: true
body_size: [32, 8]
fin_anim: grab_2
angular_velocity: 0.1
throw_velocity: 180
grab_offset: [7, 0]
kickback: 300
Binary file added assets/elements/item/buss/explosion/bullet_hit_dull.ogg
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions assets/elements/item/buss/explosion/explosion.atlas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./explosion.png
tile_size: [11, 11]
rows: 1
columns: 4
Binary file added assets/elements/item/buss/explosion/explosion.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/elements/item/buss/shoot/buss_fire.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions assets/elements/item/buss/shoot/buss_shoot.atlas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./buss_fire.png
tile_size: [25, 30]
rows: 1
columns: 4
Binary file added assets/elements/item/buss/shoot/gun_empty.ogg
View file
Open in desktop
Binary file not shown.
Binary file added assets/elements/item/buss/shoot/shoot.ogg
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions assets/game.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ core:
- /elements/item/kick_bomb/kick_bomb.element.yaml
- /elements/item/mine/mine.element.yaml
- /elements/item/musket/musket.element.yaml
- /elements/item/buss/buss.element.yaml
- /elements/item/stomp_boots/stomp_boots.element.yaml
- /elements/item/sword/sword.element.yaml
- /elements/item/sniper_rifle/sniper_rifle.element.yaml
Expand Down
2 changes: 1 addition & 1 deletion assets/map/levels/level_1.map.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,7 +1220,7 @@ layers:
- pos:
- 536.0
- 303.0
element: /elements/item/grenade/grenade.element.yaml
element: /elements/item/buss/buss.element.yaml
- pos:
- 784.0
- 495.0
Expand Down
2 changes: 1 addition & 1 deletion assets/map/levels/level_11.map.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1757,7 +1757,7 @@ layers:
- pos:
- 464.0
- 278.5
element: /elements/item/musket/musket.element.yaml
element: /elements/item/buss/buss.element.yaml
- pos:
- 548.2856
- 265.5
Expand Down
2 changes: 1 addition & 1 deletion assets/map/levels/level_3.map.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@ layers:
- pos:
- 512.0
- 246.5
element: /elements/item/musket/musket.element.yaml
element: /elements/item/buss/buss.element.yaml
- pos:
- 432.0
- 510.5
Expand Down
4 changes: 2 additions & 2 deletions assets/map/levels/level_4.map.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,7 @@ layers:
- pos:
- 1008.0
- 118.5
element: /elements/item/musket/musket.element.yaml
element: /elements/item/buss/buss.element.yaml
- pos:
- 1008.0
- 342.5
Expand All @@ -1079,7 +1079,7 @@ layers:
- pos:
- 112.0
- 118.5
element: /elements/item/musket/musket.element.yaml
element: /elements/item/buss/buss.element.yaml
- pos:
- 112.0
- 342.5
Expand Down
4 changes: 2 additions & 2 deletions assets/map/levels/level_7.map.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ layers:
- pos:
- 712.0
- 182.5
element: /elements/item/musket/musket.element.yaml
element: /elements/item/buss/buss.element.yaml
- pos:
- 552.0
- 438.5
Expand All @@ -1197,7 +1197,7 @@ layers:
- pos:
- 584.0
- 310.5
element: /elements/item/musket/musket.element.yaml
element: /elements/item/buss/buss.element.yaml
- pos:
- 400.0
- 374.5
Expand Down
4 changes: 3 additions & 1 deletion src/core/elements.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use std::sync::Mutex;

use crate::{impl_system_param, prelude::*};

pub mod buss;
pub mod crab;
pub mod crate_item;
pub mod decoration;
Expand All @@ -28,7 +29,7 @@ pub mod urchin;

pub mod prelude {
pub use super::{
crab::*, crate_item::*, decoration::*, fish_school::*, grenade::*, jellyfish::*,
buss::*, crab::*, crate_item::*, decoration::*, fish_school::*, grenade::*, jellyfish::*,
kick_bomb::*, mine::*, musket::*, player_spawner::*, slippery::*, slippery_seaweed::*,
snail::*, spike::*, sproinger::*, stomp_boots::*, sword::*, urchin::*, *,
};
Expand Down Expand Up @@ -314,6 +315,7 @@ install_plugins!(
kick_bomb,
mine,
musket,
buss,
player_spawner,
slippery_seaweed,
slippery,
Expand Down
Loading
Loading