refactor

aratama · Dec 23, 2024 · 29dac4e · 29dac4e
1 parent ea78656
commit 29dac4e
Show file tree

Hide file tree

Showing 78 changed files with 1,191 additions and 1,052 deletions.
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -0,0 +1,6 @@
+imports_indent = "Block"
+imports_layout = "Horizontal"
+imports_granularity = "Item"
+group_imports = "One"
+reorder_imports = true
+reorder_modules = true
diff --git a/src/audio.rs b/src/audio.rs
@@ -1,8 +1,7 @@
 use crate::config::GameConfig;
-use bevy::{
-    audio::{PlaybackMode, Volume},
-    prelude::*,
-};
+use bevy::audio::PlaybackMode;
+use bevy::audio::Volume;
+use bevy::prelude::*;
 
 const SPATIAL_AUDIO_MAX_DISTANCE: f32 = 400.0;
 

diff --git a/src/camera.rs b/src/camera.rs
@@ -1,6 +1,7 @@
 use crate::constant::CAMERA_SPEED;
+use crate::controller::player::Player;
 use crate::entity::actor::Actor;
-use crate::{controller::player::Player, states::GameState};
+use crate::states::GameState;
 use bevy::core::FrameCount;
 use bevy::prelude::*;
 use bevy_light_2d::light::AmbientLight2d;

diff --git a/src/cast.rs b/src/cast.rs
@@ -1,20 +1,26 @@
-use crate::{
-    asset::GameAssets,
-    constant::{
-        ENEMY_BULLET_GROUP, ENEMY_GROUP, ENTITY_GROUP, MAX_SPELLS_IN_WAND, RABBIT_GROUP,
-        WALL_GROUP, WITCH_BULLET_GROUP, WITCH_GROUP,
-    },
-    controller::remote::{send_remote_message, RemoteMessage},
-    entity::{
-        actor::{Actor, ActorGroup},
-        bullet::{spawn_bullet, SpawnBullet, BULLET_SPAWNING_MARGIN},
-        life::Life,
-        servant_seed::SpawnServantSeed,
-        witch::WITCH_COLLIDER_RADIUS,
-    },
-    se::{SEEvent, SE},
-    spell::{SpellCast, SpellType},
-};
+use crate::asset::GameAssets;
+use crate::constant::ENEMY_BULLET_GROUP;
+use crate::constant::ENEMY_GROUP;
+use crate::constant::ENTITY_GROUP;
+use crate::constant::MAX_SPELLS_IN_WAND;
+use crate::constant::RABBIT_GROUP;
+use crate::constant::WALL_GROUP;
+use crate::constant::WITCH_BULLET_GROUP;
+use crate::constant::WITCH_GROUP;
+use crate::controller::remote::send_remote_message;
+use crate::controller::remote::RemoteMessage;
+use crate::entity::actor::Actor;
+use crate::entity::actor::ActorGroup;
+use crate::entity::bullet::spawn_bullet;
+use crate::entity::bullet::SpawnBullet;
+use crate::entity::bullet::BULLET_SPAWNING_MARGIN;
+use crate::entity::life::Life;
+use crate::entity::servant_seed::SpawnServantSeed;
+use crate::entity::witch::WITCH_COLLIDER_RADIUS;
+use crate::se::SEEvent;
+use crate::se::SE;
+use crate::spell::SpellCast;
+use crate::spell::SpellType;
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::ExternalImpulse;
 use bevy_simple_websocket::ClientMessage;
@@ -143,13 +149,6 @@ pub fn cast_spell(
                                 online,
                                 &RemoteMessage::Fire(remove_bullet_props.clone()),
                             );
