Merge branch 'master' of https://code.moenext.com/beyondli/md-prerelease

script/c101301223.lua

@@ -58,13 +58,13 @@ function s.initial_effect(c)
 	--place in pzone
 	local e5=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,1))
-	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetCode(EVENT_TO_DECK)
-	e2:SetProperty(EFFECT_FLAG_DELAY)
-	e2:SetCondition(s.pzcon)
-	e2:SetTarget(s.pztg)
-	e2:SetOperation(s.pzop)
-	c:RegisterEffect(e2)
+	e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e5:SetCode(EVENT_TO_DECK)
+	e5:SetProperty(EFFECT_FLAG_DELAY)
+	e5:SetCondition(s.pzcon)
+	e5:SetTarget(s.pztg)
+	e5:SetOperation(s.pzop)
+	c:RegisterEffect(e5)
 end
 function s.reg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
@@ -130,7 +130,7 @@ function s.rspcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	return true
 end
 function s.rfilter(c)
-	return c:IsSetCard(0x197) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:CheckActivateEffect(false,true,false)~=nil
+	return c:IsSetCard(0x197) and c:GetType()==TYPE_SPELL+TYPE_RITUAL and c:CheckActivateEffect(false,true,false)~=nil
 end
 function s.rsptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then

script/c101301229.lua

@@ -35,7 +35,7 @@ function s.initial_effect(c)
 	e4:SetCountLimit(1,id+o)
 	e4:SetTarget(s.sptg)
 	e4:SetOperation(s.spop)
-	c:RegisterEffect(e2)
+	c:RegisterEffect(e4)
 end
 function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return not e:GetHandler():IsPublic() end
@@ -73,7 +73,7 @@ function s.spfilter(c,e,tp)
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return Duel.IsExistingMatchingCard(s.relfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,c,tp,c)
+	if chk==0 then return Duel.IsExistingMatchingCard(s.relfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,tp)
 		and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_DECK)
 end

script/c101301267.lua

@@ -61,10 +61,10 @@ function s.lpop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLP(1-tp)>=850 then Duel.PayLPCost(1-tp,850) end
 end
 function s.cfilter3(c,tp,e)
-	return c:IsLocation(LOCATION_MZONE) and c:IsSummonPlayer(tp) and c:IsCanBeEffectTarget(e) and c:IsLevelAbove(1)
+	return c:IsLocation(LOCATION_MZONE) and c:IsSummonPlayer(tp) and c:IsCanBeEffectTarget(e) and c:IsType(TYPE_RITUAL) and c:IsLevelAbove(1)
 end
 function s.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(s.cfilter3,1,nil,tp)
+	return eg:IsExists(s.cfilter3,1,nil,tp,e)
 end
 function s.thfilter(c)
 	return c:IsSetCard(0x196,0x197) and c:GetType()~=TYPE_SPELL+TYPE_CONTINUOUS and c:IsAbleToHand()