changed file section

httpserver/src/routes/game/achievement/achievement_clear.rs

@@ -1,7 +1,7 @@
-use actix_web::{put, web, HttpResponse, Result };
+use actix_web::{HttpResponse, Result, put, web};
 use bd2::proto::proto_net::AchievementClearRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::achievement_clear;
+use gameserver::logic::game::achievement::achievement_clear;
 use sqlx::SqlitePool;
 
 #[put("AchievementClear")]
@@ -17,4 +17,4 @@ async fn achievement_clear_handler(
     })?;
     let response = achievement_clear::handle(&pool, uid, req).await;
     Ok(HttpResponse::Ok().json(response))
-}
+}

httpserver/src/routes/game/achievement/achievement_info.rs

@@ -1,7 +1,7 @@
-use actix_web::{put, web, HttpResponse, Result};
+use actix_web::{HttpResponse, Result, put, web};
 use bd2::proto::proto_net::AchievementInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::achievement_info;
+use gameserver::logic::game::achievement::achievement_info;
 use sqlx::SqlitePool;
 
 #[put("AchievementInfo")]

httpserver/src/routes/game/achievement/achievement_update.rs

@@ -1,7 +1,7 @@
-use actix_web::{put, web, HttpResponse, Result};
+use actix_web::{HttpResponse, Result, put, web};
 use bd2::proto::proto_net::AchievementUpdateRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::achievement_update;
+use gameserver::logic::game::achievement::achievement_update;
 use sqlx::SqlitePool;
 
 #[put("AchievementUpdate")]

httpserver/src/routes/game/achievement/mod.rs

@@ -0,0 +1,3 @@
+pub mod achievement_clear;
+pub mod achievement_info;
+pub mod achievement_update;

httpserver/src/routes/game/active/active_map.rs

@@ -1,7 +1,7 @@
-use actix_web::{put, web, HttpResponse, Result};
+use actix_web::{HttpResponse, Result, put, web};
 use bd2::proto::proto_net::ActiveMapRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::active_map;
+use gameserver::logic::game::active::active_map;
 use sqlx::SqlitePool;
 
 #[put("ActiveMap")]

httpserver/src/routes/game/active/mod.rs

@@ -0,0 +1 @@
+pub mod active_map;

httpserver/src/routes/game/alchemy/alchemy.rs

@@ -1,7 +1,7 @@
-use actix_web::{put, web, HttpResponse, Result};
+use actix_web::{HttpResponse, Result, put, web};
 use bd2::proto::proto_net::AlchemyRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::alchemy;
+use gameserver::logic::game::alchemy::alchemy;
 use sqlx::SqlitePool;
 
 #[put("Alchemy")]

httpserver/src/routes/game/alchemy/alchemy_batch.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::AlchemyBatchRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::alchemy_batch;
+use gameserver::logic::game::alchemy::alchemy_batch;
 use sqlx::SqlitePool;
 
 #[put("AlchemyBatch")]

httpserver/src/routes/game/alchemy/mod.rs

@@ -0,0 +1,2 @@
+pub mod alchemy;
+pub mod alchemy_batch;

httpserver/src/routes/game/all/all_char_refresh.rs

@@ -1,7 +1,7 @@
-use actix_web::{put, web, HttpResponse, Result};
+use actix_web::{HttpResponse, Result, put, web};
 use bd2::proto::proto_net::AllCharRefreshRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::all_char_refresh;
+use gameserver::logic::game::all::all_char_refresh;
 use sqlx::SqlitePool;
 
 #[put("AllCharRefresh")]

httpserver/src/routes/game/all/mod.rs

@@ -0,0 +1 @@
+pub mod all_char_refresh;

httpserver/src/routes/game/attendance/attendance.rs

@@ -1,4 +1,4 @@
-use actix_web::{put, web, HttpResponse, Result};
+use actix_web::{HttpResponse, Result, put, web};
 use bd2::proto::proto_net::AttendanceRequest;
 use crypto::network::parse_packet;
 use gameserver::logic::game::attendance;

httpserver/src/routes/game/attendance/mod.rs

@@ -0,0 +1,2 @@
+pub mod attendance;
+pub mod attendance_info;

httpserver/src/routes/game/balance/balance_version_check.rs

@@ -1,7 +1,7 @@
 use actix_web::{HttpResponse, Result, put, web};
 use bd2::proto::proto_net::BalanceVersionCheckRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::balance_version_check;
