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

expansions/script/c17030009.lua

@@ -53,11 +53,11 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SpecialSummonComplete()
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsOnField() and chkc:IsFaceup() end
-	if chk==0 then return e:GetHandler():IsAbleToHand() and Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_ONFIELD,0,1,nil) end
+	if chkc then return chkc:IsOnField() and chkc:IsControler(tp) end
+	if chk==0 then return e:GetHandler():IsAbleToHand() and Duel.IsExistingTarget(aux.TRUE,tp,LOCATION_ONFIELD,0,1,nil) end
 	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-	local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_ONFIELD,0,1,1,nil)
+	local g=Duel.SelectTarget(tp,aux.TRUE,tp,LOCATION_ONFIELD,0,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,e:GetHandler(),1,0,0)
 end

expansions/script/c33400010.lua

@@ -67,7 +67,7 @@ function c33400010.afilter(c)
 	return c:IsSetCard(0x3340) and c:IsType(TYPE_QUICKPLAY)
 end
 function c33400010.discon(e,tp,eg,ep,ev,re,r,rp)
-	return not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) and Duel.IsChainNegatable(ev)
+	return rp==1-tp and not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) and Duel.IsChainNegatable(ev)
 end
 function c33400010.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c33700004.lua

@@ -156,7 +156,7 @@ function c33700004.penop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_PZONE)<=0 then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function c33700004.pencon2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33700005.lua

@@ -106,7 +106,7 @@ function c33700005.penop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_PZONE)<=0 then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function c33700005.pencon2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33700006.lua

@@ -115,7 +115,7 @@ function c33700006.penop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_PZONE)<=0 then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function c33700006.pencon2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33700033.lua

@@ -80,7 +80,7 @@ function c33700033.penop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_PZONE)<=0 then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function c33700033.filter(c)

expansions/script/c33700036.lua

@@ -148,6 +148,6 @@ function c33700036.penop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_PZONE)<=0 then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c33700052.lua

