Merge branch 'master' of github.com:alstroemeria-silentlove/ygopro-222DIY-cards

expansions/lflist.conf

@@ -244,6 +244,8 @@
 16001007 0 --Ⅷ集团军 破阵之歌姬
 16001011 0 --Ⅷ集团军 晓光之主教
 16001014 0 --Ⅷ集团军 远知之贤者
+#161
+16100008 0 --史上最大最恶的绝望性事件
 #170
 17011101 1 --医生 姬塔
 17060914 1 --妖精 伊甸
@@ -883,7 +885,7 @@
 77702002 1 --恋歌宣誓
 77702007 1 --楽園図
 #810
-81011102 1 --橘花音·午后之音
+81011102 2 --橘花音·午后之音
 81019012 2 --逆流茶会
 81007004 2	--素颜大小姐·水本紫
 81007017 1	--清纯大小姐·水本紫

expansions/script/c1110003.lua

@@ -104,7 +104,7 @@ function c1110003.op1(e,tp,eg,ep,ev,re,r,rp)
 		if g:GetCount()>0 then
 			local tc=g:GetFirst()
 			if tc:IsType(TYPE_FIELD) then
-				Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+				Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 			else
 				Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 			end

expansions/script/c1111018.lua

@@ -66,7 +66,7 @@ function c1111018.op1(e,tp,eg,ep,ev,re,r,rp)
 			Duel.SendtoGrave(fc,REASON_RULE)
 			Duel.BreakEffect()
 		end
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 		local te=tc:GetActivateEffect()
 		te:UseCountLimit(tp,1,true)
 		local tep=tc:GetControler()
@@ -156,4 +156,4 @@ function c1111018.op5(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterFlagEffect(1111018,RESET_EVENT+0x1fe0000,0,0)
 		tc=sg:GetNext()
 	end
-end
\ No newline at end of file
+end

expansions/script/c1111502.lua

@@ -75,7 +75,7 @@ function c1111502.op1(e,tp,eg,ep,ev,re,r,rp)
 				local fc=Duel.GetFieldCard(tp,LOCATION_SZONE,5)
 				if fc then Duel.SendtoGrave(fc,REASON_RULE) end
 			end
-			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
 		end
 	end
 end

expansions/script/c1156015.lua

@@ -140,7 +140,7 @@ function c1156015.op2(e,tp,eg,ep,ev,re,r,rp)
 	if (re:GetHandler():IsType(TYPE_FIELD) or Duel.GetLocationCount(tp,LOCATION_SZONE)>0) and not re:GetHandler():IsImmuneToEffect(e) then
 		re:GetHandler():CancelToGrave()
 		if re:GetHandler():IsType(TYPE_FIELD) then
-			if Duel.MoveToField(re:GetHandler(),tp,tp,LOCATION_PZONE,POS_FACEDOWN,false) then
+			if Duel.MoveToField(re:GetHandler(),tp,tp,LOCATION_FZONE,POS_FACEDOWN,false) then
 				if re:GetHandler():IsType(TYPE_QUICKPLAY) then
                				local e2_1=Effect.CreateEffect(e:GetHandler())
                 			e2_1:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c1197119.lua

@@ -15,6 +15,7 @@ function c1197119.initial_effect(c)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,m)
+	e1:SetCost(cm.cost1)
 	e1:SetTarget(cm.tg1)
 	e1:SetOperation(cm.op1)
 	c:RegisterEffect(e1)
@@ -27,7 +28,6 @@ function c1197119.initial_effect(c)
 	e2:SetCode(EVENT_TO_HAND)
 	e2:SetCountLimit(1,m+100)
 	e2:SetCondition(cm.con2)
-	e2:SetCost(cm.cost2)
 	e2:SetTarget(cm.tg2)
 	e2:SetOperation(cm.op2)
 	c:RegisterEffect(e2)
@@ -43,6 +43,17 @@ function c1197119.initial_effect(c)
 ]]--
 end
 --
+function cm.cfilter1(c)
+	return c:IsAbleToRemoveAsCost() and c:IsRace(RACE_SEASERPENT)
+end
+function cm.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.cfilter1,tp,LOCATION_GRAVE,0,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+	local sg=Duel.SelectMatchingCard(tp,cm.cfilter1,tp,LOCATION_GRAVE,0,1,1,nil)
+	if sg:GetCount()<1 then return end
+	Duel.Remove(sg,POS_FACEUP,REASON_COST)
+end
+--
 function cm.tfilter1(c)
 	return c:IsLinkSummonable(nil) and c:IsSetCard(0xe10)
 end
@@ -62,17 +73,6 @@ function cm.con2(e,tp,eg,ep,ev,re,r,rp)
 	return not e:GetHandler():IsReason(REASON_DRAW)
 end
 --
