bug fix

expansions/script/c12001501.lua

@@ -76,7 +76,7 @@ function cm.spfilter3(c,e,tp,g)
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter1,tp,LOCATION_HAND,0,1,nil,e,tp,Group.FromCards(c)) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.spfilter1,tp,LOCATION_HAND,0,1,nil,e,tp,Group.FromCards(c)) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_DECK)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_HAND)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,LOCATION_DECK)

expansions/script/c12001502.lua

@@ -76,7 +76,7 @@ function cm.spfilter3(c,e,tp,g)
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP) and Duel.IsExistingMatchingCard(cm.thfilter1,tp,LOCATION_HAND,0,1,nil,e,tp,Group.FromCards(c)) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
+	if chk==0 then return c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP) and Duel.IsExistingMatchingCard(cm.spfilter1,tp,LOCATION_HAND,0,1,nil,e,tp,Group.FromCards(c)) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_DECK)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_HAND)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,LOCATION_HAND)

expansions/script/c12001503.lua

@@ -76,7 +76,7 @@ function cm.spfilter3(c,e,tp,g)
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter1,tp,LOCATION_HAND,0,1,nil,e,tp,Group.FromCards(c)) and Duel.IsPlayerCanDraw(tp,1) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.spfilter1,tp,LOCATION_HAND,0,1,nil,e,tp,Group.FromCards(c)) and Duel.IsPlayerCanDraw(tp,1) end
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_DECK)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_HAND)
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,0,LOCATION_DECK)

expansions/script/c12001504.lua

@@ -76,7 +76,7 @@ function cm.spfilter3(c,e,tp,g)
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter1,tp,LOCATION_HAND,0,1,nil,e,tp,Group.FromCards(c)) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.spfilter1,tp,LOCATION_HAND,0,1,nil,e,tp,Group.FromCards(c)) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_DECK)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_HAND)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,LOCATION_REMOVED)

expansions/script/c12001510.lua

@@ -20,6 +20,7 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_DRAW)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetCost(cm.cost)
 	e1:SetTarget(cm.sptg)
 	e1:SetOperation(cm.spop)
 	c:RegisterEffect(e1)

expansions/script/c12001511.lua

@@ -20,6 +20,7 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_DRAW)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetCost(cm.cost)
 	e1:SetTarget(cm.sptg)
 	e1:SetOperation(cm.spop)
 	c:RegisterEffect(e1)

expansions/script/c12001515.lua

@@ -21,6 +21,7 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetCost(cm.cost)
 	e1:SetTarget(cm.sptg)
 	e1:SetOperation(cm.spop)
 	c:RegisterEffect(e1)

expansions/script/c16400094.lua

@@ -62,7 +62,7 @@ function cm.check(c)
     return c:IsSetCard(0xce2) and (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup())
 end
 function cm.value(e,c)
-	return Duel.GetMatchingGroupCount(cm.check,0,LOCATION_REMOVED+LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_REMOVED+LOCATION_ONFIELD+LOCATION_GRAVE)*500
+	return Duel.GetMatchingGroupCount(cm.check,0,LOCATION_REMOVED+LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_REMOVED+LOCATION_ONFIELD+LOCATION_GRAVE,nil)*500
 end
 function cm.thcon1(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)

expansions/script/c50221200.lua

@@ -49,7 +49,7 @@ function c50221200.initial_effect(c)
 	e5:SetOperation(c50221200.thop)
 	c:RegisterEffect(e5)
 end
-c50221200.lvup={50221121}
+c50221200.lvup={50218121}
 c50221200.lvdn={50218119,50218120,50218121}
 function c50221200.spfilter(c,ft,tp)
 	return c:IsCode(50218121)
@@ -73,14 +73,14 @@ function c50221200.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c50221200.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsPlayerCanSpecialSummonMonster(tp,50218147,0xcb1,0x4011,500,500,1,RACE_SPELLCASTER,ATTRIBUTE_DARK) end
+		and Duel.IsPlayerCanSpecialSummonMonster(tp,50223180,0xcb1,0x4011,500,500,1,RACE_SPELLCASTER,ATTRIBUTE_DARK) end
 	Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)
 end
 function c50221200.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
-	if Duel.IsPlayerCanSpecialSummonMonster(tp,50218147,0xcb1,0x4011,500,500,1,RACE_SPELLCASTER,ATTRIBUTE_DARK) then
-		local token=Duel.CreateToken(tp,50218147)
+	if Duel.IsPlayerCanSpecialSummonMonster(tp,50223180,0xcb1,0x4011,500,500,1,RACE_SPELLCASTER,ATTRIBUTE_DARK) then
+		local token=Duel.CreateToken(tp,50223180)
 		Duel.SpecialSummon(token,0,tp,tp,false,false,POS_FACEUP)
 	end
 end
@@ -100,12 +100,12 @@ function c50221200.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2
 end
 function c50221200.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c50221200.filter,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED)
