54188

expansions/script/c18700098.lua

@@ -20,12 +20,15 @@ function cm.initial_effect(c)
 	e2:SetCondition(cm.handcon)
 	c:RegisterEffect(e2)
 end
+function cm.thfilter(c)
+	return c:IsType(TYPE_MONSTER)
+end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	e:SetLabel(0)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and aux.NegateMonsterFilter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(aux.NegateMonsterFilter,tp,0,LOCATION_MZONE,1,nil) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISABLE)
-	Duel.SelectTarget(tp,aux.NegateMonsterFilter,tp,0,LOCATION_MZONE,1,1,nil)
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) end
+	if chk==0 then return Duel.IsExistingTarget(cm.thfilter,tp,0,LOCATION_MZONE,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
+	Duel.SelectTarget(tp,cm.thfilter,tp,0,LOCATION_MZONE,1,1,nil)
 	if e:GetHandler():IsStatus(STATUS_ACT_FROM_HAND) then
 		e:SetLabel(100)
 	end
@@ -33,12 +36,11 @@ end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if tc:IsFaceup() and tc:IsRelateToEffect(e) and tc:IsCanBeDisabledByEffect(e) then
-		Duel.NegateRelatedChain(tc,RESET_TURN_SET)
+	if tc:IsFaceup() and tc:IsRelateToEffect(e) then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_PIERCE)
-		c:RegisterEffect(e1)
+		tc:RegisterEffect(e1)
 		if not tc:IsImmuneToEffect(e) then
 			local e2=Effect.CreateEffect(e:GetHandler())
 			e2:SetType(EFFECT_TYPE_SINGLE)
@@ -67,19 +69,6 @@ end
 function cm.fuslimit(e,c,sumtype)
 	return sumtype==SUMMON_TYPE_FUSION
 end
-function cm.distg(e,c)
-	local seq,fid=e:GetLabel()
-	local tp=e:GetHandlerPlayer()
-	return c:IsType(TYPE_SPELL+TYPE_TRAP) and aux.GetColumn(c,tp)==seq and c:GetFieldID()~=fid
-end
-function cm.disop(e,tp,eg,ep,ev,re,r,rp)
-	local tseq=e:GetLabel()
-	local controller,loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_CONTROLER,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
-	if loc&LOCATION_SZONE~=0 and seq<=4 and re:IsActiveType(TYPE_SPELL+TYPE_TRAP)
-		and ((controller==tp and seq==tseq) or (controller==1-tp and seq==4-tseq)) then
-		Duel.NegateEffect(ev)
-	end
-end
 function cm.handcon(e)
 	return Duel.GetFieldGroupCount(e:GetHandlerPlayer(),LOCATION_MZONE,0)==0
 end
@@ -93,7 +82,7 @@ function cm.skipop(e,tp)
 		e1:SetTargetRange(1,0)
 		if Duel.GetTurnPlayer()==tp and ph>PHASE_MAIN1 and ph<PHASE_MAIN2 then
 			e1:SetLabel(Duel.GetTurnCount())
-			e1:SetCondition(s.skipcon)
+			e1:SetCondition(cm.skipcon)
 			e1:SetReset(RESET_PHASE+PHASE_BATTLE+RESET_SELF_TURN,2)
 		else
 			e1:SetReset(RESET_PHASE+PHASE_BATTLE+RESET_SELF_TURN,1)