-function cm.cfilter2(c)
-	return c:IsAbleToRemoveAsCost() and c:IsRace(RACE_SEASERPENT)
-end
-function cm.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.cfilter2,tp,LOCATION_GRAVE,0,1,nil) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local sg=Duel.SelectMatchingCard(tp,cm.cfilter2,tp,LOCATION_GRAVE,0,1,1,nil)
-	if sg:GetCount()<1 then return end
-	Duel.Remove(sg,POS_FACEUP,REASON_COST)
-end
---
 function cm.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c12005022.lua

@@ -23,8 +23,8 @@ function c12005022.initial_effect(c)
 end
 function c12005022.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return c:GetFlagEffect(m)==0 end
-	c:RegisterFlagEffect(m,RESET_CHAIN,0,1)
+	if chk==0 then return c:GetFlagEffect(12005022)==0 end
+	c:RegisterFlagEffect(12005022,RESET_CHAIN,0,1)
 end
 function c12005022.spfilter(c,e,tp)
 	return c:IsSetCard(0xfbb) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
@@ -117,4 +117,4 @@ function c12005022.activate(e,tp,eg,ep,ev,re,r,rp)
 	if b4 then
 		Duel.NegateActivation(ev) 
 	end
-end
\ No newline at end of file
+end

expansions/script/c12034000.lua

@@ -111,7 +111,7 @@ function sr_kmmm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 				res=Duel.IsExistingMatchingCard(sr_kmmm.spfilter1,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg4,mf,chkf)
 			end
 		end
-		return res and ( (c:IsCode(12034000) and b1) or (c:IsCode(12034001) and b2) or not c:IsCode(12034000,12034001))
+		return ( (c:IsCode(12034001) and b2) or res ) and ( (c:IsCode(12034000) and b1)  or not c:IsCode(12034000))
 	end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,0,LOCATION_MZONE+LOCATION_HAND)
@@ -126,7 +126,7 @@ function sr_kmmm.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	local chkf=tp
 	local mg=Duel.GetFusionMaterial(tp):Filter(sr_kmmm.filter1,nil,e)
-	local mg1=Duel.GetMatchingGroup(sr_kmmm.mfilter1,tp,LOCATION_HAND,0,nil)
+	local mg1=Duel.GetMatchingGroup(sr_kmmm.mfilter1,tp,LOCATION_HAND+LOCATION_ONFIELD,0,c)
 	mg:Merge(mg1)
 	local mg3=Group.FromCards()
 	local sg3=nil
@@ -294,4 +294,4 @@ function cm.ex_effect_operation(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetValue(RACE_ALL)
 	e1:SetReset(RESET_EVENT+0x1fe0000)
 	c:RegisterEffect(e1,true)
-end
\ No newline at end of file
+end

expansions/script/c12043000.lua

@@ -115,7 +115,7 @@ function tayu_frtlk.rfilter(c)
 end
 function tayu_frtlk.efspcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsReason(REASON_EFFECT)
+	return ( c:IsSummonType(SUMMON_TYPE_SPECIAL) and c:IsReason(REASON_EFFECT) ) or c:IsSummonType(SUMMON_TYPE_NORMAL)
 end
 function tayu_frtlk.efspcon1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -142,4 +142,4 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	if th:GetCount()>4 then
 	   Duel.Draw(tp,1,REASON_EFFECT)
 	end
-end
\ No newline at end of file
+end

expansions/script/c12043015.lua

@@ -18,7 +18,7 @@ function cm.filter(c)
 	return  c:IsReason(REASON_RETURN) and c:GetReasonCard():IsSetCard(0xcfaa)
 end
 function cm.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_GRAVE,LOCATION_GRAVE,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE)
 end
 function cm.spop1(e,tp,eg,ep,ev,re,r,rp)
@@ -44,4 +44,4 @@ function cm.spop2(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
 	end
-end
\ No newline at end of file
+end

expansions/script/c12043020.lua

@@ -27,7 +27,7 @@ function cm.filter(c)
 	return c:IsSetCard(0xcfaa) and c:IsFaceup() and c:IsAbleToHand()
 end
 function cm.sumfilter(c)
-	return c:IsSetCard(0xcfaa) and c:IsSummonable(true,nil,1)
+	return c:IsSetCard(0xcfaa) and c:IsSummonable(true,nil)
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and chkc:IsFaceup() end
@@ -40,12 +40,12 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and tc:IsFaceup() then
-		  if Duel.SendtoHand(tc,nil,REASON_EFFECT)~=0 then 
+		  if Duel.SendtoHand(tc,nil,REASON_EFFECT)~=0 and Duel.SelectYesNo(tp,aux.Stringid(m,2)) then 
 			  Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SUMMON)
 			  local g=Duel.SelectMatchingCard(tp,cm.sumfilter,tp,LOCATION_HAND,0,1,1,nil)
 			  local tc=g:GetFirst()
 			  if tc then
-				   Duel.Summon(tp,tc,true,nil,1)
+				   Duel.Summon(tp,tc,true,nil)
 			  end
 		  else
 			  Card.CancelToGrave(c)
@@ -70,4 +70,4 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SSet(tp,c)
 		Duel.ConfirmCards(1-tp,c)
 	end
