Battle monster waves configuration with globals.json

gameserver/globals.json

@@ -1,3 +1,8 @@
 {
-	"lineup": [1309, 1308, 1307, 1315]
+	"lineup": [1309, 1308, 1307, 1315],
+	"monster_wave_list": 
+	[
+		[3013010, 3013010],
+		[3024020]
+	]
 }

gameserver/src/game/global_config.rs

@@ -32,4 +32,5 @@ lazy_static! {
 #[derive(Deserialize)]
 pub struct Globals {
     pub lineup: Vec<u32>,
+    pub monster_wave_list: Vec<Vec<u32>>,
 }

gameserver/src/net/handlers/battle.rs

@@ -33,13 +33,20 @@ pub async fn on_start_cocoon_stage_cs_req(
                     ..Default::default()
                 })
                 .collect(),
-            monster_wave_list: vec![SceneMonsterWave {
+            monster_wave_list: globals
-                monster_list: vec![SceneMonsterParam {
+                .monster_wave_list
-                    monster_id: 3013010,
+                .iter()
+                .map(|monster_list| SceneMonsterWave {
+                    monster_list: monster_list
+                        .iter()
+                        .map(|id| SceneMonsterParam {
+                            monster_id: *id,
+                            ..Default::default()
+                        })
+                        .collect(),
                     ..Default::default()
-                }],
+                })
-                ..Default::default()
+                .collect(),
-            }],
             ..Default::default()
         }),
     };

proto/Cargo.toml

@@ -6,6 +6,7 @@ version.workspace = true
 [dependencies]
 prost.workspace = true
 prost-types.workspace = true
+serde.workspace = true
 
 [build-dependencies]
 prost-build.workspace = true

proto/build.rs

@@ -5,6 +5,7 @@ pub fn main() {
 
         prost_build::Config::new()
             .out_dir("out/")
+            .type_attribute(".", "#[derive(serde::Serialize, serde::Deserialize)]")
             .compile_protos(&[proto_file], &["."])
             .unwrap();
     }