Merge branch 'master' of github.com:alstroemeria-silentlove/ygopro-222DIY-cards

expansions/lflist.conf

@@ -69,7 +69,6 @@
 09910379 2 --常陆茉子
 09910380 1 --蕾娜·莉希特娜瓦
 09910381 1 --有地将臣
-#还会回来的，一定
 
 #109
 10904000 1 --灵刻使 月魔女
@@ -301,7 +300,6 @@
 17060885 1 --圣夜型多莫维依
 17050946 2 --迷你撒旦
 17060920 1 --交响型亚瑟
-17010307 1 --宵之审问者 赫莱尔·本·夏蕾姆
 17050923 0 --邪教化身
 17060814 1 --和战型富豪亚瑟
 17060942 0 --王者之席 君士坦丁
@@ -389,7 +387,7 @@
 26810000 2 --如月千早
 26810002 2 --苍蓝之声·如月千早
 26810003 2 --游园地·如月千早
-#26810005 1 --晨间特训·如月千早
+#26810005 1 --欢迎世界·如月千早
 #26810008 1 --初夏海岸线·如月千早
 26810009 1 --雪之花·如月千早
 26805008 2 --雨落树荫
@@ -408,7 +406,7 @@
 26806003 2 --彼此的世界·海伊
 26806028 1 --好久不见·海伊
 #26806045 1 --不思议之国·苍穹
-26806050 1 --鹊桥相会·ZERO
+26806050 1 --洁净时间·海伊
 26808008 1 --特别瞬间·白鹭千圣
 26809025 0 --Despair of Infinite
 26809026 0 --Precious Sword
@@ -421,7 +419,7 @@
 26818010 2 --小鸟游雏田
 26806008 1 --黄昏灯塔·海伊
 26806009 1 --亚特兰蒂斯的歌声
-26806051 1 --花好月圆·ZERO
+26806051 1 --海浪之舞·海伊
 26807043 0 --燃烬的现实
 26809037 2 --人赐良机
 26807033 0 --小巷探秘

expansions/script/c10908004.lua

@@ -62,12 +62,12 @@ function c10908004.activate(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e2)
 	end
 end
-function c10908004.filter(c,e,tp)
+function c10908004.filter2(c,e,tp)
 	return c:IsSetCard(0x23b) and (c:IsCanBeSpecialSummoned(e,0,tp,false,false) or c:IsSummonable(true,nil))
 end
 function c10908004.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(c10908004.filter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp) end
+		and Duel.IsExistingMatchingCard(c10908004.filter2,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE)
 	Duel.SetOperationInfo(0,CATEGORY_SUMMON,nil,1,0,0)
 end
@@ -75,7 +75,7 @@ function c10908004.sumop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SUMMON)
-		local g=Duel.SelectMatchingCard(tp,c10908004.filter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp)
+		local g=Duel.SelectMatchingCard(tp,c10908004.filter2,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp)
 		if g:GetCount()>0 then
 			if g:GetFirst():GetLocation()==LOCATION_GRAVE 
 			then

expansions/script/c12001006.lua

@@ -51,7 +51,7 @@ function c12001006.operation(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ShuffleDeck(tp)
 	end
-	local tg=Duel.GetMatchingGroup(Card.IsAbleToDeck,tp,LOCATION_HAND,0,nil)
+	local tg=Duel.GetMatchingGroup(Card.IsSetCard,tp,LOCATION_HAND,0,nil,0xfb0)
 	if tg:GetCount()>1 and tg:IsExists(Card.IsSetCard,1,nil,0xfb0) then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 			local sg1=tg:Select(tp,Card.IsSetCard,1,1,nil,0xfb0)

expansions/script/c12026032.lua

@@ -48,12 +48,12 @@ function cm.spcon(e,c)
 	local mg=Duel.GetMatchingGroup(cm.confilter,tp,LOCATION_MZONE,0,nil,c)
 	return Senya.CheckGroup(mg,cm.gcheck,nil,1,4,tp,c)
 end
-function cm.spop(e,tp,eg,ep,ev,re,r,rp,c)
+function cm.thop(e,tp,eg,ep,ev,re,r,rp,c)
 	local mg=Duel.GetMatchingGroup(cm.confilter,tp,LOCATION_MZONE,0,nil,c)
 	local g=Senya.SelectGroup(tp,HINTMSG_TOGRAVE,mg,cm.gcheck,nil,1,3,tp,c)
 	Duel.SendtoGrave(g,REASON_COST)
 end
-function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
+function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_MONSTER)
 	return g:GetClassCount(Card.GetRace)==g:GetCount()
 end