+	if chk==0 then return Duel.IsExistingMatchingCard(c50221200.filter,tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED)
 end
 function c50221200.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c50221200.filter),tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c50221200.filter),tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)

expansions/script/c50222100.lua

@@ -72,14 +72,14 @@ function c50222100.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c50222100.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsPlayerCanSpecialSummonMonster(tp,50218148,0xcb1,0x4011,700,300,1,RACE_FAIRY,ATTRIBUTE_LIGHT) end
+		and Duel.IsPlayerCanSpecialSummonMonster(tp,50223185,0xcb1,0x4011,700,300,1,RACE_FAIRY,ATTRIBUTE_LIGHT) end
 	Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)
 end
 function c50222100.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
-	if Duel.IsPlayerCanSpecialSummonMonster(tp,50218148,0xcb1,0x4011,700,300,1,RACE_FAIRY,ATTRIBUTE_LIGHT) then
-		local token=Duel.CreateToken(tp,50218148)
+	if Duel.IsPlayerCanSpecialSummonMonster(tp,50223185,0xcb1,0x4011,700,300,1,RACE_FAIRY,ATTRIBUTE_LIGHT) then
+		local token=Duel.CreateToken(tp,50223185)
 		Duel.SpecialSummon(token,0,tp,tp,false,false,POS_FACEUP)
 	end
 end

expansions/script/c65050018.lua

@@ -11,6 +11,7 @@ function c65050018.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetRange(LOCATION_SZONE)
+	e1:SetCountLimit(1)
 	e1:SetCost(c65050018.hspcost)
 	e1:SetTarget(c65050018.hsptg)
 	e1:SetOperation(c65050018.hspop)
@@ -22,7 +23,6 @@ function c65050018.initial_effect(c)
 	e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e3:SetRange(LOCATION_SZONE)
-	e3:SetCountLimit(1)
 	e3:SetCondition(c65050018.con)
 	e3:SetTarget(c65050018.target)
 	e3:SetOperation(c65050018.activate)
@@ -56,7 +56,7 @@ function c65050018.confil(c,tp)
 	return c:IsSetCard(0xcda3) and c:IsType(TYPE_MONSTER) and c:IsType(TYPE_LINK) and c:IsSummonType(SUMMON_TYPE_LINK)
 end
 function c65050018.con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c65050018.confil,1,nil) and Duel.GetTurnPlayer()~=tp
+	return eg:IsExists(c65050018.confil,1,nil) and Duel.GetTurnPlayer()~=tp and e:GetFlagEffect(65050018)==0
 end
 function c65050018.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_ONFIELD) and chkc:IsAbleToHand() and chkc:IsControler(1-tp) end
