Compare commits
No commits in common. "83fe02a8dc8b1853b8215187dd6379f395497352" and "80bb85c0d82b4590163408da1273d528017ad9b4" have entirely different histories.
83fe02a8dc
...
80bb85c0d8
1 changed files with 42 additions and 33 deletions
|
|
@ -578,14 +578,15 @@ void Mass::getArmourParts() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(armour_array->items.size() != _armour.parts.size()) {
|
if(armour_array->items.size() != 38) {
|
||||||
_state = State::Invalid;
|
_state = State::Invalid;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(UnsignedInt i = 0; i < armour_array->items.size(); i++) {
|
for(UnsignedInt i = 0; i < armour_array->items.size(); i++) {
|
||||||
auto part_prop = armour_array->at<GenericStructProperty>(i);
|
auto part_prop = armour_array->at<GenericStructProperty>(i);
|
||||||
auto& part = _armour.parts[i];
|
|
||||||
|
ArmourPart part;
|
||||||
|
|
||||||
part.slot = part_prop->at<ByteProperty>("Slot_3_408BA56F4C9605C7E805CF91B642249C")->enumValue;
|
part.slot = part_prop->at<ByteProperty>("Slot_3_408BA56F4C9605C7E805CF91B642249C")->enumValue;
|
||||||
part.id = part_prop->at<IntProperty>("ID_5_ACD101864D3481DE96EDACACC09BDD25")->value;
|
part.id = part_prop->at<IntProperty>("ID_5_ACD101864D3481DE96EDACACC09BDD25")->value;
|
||||||
|
|
@ -596,7 +597,7 @@ void Mass::getArmourParts() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(part_styles->items.size() != part.styles.size()) {
|
if(part_styles->items.size() != 4) {
|
||||||
_state = State::Invalid;
|
_state = State::Invalid;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -611,14 +612,15 @@ void Mass::getArmourParts() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(decals_array->items.size() != part.decals.size()) {
|
if(decals_array->items.size() != 8) {
|
||||||
part.demoDecals = decals_array->items.size();
|
part.demoDecals = decals_array->items.size();
|
||||||
_demo = true;
|
_demo = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(UnsignedInt j = 0; j < decals_array->items.size(); j++) {
|
for(UnsignedInt j = 0; j < decals_array->items.size(); j++) {
|
||||||
auto decal_prop = decals_array->at<GenericStructProperty>(j);
|
auto decal_prop = decals_array->at<GenericStructProperty>(j);
|
||||||
auto& decal = part.decals[j];
|
|
||||||
|
Decal decal;
|
||||||
|
|
||||||
decal.id = decal_prop->at<IntProperty>("ID_3_694C0B35404D8A3168AEC89026BC8CF9")->value;
|
decal.id = decal_prop->at<IntProperty>("ID_3_694C0B35404D8A3168AEC89026BC8CF9")->value;
|
||||||
auto colour_prop = decal_prop->at<ColourStructProperty>("Color_8_1B0B9D2B43DA6AAB9FA549B374D3E606");
|
auto colour_prop = decal_prop->at<ColourStructProperty>("Color_8_1B0B9D2B43DA6AAB9FA549B374D3E606");
|
||||||
|
|
@ -635,23 +637,25 @@ void Mass::getArmourParts() {
|
||||||
decal.rotation = decal_prop->at<FloatProperty>("Rotation_27_12D7C314493D203D5C2326A03C5F910F")->value;
|
decal.rotation = decal_prop->at<FloatProperty>("Rotation_27_12D7C314493D203D5C2326A03C5F910F")->value;
|
||||||
decal.flip = decal_prop->at<BoolProperty>("Flip_35_CECCFB184CCD9412BD93FE9A8B656BE1")->value;
|
decal.flip = decal_prop->at<BoolProperty>("Flip_35_CECCFB184CCD9412BD93FE9A8B656BE1")->value;
|
||||||
decal.wrap = decal_prop->at<BoolProperty>("Wrap_43_A7C68CDF4A92AF2ECDA53F953EE7CA62")->value;
|
decal.wrap = decal_prop->at<BoolProperty>("Wrap_43_A7C68CDF4A92AF2ECDA53F953EE7CA62")->value;
|
||||||
|
|
||||||
|
part.decals[j] = decal;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!_demo) {
|
if(!_demo) {
|
||||||
auto accs_array = part_prop->at<ArrayProperty>("Accessories_52_D902DD4241FA0050C2529596255153F3");
|
auto accs_array = part_prop->at<ArrayProperty>("Accessories_52_D902DD4241FA0050C2529596255153F3");
|
||||||
if(!accs_array) {
|
if(!accs_array) {
|
||||||
_demo = true;
|
_demo = true;
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(accs_array->items.size() != part.accessories.size()) {
|
if(accs_array->items.size() != 8) {
|
||||||
_state = State::Invalid;
|
_state = State::Invalid;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(UnsignedInt j = 0; j < accs_array->items.size(); j++) {
|
for(UnsignedInt j = 0; j < accs_array->items.size(); j++) {
|
||||||
auto acc_prop = accs_array->at<GenericStructProperty>(j);
|
auto acc_prop = accs_array->at<GenericStructProperty>(j);
|
||||||
auto& accessory = part.accessories[j];
|
|
||||||
|
Accessory accessory;
|
||||||
|
|
||||||
accessory.attachIndex = acc_prop->at<IntProperty>("AttachIndex_2_4AFCF6024E4BA7426C6B9F80B8179D20")->value;
|
accessory.attachIndex = acc_prop->at<IntProperty>("AttachIndex_2_4AFCF6024E4BA7426C6B9F80B8179D20")->value;
|
||||||
accessory.id = acc_prop->at<IntProperty>("ID_4_5757B32647BAE263266259B8A7DFFFC1")->value;
|
accessory.id = acc_prop->at<IntProperty>("ID_4_5757B32647BAE263266259B8A7DFFFC1")->value;
|
||||||
|
|
@ -669,8 +673,12 @@ void Mass::getArmourParts() {
|
||||||
accessory.relativeRotationOffset = Vector3{rel_rot_offset_prop->x, rel_rot_offset_prop->y, rel_rot_offset_prop->z};
|
accessory.relativeRotationOffset = Vector3{rel_rot_offset_prop->x, rel_rot_offset_prop->y, rel_rot_offset_prop->z};
|
||||||
auto local_scale_prop = acc_prop->at<VectorStructProperty>("LocalScale_24_DC2D93A742A41A46E7E61D988F15ED53");
|
auto local_scale_prop = acc_prop->at<VectorStructProperty>("LocalScale_24_DC2D93A742A41A46E7E61D988F15ED53");
|
||||||
accessory.localScale = Vector3{local_scale_prop->x, local_scale_prop->y, local_scale_prop->z};
|
accessory.localScale = Vector3{local_scale_prop->x, local_scale_prop->y, local_scale_prop->z};
|
||||||
|
|
||||||
|
part.accessories[j] = std::move(accessory);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_armour.parts[i] = std::move(part);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1047,34 +1055,35 @@ void Mass::getWeaponType(const char* prop_name, Containers::ArrayView<Weapon> we
|
||||||
auto part_accs = part_prop->at<ArrayProperty>("Accessories_21_3878DE8B4ED0EA0DB725E98BCDC20E0C");
|
auto part_accs = part_prop->at<ArrayProperty>("Accessories_21_3878DE8B4ED0EA0DB725E98BCDC20E0C");
|
||||||
if(!part_accs) {
|
if(!part_accs) {
|
||||||
_demo = true;
|
_demo = true;
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(part_accs->items.size() != 8) {
|
if(!_demo) {
|
||||||
_state = State::Invalid;
|
if(part_accs->items.size() != 8) {
|
||||||
return;
|
_state = State::Invalid;
|
||||||
}
|
return;
|
||||||
|
}
|
||||||
for(UnsignedInt k = 0; k < part_accs->items.size(); k++) {
|
|
||||||
auto acc_prop = part_accs->at<GenericStructProperty>(k);
|
for(UnsignedInt k = 0; k < part_accs->items.size(); k++) {
|
||||||
auto& accessory = part.accessories[k];
|
auto acc_prop = part_accs->at<GenericStructProperty>(k);
|
||||||
|
auto& accessory = part.accessories[k];
|
||||||
accessory.attachIndex = acc_prop->at<IntProperty>("AttachIndex_2_4AFCF6024E4BA7426C6B9F80B8179D20")->value;
|
|
||||||
accessory.id = acc_prop->at<IntProperty>("ID_4_5757B32647BAE263266259B8A7DFFFC1")->value;
|
accessory.attachIndex = acc_prop->at<IntProperty>("AttachIndex_2_4AFCF6024E4BA7426C6B9F80B8179D20")->value;
|
||||||
auto acc_styles = acc_prop->at<ArrayProperty>("Styles_7_91DEB0F24E24D13FC9472882C11D0DFD");
|
accessory.id = acc_prop->at<IntProperty>("ID_4_5757B32647BAE263266259B8A7DFFFC1")->value;
|
||||||
for(UnsignedInt l = 0; l < acc_styles->items.size(); l++) {
|
auto acc_styles = acc_prop->at<ArrayProperty>("Styles_7_91DEB0F24E24D13FC9472882C11D0DFD");
|
||||||
accessory.styles[l] = acc_styles->at<IntProperty>(l)->value;
|
for(UnsignedInt l = 0; l < acc_styles->items.size(); l++) {
|
||||||
|
accessory.styles[l] = acc_styles->at<IntProperty>(l)->value;
|
||||||
|
}
|
||||||
|
auto rel_pos_prop = acc_prop->at<VectorStructProperty>("RelativePosition_14_BE8FB2A94074F34B3EDA6683B227D3A1");
|
||||||
|
accessory.relativePosition = Vector3{rel_pos_prop->x, rel_pos_prop->y, rel_pos_prop->z};
|
||||||
|
auto rel_pos_offset_prop = acc_prop->at<VectorStructProperty>("RelativePositionOffset_15_98FD0CE74E44BBAFC2D46FB4CA4E0ED6");
|
||||||
|
accessory.relativePositionOffset = Vector3{rel_pos_offset_prop->x, rel_pos_offset_prop->y, rel_pos_offset_prop->z};
|
||||||
|
auto rel_rot_prop = acc_prop->at<RotatorStructProperty>("RelativeRotation_20_C78C73274E6E78E7878F8C98ECA342C0");
|
||||||
|
accessory.relativeRotation = Vector3{rel_rot_prop->x, rel_rot_prop->y, rel_rot_prop->z};
|
||||||
|
auto rel_rot_offset_prop = acc_prop->at<RotatorStructProperty>("RelativeRotationOffset_21_E07FA0EC46728B7BA763C6861249ABAA");
|
||||||
|
accessory.relativeRotationOffset = Vector3{rel_rot_offset_prop->x, rel_rot_offset_prop->y, rel_rot_offset_prop->z};
|
||||||
|
auto local_scale_prop = acc_prop->at<VectorStructProperty>("LocalScale_24_DC2D93A742A41A46E7E61D988F15ED53");
|
||||||
|
accessory.localScale = Vector3{local_scale_prop->x, local_scale_prop->y, local_scale_prop->z};
|
||||||
}
|
}
|
||||||
auto rel_pos_prop = acc_prop->at<VectorStructProperty>("RelativePosition_14_BE8FB2A94074F34B3EDA6683B227D3A1");
|
|
||||||
accessory.relativePosition = Vector3{rel_pos_prop->x, rel_pos_prop->y, rel_pos_prop->z};
|
|
||||||
auto rel_pos_offset_prop = acc_prop->at<VectorStructProperty>("RelativePositionOffset_15_98FD0CE74E44BBAFC2D46FB4CA4E0ED6");
|
|
||||||
accessory.relativePositionOffset = Vector3{rel_pos_offset_prop->x, rel_pos_offset_prop->y, rel_pos_offset_prop->z};
|
|
||||||
auto rel_rot_prop = acc_prop->at<RotatorStructProperty>("RelativeRotation_20_C78C73274E6E78E7878F8C98ECA342C0");
|
|
||||||
accessory.relativeRotation = Vector3{rel_rot_prop->x, rel_rot_prop->y, rel_rot_prop->z};
|
|
||||||
auto rel_rot_offset_prop = acc_prop->at<RotatorStructProperty>("RelativeRotationOffset_21_E07FA0EC46728B7BA763C6861249ABAA");
|
|
||||||
accessory.relativeRotationOffset = Vector3{rel_rot_offset_prop->x, rel_rot_offset_prop->y, rel_rot_offset_prop->z};
|
|
||||||
auto local_scale_prop = acc_prop->at<VectorStructProperty>("LocalScale_24_DC2D93A742A41A46E7E61D988F15ED53");
|
|
||||||
accessory.localScale = Vector3{local_scale_prop->x, local_scale_prop->y, local_scale_prop->z};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue