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

pack/2025-07-26 DOOD.ydk

@@ -4,6 +4,10 @@
 101302203
 101302006
 101302007
+101302008
+101302009
+101302010
+101302011
 101302012
 101302013
 101302014
@@ -22,11 +26,18 @@
 101302041
 101302042
 101302206
+101302044
+101302045
+101302046
 101302207
 101302050
 101302053
 101302208
 101302056
+101302057
+101302058
+101302059
+101302060
 101302061
 101302062
 101302063
@@ -34,4 +45,6 @@
 101302066
 101302069
 101302209
+101302074
+101302075
 101302076
\ No newline at end of file

pack/etc.ydk

@@ -2,5 +2,6 @@
 100200274
 100200275
 100200276
+100200277
 100238201
 100243001
\ No newline at end of file

script/c101302008.lua

---終刻竜機ⅩⅡ-ドラスティア
+--終刻竜機ⅩⅡ－ドラスティア
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--spsummon
@@ -51,10 +51,8 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 			Duel.BreakEffect()
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
 			local g=Duel.SelectMatchingCard(tp,s.eqfilter,tp,LOCATION_DECK,0,1,1,nil,c,tp)
-			local tc=g:GetFirst()
-			if tc then
-				if not Duel.Equip(tp,tc,c) then return end
-			end
+			local ec=g:GetFirst()
+			if ec then Duel.Equip(tp,ec,c) end
 		end
 	end
 end
@@ -63,7 +61,8 @@ function s.xyzcon(e,tp,eg,ep,ev,re,r,rp)
 	return g:GetCount()>0
 end
 function s.spfilter(c,e,tp,lv)
-	return c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_WIND) and c:IsRank(lv) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
+	return c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_WIND) and c:IsRank(lv)
+		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
 function s.xyztg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

script/c101302009.lua

---終刻竜機Ⅴ-アマルテ
+--終刻竜機Ⅴ－アマルテ
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--search
@@ -41,6 +41,7 @@ end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
+	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
@@ -55,7 +56,8 @@ function s.xyzcon(e,tp,eg,ep,ev,re,r,rp)
 	return g:GetCount()>0
 end
 function s.spfilter(c,e,tp,lv)
-	return c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_WIND) and c:IsRank(lv) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
+	return c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_WIND) and c:IsRank(lv)
+		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
 function s.xyztg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
@@ -63,6 +65,7 @@ function s.xyztg(e,tp,eg,ep,ev,re,r,rp,chk)
 		and aux.MustMaterialCheck(nil,tp,EFFECT_MUST_BE_XMATERIAL)
 		and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp,c:GetLevel()) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
+	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
 end
 function s.xyzop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

script/c101302010.lua

---終刻竜機Ⅶ-エララ
+--終刻竜機Ⅶ－エララ
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--set
@@ -16,7 +16,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e2)
 	local e3=e1:Clone()
 	e3:SetCode(EVENT_DESTROYED)
-	e3:SetCondition(s.thcon)
+	e3:SetCondition(s.setcon)
 	c:RegisterEffect(e3)
 	--spsummon
 	local e4=Effect.CreateEffect(c)
@@ -31,18 +31,16 @@ function s.initial_effect(c)
 	e4:SetOperation(s.xyzop)
 	c:RegisterEffect(e4)
 end
-function s.thcon(e,tp,eg,ep,ev,re,r,rp,chk)
+function s.setcon(e,tp,eg,ep,ev,re,r,rp,chk)
 	return e:GetHandler():IsReason(REASON_EFFECT)
 end
 function s.setfilter(c)
 	return c:IsSetCard(0x2d3) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSSetable()
 end
 function s.settg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0
-		and Duel.IsExistingMatchingCard(s.setfilter,tp,LOCATION_DECK,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(s.setfilter,tp,LOCATION_DECK,0,1,nil) end
 end
 function s.setop(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
 	local g=Duel.SelectMatchingCard(tp,s.setfilter,tp,LOCATION_DECK,0,1,1,nil)
 	local tc=g:GetFirst()
@@ -55,7 +53,8 @@ function s.xyzcon(e,tp,eg,ep,ev,re,r,rp)
 	return g:GetCount()>0
 end
 function s.spfilter(c,e,tp,lv)
-	return c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_WIND) and c:IsRank(lv) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
+	return c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_WIND) and c:IsRank(lv)
+		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
 function s.xyztg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

script/c101302011.lua

---獄神機Doom-Z
+--獄神機Doom－Z
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,101302044)
@@ -43,7 +43,9 @@ function s.cfilter(c,e,tp)
 		and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_XMATERIAL)
 end
 function s.spfilter(c,e,tp,mc)
-	return c:IsRank(mc:GetLevel()) and (c:IsSetCard(0x2d3) or c:IsCode(101302044)) and c:IsType(TYPE_XYZ) and mc:IsCanBeXyzMaterial(c) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0
+	return c:IsRank(mc:GetLevel()) and (c:IsSetCard(0x2d3) or c:IsCode(101302044)) and c:IsAllTypes(TYPE_XYZ+TYPE_MONSTER)
+		and mc:IsCanBeXyzMaterial(c) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false)
+		and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end
@@ -57,7 +59,8 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
 	if not aux.MustMaterialCheck(tc,tp,EFFECT_MUST_BE_XMATERIAL) then return end
-	if tc:IsFacedown() or not tc:IsRelateToChain() or tc:IsControler(1-tp) or tc:IsImmuneToEffect(e) then return end
+	if tc:IsFacedown() or not tc:IsRelateToChain() or not tc:IsType(TYPE_MONSTER)
+		or tc:IsControler(1-tp) or tc:IsImmuneToEffect(e) then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,tc)
 	local sc=g:GetFirst()
@@ -70,11 +73,11 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Overlay(sc,Group.FromCards(tc))
 		Duel.SpecialSummon(sc,SUMMON_TYPE_XYZ,tp,tp,false,false,POS_FACEUP)
 		sc:CompleteProcedure()
-		if c:IsRelateToChain() and Duel.GetLocationCount(tp,LOCATION_SZONE)>0 then
-			if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 or tc:IsFacedown() then
-       			Duel.SendtoGrave(c,REASON_EFFECT)
-    		    return
-    		end
+		if c:IsRelateToChain() and c:IsControler(tp) then
+			if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then
+				Duel.SendtoGrave(c,REASON_RULE)
+				return
+			end
 			if not Duel.Equip(tp,c,sc) then return end
 			--equip limit
 			local e1=Effect.CreateEffect(c)