From 2a7e793b23ba452cc550bf86a0c67c766dac2d14 Mon Sep 17 00:00:00 2001
From: andy <andynewjack@protonmail.com>
Date: Fri, 25 Jun 2021 23:00:57 +0000
Subject: [PATCH] ep1 doesn't have easter rappies

---
 data/battle_param/ep1_multi_hard.toml     | 2 +-
 data/battle_param/ep1_multi_normal.toml   | 2 +-
 data/battle_param/ep1_multi_ultimate.toml | 2 +-
 data/battle_param/ep1_multi_veryhard.toml | 2 +-
 data/battle_param/ep1_solo_hard.toml      | 2 +-
 data/battle_param/ep1_solo_normal.toml    | 2 +-
 data/battle_param/ep1_solo_ultimate.toml  | 2 +-
 data/battle_param/ep1_solo_veryhard.toml  | 2 +-
 src/ship/packet/handler/room.rs           | 2 +-
 src/ship/ship.rs                          | 1 -
 10 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/data/battle_param/ep1_multi_hard.toml b/data/battle_param/ep1_multi_hard.toml
index 97461cc..4dbc97d 100644
--- a/data/battle_param/ep1_multi_hard.toml
+++ b/data/battle_param/ep1_multi_hard.toml
@@ -229,7 +229,7 @@ lck = 20
 esp = 15
 exp = 40
 
-[EasterRappy]
+[AlRappy]
 atp = 527
 mst = 0
 evp = 90
diff --git a/data/battle_param/ep1_multi_normal.toml b/data/battle_param/ep1_multi_normal.toml
index db12b5a..4a529e1 100644
--- a/data/battle_param/ep1_multi_normal.toml
+++ b/data/battle_param/ep1_multi_normal.toml
@@ -229,7 +229,7 @@ lck = 10
 esp = 0
 exp = 4
 
-[EasterRappy]
+[AlRappy]
 atp = 184
 mst = 0
 evp = 45
diff --git a/data/battle_param/ep1_multi_ultimate.toml b/data/battle_param/ep1_multi_ultimate.toml
index ce9100c..c30e089 100644
--- a/data/battle_param/ep1_multi_ultimate.toml
+++ b/data/battle_param/ep1_multi_ultimate.toml
@@ -229,7 +229,7 @@ lck = 30
 esp = 35
 exp = 256
 
-[EasterRappy]
+[AlRappy]
 atp = 2100
 mst = 0
 evp = 419
diff --git a/data/battle_param/ep1_multi_veryhard.toml b/data/battle_param/ep1_multi_veryhard.toml
index e070e92..566334d 100644
--- a/data/battle_param/ep1_multi_veryhard.toml
+++ b/data/battle_param/ep1_multi_veryhard.toml
@@ -229,7 +229,7 @@ lck = 35
 esp = 30
 exp = 88
 
-[EasterRappy]
+[AlRappy]
 atp = 913
 mst = 0
 evp = 194
diff --git a/data/battle_param/ep1_solo_hard.toml b/data/battle_param/ep1_solo_hard.toml
index be12b97..469f988 100644
--- a/data/battle_param/ep1_solo_hard.toml
+++ b/data/battle_param/ep1_solo_hard.toml
@@ -229,7 +229,7 @@ lck = 20
 esp = 15
 exp = 40
 
-[EasterRappy]
+[AlRappy]
 atp = 443
 mst = 0
 evp = 28
diff --git a/data/battle_param/ep1_solo_normal.toml b/data/battle_param/ep1_solo_normal.toml
index 6a409c3..8012947 100644
--- a/data/battle_param/ep1_solo_normal.toml
+++ b/data/battle_param/ep1_solo_normal.toml
@@ -229,7 +229,7 @@ lck = 10
 esp = 0
 exp = 4
 
-[EasterRappy]
+[AlRappy]
 atp = 150
 mst = 0
 evp = 5
diff --git a/data/battle_param/ep1_solo_ultimate.toml b/data/battle_param/ep1_solo_ultimate.toml
index 3d3e0ef..2e076fb 100644
--- a/data/battle_param/ep1_solo_ultimate.toml
+++ b/data/battle_param/ep1_solo_ultimate.toml
@@ -229,7 +229,7 @@ lck = 30
 esp = 30
 exp = 256
 
-[EasterRappy]
+[AlRappy]
 atp = 1800
 mst = 0
 evp = 276
diff --git a/data/battle_param/ep1_solo_veryhard.toml b/data/battle_param/ep1_solo_veryhard.toml
index b6ecd53..306604c 100644
--- a/data/battle_param/ep1_solo_veryhard.toml
+++ b/data/battle_param/ep1_solo_veryhard.toml
@@ -229,7 +229,7 @@ lck = 35
 esp = 30
 exp = 88
 
-[EasterRappy]
+[AlRappy]
 atp = 707
 mst = 0
 evp = 55
diff --git a/src/ship/packet/handler/room.rs b/src/ship/packet/handler/room.rs
index 9a85def..283c2e4 100644
--- a/src/ship/packet/handler/room.rs
+++ b/src/ship/packet/handler/room.rs
@@ -113,7 +113,7 @@ pub fn done_bursting(id: ClientId,
         if let Some(room) = rooms.get_mut(room_id.0).unwrap().as_mut() {
             room.bursting = false;
             rare_monster_list = Some(room.maps.get_rare_monster_list());
-        });
+        };
     }
     let area_client = client_location.get_local_client(id).unwrap(); // TODO: unwrap
 
diff --git a/src/ship/ship.rs b/src/ship/ship.rs
index 250f2c0..09d89bb 100644
--- a/src/ship/ship.rs
+++ b/src/ship/ship.rs
@@ -376,7 +376,6 @@ impl<EG: EntityGateway> ShipServerStateBuilder<EG> {
             ip: self.ip.unwrap_or_else(|| Ipv4Addr::new(127,0,0,1)),
             port: self.port.unwrap_or(SHIP_PORT),
             shops: Box::new(ItemShops::default()),
-
             blocks: Blocks(blocks),
 
             auth_token: self.auth_token.unwrap_or_else(|| AuthToken("".into())),