Replace c64800181.lua

expansions/script/c64800181.lua

@@ -25,13 +25,12 @@ function cm.initial_effect(c)
 	--equip
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,1))
-	e2:SetCategory(EFFECT_UPDATE_LEVEL+CATEGORY_EQUIP)
+	e2:SetCategory(EFFECT_UPDATE_LEVEL)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCountLimit(1,m+200)
 	e2:SetCondition(cm.con)
-	e2:SetTarget(cm.seqtg)
-	e2:SetOperation(cm.seqop)
+	e2:SetOperation(cm.activate)
 	c:RegisterEffect(e2)
 end
 function cm.filter(c,e,tp)
@@ -65,7 +64,7 @@ function cm.eqlimit(e,c)
 	return c==e:GetLabelObject()
 end
 function cm.tgfilter(c)
-	return c:IsSetCard(0x412) and not c:IsCode(64800181) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
+	return c:IsSetCard(0x412) and c:IsType(TYPE_MONSTER) and not c:IsCode(64800181) and c:IsAbleToHand()
 end
 function cm.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.tgfilter,tp,LOCATION_DECK,0,1,nil) end
@@ -80,35 +79,25 @@ function cm.tgop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetEquipTarget()
-end
-function cm.seqtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local ec=e:GetHandler():GetEquipTarget()
-	if chk==0 then return ec end
+	return ec and ec:IsLevelAbove(1) and not ec:IsLevel(10)
 end
-function cm.seqop(e,tp,eg,ep,ev,re,r,rp)
+function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local tc=c:GetFirstCardTarget()
-	if tc and tc:IsLocation(LOCATION_MZONE) then
-		local e3=Effect.CreateEffect(c)
-		e3:SetType(EFFECT_TYPE_EQUIP)
-		e3:SetCode(EFFECT_CHANGE_LEVEL)
-		e3:SetValue(10)
-		e3:SetReset(RESET_EVENT+RESETS_STANDARD)
-		c:RegisterEffect(e3)
+	local tc=c:GetEquipTarget()
+	if tc and tc:IsLocation(LOCATION_MZONE) and not tc:IsLevel(10) then
+		local e1=Effect.CreateEffect(c)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+		e1:SetCode(EFFECT_CHANGE_LEVEL)
+		e1:SetValue(10)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+		tc:RegisterEffect(e1)
 		--direct attack
 		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_EQUIP)
+		e2:SetType(EFFECT_TYPE_SINGLE)
 		e2:SetCode(EFFECT_DIRECT_ATTACK)
-		e2:SetCondition(cm.dircon)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
-		c:RegisterEffect(e2)
+		tc:RegisterEffect(e2)
 	end
 end
-function cm.dircon(e)
-	return e:GetHandler():GetEquipTarget():GetControler()==e:GetHandlerPlayer()
-end
-
-
-
-