-
-                            info!("online {:?}", online);
-
-                            info!(
-                                "fire message: {:?}",
-                                RemoteMessage::Fire(remove_bullet_props)
-                            );
                         }
                     }
                     SpellCast::BulletSpeedUpDown { delta } => {

diff --git a/src/config.rs b/src/config.rs
@@ -1,7 +1,9 @@
-use crate::{constant::*, language::*};
+use crate::constant::*;
+use crate::language::*;
 use bevy::prelude::*;
 use bevy_pkv::PkvStore;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 
 #[derive(Resource, Clone, Debug, Serialize, Deserialize)]
 pub struct GameConfig {

diff --git a/src/controller/despawn_with_gold.rs b/src/controller/despawn_with_gold.rs
@@ -1,7 +1,10 @@
+use crate::asset::GameAssets;
 use crate::entity::gold::spawn_gold;
 use crate::entity::life::Life;
-use crate::se::{SEEvent, SE};
-use crate::{asset::GameAssets, set::GameSet, states::GameState};
+use crate::se::SEEvent;
+use crate::se::SE;
+use crate::set::GameSet;
+use crate::states::GameState;
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;
 

diff --git a/src/controller/player.rs b/src/controller/player.rs
@@ -1,23 +1,31 @@
 use crate::asset::GameAssets;
-use crate::constant::{ENTITY_LAYER_Z, MAX_WANDS};
+use crate::constant::ENTITY_LAYER_Z;
+use crate::constant::MAX_WANDS;
 use crate::controller::remote::send_remote_message;
 use crate::controller::remote::RemoteMessage;
-use crate::entity::actor::{Actor, ActorFireState};
+use crate::entity::actor::Actor;
+use crate::entity::actor::ActorFireState;
 use crate::entity::gold::Gold;
 use crate::entity::life::Life;
 use crate::equipment::EquipmentType;
-use crate::input::{get_direction, get_fire_trigger};
-use crate::level::{CurrentLevel, GameLevel};
+use crate::input::get_direction;
+use crate::input::get_fire_trigger;
+use crate::page::in_game::CurrentLevel;
+use crate::page::in_game::GameLevel;
 use crate::player_state::PlayerState;
-use crate::se::{SEEvent, SE};
-use crate::states::{GameMenuState, GameState};
+use crate::se::SEEvent;
+use crate::se::SE;
+use crate::states::GameMenuState;
+use crate::states::GameState;
 use bevy::core::FrameCount;
 use bevy::input::mouse::MouseWheel;
 use bevy::prelude::*;
 use bevy_aseprite_ultra::prelude::AseSpriteAnimation;
 use bevy_light_2d::light::PointLight2d;
 use bevy_rapier2d::prelude::*;
-use bevy_simple_websocket::{ClientMessage, ReadyState, WebSocketState};
+use bevy_simple_websocket::ClientMessage;
+use bevy_simple_websocket::ReadyState;
+use bevy_simple_websocket::WebSocketState;
 
 #[derive(Debug, Clone, Copy, Reflect)]
 pub struct Equipment {

diff --git a/src/controller/remote.rs b/src/controller/remote.rs
@@ -1,23 +1,34 @@
+use crate::asset::GameAssets;
 use crate::constant::*;
 use crate::controller::player::Player;
+use crate::entity::actor::Actor;
 use crate::entity::actor::ActorGroup;
+use crate::entity::bullet::spawn_bullet;
 use crate::entity::bullet::SpawnBullet;
+use crate::entity::gold::spawn_gold;
 use crate::entity::life::Life;
-use crate::entity::servant_seed::{ServantType, SpawnServantSeed};
+use crate::entity::servant_seed::ServantType;
+use crate::entity::servant_seed::SpawnServantSeed;
+use crate::entity::witch::spawn_witch;
+use crate::hud::life_bar::LifeBarResource;
 use crate::inventory::Inventory;
-use crate::level::{setup_level, CurrentLevel, GameLevel};
+use crate::page::in_game::setup_level;
+use crate::page::in_game::CurrentLevel;
+use crate::page::in_game::GameLevel;
+use crate::se::SEEvent;
 use crate::se::SE;
-use crate::{
-    asset::GameAssets,
-    entity::{actor::Actor, bullet::spawn_bullet, gold::spawn_gold, witch::spawn_witch},
-    hud::life_bar::LifeBarResource,
-    se::SEEvent,
-    states::GameState,
-};
-use bevy::{core::FrameCount, prelude::*, utils::HashMap};
-use bevy_rapier2d::{plugin::PhysicsSet, prelude::Velocity};
-use bevy_simple_websocket::{ClientMessage, ReadyState, ServerMessage, WebSocketState};
-use serde::{Deserialize, Serialize};
+use crate::states::GameState;
+use bevy::core::FrameCount;
+use bevy::prelude::*;
+use bevy::utils::HashMap;
+use bevy_rapier2d::plugin::PhysicsSet;
+use bevy_rapier2d::prelude::Velocity;
+use bevy_simple_websocket::ClientMessage;
+use bevy_simple_websocket::ReadyState;
+use bevy_simple_websocket::ServerMessage;
+use bevy_simple_websocket::WebSocketState;
+use serde::Deserialize;
+use serde::Serialize;
 use std::collections::HashSet;
 use uuid::Uuid;
 

diff --git a/src/controller/shop_rabbit.rs b/src/controller/shop_rabbit.rs
@@ -1,8 +1,11 @@
 use crate::camera::GameCamera;
 use crate::controller::player::Player;
 use crate::entity::actor::Actor;
-use crate::message::{shop_rabbit, too_few_golds, SHOP_RABBIT};
-use crate::se::{SEEvent, SE};
+use crate::message::shop_rabbit;
+use crate::message::too_few_golds;
+use crate::message::SHOP_RABBIT;
+use crate::se::SEEvent;
+use crate::se::SE;
 use crate::speech_bubble::SpeechEvent;
 use crate::states::GameState;
 use bevy::prelude::*;

diff --git a/src/controller/training_dummy.rs b/src/controller/training_dummy.rs
@@ -1,5 +1,6 @@
 use crate::controller::player::Player;
-use crate::entity::actor::{Actor, ActorFireState};
+use crate::entity::actor::Actor;
+use crate::entity::actor::ActorFireState;
 use crate::states::GameState;
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;

diff --git a/src/debug.rs b/src/debug.rs
@@ -1,25 +1,24 @@
-use crate::{
-    config::GameConfig,
-    constant::LAST_BOSS_LEVEL,
-    controller::player::Player,
-    entity::{actor::Actor, life::Life},
-    equipment::EquipmentType,
-    hud::overlay::OverlayEvent,
-    inventory_item::InventoryItemType,
-    level::{CurrentLevel, GameLevel},
-    physics::GamePhysics,
-    player_state::PlayerState,
-    spell::SpellType,
-    states::GameState,
-    wand::{Wand, WandSpell, WandType},
-};
-use bevy::{
-    input::{
-        keyboard::{Key, KeyboardInput},
-        ButtonState,
-    },
-    prelude::*,
-};
+use crate::config::GameConfig;
+use crate::constant::LAST_BOSS_LEVEL;
+use crate::controller::player::Player;
+use crate::entity::actor::Actor;
+use crate::entity::life::Life;
+use crate::equipment::EquipmentType;
+use crate::hud::overlay::OverlayEvent;
+use crate::inventory_item::InventoryItemType;
+use crate::page::in_game::CurrentLevel;
+use crate::page::in_game::GameLevel;
+use crate::physics::GamePhysics;
+use crate::player_state::PlayerState;
+use crate::spell::SpellType;
+use crate::states::GameState;
+use crate::wand::Wand;
+use crate::wand::WandSpell;
+use crate::wand::WandType;
+use bevy::input::keyboard::Key;
+use bevy::input::keyboard::KeyboardInput;
+use bevy::input::ButtonState;
+use bevy::prelude::*;
 use bevy_rapier2d::plugin::PhysicsSet;
 
 fn process_debug_command(

diff --git a/src/enemy/basic.rs b/src/enemy/basic.rs
@@ -1,15 +1,22 @@
 use crate::constant::*;
 use crate::controller::despawn_with_gold::DespawnWithGold;
 use crate::controller::servant::Servant;
-use crate::entity::actor::{Actor, ActorFireState, ActorGroup, ActorState};
+use crate::entity::actor::Actor;
+use crate::entity::actor::ActorFireState;
+use crate::entity::actor::ActorGroup;
+use crate::entity::actor::ActorState;
 use crate::entity::bullet::HomingTarget;
-use crate::entity::life::{Life, LifeBeingSprite};
+use crate::entity::life::Life;
+use crate::entity::life::LifeBeingSprite;
 use crate::entity::EntityDepth;
-use crate::hud::life_bar::{spawn_life_bar, LifeBarResource};
+use crate::hud::life_bar::spawn_life_bar;
+use crate::hud::life_bar::LifeBarResource;
 use crate::inventory::Inventory;
 use crate::spell::SpellType;
 use crate::states::GameState;
-use crate::wand::{Wand, WandSpell, WandType};
+use crate::wand::Wand;
+use crate::wand::WandSpell;
+use crate::wand::WandType;
 use bevy::prelude::*;
 use bevy_aseprite_ultra::prelude::*;
 use bevy_rapier2d::prelude::*;

diff --git a/src/enemy/eyeball.rs b/src/enemy/eyeball.rs
@@ -1,7 +1,9 @@
 use crate::asset::GameAssets;
 use crate::constant::*;
 use crate::enemy::basic::spawn_basic_enemy;
-use crate::entity::actor::{Actor, ActorFireState, ActorGroup};
+use crate::entity::actor::Actor;
+use crate::entity::actor::ActorFireState;
+use crate::entity::actor::ActorGroup;
 use crate::hud::life_bar::LifeBarResource;
 use crate::physics::compare_distance;
 use crate::set::GameSet;

diff --git a/src/enemy/huge_slime.rs b/src/enemy/huge_slime.rs
@@ -2,17 +2,24 @@ use crate::asset::GameAssets;
 use crate::audio::NextBGM;
 use crate::constant::*;
 use crate::controller::player::Player;
-use crate::entity::actor::{Actor, ActorFireState, ActorGroup, ActorState};
+use crate::entity::actor::Actor;
+use crate::entity::actor::ActorFireState;
+use crate::entity::actor::ActorGroup;
+use crate::entity::actor::ActorState;
 use crate::entity::bullet::HomingTarget;
 use crate::entity::impact::SpawnImpact;
 use crate::entity::life::Life;
-use crate::entity::servant_seed::{ServantType, SpawnServantSeed};
+use crate::entity::servant_seed::ServantType;
+use crate::entity::servant_seed::SpawnServantSeed;
 use crate::entity::EntityDepth;
 use crate::inventory::Inventory;
-use crate::se::{SEEvent, SE};
+use crate::se::SEEvent;
+use crate::se::SE;
 use crate::spell::SpellType;
 use crate::states::GameState;
-use crate::wand::{Wand, WandSpell, WandType};
+use crate::wand::Wand;
+use crate::wand::WandSpell;
+use crate::wand::WandType;
 use bevy::prelude::*;
 use bevy_aseprite_ultra::prelude::*;
 use bevy_rapier2d::prelude::*;

diff --git a/src/enemy/sandbug.rs b/src/enemy/sandbug.rs
@@ -1,12 +1,15 @@
 use crate::asset::GameAssets;
 use crate::enemy::basic::spawn_basic_enemy;
-use crate::entity::actor::{Actor, ActorEvent, ActorGroup};
+use crate::entity::actor::Actor;
+use crate::entity::actor::ActorEvent;
+use crate::entity::actor::ActorGroup;
 use crate::entity::life::LifeBeingSprite;
 use crate::hud::life_bar::LifeBarResource;
 use crate::spell::SpellType;
 use crate::states::GameState;
 use bevy::prelude::*;
-use bevy_aseprite_ultra::prelude::{AnimationState, AseSpriteAnimation};
+use bevy_aseprite_ultra::prelude::AnimationState;
+use bevy_aseprite_ultra::prelude::AseSpriteAnimation;
 use bevy_rapier2d::plugin::PhysicsSet;
 
 const ENEMY_MOVE_FORCE: f32 = 100000.0;

diff --git a/src/enemy/slime.rs b/src/enemy/slime.rs
@@ -1,7 +1,9 @@
 use crate::asset::GameAssets;
 use crate::constant::*;
 use crate::enemy::basic::spawn_basic_enemy;
-use crate::entity::actor::{Actor, ActorFireState, ActorGroup};
+use crate::entity::actor::Actor;
+use crate::entity::actor::ActorFireState;
+use crate::entity::actor::ActorGroup;
 use crate::hud::life_bar::LifeBarResource;
 use crate::physics::compare_distance;
 use crate::set::GameSet;

diff --git a/src/entity.rs b/src/entity.rs
@@ -17,14 +17,13 @@ pub mod shop;
 pub mod stone_lantern;
 pub mod witch;
 
-use crate::{
-    constant::{ENTITY_LAYER_Z, Z_ORDER_SCALE},
-    states::GameState,
-};
-use bevy::{
-    ecs::query::{QueryData, QueryFilter, ROQueryItem},
-    prelude::*,
-};
+use crate::constant::ENTITY_LAYER_Z;
+use crate::constant::Z_ORDER_SCALE;
+use crate::states::GameState;
+use bevy::ecs::query::QueryData;
+use bevy::ecs::query::QueryFilter;
+use bevy::ecs::query::ROQueryItem;
+use bevy::prelude::*;
 
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
 pub enum GameEntity {