Merge branch 'master' of git.mycard.moe:mycard/pre-release-database-cdb

script/c100223031.lua

---恐巄竜華-㟴巴
+--恐巄竜華－㟴巴
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,100223037)
@@ -88,8 +88,8 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.costfilter(c,tp,ec)
-	return c:IsCode(100223037) and c:IsAbleToDeckAsCost()
-		and Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,ec)
+	return c:IsFaceup() and c:IsCode(100223037) and c:IsAbleToDeckAsCost()
+		and Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,Group.FromCards(c,ec))
 end
 function s.descost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

script/c100223032.lua

---海瀧竜華-淵巴
+--海瀧竜華－淵巴
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,100223038)
@@ -84,12 +84,12 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e) and aux.NecroValleyFilter()(c) then
 		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
 end
 function s.costfilter(c)
-	return c:IsCode(100223038) and c:IsAbleToDeckAsCost()
+	return c:IsFaceup() and c:IsCode(100223038) and c:IsAbleToDeckAsCost()
 end
 function s.drcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

script/c100223033.lua

---幻朧竜華-覇巴
+--幻朧竜華－覇巴
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,100223039)
@@ -66,11 +66,11 @@ function s.cfilter2(c)
 	return c:IsFaceup() and c:IsType(TYPE_MONSTER) and not c:IsCode(id)
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(s.cfilter1,1,e:GetHandler()) and Duel.IsExistingMatchingCard(s.cfilter2,tp,LOCATION_REMOVED,0,2,nil)
+	return eg:IsExists(s.cfilter1,1,e:GetHandler())
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+	if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter2,tp,LOCATION_REMOVED,LOCATION_REMOVED,2,nil)
+		and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 end
 function s.spop(e,tp,eg,ep,ev,re,r,rp)
@@ -80,7 +80,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.costfilter(c)
-	return c:IsCode(100223039) and c:IsAbleToDeckAsCost()
+	return c:IsFaceup() and c:IsCode(100223039) and c:IsAbleToDeckAsCost()
 end
 function s.thcost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
@@ -90,7 +90,7 @@ function s.thcost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoDeck(g,nil,SEQ_DECKBOTTOM,REASON_COST)
 end
 function s.thfilter2(c)
-	return c:IsSetCard(0x2c1) and c:IsAbleToHand()
+	return c:IsFaceupEx() and c:IsSetCard(0x2c1) and c:IsAbleToHand()
 		and not c:IsCode(id)
 end
 function s.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)

script/c100223034.lua

---创星龙华-光巴
+--創星竜華－光巴
 local s,id,o=GetID()
 function s.initial_effect(c)
 	c:SetSPSummonOnce(id)
@@ -13,7 +13,7 @@ function s.initial_effect(c)
 	--to hand
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_PZONE)
 	e1:SetCountLimit(1,id)
@@ -47,15 +47,17 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
-		Duel.BreakEffect()
-		Duel.Destroy(e:GetHandler(),REASON_EFFECT)
+		if e:GetHandler():IsRelateToEffect(e) then
+			Duel.BreakEffect()
+			Duel.Destroy(e:GetHandler(),REASON_EFFECT)
+		end
 	end
 end
-function s.spcfilter(c,tp)
+function s.spcfilter(c)
 	return c:IsReason(REASON_BATTLE+REASON_EFFECT) and c:IsPreviousLocation(LOCATION_MZONE)
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(s.spcfilter,1,nil)
+	return eg:IsExists(s.spcfilter,1,e:GetHandler())
 end
 function s.rfilter(c,tp,ec)
 	return c:IsSetCard(0x2c1) and c:IsReleasableByEffect()
@@ -65,7 +67,7 @@ end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	local g=Duel.GetMatchingGroup(s.rfilter,tp,LOCATION_MZONE,0,c,tp)
-	if chk==0 then return #g>0 and c:IsCanBeSpecialSummoned(e,0,tp,true,true) end
+	if chk==0 then return #g>0 and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,true,true) end
 	Duel.SetOperationInfo(0,CATEGORY_RELEASE,g,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
 end
@@ -88,7 +90,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RELEASE)
 	local g=Duel.SelectMatchingCard(tp,s.rfilter,tp,LOCATION_MZONE,0,1,1,aux.ExceptThisCard(e),tp,c)
-	if Duel.Release(g,REASON_EFFECT) and c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,true,true,POS_FACEUP)~=0 then
+	if Duel.Release(g,REASON_EFFECT) and c:IsRelateToEffect(e) and Duel.SpecialSummon(c,SUMMON_TYPE_RITUAL,tp,tp,true,true,POS_FACEUP)~=0 then
 		c:CompleteProcedure()
 		if Duel.IsExistingMatchingCard(s.desfilter,tp,LOCATION_ONFIELD,0,1,nil,tp)
 			and Duel.IsExistingMatchingCard(s.pfilter,tp,LOCATION_DECK,0,1,nil,tp)

script/c100223035.lua

---龙华界辟
+--竜華界闢
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--Activate

script/c100223036.lua

---登龙华转生纹
+--登竜華転生紋
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,100223034)

script/c100223037.lua

---登龙华恐‌巄门
+--登竜華恐巄門
 local s,id,o=GetID()
 function s.initial_effect(c)
 	c:SetUniqueOnField(1,0,id)

script/c100223038.lua

---登龙华海泷门
+--登竜華海瀧門
 local s,id,o=GetID()
 function s.initial_effect(c)
 	c:SetUniqueOnField(1,0,id)

script/c100223039.lua

---登龙华幻胧门
+--登竜華幻朧門
 local s,id,o=GetID()
 function s.initial_effect(c)
 	c:SetUniqueOnField(1,0,id)