-end
\ No newline at end of file
+end

expansions/script/c12043021.lua

@@ -51,7 +51,7 @@ function cm.costfilter(c)
 end
 function cm.discost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_REMOVED,LOCATION_REMOVED,1,nil) end
-	local cc=Duel.SelectMatchingCard(tp,cm.cfilter,tp,LOCATION_REMOVED,LOCATION_REMOVED,1,1,nil)
+	local cc=Duel.SelectMatchingCard(tp,cm.costfilter,tp,LOCATION_REMOVED,LOCATION_REMOVED,1,1,nil)
 	Duel.SendtoGrave(cc,REASON_COST)
 end
 function cm.distg(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -81,4 +81,4 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SSet(tp,c)
 		Duel.ConfirmCards(1-tp,c)
 	end
-end
\ No newline at end of file
+end

expansions/script/c14000501.lua

@@ -189,8 +189,11 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
             Duel.SendtoHand(tc,nil,REASON_EFFECT)
             Duel.ConfirmCards(1-tp,tc)
         else
+           if tc:GetType()==TYPE_PENDULUM then
             Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+           else
+            Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+           end
         end
     end
-end
 end
\ No newline at end of file

expansions/script/c16100002.lua

@@ -32,7 +32,6 @@ function c16100002.initial_effect(c)
 	e1:SetCountLimit(1)
 	e1:SetCondition(c16100002.chcon)
 	e1:SetCost(c16100002.cost)
-	e1:SetTarget(c16100002.chtg)
 	e1:SetOperation(c16100002.chop)
 	c:RegisterEffect(e1)
 	--im
@@ -62,19 +61,15 @@ function c16100002.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 --
 function c16100002.op(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,c16100002.tgf,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
-	if g:GetCount()>0 then
+	if Duel.IsExistingMatchingCard(c16100002.tgf,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) then
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+		local g=Duel.SelectMatchingCard(tp,c16100002.tgf,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 	end
 end
 --
 function c16100002.chcon(e,tp,eg,ep,ev,re,r,rp)
-	return rp==1-tp and not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED)
-end
---
-function c16100002.chtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	return ep==1-tp and Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_DECK+LOCATION_HAND,0,1,nil)
 end
 --
 function c16100002.cost(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c16100006.lua

@@ -13,12 +13,12 @@ function c16100006.initial_effect(c)
 	c:RegisterEffect(e1)
 	--He is angry
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(16100002,1))
+	e2:SetDescription(aux.Stringid(16100006,1))
 	e2:SetCategory(CATEGORY_SEARCH)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_GRAVE)
-	e1:SetCountLimit(1,16100006+10000)
+	e1:SetCountLimit(1,16100006+100)
 	e2:SetCost(c16100006.cost)
 	e2:SetTarget(c16100006.tg)
 	e2:SetOperation(c16100006.op)
@@ -44,12 +44,20 @@ function c16100006.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON+EFFECT_CANNOT_SUMMON)
+	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e1:SetTargetRange(1,0)
 	e1:SetTarget(c16100006.splimit)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetCode(EFFECT_CANNOT_SUMMON)
+	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e2:SetTargetRange(1,0)
+	e2:SetTarget(c16100006.splimit)
+	e2:SetReset(RESET_PHASE+PHASE_END)
+	Duel.RegisterEffect(e2,tp)
 end
 function c16100006.splimit(e,c,sump,sumtype,sumpos,targetp,se)
 	return not c:IsSetCard(0xcc0)

expansions/script/c16100009.lua

@@ -18,7 +18,7 @@ function c16100009.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
-	e2:SetCountLimit(1,16100009+10000+EFFECT_COUNT_CODE_DUEL)
+	e2:SetCountLimit(1,EFFECT_COUNT_CODE_DUEL)
 	e2:SetOperation(c16100009.operation)
 	c:RegisterEffect(e2)
 end
@@ -36,18 +36,16 @@ function c16100009.filter1(c)
 end
 --
 function c16100009.op(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetFieldGroup(e:GetHandlerPlayer(),LOCATION_MZONE+LOCATION_HAND,0)
-	if not g:IsExists(c16100009.filter,1,nil) then
+	if not Duel.IsExistingMatchingCard(c16100013.filter,tp,LOCATION_MZONE+LOCATION_HAND,0,1,nil) then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD)
 		e1:SetCode(EFFECT_CANNOT_ACTIVATE)
 		e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-		e1:SetReset(RESET_PHASE+PHASE_END,2)
+		e1:SetReset(RESET_PHASE+PHASE_END)
 		e1:SetTargetRange(1,0)
 		e1:SetValue(c16100009.disop)
 		Duel.RegisterEffect(e1,tp)
-	end
-	if g:IsExists(c16100009.filter,1,nil) then
+	else
 		Duel.SpecialSummon(e:GetHandler(),0,tp,tp,false,false,POS_FACEUP)
 	end
 end

expansions/script/c16100010.lua

