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

fix case on unit names

Browse Source
This commit is contained in:
jake 2020-03-28 11:57:47 -07:00
parent 193cf72cdb
commit 9cf2979777
3 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
data/item_stats/unit_stats.toml
View File

@ -110,56 +110,56 @@ amount = 50
team_points = 0 team_points = 0
modifier = 2 modifier = 2
[DiggerHP] [DiggerHp]
stars = 2 stars = 2
stat = 4 stat = 4
amount = 10 amount = 10
team_points = 0 team_points = 0
modifier = 2 modifier = 2
[GeneralHP] [GeneralHp]
stars = 4 stars = 4
stat = 4 stat = 4
amount = 20 amount = 20
team_points = 0 team_points = 0
modifier = 2 modifier = 2
[DragonHP] [DragonHp]
stars = 6 stars = 6
stat = 4 stat = 4
amount = 40 amount = 40
team_points = 0 team_points = 0
modifier = 2 modifier = 2
[GodHP] [GodHp]
stars = 11 stars = 11
stat = 4 stat = 4
amount = 80 amount = 80
team_points = 0 team_points = 0
modifier = 2 modifier = 2
[MagicianTP] [MagicianTp]
stars = 2 stars = 2
stat = 5 stat = 5
amount = 10 amount = 10
team_points = 0 team_points = 0
modifier = 1 modifier = 1
[GeneralTP] [GeneralTp]
stars = 4 stars = 4
stat = 5 stat = 5
amount = 20 amount = 20
team_points = 0 team_points = 0
modifier = 1 modifier = 1
[AngelTP] [AngelTp]
stars = 6 stars = 6
stat = 5 stat = 5
amount = 30 amount = 30
team_points = 0 team_points = 0
modifier = 1 modifier = 1
[GodTP] [GodTp]
stars = 11 stars = 11
stat = 5 stat = 5
amount = 80 amount = 80
@ -355,63 +355,63 @@ amount = 9
team_points = 0 team_points = 0
modifier = 1 modifier = 1
[HPRestorate] [HpRestorate]
stars = 4 stars = 4
stat = 15 stat = 15
amount = 14 amount = 14
team_points = 0 team_points = 0
modifier = 0 modifier = 0
[HPGenerate] [HpGenerate]
stars = 6 stars = 6
stat = 15 stat = 15
amount = 11 amount = 11
team_points = 0 team_points = 0
modifier = 0 modifier = 0
[HPRevival] [HpRevival]
stars = 9 stars = 9
stat = 15 stat = 15
amount = 8 amount = 8
team_points = 0 team_points = 0
modifier = 0 modifier = 0
[TPRestorate] [TpRestorate]
stars = 4 stars = 4
stat = 16 stat = 16
amount = 15 amount = 15
team_points = 0 team_points = 0
modifier = 0 modifier = 0
[TPGenerate] [TpGenerate]
stars = 6 stars = 6
stat = 16 stat = 16
amount = 13 amount = 13
team_points = 0 team_points = 0
modifier = 0 modifier = 0
[TPRevival] [TpRevival]
stars = 9 stars = 9
stat = 16 stat = 16
amount = 11 amount = 11
team_points = 0 team_points = 0
modifier = 0 modifier = 0
[PBAmplifier] [PbAmplifier]
stars = 4 stars = 4
stat = 17 stat = 17
amount = 40 amount = 40
team_points = 0 team_points = 0
modifier = 0 modifier = 0
[PBGenerate] [PbGenerate]
stars = 6 stars = 6
stat = 17 stat = 17
amount = 35 amount = 35
team_points = 0 team_points = 0
modifier = 0 modifier = 0
[PBCreate] [PbCreate]
stars = 9 stars = 9
stat = 17 stat = 17
amount = 23 amount = 23
@ -649,14 +649,14 @@ amount = 0
team_points = 0 team_points = 0
modifier = 0 modifier = 0
[HeavenlyHP] [HeavenlyHp]
stars = 11 stars = 11
stat = 4 stat = 4
amount = 100 amount = 100
team_points = 0 team_points = 0
modifier = 2 modifier = 2
[HeavenlyTP] [HeavenlyTp]
stars = 11 stars = 11
stat = 5 stat = 5
amount = 100 amount = 100
@ -677,21 +677,21 @@ amount = 4
team_points = 0 team_points = 0
modifier = 0 modifier = 0
[HPRessurection] [HpRessurection]
stars = 11 stars = 11
stat = 15 stat = 15
amount = 5 amount = 5
team_points = 0 team_points = 0
modifier = 0 modifier = 0
[TPRessurection] [TpRessurection]
stars = 11 stars = 11
stat = 16 stat = 16
amount = 9 amount = 9
team_points = 0 team_points = 0
modifier = 0 modifier = 0
[PBIncrease] [PbIncrease]
stars = 11 stars = 11
stat = 17 stat = 17
amount = 18 amount = 18