+use gameserver::logic::game::balance::balance_version_check;
 use sqlx::SqlitePool;
 
 #[put("BalanceVersionCheck")]

httpserver/src/routes/game/balance/mod.rs

@@ -0,0 +1 @@
+pub mod balance_version_check;

httpserver/src/routes/game/battle/battle_end.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::BattleEndRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::battle_end;
+use gameserver::logic::game::battle::battle_end;
 use sqlx::SqlitePool;
 
 #[put("BattleEnd")]

httpserver/src/routes/game/battle/battle_end_test.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::BattleEndTestRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::battle_end_test;
+use gameserver::logic::game::battle::battle_end_test;
 use sqlx::SqlitePool;
 
 #[put("BattleEndTest")]

httpserver/src/routes/game/battle/battle_enter.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::BattleEnterRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::battle_enter;
+use gameserver::logic::game::battle::battle_enter;
 use sqlx::SqlitePool;
 
 #[put("BattleEnter")]

httpserver/src/routes/game/battle/battle_exit.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::BattleExitRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::battle_exit;
+use gameserver::logic::game::battle::battle_exit;
 use sqlx::SqlitePool;
 
 #[put("BattleExit")]

httpserver/src/routes/game/battle/battle_give_up.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::BattleGiveUpRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::battle_give_up;
+use gameserver::logic::game::battle::battle_give_up;
 use sqlx::SqlitePool;
 
 #[put("BattleGiveUp")]

httpserver/src/routes/game/battle/battle_retry.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::BattleRetryRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::battle_retry;
+use gameserver::logic::game::battle::battle_retry;
 use sqlx::SqlitePool;
 
 #[put("BattleRetry")]

httpserver/src/routes/game/battle/battle_retry_previous_turn.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::BattleRetryPreviousTurnRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::battle_retry_previous_turn;
+use gameserver::logic::game::battle::battle_retry_previous_turn;
 use sqlx::SqlitePool;
 
 #[put("BattleRetryPreviousTurn")]

httpserver/src/routes/game/battle/battle_start.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::BattleStartRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::battle_start;
+use gameserver::logic::game::battle::battle_start;
 use sqlx::SqlitePool;
 
 #[put("BattleStart")]

httpserver/src/routes/game/battle/battle_verify_state.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::BattleVerifyStateRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::battle_verify_state;
+use gameserver::logic::game::battle::battle_verify_state;
 use sqlx::SqlitePool;
 
 #[put("BattleVerifyState")]

httpserver/src/routes/game/battle/mod.rs

@@ -0,0 +1,9 @@
+pub mod battle_end;
+pub mod battle_end_test;
+pub mod battle_enter;
+pub mod battle_exit;
+pub mod battle_give_up;
+pub mod battle_retry;
+pub mod battle_retry_previous_turn;
+pub mod battle_start;
+pub mod battle_verify_state;

httpserver/src/routes/game/cafeteria/cafeteria_cumulative_reward.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaCumulativeRewardRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_cumulative_reward;
+use gameserver::logic::game::cafeteria::cafeteria_cumulative_reward;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaCumulativeReward")]

httpserver/src/routes/game/cafeteria/cafeteria_daily_connection_costume_refresh.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaDailyConnectionCostumeRefreshRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_daily_connection_costume_refresh;
+use gameserver::logic::game::cafeteria::cafeteria_daily_connection_costume_refresh;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaDailyConnectionCostumeRefresh")]

httpserver/src/routes/game/cafeteria/cafeteria_event_npc_interaction_reward.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaEventNpcInteractionRewardRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_event_npc_interaction_reward;
+use gameserver::logic::game::cafeteria::cafeteria_event_npc_interaction_reward;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaEventNpcInteractionReward")]

httpserver/src/routes/game/cafeteria/cafeteria_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_info;
+use gameserver::logic::game::cafeteria::cafeteria_info;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaInfo")]

httpserver/src/routes/game/cafeteria/cafeteria_introduction_story_reward.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaIntroductionStoryRewardRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_introduction_story_reward;
+use gameserver::logic::game::cafeteria::cafeteria_introduction_story_reward;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaIntroductionStoryReward")]

httpserver/src/routes/game/cafeteria/cafeteria_level_up.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaLevelUpRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_level_up;
+use gameserver::logic::game::cafeteria::cafeteria_level_up;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaLevelUp")]

httpserver/src/routes/game/cafeteria/cafeteria_manage_item_add.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaManageItemAddRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_manage_item_add;
+use gameserver::logic::game::cafeteria::cafeteria_manage_item_add;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaManageItemAdd")]

