Merge branch 'master' of https://github.com/amarillonmc/no81cards

expansions/script/c13254038.lua

@@ -75,7 +75,7 @@ function cm.disop(e,tp,eg,ep,ev,re,r,rp)
 		if sg1:GetSum(tama.tamas_getElementCount,TAMA_ELEMENT_MANA)>=3 then
 			Duel.BreakEffect()
 			--change damage
-			local e1=Effect.CreateEffect(c)
+			local e1=Effect.CreateEffect(e:GetHandler())
 			e1:SetType(EFFECT_TYPE_FIELD)
 			e1:SetCode(EFFECT_CHANGE_DAMAGE)
 			e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)

expansions/script/c13254050.lua

@@ -56,7 +56,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 
 		if op==1 or t then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-			local g=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
+			local g=Duel.SelectMatchingCard(tp,aux.TRUE,tp,0,LOCATION_ONFIELD,1,1,nil)
 			if g:GetCount()>0 then
 				Duel.Destroy(g,REASON_EFFECT)
 			end
@@ -66,7 +66,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 		end
 		if op==3 or t then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-			local g=Duel.SelectMatchingCard(tp,cm.rfilter,tp,0,LOCATION_GRAVE+LOCATION_EXTRA,1,1,nil)
+			local g=Duel.SelectMatchingCard(tp,cm.rfilter,tp,0,0+LOCATION_EXTRA,1,1,nil)
 			if g:GetCount()>0 then
 				Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
 			end

expansions/script/c13255407.lua

@@ -21,7 +21,7 @@ function cm.chainfilter(re,tp,cid)
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() and Duel.GetCustomActivityCount(m,tp,ACTIVITY_CHAIN)==0 end
-	local e1=Effect.CreateEffect(c)
+	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
 	e1:SetCode(EFFECT_CANNOT_ACTIVATE)

expansions/script/c22060140.lua

@@ -29,15 +29,12 @@ function c22060140.initial_effect(c)
 	e2:SetOperation(c22060140.negop)
 	c:RegisterEffect(e2)
 end
-function c22060140.matfilter(c)
+function c22060140.thfilter(c)
 	return c:IsSetCard(0xff3) and c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 function c22060140.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
 end
-function c22060140.thfilter(c)
-	return c:IsLevel(5) and c:IsRace(RACE_WARRIOR) and c:IsAbleToHand()
-end
 function c22060140.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c22060140.thfilter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)

expansions/script/c33701435.lua

@@ -16,13 +16,14 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local ac=Duel.AnnounceCard(tp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_CHAINING)
+	e1:SetCode(EVENT_CHAIN_SOLVING)
 	e1:SetLabel(ac)
 	e1:SetCondition(cm.discon)
 	e1:SetOperation(cm.disop)
 	Duel.RegisterEffect(e1,tp)
 end
 function cm.discon(e,tp,eg,ep,ev,re,r,rp)
+	local ac=e:GetLabel()
 	return re:GetHandler():IsCode(ac)
 end
 function cm.disop(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c9910458.lua

@@ -55,6 +55,7 @@ function c9910458.spfilter(c,e,tp,zone)
 end
 function c9910458.seqfilter(c,tp,seq)
 	if not c:IsCanAddCounter(0x1950,1) then return false end
+	if c:IsControler(1-tp) and c:GetSequence()<5 then return false end
 	local cseq=c:GetSequence()
 	local cloc=c:GetLocation()
 	if cloc==LOCATION_SZONE and cseq>=5 then return false end
@@ -67,7 +68,7 @@ end
 function c9910458.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local zone=0
 	for i=0,4 do
-		if Duel.IsExistingMatchingCard(c9910458.seqfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil,tp,i) then
+		if Duel.IsExistingMatchingCard(c9910458.seqfilter,tp,LOCATION_ONFIELD,LOCATION_MZONE,1,nil,tp,i) then
 			zone=bit.replace(zone,0x1,i)
 		end
 	end
@@ -79,7 +80,7 @@ function c9910458.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	local zone=0
 	for i=0,4 do
-		if Duel.IsExistingMatchingCard(c9910458.seqfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil,tp,i) then
+		if Duel.IsExistingMatchingCard(c9910458.seqfilter,tp,LOCATION_ONFIELD,LOCATION_MZONE,1,nil,tp,i) then
 			zone=bit.replace(zone,0x1,i)
 		end
 	end
@@ -87,7 +88,7 @@ function c9910458.spop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=g:GetFirst()
 	if tc and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP,zone)~=0 and tc:IsOnField() then
 		local seq=tc:GetSequence()
-		local sg=Duel.GetMatchingGroup(c9910458.seqfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,tc,tp,seq)
+		local sg=Duel.GetMatchingGroup(c9910458.seqfilter,tp,LOCATION_ONFIELD,LOCATION_MZONE,tc,tp,seq)
 		for sc in aux.Next(sg) do sc:AddCounter(0x1950,1) end
 		local fid=e:GetHandler():GetFieldID()
 		tc:RegisterFlagEffect(9910466,RESET_EVENT+RESETS_STANDARD,0,1,fid)

expansions/script/c9910460.lua

@@ -46,7 +46,7 @@ end
 function c9910460.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
-		local g=Duel.GetMatchingGroup(c9910460.ctfilter,tp,0,LOCATION_ONFIELD,nil)
+		local g=Duel.GetMatchingGroup(c9910460.ctfilter,tp,0,LOCATION_MZONE,nil)
 		if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(9910460,0)) then
 			local tc=g:GetFirst()
 			while tc do