88
src/entity/item/unit.rs
View File

@ -19,14 +19,14 @@ pub enum UnitType {
GeneralLegs, GeneralLegs,
ElfLegs, ElfLegs,
GodLegs, GodLegs,
DiggerHP, DiggerHp,
GeneralHP, GeneralHp,
DragonHP, DragonHp,
GodHP, GodHp,
MagicianTP, MagicianTp,
GeneralTP, GeneralTp,
AngelTP, AngelTp,
GodTP, GodTp,
WarriorBody, WarriorBody,
GeneralBody, GeneralBody,
MetalBody, MetalBody,
@ -54,15 +54,15 @@ pub enum UnitType {
AllResist, AllResist,
SuperResist, SuperResist,
PerfectResist, PerfectResist,
HPRestorate, HpRestorate,
HPGenerate, HpGenerate,
HPRevival, HpRevival,
TPRestorate, TpRestorate,
TPGenerate, TpGenerate,
TPRevival, TpRevival,
PBAmplifier, PbAmplifier,
PBGenerate, PbGenerate,
PBCreate, PbCreate,
WizardTechnique, WizardTechnique,
DevilTechnique, DevilTechnique,
GodTechnique, GodTechnique,
@ -96,13 +96,13 @@ pub enum UnitType {
HeavenlyAbility, HeavenlyAbility,
CenturionAbility, CenturionAbility,
FriendRing, FriendRing,
HeavenlyHP, HeavenlyHp,
HeavenlyTP, HeavenlyTp,
HeavenlyResist, HeavenlyResist,
HeavenlyTechnique, HeavenlyTechnique,
HPRessurection, HpRessurection,
TPRessurection, TpRessurection,
PBIncrease, PbIncrease,
} }
impl UnitType { impl UnitType {
@ -124,14 +124,14 @@ impl UnitType {
UnitType::GeneralLegs => [0x01, 0x03, 0x0D], UnitType::GeneralLegs => [0x01, 0x03, 0x0D],
UnitType::ElfLegs => [0x01, 0x03, 0x0E], UnitType::ElfLegs => [0x01, 0x03, 0x0E],
UnitType::GodLegs => [0x01, 0x03, 0x0F], UnitType::GodLegs => [0x01, 0x03, 0x0F],
UnitType::DiggerHP => [0x01, 0x03, 0x10], UnitType::DiggerHp => [0x01, 0x03, 0x10],
UnitType::GeneralHP => [0x01, 0x03, 0x11], UnitType::GeneralHp => [0x01, 0x03, 0x11],
UnitType::DragonHP => [0x01, 0x03, 0x12], UnitType::DragonHp => [0x01, 0x03, 0x12],
UnitType::GodHP => [0x01, 0x03, 0x13], UnitType::GodHp => [0x01, 0x03, 0x13],
UnitType::MagicianTP => [0x01, 0x03, 0x14], UnitType::MagicianTp => [0x01, 0x03, 0x14],
UnitType::GeneralTP => [0x01, 0x03, 0x15], UnitType::GeneralTp => [0x01, 0x03, 0x15],
UnitType::AngelTP => [0x01, 0x03, 0x16], UnitType::AngelTp => [0x01, 0x03, 0x16],
UnitType::GodTP => [0x01, 0x03, 0x17], UnitType::GodTp => [0x01, 0x03, 0x17],
UnitType::WarriorBody => [0x01, 0x03, 0x18], UnitType::WarriorBody => [0x01, 0x03, 0x18],
UnitType::GeneralBody => [0x01, 0x03, 0x19], UnitType::GeneralBody => [0x01, 0x03, 0x19],
UnitType::MetalBody => [0x01, 0x03, 0x1A], UnitType::MetalBody => [0x01, 0x03, 0x1A],
@ -159,15 +159,15 @@ impl UnitType {
UnitType::AllResist => [0x01, 0x03, 0x30], UnitType::AllResist => [0x01, 0x03, 0x30],
UnitType::SuperResist => [0x01, 0x03, 0x31], UnitType::SuperResist => [0x01, 0x03, 0x31],
UnitType::PerfectResist => [0x01, 0x03, 0x32], UnitType::PerfectResist => [0x01, 0x03, 0x32],
UnitType::HPRestorate => [0x01, 0x03, 0x33], UnitType::HpRestorate => [0x01, 0x03, 0x33],
UnitType::HPGenerate => [0x01, 0x03, 0x34], UnitType::HpGenerate => [0x01, 0x03, 0x34],
UnitType::HPRevival => [0x01, 0x03, 0x35], UnitType::HpRevival => [0x01, 0x03, 0x35],
UnitType::TPRestorate => [0x01, 0x03, 0x36], UnitType::TpRestorate => [0x01, 0x03, 0x36],
UnitType::TPGenerate => [0x01, 0x03, 0x37], UnitType::TpGenerate => [0x01, 0x03, 0x37],
UnitType::TPRevival => [0x01, 0x03, 0x38], UnitType::TpRevival => [0x01, 0x03, 0x38],
UnitType::PBAmplifier => [0x01, 0x03, 0x39], UnitType::PbAmplifier => [0x01, 0x03, 0x39],
UnitType::PBGenerate => [0x01, 0x03, 0x3A], UnitType::PbGenerate => [0x01, 0x03, 0x3A],
UnitType::PBCreate => [0x01, 0x03, 0x3B], UnitType::PbCreate => [0x01, 0x03, 0x3B],
UnitType::WizardTechnique => [0x01, 0x03, 0x3C], UnitType::WizardTechnique => [0x01, 0x03, 0x3C],
UnitType::DevilTechnique => [0x01, 0x03, 0x3D], UnitType::DevilTechnique => [0x01, 0x03, 0x3D],
UnitType::GodTechnique => [0x01, 0x03, 0x3E], UnitType::GodTechnique => [0x01, 0x03, 0x3E],
@ -201,13 +201,13 @@ impl UnitType {
UnitType::HeavenlyAbility => [0x01, 0x03, 0x5A], UnitType::HeavenlyAbility => [0x01, 0x03, 0x5A],
UnitType::CenturionAbility => [0x01, 0x03, 0x5B], UnitType::CenturionAbility => [0x01, 0x03, 0x5B],
UnitType::FriendRing => [0x01, 0x03, 0x5C], UnitType::FriendRing => [0x01, 0x03, 0x5C],
UnitType::HeavenlyHP => [0x01, 0x03, 0x5D], UnitType::HeavenlyHp => [0x01, 0x03, 0x5D],
UnitType::HeavenlyTP => [0x01, 0x03, 0x5E], UnitType::HeavenlyTp => [0x01, 0x03, 0x5E],
UnitType::HeavenlyResist => [0x01, 0x03, 0x5F], UnitType::HeavenlyResist => [0x01, 0x03, 0x5F],
UnitType::HeavenlyTechnique => [0x01, 0x03, 0x60], UnitType::HeavenlyTechnique => [0x01, 0x03, 0x60],
UnitType::HPRessurection => [0x01, 0x03, 0x61], UnitType::HpRessurection => [0x01, 0x03, 0x61],
UnitType::TPRessurection => [0x01, 0x03, 0x62], UnitType::TpRessurection => [0x01, 0x03, 0x62],
UnitType::PBIncrease => [0x01, 0x03, 0x63], UnitType::PbIncrease => [0x01, 0x03, 0x63],
} }
} }
} }

