jake
/
elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity
Browse Source

andy ur dumb xd. ep4 maps load now

pbs
Andy Newjack 4 years ago
parent
196746dae7
commit
3bcd1f4435
1 changed files with 24 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 65
      src/ship/map.rs

65
src/ship/map.rs
View File

@ -653,11 +653,7 @@ impl MapVariant {
MapArea::BarbaRay | MapArea::GolDragon | MapArea::GalGryphon | MapArea::OlgaFlow => 0, MapArea::BarbaRay | MapArea::GolDragon | MapArea::GalGryphon | MapArea::OlgaFlow => 0,
MapArea::Pioneer2Ep4 => 0, MapArea::Pioneer2Ep4 => 0,
MapArea::CraterEast => 0,
MapArea::CraterWest => 1,
MapArea::CraterSouth => 2,
MapArea::CraterNorth => 3,
MapArea::CraterInterior => 0,
MapArea::CraterEast | MapArea::CraterWest | MapArea::CraterSouth | MapArea::CraterNorth | MapArea::CraterInterior => 0,
MapArea::SubDesert1 | MapArea::SubDesert3 => rand::thread_rng().gen_range(0, 2), MapArea::SubDesert1 | MapArea::SubDesert3 => rand::thread_rng().gen_range(0, 2),
MapArea::SubDesert2 => 0, MapArea::SubDesert2 => 0,
MapArea::SaintMillion => 0, MapArea::SaintMillion => 0,
@ -687,11 +683,7 @@ impl MapVariant {
MapArea::GolDragon => 0, MapArea::GolDragon => 0,
MapArea::Pioneer2Ep4 => 0, MapArea::Pioneer2Ep4 => 0,
MapArea::CraterEast => 2, // 0 good, 1 good, 2 good
MapArea::CraterWest => 2, // 0 bad, 1 bad, 2 bad
MapArea::CraterSouth => 2, // 0 bad, 1 bad, 2 bad
MapArea::CraterNorth => 2, // 0 bad, 1 bad, 2 bad
MapArea::CraterInterior => 2, // 0 good, 1 good, 2 good
MapArea::CraterEast | MapArea::CraterWest | MapArea::CraterSouth | MapArea::CraterNorth | MapArea::CraterInterior => rand::thread_rng().gen_range(0, 3),
MapArea::SubDesert1 | MapArea::SubDesert3 => 0, MapArea::SubDesert1 | MapArea::SubDesert3 => 0,
MapArea::SubDesert2 => rand::thread_rng().gen_range(0, 2), MapArea::SubDesert2 => rand::thread_rng().gen_range(0, 2),
MapArea::SaintMillion => 0, MapArea::SaintMillion => 0,
@ -724,11 +716,7 @@ impl MapVariant {
MapArea::BarbaRay | MapArea::GolDragon | MapArea::GalGryphon | MapArea::OlgaFlow => 0, MapArea::BarbaRay | MapArea::GolDragon | MapArea::GalGryphon | MapArea::OlgaFlow => 0,
MapArea::Pioneer2Ep4 => 0, MapArea::Pioneer2Ep4 => 0,
MapArea::CraterEast => 0,
MapArea::CraterWest => 1,
MapArea::CraterSouth => 2,
MapArea::CraterNorth => 3,
MapArea::CraterInterior => 0,
MapArea::CraterEast | MapArea::CraterWest | MapArea::CraterSouth | MapArea::CraterNorth | MapArea::CraterInterior => 0,
MapArea::SubDesert1 | MapArea::SubDesert3 => rand::thread_rng().gen_range(0, 2), MapArea::SubDesert1 | MapArea::SubDesert3 => rand::thread_rng().gen_range(0, 2),
MapArea::SubDesert2 => 0, MapArea::SubDesert2 => 0,
MapArea::SaintMillion => 0, MapArea::SaintMillion => 0,
@ -757,12 +745,7 @@ impl MapVariant {
MapArea::GolDragon => 0, MapArea::GolDragon => 0,
MapArea::Pioneer2Ep4 => 0, MapArea::Pioneer2Ep4 => 0,
// MapArea::CraterEast | MapArea::CraterWest | MapArea::CraterSouth | MapArea::CraterNorth | MapArea::CraterInterior => rand::thread_rng().gen_range(0, 2),
MapArea::CraterEast => 0,
MapArea::CraterWest => 0,
MapArea::CraterSouth => 0,
MapArea::CraterNorth => 0,
MapArea::CraterInterior => 0,
MapArea::CraterEast | MapArea::CraterWest | MapArea::CraterSouth | MapArea::CraterNorth | MapArea::CraterInterior => rand::thread_rng().gen_range(0, 3),
MapArea::SubDesert1 | MapArea::SubDesert3 => 0, MapArea::SubDesert1 | MapArea::SubDesert3 => 0,
MapArea::SubDesert2 => rand::thread_rng().gen_range(0, 2), MapArea::SubDesert2 => rand::thread_rng().gen_range(0, 2),
MapArea::SaintMillion => 0, MapArea::SaintMillion => 0,
@ -815,11 +798,11 @@ impl MapVariant {
MapArea::GolDragon => "data/maps/map_boss08e.dat".into(), MapArea::GolDragon => "data/maps/map_boss08e.dat".into(),
MapArea::Pioneer2Ep4 => "data/maps/map_city02_00_00e.dat".into(), MapArea::Pioneer2Ep4 => "data/maps/map_city02_00_00e.dat".into(),
MapArea::CraterEast => format!("data/maps/map_wilds01_0{}_0{}e.dat", self.major, self.minor),
MapArea::CraterWest => format!("data/maps/map_wilds01_0{}_0{}e.dat", self.major, self.minor),
MapArea::CraterSouth => format!("data/maps/map_wilds01_0{}_0{}e.dat", self.major, self.minor),
MapArea::CraterNorth => format!("data/maps/map_wilds01_0{}_0{}e.dat", self.major, self.minor),
MapArea::CraterInterior => format!("data/maps/map_crater01_0{}_0{}e.dat", self.major, self.minor),
MapArea::CraterEast => format!("data/maps/map_wilds01_00_0{}e.dat", self.minor),
MapArea::CraterWest => format!("data/maps/map_wilds01_01_0{}e.dat", self.minor),
MapArea::CraterSouth => format!("data/maps/map_wilds01_02_0{}e.dat", self.minor),
MapArea::CraterNorth => format!("data/maps/map_wilds01_03_0{}e.dat", self.minor),
MapArea::CraterInterior => format!("data/maps/map_crater01_00_0{}e.dat", self.minor),
MapArea::SubDesert1 => format!("data/maps/map_desert01_0{}_0{}e.dat", self.major, self.minor), MapArea::SubDesert1 => format!("data/maps/map_desert01_0{}_0{}e.dat", self.major, self.minor),
MapArea::SubDesert2 => format!("data/maps/map_desert02_0{}_0{}e.dat", self.major, self.minor), MapArea::SubDesert2 => format!("data/maps/map_desert02_0{}_0{}e.dat", self.major, self.minor),
MapArea::SubDesert3 => format!("data/maps/map_desert03_0{}_0{}e.dat", self.major, self.minor), MapArea::SubDesert3 => format!("data/maps/map_desert03_0{}_0{}e.dat", self.major, self.minor),
@ -867,11 +850,11 @@ impl MapVariant {
MapArea::GolDragon => "data/maps/map_boss08e.dat".into(), MapArea::GolDragon => "data/maps/map_boss08e.dat".into(),
MapArea::Pioneer2Ep4 => "data/maps/map_city02_00_00e_s.dat".into(), MapArea::Pioneer2Ep4 => "data/maps/map_city02_00_00e_s.dat".into(),
MapArea::CraterEast => format!("data/maps/map_wilds01_0{}_0{}e.dat", self.major, self.minor),
MapArea::CraterWest => format!("data/maps/map_wilds01_0{}_0{}e.dat", self.major, self.minor),
MapArea::CraterSouth => format!("data/maps/map_wilds01_0{}_0{}e.dat", self.major, self.minor),
MapArea::CraterNorth => format!("data/maps/map_wilds01_0{}_0{}e.dat", self.major, self.minor),
MapArea::CraterInterior => format!("data/maps/map_crater01_0{}_0{}e.dat", self.major, self.minor),
MapArea::CraterEast => format!("data/maps/map_wilds01_00_0{}e.dat", self.minor),
MapArea::CraterWest => format!("data/maps/map_wilds01_01_0{}e.dat", self.minor),
MapArea::CraterSouth => format!("data/maps/map_wilds01_02_0{}e.dat", self.minor),
MapArea::CraterNorth => format!("data/maps/map_wilds01_03_0{}e.dat", self.minor),
MapArea::CraterInterior => format!("data/maps/map_crater01_00_0{}e.dat", self.minor),
MapArea::SubDesert1 => format!("data/maps/map_desert01_0{}_0{}e.dat", self.major, self.minor), MapArea::SubDesert1 => format!("data/maps/map_desert01_0{}_0{}e.dat", self.major, self.minor),
MapArea::SubDesert2 => format!("data/maps/map_desert02_0{}_0{}e.dat", self.major, self.minor), MapArea::SubDesert2 => format!("data/maps/map_desert02_0{}_0{}e.dat", self.major, self.minor),
MapArea::SubDesert3 => format!("data/maps/map_desert03_0{}_0{}e.dat", self.major, self.minor), MapArea::SubDesert3 => format!("data/maps/map_desert03_0{}_0{}e.dat", self.major, self.minor),
@ -917,11 +900,11 @@ impl MapVariant {
MapArea::GolDragon => "data/maps/map_boss08o.dat".into(), MapArea::GolDragon => "data/maps/map_boss08o.dat".into(),
MapArea::Pioneer2Ep4 => "data/maps/map_city02_00_00o.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),
MapArea::CraterWest => format!("data/maps/map_wilds01_0{}_0{}o.dat", self.major, self.minor),
MapArea::CraterSouth => format!("data/maps/map_wilds01_0{}_0{}o.dat", self.major, self.minor),
MapArea::CraterNorth => format!("data/maps/map_wilds01_0{}_0{}o.dat", self.major, self.minor),
MapArea::CraterInterior => format!("data/maps/map_crater01_0{}_0{}o.dat", self.major, self.minor),
MapArea::CraterEast => format!("data/maps/map_wilds01_00_0{}o.dat", self.minor),
MapArea::CraterWest => format!("data/maps/map_wilds01_01_0{}o.dat", self.minor),
MapArea::CraterSouth => format!("data/maps/map_wilds01_02_0{}o.dat", self.minor),
MapArea::CraterNorth => format!("data/maps/map_wilds01_03_0{}o.dat", self.minor),
MapArea::CraterInterior => format!("data/maps/map_crater01_00_0{}o.dat", self.minor),
MapArea::SubDesert1 => format!("data/maps/map_desert01_0{}_0{}o.dat", self.major, self.minor), MapArea::SubDesert1 => format!("data/maps/map_desert01_0{}_0{}o.dat", self.major, self.minor),
MapArea::SubDesert2 => format!("data/maps/map_desert02_0{}_0{}o.dat", self.major, self.minor), MapArea::SubDesert2 => format!("data/maps/map_desert02_0{}_0{}o.dat", self.major, self.minor),
MapArea::SubDesert3 => format!("data/maps/map_desert03_0{}_0{}o.dat", self.major, self.minor), MapArea::SubDesert3 => format!("data/maps/map_desert03_0{}_0{}o.dat", self.major, self.minor),
@ -969,11 +952,11 @@ impl MapVariant {
MapArea::GolDragon => "data/maps/map_boss08_offo.dat".into(), MapArea::GolDragon => "data/maps/map_boss08_offo.dat".into(),
MapArea::Pioneer2Ep4 => "data/maps/map_city02_00_00o_s.dat".into(), MapArea::Pioneer2Ep4 => "data/maps/map_city02_00_00o_s.dat".into(),
MapArea::CraterEast => format!("data/maps/map_wilds01_0{}_0{}o.dat", self.major, self.minor),
MapArea::CraterWest => format!("data/maps/map_wilds01_0{}_0{}o.dat", self.major, self.minor),
MapArea::CraterSouth => format!("data/maps/map_wilds01_0{}_0{}o.dat", self.major, self.minor),
MapArea::CraterNorth => format!("data/maps/map_wilds01_0{}_0{}o.dat", self.major, self.minor),
MapArea::CraterInterior => format!("data/maps/map_crater01_0{}_0{}o.dat", self.major, self.minor),
MapArea::CraterEast => format!("data/maps/map_wilds01_00_0{}o.dat", self.minor),
MapArea::CraterWest => format!("data/maps/map_wilds01_01_0{}o.dat", self.minor),
MapArea::CraterSouth => format!("data/maps/map_wilds01_02_0{}o.dat", self.minor),
MapArea::CraterNorth => format!("data/maps/map_wilds01_03_0{}o.dat", self.minor),
MapArea::CraterInterior => format!("data/maps/map_crater01_00_0{}o.dat", self.minor),
MapArea::SubDesert1 => format!("data/maps/map_desert01_0{}_0{}o.dat", self.major, self.minor), MapArea::SubDesert1 => format!("data/maps/map_desert01_0{}_0{}o.dat", self.major, self.minor),
MapArea::SubDesert2 => format!("data/maps/map_desert02_0{}_0{}o.dat", self.major, self.minor), MapArea::SubDesert2 => format!("data/maps/map_desert02_0{}_0{}o.dat", self.major, self.minor),
MapArea::SubDesert3 => format!("data/maps/map_desert03_0{}_0{}o.dat", self.major, self.minor), MapArea::SubDesert3 => format!("data/maps/map_desert03_0{}_0{}o.dat", self.major, self.minor),

Write Preview
Loading…
Cancel
Save