@@ -60,16 +60,18 @@ end
 --
 function c16100010.activate(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
-		Duel.Remove(eg,POS_FACEUP,REASON_EFFECT)
+		Duel.Remove(re:GetHandler(),POS_FACEUP,REASON_EFFECT)
 	end
-	if Duel.SelectYesNo(tp,aux.Stringid(16100010,1)) then
-		local g=Duel.SelectMatchingCard(tp,c16100010.filter0,tp,LOCATION_DECK,0,1,1,nil)
-		if g:GetCount()>0 then
-			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
-			sg=g:Select(tp,1,1,nil)
-			Duel.SendtoHand(sg,1-tp,REASON_EFFECT)
+	if Duel.IsExistingMatchingCard(c16100010.filter0,tp,LOCATION_DECK,0,1,nil) then 
+		if Duel.SelectYesNo(tp,aux.Stringid(16100010,1)) then
+			local g=Duel.SelectMatchingCard(tp,c16100010.filter0,tp,LOCATION_DECK,0,1,1,nil)
+			if g:GetCount()>0 then
+				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
+				sg=g:Select(tp,1,1,nil)
+				Duel.SendtoHand(sg,1-tp,REASON_EFFECT)
 			end
 	end
+	end
 end
 --
 function c16100010.ctop(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c16100013.lua

@@ -17,7 +17,7 @@ function c16100013.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
-	e2:SetCountLimit(1,16100013+10000+EFFECT_COUNT_CODE_DUEL)
+	e2:SetCountLimit(1,EFFECT_COUNT_CODE_DUEL)
 	e2:SetOperation(c16100013.operation)
 	c:RegisterEffect(e2)
 end
@@ -35,8 +35,7 @@ function c16100013.filter1(c)
 end
 --
 function c16100013.op(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetFieldGroup(e:GetHandlerPlayer(),LOCATION_MZONE+LOCATION_HAND,0)
-	if not g:IsExists(c16100013.filter,1,nil) then
+	if not Duel.IsExistingMatchingCard(c16100013.filter,tp,LOCATION_MZONE+LOCATION_HAND,0,1,nil) then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD)
 		e1:SetCode(EFFECT_CANNOT_REMOVE)
@@ -44,10 +43,9 @@ function c16100013.op(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetReset(RESET_PHASE+PHASE_END,2)
 		e1:SetTargetRange(1,0)
 		Duel.RegisterEffect(e1,tp)
-	end
-	if g:IsExists(c16100013.filter,1,nil) then
+   else
 		Duel.SpecialSummon(e:GetHandler(),0,tp,tp,false,false,POS_FACEUP)
-	end
+   end
 end
 --
 function c16100013.discon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c16100014.lua

@@ -95,7 +95,6 @@ function c16100014.op1(e,tp,eg,ep,ev,re,r,rp)
 	local tg=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
 	if not tg or tg:FilterCount(Card.IsRelateToEffect,nil,e)~=3 then return end
 	Duel.SendtoDeck(tg,nil,0,REASON_EFFECT)
-	Duel.ShuffleDeck(tp)
 	local g=Duel.GetOperatedGroup()
 	local ct0=g:FilterCount(Card.IsLocation,nil,LOCATION_DECK+LOCATION_EXTRA)
 	if ct0==3 then
@@ -121,7 +120,7 @@ function c16100014.op1(e,tp,eg,ep,ev,re,r,rp)
 				if Duel.Draw(tp,1,REASON_EFFECT)==0 then return end
 					local dg=Duel.GetOperatedGroup()
 					local dc=dg:GetFirst()
-				if Duel.GetMZoneCount(tp)>0 and dc:IsCanBeSpecialSummoned(e,0,tp,false,false)
+				if Duel.GetMZoneCount(tp)>0 and dc:IsCanBeSpecialSummoned(e,0,tp,false,false) and dc:IsSetCard(0xcc0)
 					and Duel.SelectYesNo(tp,aux.Stringid(16100014,4)) then
 					local lp=Duel.GetLP(tp)   
 							Duel.SetLP(tp,lp-2000) 
@@ -140,7 +139,7 @@ function c16100014.op1(e,tp,eg,ep,ev,re,r,rp)
 				if Duel.Draw(tp,1,REASON_EFFECT)==0 then return end
 					local dg=Duel.GetOperatedGroup()
 					local dc=dg:GetFirst()
-				if Duel.GetMZoneCount(tp)>0 and dc:IsCanBeSpecialSummoned(e,0,tp,false,false)
+				if Duel.GetMZoneCount(tp)>0 and dc:IsCanBeSpecialSummoned(e,0,tp,false,false) and dc:IsSetCard(0xcc0)
 					and Duel.SelectYesNo(tp,aux.Stringid(16100014,4)) then
 					local lp=Duel.GetLP(tp)   
 							Duel.SetLP(tp,lp-2000) 

expansions/script/c17060804.lua

@@ -83,7 +83,7 @@ function cm.cfilter(c)
 	return c:IsFacedown() or not c:IsSetCard(0x7f0)
 end
 function cm.descon(e)
-	return not Duel.IsExistingMatchingCard(cm.cfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil)
+	return not Duel.IsExistingMatchingCard(cm.cfilter,e:GetHandlerPlayer(),LOCATION_ONFIELD,0,1,nil)
 end
 function cm.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end

expansions/script/c17061153.lua

@@ -118,6 +118,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp,c)
 end
 function cm.ctop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SOUND,0,aux.Stringid(17061153,4))
+	Duel.Hint(HINT_CARD,0,17061153)
 	Duel.SetLP(tp,1)
 	e:GetHandler():AddCounter(0x7f3,3)
 end

expansions/script/c17061156.lua

@@ -12,7 +12,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3)
 	--recover
 	local e5=Effect.CreateEffect(c)