@@ -33,7 +33,7 @@ function c33700052.activate(e,tp,eg,ep,ev,re,r,rp)
 		 local pg=Duel.SelectMatchingCard(tp,c33700052.pfilter,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
 	 elseif g:GetFirst():IsSetCard(0x3440) and Duel.IsExistingMatchingCard(c33700052.spfilter,tp,LOCATION_DECK, 0,1,nil,e,tp) 
 	 and Duel.GetMZoneCount(tp)>0 then 

expansions/script/c33700170.lua

@@ -94,7 +94,7 @@ function c33700170.op(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 and g:IsExists(c33700170.filter) and  (Duel.CheckLocation(tp,LOCATION_SZONE,6) or Duel.CheckLocation(tp,LOCATION_SZONE,7))  then
 		Duel.Hint(HINT_SELECTMSG,p,HINTMSG_TARGET)
 		local sg=g:FilterSelect(p,c33700170.filter,1,1,nil)
-		Duel.MoveToField(sg:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(sg:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		Duel.DisableShuffleCheck()
 		Duel.SortDecktop(tp,tp,4)
 		if tg>0 then 

expansions/script/c33700172.lua

@@ -94,7 +94,7 @@ end
 function c33700172.pop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_SZONE,6) and not Duel.CheckLocation(tp,LOCATION_SZONE,7) then return false end
 	local c=e:GetHandler()
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 end
 function c33700172.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return not Duel.IsExistingMatchingCard(Card.IsPublic,tp,LOCATION_HAND,0,1,nil) end

expansions/script/c33700183.lua

@@ -74,6 +74,6 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
\ No newline at end of file

expansions/script/c33700184.lua

@@ -80,7 +80,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.tgvalue(e,re,rp)

expansions/script/c33700307.lua

@@ -86,6 +86,6 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end

expansions/script/c33700308.lua

@@ -107,7 +107,7 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function cm.spfilter(c,fc)

expansions/script/c33700916.lua

@@ -37,7 +37,7 @@ end
 function c33700916.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c33700916.cfilter,tp,LOCATION_GRAVE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g=Duel.SelectMatchingCard(tp,c10113040.cfilter,tp,LOCATION_GRAVE,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,c33700916.cfilter,tp,LOCATION_GRAVE,0,1,1,nil)
 	Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
 end
 function c33700916.cfilter(c)

expansions/script/c50218320.lua

 --季神-阿普若
 function c50218320.initial_effect(c)
-    c:EnableReviveLimit()
-    aux.EnablePendulumAttribute(c)
-    --splimit
-    local e0=Effect.CreateEffect(c)
-    e0:SetType(EFFECT_TYPE_FIELD)
-    e0:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
-    e0:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
-    e0:SetRange(LOCATION_PZONE)
-    e0:SetTargetRange(1,0)
-    e0:SetTarget(c50218320.splimit)
-    c:RegisterEffect(e0)
-    --pendulum set
-    local e1=Effect.CreateEffect(c)
-    e1:SetCategory(CATEGORY_DESTROY)
-    e1:SetType(EFFECT_TYPE_IGNITION)
-    e1:SetRange(LOCATION_PZONE)
-    e1:SetCountLimit(1,50218320)
-    e1:SetTarget(c50218320.pentg)
-    e1:SetOperation(c50218320.penop)
-    c:RegisterEffect(e1)
-    --cannot activate
-    local e2=Effect.CreateEffect(c)
-    e2:SetType(EFFECT_TYPE_FIELD)
-    e2:SetCode(EFFECT_CANNOT_ACTIVATE)
-    e2:SetRange(LOCATION_MZONE)
-    e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-    e2:SetTargetRange(0,1)
-    e2:SetCondition(c50218320.actcon)
-    e2:SetValue(c50218320.afilter)
-    c:RegisterEffect(e2)
-    --to hand
-    local e3=Effect.CreateEffect(c)
-    e3:SetCategory(CATEGORY_TOHAND)
-    e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-    e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
-    e3:SetCode(EVENT_SPSUMMON_SUCCESS)
-    e3:SetCountLimit(1,50218321)
-    e3:SetCondition(c50218320.thcon)
-    e3:SetTarget(c50218320.thtg)
-    e3:SetOperation(c50218320.thop)
-    c:RegisterEffect(e3)
-    --draw
-    local e4=Effect.CreateEffect(c)
-    e4:SetCategory(CATEGORY_DRAW)
-    e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-    e4:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_PLAYER_TARGET)
-    e4:SetCode(EVENT_RELEASE)
-    e4:SetCountLimit(1,50218321)
-    e4:SetTarget(c50218320.drtg)
-    e4:SetOperation(c50218320.drop)
-    c:RegisterEffect(e4)
+	c:EnableReviveLimit()
+	aux.EnablePendulumAttribute(c)
+	--splimit
+	local e0=Effect.CreateEffect(c)
+	e0:SetType(EFFECT_TYPE_FIELD)
+	e0:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
+	e0:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
+	e0:SetRange(LOCATION_PZONE)
+	e0:SetTargetRange(1,0)
+	e0:SetTarget(c50218320.splimit)
+	c:RegisterEffect(e0)
+	--pendulum set
+	local e1=Effect.CreateEffect(c)
+	e1:SetCategory(CATEGORY_DESTROY)
+	e1:SetType(EFFECT_TYPE_IGNITION)
+	e1:SetRange(LOCATION_PZONE)
+	e1:SetCountLimit(1,50218320)
+	e1:SetTarget(c50218320.pentg)
+	e1:SetOperation(c50218320.penop)
+	c:RegisterEffect(e1)
+	--cannot activate
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetCode(EFFECT_CANNOT_ACTIVATE)
+	e2:SetRange(LOCATION_MZONE)
+	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e2:SetTargetRange(0,1)
+	e2:SetCondition(c50218320.actcon)
+	e2:SetValue(c50218320.afilter)
+	c:RegisterEffect(e2)
+	--to hand
+	local e3=Effect.CreateEffect(c)
+	e3:SetCategory(CATEGORY_TOHAND)
+	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e3:SetCountLimit(1,50218321)
+	e3:SetCondition(c50218320.thcon)
+	e3:SetTarget(c50218320.thtg)
+	e3:SetOperation(c50218320.thop)
+	c:RegisterEffect(e3)
+	--draw
+	local e4=Effect.CreateEffect(c)
+	e4:SetCategory(CATEGORY_DRAW)
+	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e4:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_PLAYER_TARGET)
+	e4:SetCode(EVENT_RELEASE)
+	e4:SetCountLimit(1,50218321)
+	e4:SetTarget(c50218320.drtg)
+	e4:SetOperation(c50218320.drop)
+	c:RegisterEffect(e4)
 end
 function c50218320.splimit(e,c,tp,sumtp,sumpos)
-    return not c:IsSetCard(0xcb3)
+	return not c:IsSetCard(0xcb3)
 end
 function c50218320.penfilter(c)
-    return c:IsSetCard(0xcb3) and c:IsType(TYPE_PENDULUM) and not c:IsCode(50218320) and not c:IsForbidden()
+	return c:IsSetCard(0xcb3) and c:IsType(TYPE_PENDULUM) and not c:IsCode(50218320) and not c:IsForbidden()
 end
 function c50218320.pentg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return e:GetHandler():IsDestructable()
-        and Duel.IsExistingMatchingCard(c50218320.penfilter,tp,LOCATION_DECK,0,1,nil) end
-    Duel.SetOperationInfo(0,CATEGORY_DESTROY,e:GetHandler(),1,0,0)
+	if chk==0 then return e:GetHandler():IsDestructable()
+		and Duel.IsExistingMatchingCard(c50218320.penfilter,tp,LOCATION_DECK,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_DESTROY,e:GetHandler(),1,0,0)
 end
 function c50218320.penop(e,tp,eg,ep,ev,re,r,rp)
-    if not e:GetHandler():IsRelateToEffect(e) then return end
-    if Duel.Destroy(e:GetHandler(),REASON_EFFECT)~=0 then
-        Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
-        local g=Duel.SelectMatchingCard(tp,c50218320.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)
-        end
-    end
+	if not e:GetHandler():IsRelateToEffect(e) then return end
+	if Duel.Destroy(e:GetHandler(),REASON_EFFECT)~=0 then
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
+		local g=Duel.SelectMatchingCard(tp,c50218320.penfilter,tp,LOCATION_DECK,0,1,1,nil)
+		local tc=g:GetFirst()
+		if tc then
+			Duel.MoveToField(tc,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
+		end
+	end
 end
 function c50218320.actcon(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM)
 end
 function c50218320.afilter(e,re,tp)
-    return re:GetHandler():GetType()==TYPE_SPELL+TYPE_EQUIP and re:IsHasType(EFFECT_TYPE_ACTIVATE)
+	return re:GetHandler():GetType()==TYPE_SPELL+TYPE_EQUIP and re:IsHasType(EFFECT_TYPE_ACTIVATE)
 end
 function c50218320.thcon(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL)
 end
 function c50218320.thfilter(c)
-    return c:IsFaceup() and c:IsAbleToHand()
+	return c:IsFaceup() and c:IsAbleToHand()
 end
 function c50218320.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-    if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) and c50218320.thfilter(chkc) end
-    if chk==0 then return Duel.IsExistingTarget(c50218320.thfilter,tp,0,LOCATION_ONFIELD,1,nil) end
-    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
-    local g=Duel.SelectTarget(tp,c50218320.thfilter,tp,0,LOCATION_ONFIELD,1,1,nil)
-    Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
+	if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) and c50218320.thfilter(chkc) end
+	if chk==0 then return Duel.IsExistingTarget(c50218320.thfilter,tp,0,LOCATION_ONFIELD,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
+	local g=Duel.SelectTarget(tp,c50218320.thfilter,tp,0,LOCATION_ONFIELD,1,1,nil)
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
 end
 function c50218320.thop(e,tp,eg,ep,ev,re,r,rp)
-    local tc=Duel.GetFirstTarget()
-    if tc:IsRelateToEffect(e) then
-        Duel.SendtoHand(tc,nil,REASON_EFFECT)
-    end
+	local tc=Duel.GetFirstTarget()
+	if tc:IsRelateToEffect(e) then
+		Duel.SendtoHand(tc,nil,REASON_EFFECT)
+	end
 end
 function c50218320.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return true end
-    Duel.SetTargetPlayer(tp)
-    Duel.SetTargetParam(1)
-    Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
+	if chk==0 then return true end
+	Duel.SetTargetPlayer(tp)
+	Duel.SetTargetParam(1)
+	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
 end
 function c50218320.drop(e,tp,eg,ep,ev,re,r,rp)
-    local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
-    Duel.Draw(p,d,REASON_EFFECT)
+	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
+	Duel.Draw(p,d,REASON_EFFECT)
 end
\ No newline at end of file

expansions/script/c50218640.lua

@@ -101,7 +101,7 @@ function c50218640.pcop(e,tp,eg,ep,ev,re,r,rp)
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
     local g=Duel.SelectMatchingCard(tp,c50218640.pcfilter,tp,LOCATION_DECK,0,1,1,nil)
     if g:GetCount()>0 then
-        Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+        Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)
     end
 end
 function c50218640.filter1(c)
@@ -144,6 +144,6 @@ function c50218640.penop(e,tp,eg,ep,ev,re,r,rp)
     if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
     local c=e:GetHandler()
     if c:IsRelateToEffect(e) then
-        Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+        Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
     end
 end
\ No newline at end of file