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

expansions/lflist.conf

@@ -78,6 +78,7 @@
 11200043 0 --腹黑兔 因幡帝
 11200064 0 --幸运的白兔 因幡帝
 11200065 0 --因幡帝
+11200040 0 --诅咒之地
 #120
 12001006 2 --六曜的占星
 12001009 2 --六曜的先负
@@ -350,6 +351,7 @@
 33330038 0 --大洞穴之城 奥斯
 33330601 1 --相对性理论武装
 33330602 1 --相对性理性缺失
+33330107 1 --造神计划7 赤游鱼
 
 #334
 33400037 1 --D.A.L-时崎狂三-ALTER
@@ -709,7 +711,6 @@
 81009011 2	--恋风·高垣枫
 81009024 2	--风纪委员·冴岛清美
 #81015017 2	--怦然心动·北上丽花
-81000004 2 --大轮之华·桑山千雪
 81010041 0 --无法回避的视线
 81006011 0 --空鸽水着
 81007034 0 --终焉之证·白菊萤
@@ -748,6 +749,8 @@
 81008017 0 --一发逆转·多田李衣菜
 81008021 2 --不悦目光·橘爱丽丝
 81010027 1 --高空坠落
+81015002 1 --剧场·北上丽花
+81015045 0 --北上丽花的澡堂蹦迪
 
 #822
 82228501 1 --光之精灵王 斯嘉丽

expansions/script/c30556010.lua

@@ -91,6 +91,7 @@ function c30556010.cfilter(c)
 	return c:IsType(TYPE_SYNCHRO)
 end
 function c30556010.damcon(e,tp,eg,ep,ev,re,r,rp)
+	local tp=e:GetHandler()
 	return Duel.IsExistingMatchingCard(c30556010.cfilter,tp,LOCATION_GRAVE,0,1,nil)
 end
 --to hand
@@ -112,7 +113,7 @@ function c30556010.desop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,c30556010.qfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil)
 	if g:GetCount()>0 then
 		if Duel.SendtoHand(g,nil,REASON_EFFECT)~=0 then
-			Duel.ConfirmCards(1-tp,g)		 
+			Duel.ConfirmCards(1-tp,g)		
 		end
 	end
 end

expansions/script/c33330107.lua

 --造神计划7 赤游鱼
 function c33330107.initial_effect(c)
 	--link summon
-	aux.AddLinkProcedure(c,nil,2,2,c33330107.lcheck)
+	aux.AddLinkProcedure(c,nil,2,99,c33330107.lcheck)
 	c:EnableReviveLimit()
 	--spsummon
 	local e1=Effect.CreateEffect(c)
@@ -37,6 +37,7 @@ function c33330107.lcheck(g,lc)
 	return g:IsExists(Card.IsLinkRace,1,nil,RACE_AQUA)
 end
 function c33330107.disable(e,c)
+	local tp=e:GetHandlerPlayer()
 	local lg1=Duel.GetLinkedGroup(tp,1,1)
 	local lg2=Duel.GetLinkedGroup(1-tp,1,1)
 	lg1:Merge(lg2)
@@ -62,13 +63,16 @@ function c33330107.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=lg:FilterSelect(tp,c33330107.relfil,1,1,nil,tp)
 	Duel.Release(g,REASON_COST)
 end
+function c33330107.spfil(c,e,tp)
+	return c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsRace(RACE_AQUA) and not c:IsCode(33330107)
+end
 function c33330107.tg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsCanBeSpecialSummoned,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil,e,0,tp,false,false) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c33330107.spfil,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,LOCATION_GRAVE)
 end
-function c33330107.cost(e,tp,eg,ep,ev,re,r,rp)
+function c33330107.op(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetMZoneCount(tp)<=0 then return end
-	local g=Duel.SelectMatchingCard(tp,Card.IsCanBeSpecialSummoned,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,1,nil,e,0,tp,false,false)
+	local g=Duel.SelectMatchingCard(tp,c33330107.spfil,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,1,nil,e,tp)
 	if g then
 		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 	end

expansions/script/c33400114.lua

@@ -16,7 +16,7 @@ function c33400114.tfilter(c,e,tp)
 	return c:IsCode(33400011) and c:IsCanBeSpecialSummoned(e,0,tp,true,false)
 end
 function c33400114.filter(c,e,tp)
-	return  c:IsSetCard(0x3341)
+	return  c:IsSetCard(0x3341) 
 		and Duel.IsExistingMatchingCard(c33400114.tfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp)
 		and Duel.GetLocationCountFromEx(tp,tp,c)>0
 end
@@ -69,8 +69,8 @@ function c33400114.tgop(e,tp,eg,ep,ev,re,r,rp)
 	local dg=Duel.GetMatchingGroup(c33400114.ss,tp,LOCATION_GRAVE,0,nil,e,tp)
 		if dg:GetCount()>0  and Duel.SelectYesNo(tp,aux.Stringid(33400114,0)) then
 			Duel.BreakEffect()
-			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)		
-			local g=Duel.SelectMatchingCard(tp,c33400114.ss,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)	   
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)	  
+			local g=Duel.SelectMatchingCard(tp,c33400114.ss,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)	 
 			local  tc=g:GetFirst()
 			Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 		end

expansions/script/c33400429.lua

@@ -16,7 +16,7 @@ function c33400429.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_TO_GRAVE)
 	e3:SetRange(LOCATION_GRAVE)
-	e3:SetProperty(EFFECT_FLAG_DELAY)
+	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e3:SetCountLimit(1,33400429)
 	e3:SetCondition(c33400429.setcon)
 	e3:SetTarget(c33400429.settg)

expansions/script/c65010092.lua

@@ -16,7 +16,7 @@ function c65010092.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e1:SetRange(LOCATION_HAND)
-	e1:SetCountLimit(1)
+	e1:SetCountLimit(1,65010092)
 	e1:SetCost(c65010092.cost)
 	e1:SetTarget(c65010092.tg)
 	e1:SetOperation(c65010092.op)

expansions/script/c65050125.lua

@@ -38,7 +38,7 @@ function c65050125.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,0,0,tp,2)
 end
 function c65050125.op(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.DiscardHand(tp,Card.IsAbleToGrave,1,1,REASON_EFFECT,nil)~=0 then
+	if Duel.DiscardHand(tp,c65050125.tgfilter,1,1,REASON_EFFECT,nil)~=0 then
 		Duel.Draw(tp,2,REASON_EFFECT)
 	end
 end

expansions/script/c81019029.lua

@@ -61,7 +61,7 @@ function c81019029.spop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SpecialSummonComplete()
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)
-	e4:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
+	e4:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e4:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	e4:SetTargetRange(1,0)
 	e4:SetTarget(c81019029.splimit)

expansions/strings.conf

@@ -304,9 +304,11 @@ named_with_Zero 泽洛
 !setname 0x341 D.A.L
 !setname 0x3341 时崎
 !setname 0x5341 夜刀神
-!setname 0x5342 鸢一折纸
+!setname 0x9341 五河
+!setname 0x5342 鸢一
 !setname 0x6342 本条
-!setname 0xc342 五河士道
+!setname 0xa342 崇宫
+!setname 0xc342 士道
 !setname 0x3343 天香
 !setname 0x6343 CR-Unit
 !setname 0x9343 AST