-	e5:SetDescription(aux.Stringid(m,1))
+	e5:SetDescription(aux.Stringid(17061156,1))
 	e5:SetCategory(CATEGORY_DRAW+CATEGORY_RECOVER)
 	e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e5:SetCode(EVENT_PHASE+PHASE_END)
@@ -38,6 +38,7 @@ function cm.rectg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,5000)
 end
 function cm.recop(e,tp,eg,ep,ev,re,r,rp)
+	Duel.Hint(HINT_CARD,0,17061156)
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
 	local ct=5-Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)
 	if ct>0 then

expansions/script/c26800000.lua

@@ -29,7 +29,7 @@ end
 function Amana.tgcon(e)
 	local tp=e:GetHandlerPlayer()
 	return Duel.GetCurrentPhase()==PHASE_END
-		and not Duel.IsExistingMatchingCard(Amana.cfilter,tp,LOCATION_MZONE,0,1,nil)
+		and not (Duel.IsExistingMatchingCard(Amana.cfilter,tp,LOCATION_MZONE,0,1,nil) or Duel.IsPlayerAffectedByEffect(tp,26818046))
 end
 --majsoulGirl/Boy
 function Amana.MajsoulGirl(c)

expansions/script/c33310211.lua

@@ -80,11 +80,11 @@ function c33310211.opdisable(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetOperatedGroup()
 	local gc=g:GetFirst()
 	Duel.ConfirmCards(1-tp,gc)
-	--local e1=Effect.CreateEffect(e:GetHandler())
-	--e1:SetType(EFFECT_TYPE_SINGLE)
-	--e1:SetCode(EFFECT_PUBLIC)
-	--e1:SetReset(RESET_EVENT+RESETS_STANDARD)
-	--gc:RegisterEffect(e1)
+	local e1=Effect.CreateEffect(e:GetHandler())
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_PUBLIC)
+	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+	gc:RegisterEffect(e1)
 	if gc:IsSetCard(0x551) and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(33310211,3)) then
 		local sg=Duel.SelectMatchingCard(tp,Card.IsAbleToHand,tp,0,LOCATION_ONFIELD,1,1,nil)
 		Duel.HintSelection(sg)

expansions/script/c33310213.lua

@@ -18,8 +18,9 @@ function c33310213.initial_effect(c)
 	--forbidden
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetCode(EFFECT_FORBIDDEN)
+	--e2:SetCode(EFFECT_FORBIDDEN)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 	e2:SetTargetRange(LOCATION_HAND,LOCATION_HAND)
 	e2:SetTarget(c33310213.bantg)
 	c:RegisterEffect(e2)
@@ -30,7 +31,7 @@ function c33310213.initial_effect(c)
 	e7:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	c:RegisterEffect(e7) 
 	local e8=e2:Clone()
-	e8:SetCode(EFFECT_CANNOT_ACTIVATE)
+	e8:SetCode(EFFECT_CANNOT_TRIGGER)
 	c:RegisterEffect(e8) 
 	--special summon
 	local e5=Effect.CreateEffect(c)
@@ -92,7 +93,7 @@ function c33310213.activate(e,tp,eg,ep,ev,re,r,rp,chk)
 	if not e:GetHandler():IsRelateToEffect(e) then return end
 	local tc=e:GetLabelObject()
 	if tc:IsRelateToEffect(e) then
-		local e1=Effect.CreateEffect(e:GetHandler())
+	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_PUBLIC)
 	e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)

expansions/script/c33403503.lua

@@ -36,10 +36,10 @@ function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
 	return not se:GetHandler():IsSetCard(0x5349)and  not c:IsCode(33403500)
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	local b1=Duel.GetFieldGroupCount(tp,0,LOCATION_REMOVED+LOCATION_GRAVE+LOCATION_ONFIELD)
+	local b1=Duel.IsExistingMatchingCard(aux.disfilter1,tp,0,LOCATION_REMOVED+LOCATION_GRAVE+LOCATION_ONFIELD,1,nil)
 	local b2=Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_MZONE,0,1,nil,33403500)
 	if chkc then return true end
