Push by Appveyor

expansions/script/c1000602.lua

@@ -5,19 +5,18 @@ function c1000602.initial_effect(c)
 	e1:SetDescription(aux.Stringid(1000602,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
-	e1:SetCountLimit(1,1000621)
+	e1:SetCountLimit(1,10006021)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCost(c1000602.spcost)
 	e1:SetTarget(c1000602.sptg)
 	e1:SetOperation(c1000602.spop)
 	c:RegisterEffect(e1)
-	Duel.AddCustomActivityCounter(1000602,ACTIVITY_SPSUMMON,c1000602.counterfilter)
 	--
 	local e2=Effect.CreateEffect(c)
 	e2:SetCategory(CATEGORY_TOGRAVE)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_GRAVE)
-	e2:SetCountLimit(1,1000602)
+	e2:SetCountLimit(1,10006022)
 	e2:SetCondition(c1000602.con)
 	e2:SetCost(c1000602.cost)
 	e2:SetTarget(c1000602.tg)
@@ -28,10 +27,6 @@ function c1000602.initial_effect(c)
 		NitoriGlobal["Effects"]={}
 	end
 	NitoriGlobal["Effects"]["c1000602"]=e2
-	Duel.AddCustomActivityCounter(1000602,ACTIVITY_SPSUMMON,c1000602.counterfilter)
-end
-function c1000602.counterfilter(c)
-	return c:IsSetCard(0xc204) and not c:IsType(TYPE_PENDULUM)
 end
 function c1000602.costfilter(c)
 	return c:IsSetCard(0xc204) and c:IsType(TYPE_MONSTER) and not c:IsType(TYPE_PENDULUM) and c:IsDiscardable() 
@@ -40,17 +35,6 @@ function c1000602.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c1000602.costfilter,tp,LOCATION_HAND,0,1,e:GetHandler()) 
 	  and Duel.GetCustomActivityCount(1000602,tp,ACTIVITY_SPSUMMON)==0 end
 	Duel.DiscardHand(tp,c1000602.costfilter,1,1,REASON_COST+REASON_DISCARD)
-	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
-	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
-	e1:SetReset(RESET_PHASE+PHASE_END)
-	e1:SetTargetRange(1,0)
-	e1:SetTarget(c1000602.splimit)
-	Duel.RegisterEffect(e1,tp)
-end
-function c1000602.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not c:IsSetCard(0xc204)
 end
 function c1000602.filter(c,e,tp)
 	return c:IsSetCard(0xc204) and not (c:IsType(TYPE_TUNER) and c:IsType(TYPE_PENDULUM)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
@@ -79,14 +63,6 @@ function c1000602.con(e,tp,eg,ep,ev,re,r,rp)
 end
 function c1000602.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return  Duel.GetCustomActivityCount(1000602,tp,ACTIVITY_SPSUMMON)==0 end
-	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
-	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
-	e1:SetReset(RESET_PHASE+PHASE_END)
-	e1:SetTargetRange(1,0)
-	e1:SetTarget(c1000602.splimit)
-	Duel.RegisterEffect(e1,tp)
 end
 function c1000602.tgfilter(c)
 	return c:IsSetCard(0xc204) and not (c:IsType(TYPE_TUNER) and c:IsType(TYPE_PENDULUM)) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()

expansions/script/c1000603.lua

@@ -8,7 +8,6 @@ function c1000603.initial_effect(c)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,1000603)
 	e1:SetCondition(c1000603.con)
-	e1:SetCost(c1000603.cost)
 	e1:SetTarget(c1000603.setg)
 	e1:SetOperation(c1000603.seop)
 	c:RegisterEffect(e1)
@@ -59,6 +58,11 @@ end
 function c1000603.filter9(c,e,tp)
 	return c:IsSetCard(0xc204) and c:IsControler(tp) and not c:IsType(TYPE_PENDULUM) 
 end
+function c1000603.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return  Duel.IsExistingMatchingCard(c1000603.costfilter,tp,LOCATION_HAND,0,1,nil) end
+	Duel.DiscardHand(tp,c1000603.costfilter,1,1,REASON_COST+REASON_DISCARD)
+	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
+end
 function c1000603.con(e,tp,eg,ep,ev,re,r,rp)
    local g=Duel.GetMatchingGroup(c1000603.filter9,e:GetHandlerPlayer(),LOCATION_GRAVE,0,nil,e,tp)
 	local ct=g:GetClassCount(Card.GetCode)
@@ -67,11 +71,6 @@ end
 function c1000603.costfilter(c)
 	return c:IsDiscardable() and c:IsSetCard(0xc204) and not c:IsType(TYPE_PENDULUM)
 end
-function c1000603.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return  Duel.IsExistingMatchingCard(c1000603.costfilter,tp,LOCATION_HAND,0,1,nil) end
-	Duel.DiscardHand(tp,c1000603.costfilter,1,1,REASON_COST+REASON_DISCARD)
-	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
-end
 function c1000603.sefilter(c)
 	return c:IsSetCard(0xc204)  and c:IsAbleToHand() and  c:IsType(TYPE_MONSTER) and not c:IsType(TYPE_PENDULUM)
 end

