Merge pull request #562 from VanillaSalt/patch69

fix

script/c13513663.lua

@@ -25,6 +25,7 @@ function c13513663.initial_effect(c)
 	--spsummon
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(13513663,1))
+	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_TO_GRAVE)
 	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_CARD_TARGET)
@@ -70,6 +71,7 @@ function c13513663.target2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c13513663.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c13513663.cfilter,tp,LOCATION_GRAVE,0,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local rg=Duel.SelectMatchingCard(tp,c13513663.cfilter,tp,LOCATION_GRAVE,0,1,1,nil)
 	Duel.Remove(rg,POS_FACEUP,REASON_COST)
 	e:GetHandler():RegisterFlagEffect(13513663,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,0,1)
@@ -93,8 +95,8 @@ function c13513663.spfilter(c,e,tp)
 	return c:IsFaceup() and c:IsRace(RACE_DRAGON) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c13513663.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_REMOVED) and chkc:IsFaceup() end
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)
+	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_REMOVED) and c13513663.spfilter(chkc,e,tp) end
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingTarget(c13513663.spfilter,tp,LOCATION_REMOVED,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectTarget(tp,c13513663.spfilter,tp,LOCATION_REMOVED,0,1,1,nil,e,tp)

script/c26285788.lua

@@ -49,7 +49,7 @@ function c26285788.filter2(c)
 	return c:IsFaceup() and c:IsDestructable()
 end
 function c26285788.effectop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_CARD,0,26285789)
+	Duel.Hint(HINT_CARD,0,26285788)
 	local ct=Duel.GetFlagEffect(tp,26285789)
 	if ct==1 then
 		Duel.Draw(tp,1,REASON_EFFECT)

script/c32835363.lua

@@ -29,7 +29,7 @@ function c32835363.regcon(e,tp,eg,ep,ev,re,r,rp)
 	local d2=false
 	local tc=eg:GetFirst()
 	while tc do
-		if tc:IsPreviousLocation(LOCATION_MZONE) and tc:IsType(TYPE_MONSTER) and bit.band(tc:GetReason(),0x41)==0x41 then
+		if tc:IsPreviousLocation(LOCATION_MZONE) and tc:IsType(TYPE_MONSTER) and tc:IsReason(REASON_EFFECT) then
 			if tc:GetControler()==0 then d1=true
 			else d2=true end
 		end

script/c40908371.lua

@@ -60,7 +60,7 @@ function c40908371.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingTarget(c40908371.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectTarget(tp,c40908371.spfilter,tp,LOCATION_MZONE+LOCATION_GRAVE,0,1,1,nil,e,tp)
+	local g=Duel.SelectTarget(tp,c40908371.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
 end
 function c40908371.spop(e,tp,eg,ep,ev,re,r,rp)

script/c41620959.lua

@@ -5,10 +5,15 @@ function c41620959.initial_effect(c)
 	e1:SetCategory(CATEGORY_TOGRAVE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetCost(c41620959.cost)
 	e1:SetTarget(c41620959.target)
 	e1:SetOperation(c41620959.activate)
 	c:RegisterEffect(e1)
 end
+function c41620959.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.GetFlagEffect(tp,41620959)==0 end
+	Duel.RegisterFlagEffect(tp,41620959,RESET_PHASE+PHASE_END,0,1)
+end
 function c41620959.tgfilter(c)
 	return c:IsRace(RACE_DRAGON) and c:IsAbleToGrave()
 end

script/c64382839.lua

@@ -22,8 +22,8 @@ function c64382839.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c64382839.cfilter(c,tp)
-	return c:GetPreviousControler()==1-tp and (c:IsPreviousLocation(LOCATION_MZONE) or
-		(c:IsPreviousLocation(LOCATION_SZONE) and c:IsType(TYPE_MONSTER)))
+	return c:GetPreviousControler()==1-tp and c:IsPreviousLocation(LOCATION_ONFIELD)
+		and c:IsType(TYPE_MONSTER) and not c:IsType(TYPE_TOKEN)
 end
 function c64382839.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c64382839.cfilter,1,nil,tp)

script/c67757079.lua

 --キング·オブ·ビースト
 function c67757079.initial_effect(c)
-	c:SetUniqueOnField(1,0,67757079)
+	c:SetUniqueOnField(1,1,67757079)
 	--special summon
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(67757079,0))

script/c88071625.lua

@@ -43,7 +43,7 @@ function c88071625.otop(e,tp,eg,ep,ev,re,r,rp,c)
 	c:SetMaterial(sg)
 	Duel.Release(sg, REASON_SUMMON+REASON_MATERIAL)
 end
-function c6614221.valcheck(e,c)
+function c88071625.valcheck(e,c)
 	local g=c:GetMaterial()
 	local tc=g:GetFirst()
 	local atk=0

script/c88241506.lua

@@ -54,7 +54,7 @@ function c88241506.spcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c88241506.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	Duel.SetOperationInfo(0,CATEGORY_POSITION,e:GetHandler(),1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE)
 end
 function c88241506.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end