stat, field::equip()

card.cpp

@@ -603,13 +603,19 @@ void card::calc_attack_defence(int32 *patk, int32 *pdef) {
 	temp.base_defence = -1;
 	temp.defence = -1;
 }
+// Level/Attribute/Race is available for:
+// 1. cards in LOCATION_MZONE or
+// 2. cards with original type TYPE_MONSTER or
+// 3. cards with current type TYPE_MONSTER(Ex. c87772572)
+// They can be changed for cards satisfying 1 or 2 or current type TYPE_TRAPMONSTER.
+// This is because some Phantom Knights is changed into TYPE_MONSTER but is not affected by Zombie World.
 uint32 card::get_level() {
 	if((data.type & TYPE_XYZ) || (status & STATUS_NO_LEVEL) 
 	        || (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER)))
 		return 0;
 	if(assume_type == ASSUME_LEVEL)
 		return assume_value;
-	if(!(current.location & LOCATION_MZONE) && !(data.type & TYPE_MONSTER))
+	if(current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_TRAPMONSTER))
 		return data.level;
 	if (temp.level != 0xffffffff)
 		return temp.level;
@@ -733,12 +739,13 @@ uint32 card::check_xyz_level(card* pcard, uint32 lv) {
 		return (lev >> 16) & 0xffff;
 	return 0;
 }
+// see get_level()
 uint32 card::get_attribute() {
 	if(assume_type == ASSUME_ATTRIBUTE)
 		return assume_value;
 	if(current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER))
 		return 0;
-	if(!(current.location & (LOCATION_MZONE)) && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_TRAPMONSTER))
+	if(current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_TRAPMONSTER))
 		return data.attribute;
 	if (temp.attribute != 0xffffffff)
 		return temp.attribute;
@@ -763,12 +770,13 @@ uint32 card::get_attribute() {
 	temp.attribute = 0xffffffff;
 	return attribute;
 }
+// see get_level()
 uint32 card::get_race() {
 	if(assume_type == ASSUME_RACE)
 		return assume_value;
 	if(current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER))
 		return 0;
-	if(!(current.location & (LOCATION_MZONE)) && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_TRAPMONSTER))
+	if(current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_TRAPMONSTER))
 		return data.race;
 	if (temp.race != 0xffffffff)
 		return temp.race;

operations.cpp

@@ -1114,13 +1114,18 @@ int32 field::equip(uint16 step, uint8 equip_player, card * equip_card, card * ta
 			peffect->owner = equip_card;
 			peffect->handler = equip_card;
 			peffect->type = EFFECT_TYPE_SINGLE;
+			if(equip_card->get_type() & TYPE_TRAP) {
+				peffect->code = EFFECT_ADD_TYPE;
+				peffect->value = TYPE_EQUIP;
+			}
+			else if(equip_card->data.type & TYPE_UNION) {
 				peffect->code = EFFECT_CHANGE_TYPE;
-			if(equip_card->data.type & TYPE_TRAP)
-				peffect->value = TYPE_EQUIP + equip_card->data.type;
-			else if(equip_card->data.type & TYPE_UNION)
 				peffect->value = TYPE_EQUIP + TYPE_SPELL + TYPE_UNION;
-			else
+			}
+			else {
+				peffect->code = EFFECT_CHANGE_TYPE;
 				peffect->value = TYPE_EQUIP + TYPE_SPELL;
+			}
 			peffect->flag[0] = EFFECT_FLAG_CANNOT_DISABLE;
 			peffect->reset_flag = RESET_EVENT + 0x17e0000;
 			equip_card->add_effect(peffect);