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

expansions/script/c20100002.lua

@@ -596,6 +596,7 @@ function Cirn9.ap1(e,tp,eg,ep,ev,re,r,rp,chk)
 	local fc=fa-fb
 	if chk==0 then return fc<6 end
 	Duel.RegisterFlagEffect(tp,20100050,RESET_PHASE+PHASE_END,0,1)
+	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
 	local rd=5-fc
 	Debug.Message("ReLive卡行动次数剩余"..rd.."次  DA☆ZE")
 end
@@ -606,6 +607,7 @@ function Cirn9.ap2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return fc<5 end
 	Duel.RegisterFlagEffect(tp,20100050,RESET_PHASE+PHASE_END,0,1)
 	Duel.RegisterFlagEffect(tp,20100050,RESET_PHASE+PHASE_END,0,1)
+	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
 	local rd=4-fc
 	Debug.Message("ReLive卡行动次数剩余"..rd.."次  DA☆ZE")
 end

expansions/script/c21520180.lua

@@ -53,7 +53,7 @@ function c21520180.activate(e,tp,eg,ep,ev,re,r,rp)
 	local ec=Duel.GetFirstTarget()
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) and 
-		Duel.IsPlayerCanSpecialSummonMonster(tp,nil,0,0x11,ec:GetAttack(),ec:GetDefense(),ec:GetLevel(),RACE_FIEND,ATTRIBUTE_DARK) then
+		Duel.IsPlayerCanSpecialSummonMonster(tp,nil,0,0x11,ec:GetAttack(),ec:GetDefense(),1,RACE_FIEND,ATTRIBUTE_DARK) then
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_CHANGE_TYPE)
@@ -61,7 +61,7 @@ function c21520180.activate(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetValue(TYPE_NORMAL+TYPE_MONSTER)
 		e1:SetReset(RESET_EVENT+0x47c0000)
 		c:RegisterEffect(e1,true)
---[[		local e2=e1:Clone()
+		local e2=e1:Clone()
 		e2:SetCode(EFFECT_CHANGE_RACE)
 		e2:SetValue(RACE_FIEND)
 		c:RegisterEffect(e2,true)
@@ -69,7 +69,7 @@ function c21520180.activate(e,tp,eg,ep,ev,re,r,rp)
 		e3:SetCode(EFFECT_CHANGE_ATTRIBUTE)
 		e3:SetValue(ATTRIBUTE_DARK)
 		c:RegisterEffect(e3,true)
-		local e4=e1:Clone()
+--[[		local e4=e1:Clone()
 		e4:SetCode(EFFECT_CHANGE_LEVEL)
 		e4:SetValue(ec:GetLevel())
 		c:RegisterEffect(e4,true)--]]

expansions/script/c21520182.lua

@@ -2,7 +2,7 @@
 function c21520182.initial_effect(c)
 	c:EnableReviveLimit()
 	--fusion material
-	aux.AddFusionProcMixRep(c,false,false,aux.FilterBoolFunction(Card.IsFusionSetCard,0x490),3,100)
+	aux.AddFusionProcMixRep(c,false,false,c21520182.sefilter,3,100)
 	--spsummon condition
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
@@ -236,3 +236,6 @@ function c21520182.drop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Draw(1-tp,1,REASON_EFFECT)
 	end
 end
+function c21520182.sefilter(c)
+	return c:IsFusionSetCard(0x490) and c:IsType(TYPE_MONSTER)
+end

expansions/script/c21520183.lua

@@ -81,6 +81,35 @@ end
 function c21520183.spcheck2(c)
 	return c:IsRace(RACE_FIEND) and c:IsType(TYPE_MONSTER)
 end
+function c21520183.spgoal(sg,tp,loc)
+	if loc==LOCATION_EXTRA then 
+		return Duel.GetLocationCountFromEx(tp,tp,sg)>0 and sg:IsExists(c21520183.spcheck,1,nil,sg)
+	else 
+		return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and sg:IsExists(c21520183.spcheck,1,nil,sg)
+	end
+end
+function c21520183.spcon(e,c)
+	if c==nil then return true end
+	local tp=c:GetControler()
+	local mg=Duel.GetMatchingGroup(c21520183.spfilter,tp,LOCATION_MZONE+LOCATION_GRAVE,0,e:GetHandler())
+	local sg=Group.CreateGroup()
+	return mg:CheckSubGroup(c21520183.spgoal,1,nil,tp)
+end
+function c21520183.spop(e,tp,eg,ep,ev,re,r,rp,c)
+	local mg=Duel.GetMatchingGroup(c21520183.spfilter,tp,LOCATION_MZONE+LOCATION_GRAVE,0,e:GetHandler())
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+	local cancel=Duel.GetCurrentChain()==0
+	local sg=mg:SelectSubGroup(tp,c21520183.spgoal,cancel,1,nil,tp,c:GetLocation())
+	c:SetMaterial(sg)
+	Duel.Remove(sg,POS_FACEUP,REASON_COST)
+end
+--[[nction c21520183.spcheck(c,sg)
+	return c:IsSetCard(0x490) and c:IsType(TYPE_MONSTER) and sg:FilterCount(c21520183.spcheck2,c)+1==sg:GetCount()
+	and sg:FilterCount(Card.IsSetCard,c,0x490)>=2
+end
+function c21520183.spcheck2(c)
+	return c:IsRace(RACE_FIEND) and c:IsType(TYPE_MONSTER)
+end
 function c21520183.spgoal(c,tp,sg)
 	return sg:GetCount()>1 and Duel.GetLocationCountFromEx(tp,tp,sg)>0 and sg:IsExists(c21520183.spcheck,1,nil,sg)
 end
@@ -110,7 +139,7 @@ function c21520183.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	end
 	c:SetMaterial(sg)
 	Duel.Remove(sg,POS_FACEUP,REASON_COST)
-end
+end--]]
 function c21520183.drcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)