Merge branch '24PP' from upstream

c20357457.lua

---未来の柱ーキアノス
+--未来の柱－キアノス
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--special summon(self)

c21579049.lua

 --白の循環礁
---Coded by Lee
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--activate

c22414174.lua

---シンクロ・グリード
+--シンクロ・クリード
 local s,id,o=GetID()
 function s.initial_effect(c)	
 	--Activate

c24878656.lua

@@ -75,9 +75,8 @@ function s.dmcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=Duel.SelectMatchingCard(tp,s.cfilter,tp,LOCATION_ONFIELD,0,1,1,c,tp)
 	Duel.SendtoGrave(g,REASON_COST)
 end
-function s.dmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+function s.dmtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local ac=Duel.GetAttacker()
-	if chkc then return chkc==ac end
 	if chk==0 then return ac:IsOnField() end
 	Duel.SetTargetCard(ac)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,ac,1,0,0)

c42427230.lua

 --ディーヴジャン
---Amiya
 function c42427230.initial_effect(c)
 	--token
 	local e1=Effect.CreateEffect(c)
@@ -31,7 +30,7 @@ function c42427230.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
 	local rg=Duel.GetMatchingGroup(c42427230.cfilter,tp,LOCATION_MZONE,0,nil,tp)
 	if chk==0 then return rg:GetCount()==Duel.GetMatchingGroup(Card.IsCode,tp,LOCATION_MZONE,0,nil,42427230):GetCount() and rg:GetCount()~=0 and Duel.GetMZoneCount(tp,rg)>0 end
-	ct=Duel.Release(rg,REASON_COST)*2
+	local ct=Duel.Release(rg,REASON_COST)*2
 	e:SetLabel(ct)
 end
 function c42427230.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

c56741506.lua

---閃刀姫ーアザレア・テンペランス
+--閃刀姫－アザレア・テンペランス
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--link summon

c57964143.lua

 --白の仲裁
---Coded by Lee
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--activate

c69802283.lua

@@ -11,6 +11,7 @@ function s.initial_effect(c)
 	e2:SetDescription(aux.Stringid(id,0))
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_IGNITION)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCost(s.descost)
 	e2:SetTarget(s.destg)
@@ -38,13 +39,18 @@ function s.initial_effect(c)
 end
 function s.cfilter(c)
 	return (c:IsSetCard(0xc2) or c:IsLevel(7,8) and c:IsRace(RACE_DRAGON))
-		and c:IsType(TYPE_SYNCHRO) and c:IsAbleToRemoveAsCost()
+		and c:IsType(TYPE_SYNCHRO) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
 end
 function s.descost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,1,nil) and Duel.IsExistingMatchingCard(Card.IsAbleToRemoveAsCost,tp,LOCATION_MZONE,0,1,nil) end
+	if chk==0 then
+		return Duel.IsExistingMatchingCard(Card.IsAbleToRemoveAsCost,tp,LOCATION_MZONE,0,1,nil)
+			and Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,1,nil)
+	end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g=Group.__add(Duel.SelectMatchingCard(tp,s.cfilter,tp,LOCATION_GRAVE,0,1,1,nil),Duel.SelectMatchingCard(tp,Card.IsAbleToRemoveAsCost,tp,LOCATION_MZONE,0,1,1,nil))
-	Duel.Remove(g,POS_FACEUP,REASON_COST)
+	local g1=Duel.SelectMatchingCard(tp,Card.IsAbleToRemoveAsCost,tp,LOCATION_MZONE,0,1,1,nil)
+	local g2=Duel.SelectMatchingCard(tp,s.cfilter,tp,LOCATION_GRAVE,0,1,1,nil)
+	g1:Merge(g2)
+	Duel.Remove(g1,POS_FACEUP,REASON_COST)
 end
 function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) end
@@ -60,13 +66,16 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.filter(c)
-	return c:IsFaceup() and c:IsType(TYPE_SYNCHRO) and c:IsLevelAbove(7)
+	return c:IsFaceup() and c:IsType(TYPE_SYNCHRO) and c:IsType(TYPE_MONSTER) and c:IsLevelAbove(7)
 end
 function s.val(e,c)
-	return Duel.GetMatchingGroupCount(s.filter,c:GetControler(),LOCATION_REMOVED,0,nil)*400
+	return Duel.GetMatchingGroupCount(s.filter,e:GetHandlerPlayer(),LOCATION_REMOVED,0,nil)*400
+end
+function s.negfilter(c)
+	return c:IsFaceup() and c:IsType(TYPE_SYNCHRO) and c:IsType(TYPE_MONSTER)
 end
 function s.negcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetAttacker():IsControler(1-tp) and Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_REMOVED,0,1,nil,TYPE_SYNCHRO)
+	return Duel.GetTurnPlayer()~=tp and Duel.IsExistingMatchingCard(s.negfilter,tp,LOCATION_REMOVED,0,1,nil)
 end
 function s.negop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.NegateAttack()

c74055055.lua

 --石油採掘
---Amiya
 function c74055055.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

c9107531.lua

 --エレクトロ・ガンナー
---Coded by Lee
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--spsummon