httpserver/src/routes/game/cafeteria/cafeteria_rare_npc_interaction_reward.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaRareNpcInteractionRewardRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_rare_npc_interaction_reward;
+use gameserver::logic::game::cafeteria::cafeteria_rare_npc_interaction_reward;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaRareNpcInteractionReward")]

httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_interaction_all_reward.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaRegularCostumeInteractionAllRewardRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_regular_costume_interaction_all_reward;
+use gameserver::logic::game::cafeteria::cafeteria_regular_costume_interaction_all_reward;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaRegularCostumeInteractionAllReward")]

httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_interaction_reward.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaRegularCostumeInteractionRewardRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_regular_costume_interaction_reward;
+use gameserver::logic::game::cafeteria::cafeteria_regular_costume_interaction_reward;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaRegularCostumeInteractionReward")]

httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_note_all_reward.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaRegularCostumeNoteAllRewardRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_regular_costume_note_all_reward;
+use gameserver::logic::game::cafeteria::cafeteria_regular_costume_note_all_reward;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaRegularCostumeNoteAllReward")]

httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_note_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaRegularCostumeNoteInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_regular_costume_note_info;
+use gameserver::logic::game::cafeteria::cafeteria_regular_costume_note_info;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaRegularCostumeNoteInfo")]

httpserver/src/routes/game/cafeteria/cafeteria_regular_costume_note_reward.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaRegularCostumeNoteRewardRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_regular_costume_note_reward;
+use gameserver::logic::game::cafeteria::cafeteria_regular_costume_note_reward;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaRegularCostumeNoteReward")]

httpserver/src/routes/game/cafeteria/cafeteria_reward_receipt_time_update_using_cheat.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaRewardReceiptTimeUpdateUsingCheatRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_reward_receipt_time_update_using_cheat;
+use gameserver::logic::game::cafeteria::cafeteria_reward_receipt_time_update_using_cheat;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaRewardReceiptTimeUpdateUsingCheat")]

httpserver/src/routes/game/cafeteria/cafeteria_spawn_reset.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaSpawnResetRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_spawn_reset;
+use gameserver::logic::game::cafeteria::cafeteria_spawn_reset;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaSpawnReset")]

httpserver/src/routes/game/cafeteria/cafeteria_spawn_reset_cheat.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CafeteriaSpawnResetCheatRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cafeteria_spawn_reset_cheat;
+use gameserver::logic::game::cafeteria::cafeteria_spawn_reset_cheat;
 use sqlx::SqlitePool;
 
 #[put("CafeteriaSpawnResetCheat")]

httpserver/src/routes/game/cafeteria/mod.rs

@@ -0,0 +1,16 @@
+pub mod cafeteria_cumulative_reward;
+pub mod cafeteria_daily_connection_costume_refresh;
+pub mod cafeteria_event_npc_interaction_reward;
+pub mod cafeteria_info;
+pub mod cafeteria_introduction_story_reward;
+pub mod cafeteria_level_up;
+pub mod cafeteria_manage_item_add;
+pub mod cafeteria_rare_npc_interaction_reward;
+pub mod cafeteria_regular_costume_interaction_all_reward;
+pub mod cafeteria_regular_costume_interaction_reward;
+pub mod cafeteria_regular_costume_note_all_reward;
+pub mod cafeteria_regular_costume_note_info;
+pub mod cafeteria_regular_costume_note_reward;
+pub mod cafeteria_reward_receipt_time_update_using_cheat;
+pub mod cafeteria_spawn_reset;
+pub mod cafeteria_spawn_reset_cheat;

httpserver/src/routes/game/cancel/cancel_leave_user.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CancelLeaveUserRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cancel_leave_user;
+use gameserver::logic::game::cancel::cancel_leave_user;
 use sqlx::SqlitePool;
 
 #[put("CancelLeaveUser")]

httpserver/src/routes/game/cancel/mod.rs

@@ -0,0 +1 @@
+pub mod cancel_leave_user;

httpserver/src/routes/game/cash/cash_mail_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CashMailInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cash_mail_info;
+use gameserver::logic::game::cash::cash_mail_info;
 use sqlx::SqlitePool;
 
 #[put("CashMailInfo")]

httpserver/src/routes/game/cash/cash_shop_buy.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CashShopBuyRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cash_shop_buy;
+use gameserver::logic::game::cash::cash_shop_buy;
 use sqlx::SqlitePool;
 
 #[put("CashShopBuy")]

