Add files via upload

expansions/script/c1110112.lua

@@ -57,7 +57,7 @@ function c1110112.tfilter1_1(c,e,tp)
 	return muxu.check_set_Urban(c) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsType(TYPE_MONSTER)
 end
 function c1110112.tfilter1_2(c)
-	return c:IsAbleToDeck() and bit.band(c:GetSummonType(),TYPE_SPSUMMON)~=0 and not c:IsPreviousLocation(LOCATION_EXTRA)
+	return c:IsAbleToDeck() and c:IsSummonType(SUMMON_TYPE_SPECIAL) and not c:IsPreviousLocation(LOCATION_EXTRA)
 end
 function c1110112.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	local b1=Duel.IsExistingMatchingCard(c1110112.tfilter1_1,tp,LOCATION_GRAVE,0,1,nil,e,tp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -98,7 +98,7 @@ function c1110112.op1(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,c1110112.tfilter1_1,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
 		if g:GetCount()<1 then return end
 		local tc=g:GetFirst()
-		Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP)
+		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
 		local e1_3=Effect.CreateEffect(c)
 		e1_3:SetType(EFFECT_TYPE_SINGLE)
 		e1_3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
@@ -107,7 +107,6 @@ function c1110112.op1(e,tp,eg,ep,ev,re,r,rp)
 		e1_3:SetReset(RESET_EVENT+0x1fe0000)
 		tc:RegisterEffect(e1_3,true)
 		tc:RegisterFlagEffect(1110112,RESET_EVENT+0x1fe0000,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(1110112,6))
-		Duel.SpecialSummonComplete()
 	else
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 		local g=Duel.SelectMatchingCard(tp,c1110112.tfilter1_2,tp,0,LOCATION_MZONE,1,1,nil)

expansions/script/c1110114.lua

@@ -51,7 +51,7 @@ function c1110114.op1(e,tp,eg,ep,ev,re,r,rp)
 	if fg:GetCount()<1 then return end
 	local fc=fg:GetFirst()
 	while fc do
-		if bit.band(fc:GetOriginalType(),TYPE_MONSTER)~=0 then
+		if bit.band(fc:GetOriginalType(),TYPE_MONSTER)~=0 and bit.band(fc:GetOriginalType(),TYPE_EFFECT)~=0 then
 			local code=fc:GetOriginalCode()
 			c:CopyEffect(code,RESET_EVENT+0x1fe0000,0,1)
 		end

expansions/script/c1111223.lua

@@ -7,10 +7,12 @@ cm.named_with_Soul=true
 function c1111223.initial_effect(c)
 --
 	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_CONTINUOUS)
+	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e1:SetCode(EFFECT_DESTROY_REPLACE)
 	e1:SetRange(LOCATION_SZONE)
 	e1:SetTarget(c1111223.tg1)
+	e1:SetValue(c1111223.val1)
+	e1:SetOperation(c1111223.op1)
 	c:RegisterEffect(e1)
 --
 	local e2=Effect.CreateEffect(c)
@@ -56,15 +58,17 @@ function c1111223.initial_effect(c)
 --
 end
 --
-function c1111223.tfilter1(c,tp)
-	return c:IsReason(REASON_EFFECT) and not c:IsReason(REASON_REPLACE)
+function c1111223.tfilter1(c,e,tp)
+	return c:IsLocation(LOCATION_ONFIELD) and c:IsReason(REASON_EFFECT) and not c:IsReason(REASON_REPLACE) and c~=e:GetHandler() 
 end
 function c1111223.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return Duel.IsCanRemoveCounter(tp,LOCATION_ONFIELD,LOCATION_ONFIELD,0x1111,1,REASON_EFFECT) and eg:IsExists(c1111223.tfilter1,1,c,tp) end
-	if Duel.SelectEffectYesNo(tp,c,96) then
-		return true
-	else return false end
+	if chk==0 then return Duel.IsCanRemoveCounter(tp,LOCATION_ONFIELD,LOCATION_ONFIELD,0x1111,1,REASON_EFFECT) and eg:IsExists(c1111223.tfilter1,1,c,e,tp) end
+	return Duel.SelectEffectYesNo(tp,e:GetHandler(),96)
+end
+--
+function c1111223.val1(e,c)
+	return c1111223.tfilter1(c,e,e:GetHandlerPlayer())
 end
 --
 function c1111223.op1(e,tp,eg,ep,ev,re,r,rp)
@@ -111,13 +115,13 @@ end
 --
 function c1111223.op3(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetFlagEffect(1111223)<1 then return false end
+	if c:GetFlagEffect(1111223)<1 then return end
 	Duel.SetChainLimitTillChainEnd(aux.FALSE)
 end
 --
 function c1111223.op4(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetFlagEffect(1111224)<1 then return false end
+	if c:GetFlagEffect(1111224)<1 then return end
 	Duel.SetChainLimit(aux.FALSE)
 end
 --