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

script/c101303030.lua

@@ -52,7 +52,7 @@ function s.cfilter(c,tp)
 		and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil,c:GetLevel()-1,c:GetRace())
 end
 function s.thfilter(c,level,race)
-	return c:IsLevel(level) and c:IsRace(race)
+	return c:IsLevel(level) and c:IsRace(race) and c:IsType(TYPE_MONSTER)
 		and c:IsAttribute(ATTRIBUTE_WATER) and c:IsAbleToHand()
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)

script/c101303077.lua

---
+--禁断儀式術
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--Activate
 	local e1=aux.AddRitualProcEqual2(c,aux.TRUE,LOCATION_GRAVE,aux.TRUE,aux.FALSE,false,s.extraop)
+	e1:SetDescription(aux.Stringid(id,0))
 	e1:SetCountLimit(1,id)
+	e1:SetHintTiming(TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
 	c:RegisterEffect(e1)
 	--ritual
 	local e2=Effect.CreateEffect(c)
@@ -12,6 +14,7 @@ function s.initial_effect(c)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_GRAVE)
 	e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER)
+	e2:SetCountLimit(1,id+o)
 	e2:SetCost(aux.bfgcost)
 	e2:SetOperation(s.rlop)
 	c:RegisterEffect(e2)
@@ -56,6 +59,7 @@ function s.descon(e,tp,eg,ep,ev,re,r,rp)
 	else return true end
 end
 function s.desop(e,tp,eg,ep,ev,re,r,rp)
+	Duel.Hint(HINT_CARD,0,id)
 	Duel.Destroy(e:GetLabelObject(),REASON_EFFECT)
 end
 function s.rlop(e,tp,eg,ep,ev,re,r,rp)
@@ -77,4 +81,4 @@ function s.rlcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function s.rltg(e,c)
 	return c:IsType(TYPE_RITUAL)
-end
\ No newline at end of file
+end

script/c101303079.lua

---
+--舌先減少
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--Activate
@@ -42,6 +42,7 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 		local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil,code)
 		if g:GetCount()>0 then
+			Duel.BreakEffect()
 			Duel.SendtoHand(g,nil,REASON_EFFECT)
 			Duel.ConfirmCards(1-tp,g)
 		end

script/c101303080.lua

---
+--死地誤算守護
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--activate
 	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(id,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(TIMING_END_PHASE)
 	e1:SetCost(s.cost)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
@@ -33,7 +35,7 @@ function s.initial_effect(c)
 	e4:SetCondition(s.lvcon(5))
 	e4:SetValue(s.efilter)
 	c:RegisterEffect(e4)
-	--lv
+	--tograve
 	local e5=Effect.CreateEffect(c)
 	e5:SetCategory(CATEGORY_TOGRAVE)
 	e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
@@ -149,4 +151,4 @@ end
 function s.tgop2(e,tp,eg,ep,ev,re,r,rp)
 	local dg=Duel.GetMatchingGroup(Card.IsAbleToGrave,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
 	Duel.SendtoGrave(dg,REASON_EFFECT)
-end
\ No newline at end of file
+end