4
src/ship/drops/generic_unit.rs
View File

@ -111,9 +111,9 @@ mod test {
let gut = GenericUnitTable::new(Episode::One, Difficulty::Hard, SectionID::Skyly); let gut = GenericUnitTable::new(Episode::One, Difficulty::Hard, SectionID::Skyly);
let unit_tests = vec![(MapVariantType::Forest1, UnitType::ResistFreeze, Some(UnitModifier::PlusPlus)), let unit_tests = vec![(MapVariantType::Forest1, UnitType::ResistFreeze, Some(UnitModifier::PlusPlus)),
(MapVariantType::Caves3, UnitType::GeneralTP, None), (MapVariantType::Caves3, UnitType::GeneralTp, None),
(MapVariantType::Mines2, UnitType::ResistEvil, Some(UnitModifier::PlusPlus)), (MapVariantType::Mines2, UnitType::ResistEvil, Some(UnitModifier::PlusPlus)),
(MapVariantType::DarkFalz, UnitType::DragonHP, Some(UnitModifier::Minus))]; (MapVariantType::DarkFalz, UnitType::DragonHp, Some(UnitModifier::Minus))];
for (area, unit, umod) in unit_tests { for (area, unit, umod) in unit_tests {
assert!(gut.get_drop(&area, &mut rng) == Some(ItemDetail::Unit(Unit { assert!(gut.get_drop(&area, &mut rng) == Some(ItemDetail::Unit(Unit {
unit: unit, unit: unit,