From 4fa3aa1a3d6d3da06b83fc37c79a61bffca4d3ec Mon Sep 17 00:00:00 2001 From: Andy Newjack Date: Wed, 1 Jul 2020 17:06:33 -0300 Subject: [PATCH] ep2 offline mode maps --- src/ship/map.rs | 80 ++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/ship/map.rs b/src/ship/map.rs index 60e33a8..63ee746 100644 --- a/src/ship/map.rs +++ b/src/ship/map.rs @@ -699,13 +699,13 @@ impl MapVariant { MapArea::Dragon | MapArea::DeRolLe | MapArea::VolOpt | MapArea::DarkFalz => 0, MapArea::Pioneer2Ep2 => 0, - MapArea::VrTempleAlpha | MapArea::VrTempleBeta | MapArea::VrSpaceshipAlpha | MapArea::VrSpaceshipBeta => rand::thread_rng().gen_range(0, 1), + MapArea::VrTempleAlpha | MapArea::VrTempleBeta | MapArea::VrSpaceshipAlpha | MapArea::VrSpaceshipBeta => rand::thread_rng().gen_range(0, 2), MapArea::Cca => 0, MapArea::JungleAreaNorth => 0, MapArea::JungleAreaEast => 0, - MapArea::Mountain => rand::thread_rng().gen_range(0, 1), + MapArea::Mountain => rand::thread_rng().gen_range(0, 2), MapArea::Seaside => 0, - MapArea::SeabedUpper | MapArea::SeabedLower => rand::thread_rng().gen_range(0, 1), + MapArea::SeabedUpper | MapArea::SeabedLower => rand::thread_rng().gen_range(0, 2), MapArea::BarbaRay | MapArea::GolDragon | MapArea::GalGryphon | MapArea::OlgaFlow => 0, MapArea::Pioneer2Ep4 => 0, @@ -724,9 +724,9 @@ impl MapVariant { MapArea::Forest1 => rand::thread_rng().gen_range(0, 3) * 2, MapArea::Forest2 => 0, // TODO: check if the other offline map files are corrupted? // MapArea::Forest2 => {match rand::thread_rng().gen_range(0, 3) { - // 0 => 0, - // 1 => 3, - // 2 => 4, + // 0 => 0, // valid + // 1 => 3, // invalid + // 2 => 4, // invalid // _ => unreachable!()}}, MapArea::Caves1 | MapArea::Caves2 | MapArea::Caves3 => 0, MapArea::Mines1 | MapArea::Mines2 => rand::thread_rng().gen_range(0, 2), // no offline-specific maps @@ -735,12 +735,12 @@ impl MapVariant { MapArea::Pioneer2Ep2 => 0, MapArea::VrTempleAlpha | MapArea::VrTempleBeta | MapArea::VrSpaceshipAlpha | MapArea::VrSpaceshipBeta => 0, - MapArea::Cca => 0, - MapArea::JungleAreaNorth => 0, - MapArea::JungleAreaEast => 0, - MapArea::Mountain => rand::thread_rng().gen_range(0, 1), - MapArea::Seaside => 0, - MapArea::SeabedUpper | MapArea::SeabedLower => rand::thread_rng().gen_range(0, 1), + MapArea::Cca => rand::thread_rng().gen_range(0, 3), + MapArea::JungleAreaNorth => rand::thread_rng().gen_range(0, 3), + MapArea::JungleAreaEast => rand::thread_rng().gen_range(0, 3), + MapArea::Mountain => rand::thread_rng().gen_range(0, 2), + MapArea::Seaside => rand::thread_rng().gen_range(0, 3), + MapArea::SeabedUpper | MapArea::SeabedLower => 0, MapArea::GalGryphon => 0, MapArea::OlgaFlow => 0, MapArea::BarbaRay => 0, @@ -828,18 +828,18 @@ impl MapVariant { MapArea::VolOpt => "data/maps/map_boss03e.dat".into(), MapArea::DarkFalz => "data/maps/map_boss04e.dat".into(), - MapArea::Pioneer2Ep2 => "data/maps/map_labo00_00e.dat".into(), - MapArea::VrTempleAlpha => format!("data/maps/map_ruins01_0{}_0{}e.dat", self.major, self.minor), - MapArea::VrTempleBeta => format!("data/maps/map_ruins02_0{}_0{}e.dat", self.major, self.minor), - MapArea::VrSpaceshipAlpha => format!("data/maps/map_space01_0{}_0{}e.dat", self.major, self.minor), - MapArea::VrSpaceshipBeta => format!("data/maps/map_space02_0{}_0{}e.dat", self.major, self.minor), - MapArea::Cca => format!("data/maps/map_jungle01_0{}e.dat", self.minor), - MapArea::JungleAreaNorth => format!("data/maps/map_jungle02_0{}e.dat", self.minor), - MapArea::JungleAreaEast => format!("data/maps/map_jungle03_0{}e.dat", self.minor), - MapArea::Mountain => format!("data/maps/map_jungle04_0{}_0{}e.dat", self.major, self.minor), - MapArea::Seaside => format!("data/maps/map_jungle05_0{}e.dat", self.minor), - MapArea::SeabedUpper => format!("data/maps/map_seabed01_0{}_0{}e.dat", self.major, self.minor), - MapArea::SeabedLower => format!("data/maps/map_seabed02_0{}_0{}e.dat", self.major, self.minor), + MapArea::Pioneer2Ep2 => "data/maps/map_labo00_00e_s.dat".into(), + MapArea::VrTempleAlpha => format!("data/maps/map_ruins01_0{}_0{}_offe.dat", self.major, self.minor), + MapArea::VrTempleBeta => format!("data/maps/map_ruins02_0{}_0{}_offe.dat", self.major, self.minor), + MapArea::VrSpaceshipAlpha => format!("data/maps/map_space01_0{}_0{}_offe.dat", self.major, self.minor), + MapArea::VrSpaceshipBeta => format!("data/maps/map_space02_0{}_0{}_offe.dat", self.major, self.minor), + MapArea::Cca => format!("data/maps/map_jungle01_0{}_offe.dat", self.minor), + MapArea::JungleAreaNorth => format!("data/maps/map_jungle02_0{}_offe.dat", self.minor), + MapArea::JungleAreaEast => format!("data/maps/map_jungle03_0{}_offe.dat", self.minor), + MapArea::Mountain => format!("data/maps/map_jungle04_0{}_0{}_offe.dat", self.major, self.minor), + MapArea::Seaside => format!("data/maps/map_jungle05_0{}_offe.dat", self.minor), + MapArea::SeabedUpper => format!("data/maps/map_seabed01_0{}_0{}_offe.dat", self.major, self.minor), + MapArea::SeabedLower => format!("data/maps/map_seabed02_0{}_0{}_offe.dat", self.major, self.minor), MapArea::GalGryphon => "data/maps/map_boss05e.dat".into(), MapArea::OlgaFlow => "data/maps/map_boss06e.dat".into(), MapArea::BarbaRay => "data/maps/map_boss07e.dat".into(), @@ -924,22 +924,22 @@ impl MapVariant { MapArea::VolOpt => "data/maps/map_boss03o.dat".into(), MapArea::DarkFalz => "data/maps/map_boss04_offo.dat".into(), - MapArea::Pioneer2Ep2 => "data/maps/map_labo00_00o.dat".into(), - MapArea::VrTempleAlpha => format!("data/maps/map_ruins01_0{}_0{}o.dat", self.major, self.minor), - MapArea::VrTempleBeta => format!("data/maps/map_ruins02_0{}_0{}o.dat", self.major, self.minor), - MapArea::VrSpaceshipAlpha => format!("data/maps/map_space01_0{}_0{}o.dat", self.major, self.minor), - MapArea::VrSpaceshipBeta => format!("data/maps/map_space02_0{}_0{}o.dat", self.major, self.minor), - MapArea::Cca => format!("data/maps/map_jungle01_0{}o.dat", self.major), - MapArea::JungleAreaNorth => format!("data/maps/map_jungle02_0{}o.dat", self.major), - MapArea::JungleAreaEast => format!("data/maps/map_jungle03_0{}o.dat", self.major), - MapArea::Mountain => format!("data/maps/map_jungle04_0{}_0{}o.dat", self.major, self.minor), - MapArea::Seaside => format!("data/maps/map_jungle05_0{}o.dat", self.major), - MapArea::SeabedUpper => format!("data/maps/map_seabed01_0{}_0{}o.dat", self.major, self.minor), - MapArea::SeabedLower => format!("data/maps/map_seabed02_0{}_0{}o.dat", self.major, self.minor), - MapArea::GalGryphon => "data/maps/map_boss05o.dat".into(), - MapArea::OlgaFlow => "data/maps/map_boss06o.dat".into(), - MapArea::BarbaRay => "data/maps/map_boss07o.dat".into(), - MapArea::GolDragon => "data/maps/map_boss08o.dat".into(), + MapArea::Pioneer2Ep2 => "data/maps/map_labo00_00o_s.dat".into(), + MapArea::VrTempleAlpha => format!("data/maps/map_ruins01_0{}_0{}_offo.dat", self.major, self.minor), + MapArea::VrTempleBeta => format!("data/maps/map_ruins02_0{}_0{}_offo.dat", self.major, self.minor), + MapArea::VrSpaceshipAlpha => format!("data/maps/map_space01_0{}_0{}_offo.dat", self.major, self.minor), + MapArea::VrSpaceshipBeta => format!("data/maps/map_space02_0{}_0{}_offo.dat", self.major, self.minor), + MapArea::Cca => format!("data/maps/map_jungle01_0{}_offo.dat", self.minor), + MapArea::JungleAreaNorth => format!("data/maps/map_jungle02_0{}_offo.dat", self.minor), + MapArea::JungleAreaEast => format!("data/maps/map_jungle03_0{}_offo.dat", self.minor), + MapArea::Mountain => format!("data/maps/map_jungle04_0{}_0{}_offo.dat", self.major, self.minor), + MapArea::Seaside => format!("data/maps/map_jungle05_0{}_offo.dat", self.minor), + MapArea::SeabedUpper => format!("data/maps/map_seabed01_0{}_0{}_offo.dat", self.major, self.minor), + MapArea::SeabedLower => format!("data/maps/map_seabed02_0{}_0{}_offo.dat", self.major, self.minor), + MapArea::GalGryphon => "data/maps/map_boss05_offo.dat".into(), + MapArea::OlgaFlow => "data/maps/map_boss06_offo.dat".into(), + MapArea::BarbaRay => "data/maps/map_boss07_offo.dat".into(), + MapArea::GolDragon => "data/maps/map_boss08_offo.dat".into(), MapArea::Pioneer2Ep4 => "data/maps/map_city02_00_00o.dat".into(), MapArea::CraterEast => format!("data/maps/map_wilds01_0{}_0{}o.dat", self.major, self.minor),