-	if chk==0 then return b1>0 or b2>0 end
+	if chk==0 then return b1 or b2 end
 	if e:GetLabel()==1 then 
 	local c=e:GetHandler()
 	local e2=Effect.CreateEffect(c)
@@ -83,7 +83,7 @@ function cm.regop2(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local b1=Duel.GetFieldGroupCount(tp,0,LOCATION_REMOVED+LOCATION_GRAVE+LOCATION_ONFIELD)
+	local b1=Duel.IsExistingMatchingCard(aux.disfilter1,tp,0,LOCATION_REMOVED+LOCATION_GRAVE+LOCATION_ONFIELD,1,nil)
 	local b2=Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_MZONE,0,1,nil,33403500)
 	if not (b1 or b2) then return end 
 	local op
@@ -95,7 +95,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
    if op==0 then 
 	local ct=Duel.GetFlagEffect(tp,33403501)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPPO)
-	local tg=Duel.SelectMatchingCard(tp,nil,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE+LOCATION_REMOVED,1,ct,nil)  
+	local tg=Duel.SelectMatchingCard(tp,aux.disfilter1,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE+LOCATION_REMOVED,1,ct,nil)  
 	local tc=tg:GetFirst()  
 		while tc do
 		Duel.NegateRelatedChain(tc,RESET_TURN_SET)
@@ -103,21 +103,21 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetType(EFFECT_TYPE_SINGLE)
 			e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 			e1:SetCode(EFFECT_DISABLE)
-			e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+			e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 			tc:RegisterEffect(e1)
 			local e2=Effect.CreateEffect(c)
 			e2:SetType(EFFECT_TYPE_SINGLE)
 			e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 			e2:SetCode(EFFECT_DISABLE_EFFECT)
 			e2:SetValue(RESET_TURN_SET)
-			e2:SetReset(RESET_EVENT+RESETS_STANDARD)
+			e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 			tc:RegisterEffect(e2)
 			if tc:IsType(TYPE_TRAPMONSTER) then
 				local e3=Effect.CreateEffect(c)
 				e3:SetType(EFFECT_TYPE_SINGLE)
 				e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 				e3:SetCode(EFFECT_DISABLE_TRAPMONSTER)
-				e3:SetReset(RESET_EVENT+RESETS_STANDARD)
+				e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 				tc:RegisterEffect(e3)
 			end
 		tc=tg:GetNext()

expansions/script/c33500109.lua

@@ -16,7 +16,7 @@ function cm.initial_effect(c)
 	e2:SetCategory(CATEGORY_TODECK+CATEGORY_DRAW)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e2:SetCode(LOCATION_GRAVE)
+	e2:SetRange(LOCATION_GRAVE)
 	e2:SetCountLimit(1,m+10000)
 	e2:SetCost(cm.thcost)
 	e2:SetTarget(cm.target2)
@@ -62,7 +62,7 @@ end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local chkf=tp
 	local mg1=Duel.GetFusionMaterial(tp):Filter(cm.filter1,nil,e)
-	if Duel.IsExistingMatchingCard(cm.cfilter,tp,0,LOCATION_MZONE,1,nil) then
+	if Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_MZONE,0,1,nil) then
 		local mg2=Duel.GetMatchingGroup(cm.filter0,tp,LOCATION_DECK,0,nil)
 		mg1:Merge(mg2)
 	end

expansions/script/c33500306.lua

@@ -6,10 +6,12 @@ function cm.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
 	e1:SetCategory(CATEGORY_TOHAND)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_RECOVER)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,m)
+	e1:SetCondition(cm.thcon1)
 	e1:SetTarget(cm.atktg1)
 	e1:SetOperation(cm.atkop1)
 	c:RegisterEffect(e1)
@@ -28,6 +30,9 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)  
 end
 --e1
+function cm.thcon1(e,tp,eg,ep,ev,re,r,rp)
+	return ep==tp
+end
 function cm.filter(c)
 	return c:IsSetCard(0xa82)  and c:IsAbleToHand() and (c:IsType(TYPE_SPELL) or c:IsType(TYPE_TRAP))
 end

expansions/script/c53703004.lua

@@ -172,7 +172,7 @@ function c53703004.desop(e,tp,eg,ep,ev,re,r,rp)
 		local pg=Duel.SelectMatchingCard(tp,c53703004.pen2filter,tp,LOCATION_DECK,0,1,1,nil)
 		local tc=pg:GetFirst()
 		if tc then
-			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		end
 	end
 end

expansions/script/c53703009.lua

@@ -95,14 +95,14 @@ function c53703009.spop(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,c53703009.penfilter,tp,LOCATION_HAND,0,1,1,nil)
 		local tc=g:GetFirst()
 		if tc then
-			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		end
 	end
 	if Duel.GetTurnPlayer()==tp then
 		local g=Duel.SelectMatchingCard(tp,c53703009.penfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil)
 		local tc=g:GetFirst()
 		if tc then
-			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+			Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		end
 	end
 end

expansions/script/c53703010.lua