httpserver/src/routes/game/cash/cash_shop_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CashShopInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cash_shop_info;
+use gameserver::logic::game::cash::cash_shop_info;
 use sqlx::SqlitePool;
 
 #[put("CashShopInfo")]

httpserver/src/routes/game/cash/cash_shop_purchase_count_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CashShopPurchaseCountInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cash_shop_purchase_count_info;
+use gameserver::logic::game::cash::cash_shop_purchase_count_info;
 use sqlx::SqlitePool;
 
 #[put("CashShopPurchaseCountInfo")]

httpserver/src/routes/game/cash/mod.rs

@@ -0,0 +1,4 @@
+pub mod cash_mail_info;
+pub mod cash_shop_buy;
+pub mod cash_shop_info;
+pub mod cash_shop_purchase_count_info;

httpserver/src/routes/game/char/char_all_revival.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharAllRevivalRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_all_revival;
+use gameserver::logic::game::char::char_all_revival;
 use sqlx::SqlitePool;
 
 #[put("CharAllRevival")]

httpserver/src/routes/game/char/char_auto_revive_set.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharAutoReviveSetRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_auto_revive_set;
+use gameserver::logic::game::char::char_auto_revive_set;
 use sqlx::SqlitePool;
 
 #[put("CharAutoReviveSet")]

httpserver/src/routes/game/char/char_awake_active.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharAwakeActiveRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_awake_active;
+use gameserver::logic::game::char::char_awake_active;
 use sqlx::SqlitePool;
 
 #[put("CharAwakeActive")]

httpserver/src/routes/game/char/char_awake_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharAwakeInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_awake_info;
+use gameserver::logic::game::char::char_awake_info;
 use sqlx::SqlitePool;
 
 #[put("CharAwakeInfo")]

httpserver/src/routes/game/char/char_class_up.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharClassUpRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_class_up;
+use gameserver::logic::game::char::char_class_up;
 use sqlx::SqlitePool;
 
 #[put("CharClassUp")]

httpserver/src/routes/game/char/char_expiry.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharExpiryRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_expiry;
+use gameserver::logic::game::char::char_expiry;
 use sqlx::SqlitePool;
 
 #[put("CharExpiry")]

httpserver/src/routes/game/char/char_growth.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharGrowthRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_growth;
+use gameserver::logic::game::char::char_growth;
 use sqlx::SqlitePool;
 
 #[put("CharGrowth")]

httpserver/src/routes/game/char/char_healing.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharHealingRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_healing;
+use gameserver::logic::game::char::char_healing;
 use sqlx::SqlitePool;
 
 #[put("CharHealing")]

httpserver/src/routes/game/char/char_immortal.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharImmortalRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_immortal;
+use gameserver::logic::game::char::char_immortal;
 use sqlx::SqlitePool;
 
 #[put("CharImmortal")]

httpserver/src/routes/game/char/char_imprint_level_up.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharImprintLevelUpRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_imprint_level_up;
+use gameserver::logic::game::char::char_imprint_level_up;
 use sqlx::SqlitePool;
 
 #[put("CharImprintLevelUp")]

httpserver/src/routes/game/char/char_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_info;
+use gameserver::logic::game::char::char_info;
 use sqlx::SqlitePool;
 
 #[put("CharInfo")]

httpserver/src/routes/game/char/char_level_up.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharLevelUpRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_level_up;
+use gameserver::logic::game::char::char_level_up;
 use sqlx::SqlitePool;
 
 #[put("CharLevelUp")]

httpserver/src/routes/game/char/char_partner_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharPartnerInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_partner_info;
+use gameserver::logic::game::char::char_partner_info;
 use sqlx::SqlitePool;
 
 #[put("CharPartnerInfo")]

httpserver/src/routes/game/char/char_partner_reward.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharPartnerRewardRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_partner_reward;
+use gameserver::logic::game::char::char_partner_reward;
 use sqlx::SqlitePool;
 
 #[put("CharPartnerReward")]

httpserver/src/routes/game/char/char_partner_story_reward.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharPartnerStoryRewardRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_partner_story_reward;
+use gameserver::logic::game::char::char_partner_story_reward;
 use sqlx::SqlitePool;
 
 #[put("CharPartnerStoryReward")]

httpserver/src/routes/game/char/char_scout_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharScoutInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_scout_info;
+use gameserver::logic::game::char::char_scout_info;
 use sqlx::SqlitePool;
 
 #[put("CharScoutInfo")]

