From d59ec43f6e03b1adb78dca747eb1520b9d2327ef Mon Sep 17 00:00:00 2001
From: jake <jake@sharnoth.com>
Date: Mon, 13 Apr 2020 01:01:25 -0700
Subject: [PATCH] fix monster names

---
 src/ship/map.rs     |  8 ++++----
 src/ship/monster.rs | 15 +++++++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/ship/map.rs b/src/ship/map.rs
index afd4802..d548056 100644
--- a/src/ship/map.rs
+++ b/src/ship/map.rs
@@ -124,12 +124,12 @@ impl MapEnemy {
             (RawMapEnemy {id: 194, ..}, _) => MonsterType::VolOptPartA,
             (RawMapEnemy {id: 197, ..}, _) => MonsterType::VolOpt,
             (RawMapEnemy {id: 200, ..}, _) => MonsterType::DarkFalz,
-            (RawMapEnemy {id: 202, ..}, _) => MonsterType::Olga,
+            (RawMapEnemy {id: 202, ..}, _) => MonsterType::OlgaFlow,
             (RawMapEnemy {id: 203, ..}, _) => MonsterType::BarbaRay,
             (RawMapEnemy {id: 204, ..}, _) => MonsterType::GolDragon,
-            (RawMapEnemy {id: 212, skin: 0, ..}, _) => MonsterType::SinowBeril,
+            (RawMapEnemy {id: 212, skin: 0, ..}, _) => MonsterType::SinowBerill,
             (RawMapEnemy {id: 212, skin: 1, ..}, _) => MonsterType::SinowSpigell,
-            (RawMapEnemy {id: 213, skin: 0, ..}, _) => MonsterType::Merillias,
+            (RawMapEnemy {id: 213, skin: 0, ..}, _) => MonsterType::Merillia,
             (RawMapEnemy {id: 213, skin: 1, ..}, _) => MonsterType::Meriltas,
             (RawMapEnemy {id: 214, skin: 0, ..}, _) => MonsterType::Mericarol,
             (RawMapEnemy {id: 214, skin: 1, ..}, _) => MonsterType::Merikle,
@@ -144,7 +144,7 @@ impl MapEnemy {
             (RawMapEnemy {id: 221, skin: 0, ..}, _) => MonsterType::Dolmdarl,
             (RawMapEnemy {id: 221, skin: 1, ..}, _) => MonsterType::Dolmolm,
             (RawMapEnemy {id: 222, ..}, _) => MonsterType::Morfos,
-            (RawMapEnemy {id: 223, ..}, _) => MonsterType::ReconBox,
+            (RawMapEnemy {id: 223, ..}, _) => MonsterType::Recobox,
             (RawMapEnemy {id: 224, ..}, _) => MonsterType::Epsilon,
             (RawMapEnemy {id: 224, skin: 0, ..}, _) => MonsterType::SinowZoa,
             (RawMapEnemy {id: 224, skin: 1, ..}, _) => MonsterType::SinowZele,
diff --git a/src/ship/monster.rs b/src/ship/monster.rs
index c9cf97f..1d089d8 100644
--- a/src/ship/monster.rs
+++ b/src/ship/monster.rs
@@ -15,6 +15,10 @@ pub enum MonsterType {
     SandRappy,
     RagRappy,
     AlRappy,
+    EasterRappy,
+    StRappy,
+    HalloRappy,
+    LoveRappy,
     Monest,
     Mothmant,
     SavageWolf,
@@ -49,12 +53,14 @@ pub enum MonsterType {
     BeeR,
     BeeL,
     DarkGunner,
+    DeathGunner,
     ChaosBringer,
     DarkBelra,
     Dimenian,
     LaDimenian,
     SoDimenian,
     Bulclaw,
+    Bulk,
     Claw,
     Dragon,
     GalGryphon,
@@ -74,12 +80,12 @@ pub enum MonsterType {
     DarkFalz3,
     Darvant,
     UltDarvant,
-    Olga,
+    OlgaFlow,
     BarbaRay,
     GolDragon,
-    SinowBeril,
+    SinowBerill,
     SinowSpigell,
-    Merillias,
+    Merillia,
     Meriltas,
     Mericarol,
     Merikle,
@@ -94,7 +100,8 @@ pub enum MonsterType {
     Dolmdarl,
     Dolmolm,
     Morfos,
-    ReconBox,
+    Recon,
+    Recobox,
     Epsilon,
     Epsiguard,
     SinowZoa,