@@ -85,7 +85,7 @@ function c53703010.penop2(e,tp,eg,ep,ev,re,r,rp)
 	local ct2=Duel.Remove(gg,POS_FACEUP,REASON_EFFECT)
 	if e:GetHandler():IsRelateToEffect(e) and ct1+ct2==3
 		and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) then
-		Duel.MoveToField(e:GetHandler(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(e:GetHandler(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function c53703010.target(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c53703012.lua

@@ -90,7 +90,7 @@ end
 function c53703012.damop(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsRelateToEffect(e)
 		and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) then
-		Duel.MoveToField(e:GetHandler(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(e:GetHandler(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function c53703012.spcost(e,c,tp)

expansions/script/c53703013.lua

@@ -75,7 +75,7 @@ function c53703013.penop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,c53703013.penfilter,tp,LOCATION_DECK,0,1,1,nil)
 	local tc=g:GetFirst()
 	if tc then
-		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 	local c=e:GetHandler()
 	local e5=Effect.CreateEffect(c)

expansions/script/c60151103.lua

 --├风语者 妲修斯┤
 function c60151103.initial_effect(c)
-	c:EnableUnsummonable()
 	--special summon
 	local e11=Effect.CreateEffect(c)
 	e11:SetType(EFFECT_TYPE_FIELD)

expansions/script/c60151104.lua

@@ -121,9 +121,18 @@ function c60151104.spop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,c60151104.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
 	local tc=g:GetFirst()
 	if Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP) then
-		
-		Duel.SpecialSummonComplete()
+		local e1=Effect.CreateEffect(e:GetHandler())
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_DISABLE)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+		tc:RegisterEffect(e1)
+		local e2=Effect.CreateEffect(e:GetHandler())
+		e2:SetType(EFFECT_TYPE_SINGLE)
+		e2:SetCode(EFFECT_DISABLE_EFFECT)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
+		tc:RegisterEffect(e2)
 	end
+	Duel.SpecialSummonComplete()
 end
 function c60151104.xyzlimit(e,c)
 	if not c then return false end

expansions/script/c60151128.lua

@@ -134,13 +134,13 @@ function c60151128.activate(e,tp,eg,ep,ev,re,r,rp)
 						local e1=Effect.CreateEffect(c)
 						e1:SetType(EFFECT_TYPE_SINGLE)
 						e1:SetCode(EFFECT_DISABLE)
-						e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
+						e1:SetReset(RESET_EVENT+0x1fe0000)
 						tc:RegisterEffect(e1)
 						local e2=Effect.CreateEffect(c)
 						e2:SetType(EFFECT_TYPE_SINGLE)
 						e2:SetCode(EFFECT_DISABLE_EFFECT)
 						e2:SetValue(RESET_TURN_SET)
-						e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
+						e2:SetReset(RESET_EVENT+0x1fe0000)
 						tc:RegisterEffect(e2)
 						local e3=Effect.CreateEffect(c)
 						e3:SetDescription(aux.Stringid(60151128,1))

expansions/script/c65071158.lua

@@ -56,7 +56,7 @@ function c65071158.tgfil2(c,tp)
 	return c:IsAbleToGrave() and c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 function c65071158.tgfil3(c,tp)
-	return c:IsSSetable() and (Duel.GetLocationCount(tp,LOCATION_SZONE)>0 or c:IsType(TYPE_FIELD) and (c:IsType(TYPE_QUICKPLAY) or (c:IsType(TYPE_NORMAL) and c:IsType(TYPE_TRAP))) 
+	return c:IsSSetable() and (Duel.GetLocationCount(tp,LOCATION_SZONE)>0 or c:IsType(TYPE_FIELD)) and (c:IsType(TYPE_QUICKPLAY) or (c:IsType(TYPE_NORMAL) and c:IsType(TYPE_TRAP))) 
 end
 function c65071158.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local b1=Duel.GetCounter(tp,LOCATION_ONFIELD,LOCATION_ONFIELD,0x1da0)>=6 and Duel.IsExistingMatchingCard(c65071158.tgfil1,tp,LOCATION_DECK,0,1,nil,tp)
@@ -97,6 +97,7 @@ function c65071158.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:GetHandler():RegisterFlagEffect(65071158,RESET_CHAIN,0,1)
 end
 function c65071158.op(e,tp,eg,ep,ev,re,r,rp)
+	local op=e:GetLabel()
 	if op==0 then
 		local g1=Duel.SelectMatchingCard(tp,c65071158.tgfil1,tp,LOCATION_DECK,0,1,1,nil,tp)
 		local tc1=g1:GetFirst()

expansions/script/c75646009.lua

@@ -56,7 +56,7 @@ function c75646009.immop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	Duel.RegisterEffect(e1,tp)
 end
-function c75646009.effilter(c)
+function c75646009.effilter(e,c)
 	return c:IsSetCard(0x2c0) or c:IsSetCard(0xc2c1)
 end
 function c75646009.efilter(e,re)

expansions/script/c75646912.lua

@@ -38,7 +38,7 @@ end
 function cm.eqfilter(c)
 	return c:IsSetCard(0xc2c1) and c:IsType(TYPE_MONSTER)
 end
-function cm.cfilter(c)
+function cm.cfilter(c,tp)
 	if c:IsLocation(LOCATION_ONFIELD) then return c:IsSetCard(0xc2c1) and c:IsFaceup() and c:IsAbleToGraveAsCost() and Duel.IsExistingTarget(cm.eqfilter,tp,LOCATION_GRAVE,0,1,nil) end
 	return c:IsAbleToRemoveAsCost() and c:IsHasEffect(75646911) and Duel.IsExistingTarget(cm.eqfilter,tp,LOCATION_GRAVE,0,1,nil)
 end
@@ -48,10 +48,10 @@ function cm.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 		if e:GetLabel()~=100 then return false end
 		e:SetLabel(0)
 		return Duel.GetLocationCount(tp,LOCATION_SZONE)>0 
-			and Duel.IsExistingTarget(cm.cfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,e:GetHandler())
+			and Duel.IsExistingTarget(cm.cfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,e:GetHandler(),tp)
 	end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g=Duel.SelectMatchingCard(tp,cm.cfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,1,e:GetHandler())
+	local g=Duel.SelectMatchingCard(tp,cm.cfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,1,e:GetHandler(),tp)
 	local tc=g:GetFirst()
 	local te=tc:IsHasEffect(75646911,tp)
 	local tn=nil

expansions/script/c75646915.lua

@@ -48,7 +48,7 @@ function cm.tgcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:SetLabel(100)
 	if chk==0 then return true end
 end
-function cm.cfilter(c)
+function cm.cfilter(c,tp)
 	if c:IsLocation(LOCATION_ONFIELD) then return c:IsAbleToGraveAsCost() and Duel.IsExistingTarget(Card.IsAbleToGrave,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c) end
 	return c:IsAbleToRemoveAsCost() and c:IsHasEffect(75646911) and Duel.IsExistingTarget(Card.IsAbleToGrave,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
 end
@@ -57,10 +57,10 @@ function cm.tgtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then
 		if e:GetLabel()~=100 then return false end
 		e:SetLabel(0)
-		return Duel.IsExistingTarget(cm.cfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,nil)
+		return Duel.IsExistingTarget(cm.cfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,nil,tp)
 	end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g=Duel.SelectMatchingCard(tp,cm.cfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,cm.cfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,1,nil,tp)
 	local tc=g:GetFirst()
 	local te=tc:IsHasEffect(75646911)
 	if te then

expansions/script/c960007.lua

@@ -3,7 +3,7 @@ function c960007.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(960007,0))
-	e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE)
+	e1:SetCategory(CATEGORY_ATKCHANGE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_CANNOT_INACTIVATE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
@@ -15,7 +15,7 @@ function c960007.initial_effect(c)
 	c:RegisterEffect(e1)
 	--todeck
 	local e4=Effect.CreateEffect(c)
-	e4:SetDescription(aux.Stringid(960007,1))
+	e4:SetDescription(aux.Stringid(960007,2))
 	e4:SetCategory(CATEGORY_TODECK)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e4:SetCode(EVENT_TO_GRAVE)
@@ -43,24 +43,21 @@ function c960007.activate(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsControler(tp) then
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetCode(EFFECT_UPDATE_ATTACK)
+		e1:SetCode(EFFECT_UPDATE_DEFENSE)
 		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 		e1:SetValue(d*1000)
 		tc:RegisterEffect(e1)
-		local e2=e1:Clone()
-		e2:SetCode(EFFECT_UPDATE_DEFENSE)
+		local e2=Effect.CreateEffect(c)
+		e2:SetType(EFFECT_TYPE_SINGLE)
+		e2:SetCode(EFFECT_IMMUNE_EFFECT)
+		e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+		e2:SetRange(LOCATION_MZONE)
+		e2:SetValue(c960007.efilter)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+		e2:SetOwnerPlayer(tp)
 		tc:RegisterEffect(e2)
-		local e3=Effect.CreateEffect(c)
-		e3:SetType(EFFECT_TYPE_SINGLE)
-		e3:SetCode(EFFECT_IMMUNE_EFFECT)
-		e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-		e3:SetRange(LOCATION_MZONE)
-		e3:SetValue(c960007.efilter)
-		e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
-		e3:SetOwnerPlayer(tp)
-		tc:RegisterEffect(e3)
 	end
-	Duel.Hint(HINT_MUSIC,0,aux.Stringid(960007,2)) 
+	Duel.Hint(HINT_MUSIC,0,aux.Stringid(960007,1)) 
 end
 function c960007.efilter(e,re)
 	return e:GetOwnerPlayer()~=re:GetOwnerPlayer()
@@ -74,3 +71,4 @@ function c960007.tdop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SendtoDeck(e:GetHandler(),nil,0,REASON_EFFECT)
 	end
 end
+