expansions/script/c1000609.lua

@@ -30,7 +30,7 @@ function c1000609.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
 end
 function c1000609.sefilter(c)
-	return c:IsSetCard(0xc204) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() and not c:IsType(TYPE_PENDULUM)
+	return c:IsSetCard(0xc204) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function c1000609.setg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c1000609.sefilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c1000615.lua

@@ -39,7 +39,7 @@ function c1000615.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c1000615.filter9(c,e,tp)
-	return c:IsSetCard(0xc204) and c:IsControler(tp) and not c:IsType(TYPE_PENDULUM) 
+	return c:IsSetCard(0xc204) and c:IsControler(tp)
 end
 function c1000615.con2(e,tp,eg,ep,ev,re,r,rp)
    local g=Duel.GetMatchingGroup(c1000615.filter9,e:GetHandlerPlayer(),LOCATION_GRAVE,0,nil,e,tp)

expansions/script/c1000621.lua

@@ -3,9 +3,9 @@ function c1000621.initial_effect(c)
 	--search
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(1000621,0))
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_HANDES)
+	e1:SetCategory(CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_IGNITION)
-	e1:SetCountLimit(1,1000621)
+	e1:SetCountLimit(1,10006211)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTarget(c1000621.target)
 	e1:SetOperation(c1000621.operation)
@@ -18,27 +18,26 @@ function c1000621.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_CHAINING)
 	e1:SetRange(LOCATION_GRAVE)
-	e1:SetCountLimit(1,10006210)
+	e1:SetCountLimit(1,10006212)
 	e1:SetCondition(c1000621.negcon)
 	e1:SetTarget(c1000621.negtg)
 	e1:SetOperation(c1000621.negop)
 	c:RegisterEffect(e1)
 end
 function c1000621.filter(c)
-	return c:IsSetCard(0xc204) and c:IsType(TYPE_MONSTER) and not c:IsType(TYPE_PENDULUM) and c:IsAbleToHand()
+	return c:IsSetCard(0xc204) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function c1000621.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c1000621.filter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
-	Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,1,tp,1)
 end
 function c1000621.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectMatchingCard(tp,c1000621.filter,tp,LOCATION_DECK,0,1,1,nil)
-	if g:GetCount()==0 then return end
+	if g:GetCount()>0 then
 	Duel.SendtoHand(g,nil,REASON_EFFECT)
 	Duel.ConfirmCards(1-tp,g)
-	Duel.ShuffleHand(tp)
+	end
 end
 function c1000621.tfilter(c,tp)
 	return c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) and c:IsFaceup() and c:IsSetCard(0xc204)

expansions/script/c22241001.lua

@@ -31,7 +31,7 @@ function c22241001.IsSolid(c)
 	return m and m.named_with_Solid
 end
 function c22241001.desfilter(c)
-	return bit.band(c:GetType(),0x81)==0x81
+	return bit.band(c:GetType(),0x81)==0x81 and c22241001.IsSolid(c)
 end
 function c22241001.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(tp) and c22241001.desfilter(chkc) end

expansions/script/c37564337.lua