httpserver/src/routes/game/char/char_special_scout_buy.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharSpecialScoutBuyRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_special_scout_buy;
+use gameserver::logic::game::char::char_special_scout_buy;
 use sqlx::SqlitePool;
 
 #[put("CharSpecialScoutBuy")]

httpserver/src/routes/game/char/char_special_scout_reset.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CharSpecialScoutResetRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::char_special_scout_reset;
+use gameserver::logic::game::char::char_special_scout_reset;
 use sqlx::SqlitePool;
 
 #[put("CharSpecialScoutReset")]

httpserver/src/routes/game/char/mod.rs

@@ -0,0 +1,18 @@
+pub mod char_all_revival;
+pub mod char_auto_revive_set;
+pub mod char_awake_active;
+pub mod char_awake_info;
+pub mod char_class_up;
+pub mod char_expiry;
+pub mod char_growth;
+pub mod char_healing;
+pub mod char_immortal;
+pub mod char_imprint_level_up;
+pub mod char_info;
+pub mod char_level_up;
+pub mod char_partner_info;
+pub mod char_partner_reward;
+pub mod char_partner_story_reward;
+pub mod char_scout_info;
+pub mod char_special_scout_buy;
+pub mod char_special_scout_reset;

httpserver/src/routes/game/charge/charge_cost_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::ChargeCostInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::charge_cost_info;
+use gameserver::logic::game::charge::charge_cost_info;
 use sqlx::SqlitePool;
 
 #[put("ChargeCostInfo")]

httpserver/src/routes/game/charge/mod.rs

@@ -0,0 +1 @@
+pub mod charge_cost_info;

httpserver/src/routes/game/clear/clear_package_reward.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::ClearPackageRewardRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::clear_package_reward;
+use gameserver::logic::game::clear::clear_package_reward;
 use sqlx::SqlitePool;
 
 #[put("ClearPackageReward")]

httpserver/src/routes/game/clear/mod.rs

@@ -0,0 +1 @@
+pub mod clear_package_reward;

httpserver/src/routes/game/client/client_custom_log.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::ClientCustomLogRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::client_custom_log;
+use gameserver::logic::game::client::client_custom_log;
 use sqlx::SqlitePool;
 
 #[put("ClientCustomLog")]

httpserver/src/routes/game/client/mod.rs

@@ -0,0 +1 @@
+pub mod client_custom_log;

httpserver/src/routes/game/community/community_reward.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CommunityRewardRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::community_reward;
+use gameserver::logic::game::community::community_reward;
 use sqlx::SqlitePool;
 
 #[put("CommunityReward")]

httpserver/src/routes/game/community/community_reward_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CommunityRewardInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::community_reward_info;
+use gameserver::logic::game::community::community_reward_info;
 use sqlx::SqlitePool;
 
 #[put("CommunityRewardInfo")]

httpserver/src/routes/game/community/mod.rs

@@ -0,0 +1,2 @@
+pub mod community_reward;
+pub mod community_reward_info;

httpserver/src/routes/game/cooking/cooking.rs

@@ -1,7 +1,7 @@
-use actix_web::{put, web, HttpResponse, Result};
+use actix_web::{HttpResponse, Result, put, web};
 use bd2::proto::proto_net::CookingRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cooking;
+use gameserver::logic::game::cooking::cooking;
 use sqlx::SqlitePool;
 
 #[put("Cooking")]

httpserver/src/routes/game/cooking/cooking_research.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CookingResearchRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::cooking_research;
+use gameserver::logic::game::cooking::cooking_research;
 use sqlx::SqlitePool;
 
 #[put("CookingResearch")]

httpserver/src/routes/game/cooking/mod.rs

@@ -0,0 +1,2 @@
+pub mod cooking;
+pub mod cooking_research;

httpserver/src/routes/game/costume/costume_all_rounder_upgrade.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CostumeAllRounderUpgradeRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::costume_all_rounder_upgrade;
+use gameserver::logic::game::costume::costume_all_rounder_upgrade;
 use sqlx::SqlitePool;
 
 #[put("CostumeAllRounderUpgrade")]

httpserver/src/routes/game/costume/costume_clear.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CostumeClearRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::costume_clear;
+use gameserver::logic::game::costume::costume_clear;
 use sqlx::SqlitePool;
 
 #[put("CostumeClear")]

