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

fix unit modifier indexes

Browse Source
This commit is contained in:
Andy Newjack 2020-07-01 18:01:08 -03:00
parent 1062382552
commit 040415e699
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,18 +346,18 @@ impl Unit {
if let Some(modifier) = self.modifier { if let Some(modifier) = self.modifier {
match modifier { match modifier {
UnitModifier::PlusPlus => { UnitModifier::PlusPlus => {
result[7] = 3; result[6] = 2;
}, },
UnitModifier::Plus => { UnitModifier::Plus => {
result[7] = 1; result[6] = 1;
}, },
UnitModifier::Minus => { UnitModifier::Minus => {
result[6] = 0xFF;
result[7] = 0xFF; result[7] = 0xFF;
result[8] = 0xFF;
}, },
UnitModifier::MinusMinus => { UnitModifier::MinusMinus => {
result[7] = 0xFE; result[6] = 0xFE;
result[8] = 0xFF; result[7] = 0xFF;
}, },
} }
} }
@ -368,8 +368,8 @@ impl Unit {
pub fn from_bytes(data: [u8; 16]) -> Result<Unit, ItemParseError> { pub fn from_bytes(data: [u8; 16]) -> Result<Unit, ItemParseError> {
let u = UnitType::parse_type([data[0], data[1], data[2]]); let u = UnitType::parse_type([data[0], data[1], data[2]]);
if u.is_ok() { if u.is_ok() {
let m = match u16::from_le_bytes([data[7], data[8]]) { let m = match u16::from_le_bytes([data[6], data[7]]) {
0x03 => Some(UnitModifier::PlusPlus), 0x02 => Some(UnitModifier::PlusPlus),
0x01 => Some(UnitModifier::Plus), 0x01 => Some(UnitModifier::Plus),
0xFEFF => Some(UnitModifier::Minus), 0xFEFF => Some(UnitModifier::Minus),
0xFFFF => Some(UnitModifier::MinusMinus), 0xFFFF => Some(UnitModifier::MinusMinus),