diff --git a/server/src/skill.rs b/server/src/skill.rs index 3f9b1cbc..8fd2a685 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -717,27 +717,28 @@ impl Skill { Skill::Attack => 80, // Base Skill::Blast=> 110, // BB - Skill::BlastPlus => 130, // BB - Skill::BlastPlusPlus => 150, // BB + Skill::BlastPlus => 145, // BB + Skill::BlastPlusPlus => 210, // BB Skill::Chaos=> 40, // BR - Skill::ChaosPlus => 50, // BR - Skill::ChaosPlusPlus => 60, // BR + Skill::ChaosPlus => 65, // BR + Skill::ChaosPlusPlus => 90, // BR + + Skill::Heal=> 125, //GG + Skill::HealPlus => 185, //GG + Skill::HealPlusPlus => 270, //GG - Skill::Heal=> 130, //GG - Skill::HealPlus => 160, //GG - Skill::HealPlusPlus => 200, //GG Skill::SiphonTick=> 40, // GB - Skill::SiphonTickPlus => 70, - Skill::SiphonTickPlusPlus => 110, + Skill::SiphonTickPlus => 50, + Skill::SiphonTickPlusPlus => 60, Skill::Slay=> 70, // RG - Skill::SlayPlus => 90, - Skill::SlayPlusPlus => 120, + Skill::SlayPlus => 115, + Skill::SlayPlusPlus => 180, Skill::Strike=> 90, //RR - Skill::StrikePlus => 110, - Skill::StrikePlusPlus => 140, + Skill::StrikePlus => 140, + Skill::StrikePlusPlus => 200, // Block Base Skill::ElectrocuteTick=> 80, diff --git a/server/src/spec.rs b/server/src/spec.rs index a809339d..736eaba1 100644 --- a/server/src/spec.rs +++ b/server/src/spec.rs @@ -174,161 +174,161 @@ impl Spec { Spec::PowerRR=> SpecValues { base: 25, bonuses: vec![ - SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 25 }, - SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 25 }, - SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 25 } + SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 10 }, + SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 15 }, + SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 20 } ], }, Spec::PowerGG=> SpecValues { base: 25, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 25 }, - SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 25 }, - SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 25 } + SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 10 }, + SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 15 }, + SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 20 } ], }, Spec::PowerBB=> SpecValues { base: 25, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 25 }, - SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 25 }, - SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 25 } + SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 10 }, + SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 15 }, + SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 20 } ], }, Spec::PowerRG=> SpecValues { - base: 15, + base: 20, bonuses: vec![ - SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 15 }, - SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 15 }, + SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 5 }, + SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 10 }, SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 15 } ], }, Spec::PowerGB=> SpecValues { - base: 15, + base: 20, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 15 }, - SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 15 }, + SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 5 }, + SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 10 }, SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 15 } ], }, Spec::PowerRB=> SpecValues { - base: 15, + base: 20, bonuses: vec![ - SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 15 }, - SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 15 }, + SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 5 }, + SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 10 }, SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 15 } ], }, Spec::PowerRRPlus => SpecValues { - base: 40, + base: 45, bonuses: vec![ - SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 40 }, - SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 40 }, - SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 40 } + SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 15 }, + SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 25 }, + SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 35 } ], }, Spec::PowerGGPlus => SpecValues { - base: 40, + base: 45, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 40 }, - SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 40 }, - SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 40 } + SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 15 }, + SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 25 }, + SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 35 } ], }, Spec::PowerBBPlus => SpecValues { - base: 40, + base: 45, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 40 }, - SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 40 }, - SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 40 } + SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 15 }, + SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 25 }, + SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 35 } ], }, Spec::PowerRGPlus => SpecValues { - base: 25, + base: 35, bonuses: vec![ - SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 25 }, - SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 25 }, + SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 10 }, + SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 20 }, SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 25 } ], }, Spec::PowerGBPlus => SpecValues { - base: 25, + base: 35, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 25 }, - SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 25 }, + SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 10 }, + SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 20 }, SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 25 } ], }, Spec::PowerRBPlus => SpecValues { - base: 25, + base: 35, bonuses: vec![ - SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 25 }, - SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 25 }, + SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 10 }, + SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 20 }, SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 25 } ], }, Spec::PowerRRPlusPlus => SpecValues { - base: 60, + base: 80, bonuses: vec![ - SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 60 }, - SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 60 }, + SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 25 }, + SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 45 }, SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 60 } ], }, Spec::PowerGGPlusPlus => SpecValues { - base: 60, + base: 80, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 60 }, - SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 60 }, + SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 25 }, + SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 45 }, SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 60 } ], }, Spec::PowerBBPlusPlus => SpecValues { - base: 60, + base: 80, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 60 }, - SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 60 }, + SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 25 }, + SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 45 }, SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 60 } ], }, Spec::PowerRGPlusPlus => SpecValues { - base: 40, + base: 60, bonuses: vec![ - SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 40 }, - SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 40 }, - SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 40 } + SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 20 }, + SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 30 }, + SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 45 } ], }, Spec::PowerGBPlusPlus => SpecValues { - base: 40, + base: 60, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 40 }, - SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 40 }, - SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 40 } + SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 20 }, + SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 30 }, + SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 45 } ], }, Spec::PowerRBPlusPlus => SpecValues { - base: 40, + base: 60, bonuses: vec![ - SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 40 }, - SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 40 }, - SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 40 } + SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 20 }, + SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 30 }, + SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 45 } ], }, @@ -500,167 +500,167 @@ impl Spec { }, Spec::Life => SpecValues { - base: 100, + base: 125, bonuses: vec![]}, Spec::LifeRR=> SpecValues { - base: 200, + base: 275, bonuses: vec![ - SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 100 }, - SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 100 }, - SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 100 } + SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 75 }, + SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 125 }, + SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 175 } ], }, Spec::LifeGG=> SpecValues { - base: 200, + base: 225, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 100 }, - SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 100 }, - SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 100 } + SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 50 }, + SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 75 }, + SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 125 } ], }, Spec::LifeBB=> SpecValues { - base: 200, + base: 275, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 100 }, - SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 100 }, - SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 100 } + SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 75 }, + SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 125 }, + SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 175 } ], }, Spec::LifeRG=> SpecValues { - base: 150, + base: 125, bonuses: vec![ - SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 75 }, + SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 50 }, SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 75 }, - SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 75 } + SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 125 } ], }, Spec::LifeGB=> SpecValues { - base: 150, + base: 125, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 75 }, + SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 50 }, SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 75 }, - SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 75 } + SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 125 } ], }, Spec::LifeRB=> SpecValues { - base: 150, + base: 175, bonuses: vec![ - SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 75 }, + SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 50 }, SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 75 }, - SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 75 } + SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 125 } ], }, Spec::LifeRRPlus => SpecValues { - base: 300, + base: 500, bonuses: vec![ - SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 150 }, - SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 150 }, - SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 150 } - ], - }, - - Spec::LifeGGPlus => SpecValues { - base: 300, - bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 150 }, - SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 150 }, - SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 150 } - ], - }, - - Spec::LifeBBPlus => SpecValues { - base: 300, - bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 150 }, - SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 150 }, - SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 150 } - ], - }, - - Spec::LifeRGPlus => SpecValues { - base: 200, - bonuses: vec![ - SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 100 }, - SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 100 }, - SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 100 } - ], - }, - - Spec::LifeGBPlus => SpecValues { - base: 200, - bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 100 }, - SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 100 }, - SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 100 } - ], - }, - - Spec::LifeRBPlus => SpecValues { - base: 200, - bonuses: vec![ - SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 100 }, - SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 100 }, - SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 100 } - ], - }, - Spec::LifeRRPlusPlus => SpecValues { - base: 300, - bonuses: vec![ - SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 300 }, - SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 300 }, + SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 125 }, + SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 225 }, SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 300 } ], }, - Spec::LifeGGPlusPlus => SpecValues { - base: 300, + Spec::LifeGGPlus => SpecValues { + base: 400, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 300 }, - SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 300 }, + SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 90 }, + SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 130 }, + SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 225 } + ], + }, + + Spec::LifeBBPlus => SpecValues { + base: 500, + bonuses: vec![ + SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 125 }, + SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 225 }, + SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 300 } + ], + }, + + Spec::LifeRGPlus => SpecValues { + base: 225, + bonuses: vec![ + SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 100 }, + SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 150 }, + SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 225 } + ], + }, + + Spec::LifeGBPlus => SpecValues { + base: 225, + bonuses: vec![ + SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 100 }, + SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 150 }, + SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 225 } + ], + }, + + Spec::LifeRBPlus => SpecValues { + base: 350, + bonuses: vec![ + SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 100 }, + SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 150 }, + SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 225 } + ], + }, + Spec::LifeRRPlusPlus => SpecValues { + base: 875, + bonuses: vec![ + SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 225 }, + SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 400 }, + SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 525 } + ], + }, + + Spec::LifeGGPlusPlus => SpecValues { + base: 475, + bonuses: vec![ + SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 130 }, + SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 225 }, SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 300 } ], }, Spec::LifeBBPlusPlus => SpecValues { - base: 300, + base: 875, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 300 }, - SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 300 }, - SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 300 } + SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 225 }, + SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 400 }, + SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 525 } ], }, Spec::LifeRGPlusPlus => SpecValues { - base: 200, + base: 400, bonuses: vec![ - SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 200 }, - SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 200 }, - SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 200 } + SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 175 }, + SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 275 }, + SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 400 } ], }, Spec::LifeGBPlusPlus => SpecValues { - base: 200, + base: 625, bonuses: vec![ - SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 200 }, - SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 200 }, - SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 200 } + SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 175 }, + SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 275 }, + SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 400 } ], }, Spec::LifeRBPlusPlus => SpecValues { - base: 200, + base: 400, bonuses: vec![ - SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 200 }, - SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 200 }, - SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 200 } + SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 175 }, + SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 275 }, + SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 400 } ], }, }