httpserver/src/routes/game/costume/costume_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CostumeInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::costume_info;
+use gameserver::logic::game::costume::costume_info;
 use sqlx::SqlitePool;
 
 #[put("CostumeInfo")]

httpserver/src/routes/game/costume/costume_node_activation.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CostumeNodeActivationRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::costume_node_activation;
+use gameserver::logic::game::costume::costume_node_activation;
 use sqlx::SqlitePool;
 
 #[put("CostumeNodeActivation")]

httpserver/src/routes/game/costume/costume_potential_connect.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CostumePotentialConnectRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::costume_potential_connect;
+use gameserver::logic::game::costume::costume_potential_connect;
 use sqlx::SqlitePool;
 
 #[put("CostumePotentialConnect")]

httpserver/src/routes/game/costume/costume_upgrade.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CostumeUpgradeRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::costume_upgrade;
+use gameserver::logic::game::costume::costume_upgrade;
 use sqlx::SqlitePool;
 
 #[put("CostumeUpgrade")]

httpserver/src/routes/game/costume/costume_use.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::CostumeUseRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::costume_use;
+use gameserver::logic::game::costume::costume_use;
 use sqlx::SqlitePool;
 
 #[put("CostumeUse")]

httpserver/src/routes/game/costume/mod.rs

@@ -0,0 +1,7 @@
+pub mod costume_all_rounder_upgrade;
+pub mod costume_clear;
+pub mod costume_info;
+pub mod costume_node_activation;
+pub mod costume_potential_connect;
+pub mod costume_upgrade;
+pub mod costume_use;

httpserver/src/routes/game/dating/dating_episode_clear.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::DatingEpisodeClearRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::dating_episode_clear;
+use gameserver::logic::game::dating::dating_episode_clear;
 use sqlx::SqlitePool;
 
 #[put("DatingEpisodeClear")]

httpserver/src/routes/game/dating/dating_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::DatingInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::dating_info;
+use gameserver::logic::game::dating::dating_info;
 use sqlx::SqlitePool;
 
 #[put("DatingInfo")]

httpserver/src/routes/game/dating/dating_message_update.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::DatingMessageUpdateRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::dating_message_update;
+use gameserver::logic::game::dating::dating_message_update;
 use sqlx::SqlitePool;
 
 #[put("DatingMessageUpdate")]

httpserver/src/routes/game/dating/mod.rs

@@ -0,0 +1,3 @@
+pub mod dating_episode_clear;
+pub mod dating_info;
+pub mod dating_message_update;

httpserver/src/routes/game/deck/deck_char_auto_revive.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::DeckCharAutoReviveRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::deck_char_auto_revive;
+use gameserver::logic::game::deck::deck_char_auto_revive;
 use sqlx::SqlitePool;
 
 #[put("DeckCharAutoRevive")]

httpserver/src/routes/game/deck/deck_costume_setting_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::DeckCostumeSettingInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::deck_costume_setting_info;
+use gameserver::logic::game::deck::deck_costume_setting_info;
 use sqlx::SqlitePool;
 
 #[put("DeckCostumeSettingInfo")]

httpserver/src/routes/game/deck/deck_costume_setting_save.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::DeckCostumeSettingSaveRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::deck_costume_setting_save;
+use gameserver::logic::game::deck::deck_costume_setting_save;
 use sqlx::SqlitePool;
 
 #[put("DeckCostumeSettingSave")]

httpserver/src/routes/game/deck/deck_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::DeckInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::deck_info;
+use gameserver::logic::game::deck::deck_info;
 use sqlx::SqlitePool;
 
 #[put("DeckInfo")]

httpserver/src/routes/game/deck/deck_save.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::DeckSaveRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::deck_save;
+use gameserver::logic::game::deck::deck_save;
 use sqlx::SqlitePool;
 
 #[put("DeckSave")]

httpserver/src/routes/game/deck/mod.rs

@@ -0,0 +1,5 @@
+pub mod deck_char_auto_revive;
+pub mod deck_costume_setting_info;
+pub mod deck_costume_setting_save;
+pub mod deck_info;
+pub mod deck_save;

httpserver/src/routes/game/dispatch/dispatch_info.rs

@@ -1,7 +1,7 @@
 use actix_web::{put, web, HttpResponse, Result};
 use bd2::proto::proto_net::DispatchInfoRequest;
 use crypto::network::parse_packet;
-use gameserver::logic::game::dispatch_info;
+use gameserver::logic::game::dispatch::dispatch_info;
 use sqlx::SqlitePool;
 
 #[put("DispatchInfo")]