@@ -64,6 +64,7 @@ function c65050018.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
 	local g=Duel.SelectTarget(tp,Card.IsAbleToHand,tp,0,LOCATION_ONFIELD,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
+	e:GetHandler():RegisterFlagEffect(65050018,RESET_CHAIN,0,1)
 end
 function c65050018.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()

expansions/script/c65060039.lua

@@ -22,7 +22,6 @@ function c65060039.initial_effect(c)
 	e2:SetOperation(c65060039.activate)
 	c:RegisterEffect(e2)
 end
-c65060039.has_text_type=TYPE_DUAL
 function c65060039.actop(e,tp,eg,ep,ev,re,r,rp)
 	local rc=re:GetHandler()
 	if re:IsActiveType(TYPE_MONSTER) and rc:IsType(TYPE_DUAL) and ep==tp then
@@ -43,7 +42,7 @@ function c65060039.thfilter1(c)
 end
 function c65060039.activate(e,tp,eg,ep,ev,re,r,rp)
 	if not e:GetHandler():IsRelateToEffect(e) then return end
-	local g=Duel.GetFieldGroup(tp,LOCATION_PZONE,LOCATION_PZONE)
+	local g=Duel.GetFieldGroup(tp,LOCATION_PZONE,0)
 	local ct=Duel.Destroy(g,REASON_EFFECT)
 	local sg=Duel.GetOperatedGroup()
 	if ct>=1 then
@@ -59,7 +58,6 @@ function c65060039.activate(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_EXTRA_PENDULUM_SUMMON)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e1:SetCountLimit(1,29432356)
 	e1:SetTargetRange(1,0)
 	e1:SetValue(aux.TargetBoolFunction(Card.IsType,TYPE_DUAL))
 	e1:SetReset(RESET_PHASE+PHASE_END)

expansions/script/c71401001.lua

@@ -56,15 +56,6 @@ function c71401001.op1(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToEffect(e) then
 		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
-	e1:SetCode(EFFECT_TO_GRAVE_REDIRECT)
-	e1:SetTargetRange(0xff,0xfe)
-	e1:SetValue(LOCATION_REMOVED)
-	e1:SetReset(RESET_PHASE+PHASE_END)
-	e1:SetTarget(c71401001.rmtg)
-	Duel.RegisterEffect(e1,tp)
 end
 function c71401001.rmtg(e,c)
 	return c:GetOwner()==e:GetHandlerPlayer()
@@ -97,6 +88,15 @@ function c71401001.op2(e,tp,eg,ep,ev,re,r,rp)
 			Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
 		end
 	end
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
+	e1:SetCode(EFFECT_TO_GRAVE_REDIRECT)
+	e1:SetTargetRange(0xff,0xfe)
+	e1:SetValue(LOCATION_REMOVED)
+	e1:SetReset(RESET_PHASE+PHASE_END)
+	e1:SetTarget(c71401001.rmtg)
+	Duel.RegisterEffect(e1,tp)
 end
 end
 function yume.ButterflyCounter()

expansions/script/c71401003.lua

@@ -49,7 +49,7 @@ function c71401003.op2(e,tp,eg,ep,ev,re,r,rp)
 		local b1=tc:IsAbleToHand()
 		local b2=not tc:IsForbidden() and tc:CheckUniqueOnField(tp)
 		local flag=0
-		if b1 and (not b2 or Duel.SelectOption(tp,1152,aux.Stringid(71401003,1))==0) then
+		if b1 and (not b2 or Duel.SelectOption(tp,1190,aux.Stringid(71401003,1))==0) then
 			flag=Duel.SendtoHand(tc,nil,REASON_EFFECT)
 			Duel.ConfirmCards(1-tp,tc)
 		else

expansions/script/c71401004.lua

@@ -41,16 +41,16 @@ function c71401004.filtercon1(c,tp,se)
 end
 function c71401004.con1(e,tp,eg,ep,ev,re,r,rp)
 	local se=e:GetLabelObject():GetLabelObject()
-	return eg:IsExists(c71401004.filtercon1,1,nil,tp,se)
+	return eg:IsExists(c71401004.filtercon1,1,nil,tp,se) or e:GetHandler():IsLocation(LOCATION_HAND)
 end
 function c71401004.filterc1(c,tp)
-	return c:IsFaceup() and c:IsRace(RACE_SPELLCASTER) and c:IsAbleToGraveAsCost()
+	return c:IsFaceup() and c:IsRace(RACE_SPELLCASTER) and c:IsAbleToRemoveAsCost()
 		and Duel.GetMZoneCount(tp,c)>0
 end
 function c71401004.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c71401004.filterc1,tp,LOCATION_MZONE,0,1,nil,tp) and Duel.GetCustomActivityCount(71401001,tp,ACTIVITY_CHAIN)==0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g=Duel.SelectMatchingCard(tp,c71401004.filterc1,tp,LOCATION_MZONE,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,c71401004.filterc1,tp,LOCATION_MZONE,0,1,1,nil,tp)
 	Duel.Remove(g,POS_FACEUP,REASON_COST)
 	yume.RegButterflyCostLimit(e,tp)
 end

expansions/script/c71401008.lua

@@ -50,7 +50,7 @@ end
 function c71401008.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c71401008.filterc2,tp,LOCATION_ONFIELD,0,1,nil,tp) and Duel.GetCustomActivityCount(71401001,tp,ACTIVITY_CHAIN)==0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g=Duel.SelectMatchingCard(tp,c71401008.filterc2,tp,LOCATION_ONFIELD,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,c71401008.filterc2,tp,LOCATION_ONFIELD,0,1,1,nil,tp)
 	Duel.Remove(g,POS_FACEUP,REASON_COST)
 	yume.RegButterflyCostLimit(e,tp)
 end

expansions/script/c9310022.lua

---新宇宙勇机 雄伟单调士
+--星联勇机 雄伟单调士
 function c9310022.initial_effect(c)
 	--special Summon
 	local e1=Effect.CreateEffect(c)
@@ -114,5 +114,12 @@ function c9310022.operation2(e,tp,eg,ep,ev,re,r,rp)
 		end
 		Duel.ShuffleHand(tp)
 	end
+	local e2=Effect.CreateEffect(e:GetHandler())
+	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetCode(EFFECT_CANNOT_DRAW)
+	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e2:SetTargetRange(1,0)
+	e2:SetReset(RESET_PHASE+PHASE_END)
+	Duel.RegisterEffect(e2,tp)
 end
 

expansions/script/c9310027.lua

@@ -61,7 +61,7 @@ function c9310027.initial_effect(c)
 end
 function c9310027.splimit(e,c,sump,sumtype,sumpos,targetp,se)
 	return not (c:IsType(TYPE_TUNER) or c:IsOriginalCodeRule(9310061)
-			or (c:IsLocation(LOCATION_SZONE) and c:GetOriginalType(TYPE_TUNER)))
+			or (c:IsLocation(LOCATION_SZONE) and c:GetOriginalType()&TYPE_TUNER >0))
 end
 function c9310027.effectfilter(e,ct)
 	local te=Duel.GetChainInfo(ct,CHAININFO_TRIGGERING_EFFECT)