+--DON'T CUT
+local m=37564337
+local cm=_G["c"..m]
+xpcall(function() require("expansions/script/c37564765") end,function() require("script/c37564765") end)
+function cm.initial_effect(c)
+	Senya.AddXyzProcedureCustom(c,function(c) return c:IsType(TYPE_LINK) and c:GetLink()==3 end,nil,2,63)
+	Senya.AddSummonMusic(c,m*16,SUMMON_TYPE_XYZ)
+	local e4=Effect.CreateEffect(c)
+	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
+	e4:SetCode(EVENT_PHASE+PHASE_STANDBY)
+	e4:SetRange(LOCATION_MZONE)
+	e4:SetCountLimit(1)
+	e4:SetCondition(function(e,tp) return Duel.GetTurnPlayer()==tp end)
+	e4:SetTarget(cm.rmtg)
+	e4:SetOperation(cm.rmop)
+	c:RegisterEffect(e4)
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_SET_ATTACK)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	e1:SetTarget(function(e,c) return c:IsType(TYPE_LINK) end)
+	e1:SetValue(function(e,c) return math.ceil(c:GetBaseAttack()/2) end)
+	c:RegisterEffect(e1)
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(710253)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	e1:SetCondition(function(e) return e:GetHandler():GetOverlayCount()>0 end)
+	e1:SetTarget(function(e,c) return c:IsType(TYPE_LINK) end)
+	e1:SetValue(0)
+	c:RegisterEffect(e1)
+end
+function cm.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return true end
+	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
+end
+function cm.rmop(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	c:RemoveOverlayCard(tp,1,1,REASON_EFFECT)
+end
\ No newline at end of file

expansions/script/c37564338.lua

+--恋色的舞姬·纱由里
+local m=37564338
+local cm=_G["c"..m]
+xpcall(function() require("expansions/script/c37564765") end,function() require("script/c37564765") end)
+function cm.initial_effect(c)
+	--link summon
+	aux.AddLinkProcedure(c,aux.TRUE,4)
+	c:EnableReviveLimit()
+	--atk
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_UPDATE_ATTACK)
+	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetValue(cm.atkval)
+	c:RegisterEffect(e1)
+	--negate
+	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(m,0))
+	e2:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
+	e2:SetType(EFFECT_TYPE_QUICK_O)
+	e2:SetCode(EVENT_CHAINING)
+	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
+	e2:SetRange(LOCATION_MZONE)
+	e2:SetCondition(cm.discon)
+	e2:SetCost(cm.discost)
+	e2:SetTarget(cm.distg)
+	e2:SetOperation(cm.disop)
+	c:RegisterEffect(e2)	
+end
+function cm.atkval(e,c)
+	return c:GetLinkedGroupCount()*2000
+end
+function cm.tfilter(c,tp)
+	return c:IsOnField() and c:IsControler(tp)
+end
+function cm.discon(e,tp,eg,ep,ev,re,r,rp)
+	return not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) and Duel.IsChainNegatable(ev)
+end
+function cm.cfilter(c,g)
+	return g:IsContains(c) and not c:IsStatus(STATUS_BATTLE_DESTROYED) and c:IsAbleToRemoveAsCost()
+end
+function cm.discost(e,tp,eg,ep,ev,re,r,rp,chk)
+	local lg=e:GetHandler():GetLinkedGroup()
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_MZONE,0,1,nil,lg) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINGMSG_REMOVE)
+	local g=Duel.SelectMatchingCard(tp,cm.cfilter,tp,LOCATION_MZONE,0,1,1,nil,lg)
+	local tc=g:GetFirst()
+	if Duel.Remove(tc,POS_FACEUP,REASON_COST+REASON_TEMPORARY)~=0 then
+		local e1=Effect.CreateEffect(e:GetHandler())
+		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		e1:SetCode(EVENT_PHASE+PHASE_END)
+		e1:SetReset(RESET_PHASE+PHASE_END)
+		e1:SetLabelObject(tc)
+		e1:SetCountLimit(1)
+		e1:SetOperation(cm.retop)
+		Duel.RegisterEffect(e1,tp)
+	end
+end
+function cm.retop(e,tp,eg,ep,ev,re,r,rp)
+	Duel.ReturnToField(e:GetLabelObject())
+end
+function cm.distg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return true end
+	Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
+	if re:GetHandler():IsDestructable() and re:GetHandler():IsRelateToEffect(re) then
+		Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0)
+	end
+end
+function cm.disop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
+		Duel.Destroy(eg,REASON_EFFECT)
+	end
+end
\ No newline at end of file

expansions/strings.conf

@@ -118,6 +118,7 @@
 #兔锅 222
 #named_with_Shirasawa_Tama 白泽球
 #named_with_Darkest_D Darkest
+#named_with_Solid Solid
 
 #Nemoma 337 0x440-0x44f
 !setname 0x442 动物朋友

lflist.conf

@@ -22,17 +22,16 @@
 #52
 05200010 0 --圣精灵 格奥基乌斯
 #101
-#食腐鼠
 10173052 1 --喜剧小丑
 10173054 0 --食腐骨犬
 10173058 0 --恶魔科学塑型体
 10173059 0 --连接融合者
 #132
-13254059 2 --元始飞球
-13254065 1 --禁忌飞球·饕餮
-13254067 1 --禁忌飞球·怠惰
-13254073 1 --禁忌飞球·妒忌
-13254085 1 --腐化飞球·侵蚀
+#元始飞球
+#禁忌飞球·饕餮
+#禁忌飞球·怠惰
+#禁忌飞球·妒忌
+#腐化飞球·侵蚀
 13255402 2 --清者自清
 #135
 13580008 0 --怨念之冥途世界
@@ -46,6 +45,7 @@
 16081010 0 --重金属狂欢 关岛
 #170
 17060884 0 --华恋型多莫维依
+17091001 1 --RX-0 独角兽高达
 #214
 
 #222
@@ -71,7 +71,7 @@
 37564509 2 --Harunohi
 37564510 1 --Koinomi
 37564701 0 --邪眼之魔女-桑德莉佣
-37564819 2 --3L·苍空之舞-墨染之樱
+#3L·苍空之舞-墨染之樱
 37564836 1 --邪符『不祥之兆』
 37564848 2 --3L·不可思议的梦幻
 37564906 1 --Sayuri·Amazing one more
@@ -84,13 +84,17 @@
 50000074 0 --绝对条件 奇犽
 50000066 0 --船长 奇犽
 50000507 2 --星宿的神迹
-50000510 2 --星宿的精灵
+50000510 1 --星宿的精灵
 50000511 1 --灵装之星宿骑士
 #573
 #601
 60151704 0 --天空的水晶部队 狡猾的女仆贼
 #666
+66619903 0 --AIW·指引者柴郡喵
+66619906 1 --AIW·先知毛毛虫
 66619913 1 --下午茶时间☆
+66619914 2 --未眠的心之火
+66619920 0 --AIW·绽放之蝶
 66677705 2 --777-祈愿
 66677708 2 --777-绽放之时的色彩
 66677711 1 --777-风映之春