ladies and xiangqinmen

expansions/script/c17060820.lua

@@ -39,21 +39,6 @@ function cm.initial_effect(c)
 	e3:SetOperation(cm.fpop)
 	c:RegisterEffect(e3)
 end
-cm.is_named_with_Regal_Arthur=1
-cm.is_named_with_Million_Arthur=1
-cm.is_named_with_Dark_Degenerate=1
-function cm.IsRegal_Arthur(c)
-	local m=_G["c"..c:GetCode()]
-	return m and m.is_named_with_Regal_Arthur
-end
-function cm.IsMillion_Arthur(c)
-	local m=_G["c"..c:GetCode()]
-	return m and m.is_named_with_Million_Arthur
-end
-function cm.IsDark_Degenerate(c)
-	local m=_G["c"..c:GetCode()]
-	return m and m.is_named_with_Dark_Degenerate
-end
 function cm.epcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==tp
 end
@@ -90,7 +75,7 @@ function cm.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end
 function cm.filter2(c,e,tp,m,f,gc,chkf)
-	return c:IsType(TYPE_FUSION) and c:IsRace(RACE_WARRIOR) and (not f or f(c))
+	return c:IsType(TYPE_FUSION) and c:IsSetCard(0x7f0) and (not f or f(c))
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,gc,chkf)
 end
 function cm.fpcon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c17060921.lua

@@ -24,18 +24,13 @@ function cm.initial_effect(c)
 	e0:SetOperation(cm.spop)
 	c:RegisterEffect(e0)
 end
-cm.is_named_with_Symphony=1
 cm.is_named_with_Ma_Elf=1
 function cm.IsMa_Elf(c)
 	local m=_G["c"..c:GetCode()]
 	return m and m.is_named_with_Ma_Elf 
 end
-function cm.IsSymphony(c)
-	local m=_G["c"..c:GetCode()]
-	return m and m.is_named_with_Symphony
-end
 function cm.thfilter(c)
-	return c:IsFaceup() and (c:IsSetCard(0x17f3) or c:IsSetCard(0x7f0)) and c:IsType(TYPE_PENDULUM) and c:IsAbleToHand()
+	return c:IsFaceup() and c:IsSetCard(0x17f3,0x7f0) and c:IsType(TYPE_PENDULUM) and c:IsAbleToHand()
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_EXTRA,0,1,nil) end
@@ -59,16 +54,16 @@ end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_PZONE) and chkc:IsControler(tp) and cm.thfilter1(chkc) and chkc~=e:GetHandler() end
 	if chk==0 then return Duel.GetFlagEffect(tp,17060921)==0 and Duel.IsExistingTarget(cm.thfilter1,tp,LOCATION_PZONE,0,1,nil)
-	and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
+	and Duel.IsExistingMatchingCard(cm.spfilter2,tp,LOCATION_HAND,0,1,nil,e,tp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 	local g=Duel.SelectTarget(tp,cm.thfilter1,tp,LOCATION_PZONE,0,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
 	Duel.RegisterFlagEffect(tp,17060921,RESET_PHASE+PHASE_END,0,1)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) and Duel.SendtoHand(tc,nil,REASON_EFFECT)~=0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 
-		and Duel.IsExistingMatchingCard(cm.spfilter2,tp,LOCATION_HAND,0,1,nil,e,tp) then
+	if tc:IsRelateToEffect(e) and Duel.SendtoHand(tc,nil,REASON_EFFECT)~=0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 		local g=Duel.SelectMatchingCard(tp,cm.spfilter2,tp,LOCATION_HAND,0,1,1,nil,e,tp)
 		if g:GetCount()>0 then