fixed missing on eggs and fixed naming (#327)

* fixed missing on eggs and fixed naming

---------

Co-authored-by: darkfriend77 <darkfriend@swissonline.ch>
Co-authored-by: Didac Semente Fernandez <didac@ajuna.io>

pallets/ajuna-awesome-avatars/src/types/avatar/versions/v2/avatar_utils.rs

@@ -184,11 +184,11 @@ impl WrappedAvatar {
 		DnaUtils::read_attribute::<T>(&self.inner, AvatarAttr::CustomType2)
 	}
 
-	pub fn set_custom_type_2<T>(&mut self, custom_type_1: T)
+	pub fn set_custom_type_2<T>(&mut self, custom_type_2: T)
 	where
 		T: ByteConvertible,
 	{
-		DnaUtils::write_attribute::<T>(&mut self.inner, AvatarAttr::CustomType2, &custom_type_1)
+		DnaUtils::write_attribute::<T>(&mut self.inner, AvatarAttr::CustomType2, &custom_type_2)
 	}
 
 	pub fn same_custom_type_2(&self, other: &WrappedAvatar) -> bool {

pallets/ajuna-awesome-avatars/src/types/avatar/versions/v2/mod.rs

@@ -244,9 +244,7 @@ impl<T: Config> ForgerV2<T> {
 					}) {
 						ForgeType::Mate
 					} else if sacrifices.iter().all(|sacrifice| {
-						sacrifice.same_item_type(leader) &&
-							sacrifice.has_subtype(PetItemType::Egg) &&
-							sacrifice.get_rarity() < RarityTier::Legendary
+						sacrifice.same_item_type(leader) && sacrifice.has_subtype(PetItemType::Egg)
 					}) {
 						ForgeType::Feed
 					} else {
@@ -683,19 +681,19 @@ mod test {
 				ForgeType::Feed
 			);
 
-			// Feed with Legendary egg sacrifices fails
+			// Feed with Legendary egg sacrifices doesn't fail anymore
 			let sacrifices_err = [&create_random_egg(
 				None,
 				&ALICE,
 				&RarityTier::Legendary,
-				0b0001_0010,
+				0b0000_0000,
 				10,
 				[2; 11],
 			)
 			.1];
 			assert_eq!(
 				ForgerV2::<Test>::determine_forge_type(&leader, &sacrifices_err),
-				ForgeType::None
+				ForgeType::Feed
 			);
 
 			// Feed with non-eggs fails
@@ -830,15 +828,9 @@ mod test {
 			);
 
 			// Mate with non-pet fails
-			let sacrifices_err = [&create_random_egg(
-				None,
-				&ALICE,
-				&RarityTier::Legendary,
-				0b0001_0010,
-				10,
-				[2; 11],
-			)
-			.1];
+
+			let sacrifices_err =
+				[&create_random_pet_part(&ALICE, &PetType::FoxishDude, &SlotType::Head, 1).1];
 			assert_eq!(
 				ForgerV2::<Test>::determine_forge_type(&leader, &sacrifices_err),
 				ForgeType::None