@@ -84,4 +84,4 @@ function cm.regop(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetValue(99)
 	e2:SetTargetRange(1,0)
 	Duel.RegisterEffect(e2,tp)
-end
\ No newline at end of file
+end

expansions/script/c12038011.lua

@@ -109,14 +109,14 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-   if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,0,1,nil) end
+   if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_ONFIELD)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if not Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,0,1,nil) then return end
+	if not Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local sc=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,LOCATION_ONFIELD,0,1,1,nil) 
+	local sc=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil) 
 	if  Duel.Remove(sc,0,REASON_EFFECT+REASON_TEMPORARY)~=0 then
 	   local e1=Effect.CreateEffect(e:GetHandler())
 	   e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
@@ -127,4 +127,4 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	   e1:SetOperation(srprzm.retop)
 	   Duel.RegisterEffect(e1,tp)
 	end
-end
\ No newline at end of file
+end

expansions/script/c12041005.lua

@@ -21,6 +21,7 @@ function cm.initial_effect(c)
 	e2:SetCode(EFFECT_IMMUNE_EFFECT)
 	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetCondition(cm.imcon)
 	e2:SetValue(cm.efilter)
 	c:RegisterEffect(e2)
 	--destroy
@@ -35,6 +36,9 @@ function cm.initial_effect(c)
 	e4:SetOperation(cm.desop)
 	c:RegisterEffect(e4)
 end
+function cm.imcon(e)
+    return e:GetHandler():GetFlagEffect(m)==0
+end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return Duel.IsPlayerCanDiscardDeckAsCost(tp,3) end

expansions/script/c33500107.lua

@@ -33,12 +33,14 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.NegateActivation(ev) and ec:IsRelateToEffect(re) then
 		if Duel.Remove(eg,POS_FACEUP,REASON_EFFECT)~=0 then
 			local g=Duel.GetMatchingGroup(cm.desfilter,tp,0,LOCATION_ONFIELD,aux.ExceptThisCard(e))
-			local g1=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.thfilter),tp,LOCATION_DECK,0,1,1,nil)
-			if #g>0 and Duel.SelectYesNo(tp,aux.Stringid(m,1)) and #g1>0 then
-				Duel.BreakEffect()
+			if #g>0 and Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil) then
+				local g1=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.thfilter),tp,LOCATION_DECK,0,1,1,nil)
 				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-				Duel.SendtoHand(g1,nil,REASON_EFFECT)
-				Duel.ConfirmCards(1-tp,g1)
+				if #g1>0  then
+				   Duel.BreakEffect()
+				   Duel.SendtoHand(g1,nil,REASON_EFFECT)
+				   Duel.ConfirmCards(1-tp,g1)
+				end
 			end
 		end
 	end

expansions/script/c66915005.lua

 --光辉星曜·圣芒
-function c66915005.initial_effect(c)
 function c66915005.initial_effect(c)
     c:SetUniqueOnField(1,0,66915005)
     --Activate

expansions/script/c81005016.lua

@@ -56,13 +56,13 @@ function cm.dfilter(c,code)
 end
 function cm.tftg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0
-		and Duel.IsExistingMatchingCard(cm.tffilter,tp,LOCATION_DECK,0,1,nil,tp) end
+		and Duel.IsExistingMatchingCard(cm.tffilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,tp) end
 	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
 end
 function cm.tfop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
-	local tc=Duel.SelectMatchingCard(tp,cm.tffilter,tp,LOCATION_DECK,0,1,1,nil,tp):GetFirst()
+	local tc=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.tffilter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,tp):GetFirst()
 	if tc then
 		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 		local e1=Effect.CreateEffect(e:GetHandler())