update 10401005-10401020

README.md

@@ -429,7 +429,7 @@ vgf.VgCard(c)
 ## 2.用于行为的封装函数（仅用于operation函数）：从X1处寻找卡送去X2处
 
 ```lua
-vgf.SearchCard(loc_to, loc_from, f[, int_max, int_min])
+vgf.SearchCard(loc_to, loc_from, f[, int_max, int_min, ...])
 ```
 返回值：int 【具体操作的数量】
 
@@ -444,6 +444,8 @@ vgf.SearchCard(loc_to, loc_from, f[, int_max, int_min])
 > **int_max : 找至多几张卡 `填nil | 不填则为1张`**
 > 
 > **int_min : 找至少几张卡 `一般用于“探寻至多x张”的字样，此时填0，填nil | 不填则等同于int_max`**
+> 
+> **... : 额外参数 `如过滤函数内容为cm.filter(c,e,tp)，c为内核对函数传递的参数（即遍历到的每张卡），e,tp则需从额外参数传入`**
 
 ## 3.用于行为的封装函数：力量上升
 

VgD.Lua

@@ -1250,4 +1250,20 @@ function VgD.GlobalCheckEffect(c,m,typ,code,con,op)
         end
         Duel.RegisterEffect(ge1,0)
     end
+end
+
+function VgD.CannotBeTarget(c,con,val,loc)
+    if not loc then loc=LOCATION_MZONE end
+	local e1=Effect.CreateEffect(c)
+    e1:SetType(EFFECT_TYPE_SINGLE)
+    e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+    e1:SetRange(loc)
+    e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	if VgF.GetValueType(con)=="function" then e1:SetCondition(con) end
+	if VgF.GetValueType(val)=="function" then e1:SetValue(val) else
+        e1:SetValue(function (e,re,rp)
+            return rp==1-e:GetHandlerPlayer()
+        end)
+    end
+    c:RegisterEffect(e1)
 end
\ No newline at end of file

c10101009.lua

@@ -2,12 +2,5 @@
 local cm,m,o=GetID()
 function cm.initial_effect(c)
 	vgf.VgCard(c)
-	local e1=Effect.CreateEffect(c)
-    e1:SetType(EFFECT_TYPE_SINGLE)
-    e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-    e1:SetRange(LOCATION_MZONE)
-    e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-	e1:SetCondition(vgf.RMonsterCondition)
-    e1:SetValue(vgf.tgoval)
-    c:RegisterEffect(e1)
+	vgd.CannotBeTarget(c,vgf.RMonsterCondition)
 end
\ No newline at end of file

c10401006.lua

@@ -13,8 +13,10 @@ function cm.filter(c)
 	return c:GetFlagEffect(FLAG_IMPRISON)>0
 end
 function cm.op(e,tp,eg,ep,ev,re,r,rp)
-	local g=vgf.SelectMatchingCard(HINTMSG_OPPO,e,tp,cm.filter1,tp,0,LOCATION_MZONE,1,1,nil)
-	vgf.SendtoPrison(g,tp)
+	if vgf.CheckPrison(tp) then
+		local g=vgf.SelectMatchingCard(HINTMSG_OPPO,e,tp,cm.filter1,tp,0,LOCATION_MZONE,1,1,nil)
+		vgf.SendtoPrison(g,tp)
+	end
 end
 function cm.filter1(c)
 	return vgf.RMonsterFilter(c) and vgf.FrontFilter(c)

c10401012.lua

 local cm,m,o=GetID()
 function cm.initial_effect(c)
 	vgf.VgCard(c)
+	vgd.EffectTypeTriggerWhenHitting(c,m,LOCATION_MZONE,EFFECT_TYPE_FIELD,cm.op,cm.cost,cm.con)
 end
+function cm.op(e,tp,eg,ep,ev,re,r,rp)
+	local code=vgf.GetVMonster(tp):GetCode()
+	vgf.SearchCard(LOCATION_HAND,LOCATION_DECK,cm.filter,1,0,code)
+end
+function cm.filter(c,code)
+	return c:IsCode(code)
+end
+function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+	local c=e:GetHandler()
+	if chk==0 then return c:IsAbleToGraveAsCost() and vgf.DamageCost(1)(e,tp,eg,ep,ev,re,r,rp,chk) end
+	vgf.DamageCost(1)(e,tp,eg,ep,ev,re,r,rp,chk)
+	vgf.Sendto(LOCATION_DROP,c,REASON_COST)
+end
+function cm.con(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	return c:GetFlagEffect(FLAG_SUPPORT)>0
+end
\ No newline at end of file

c10401013.lua

 local cm,m,o=GetID()
 function cm.initial_effect(c)
 	vgf.VgCard(c)
+	vgd.CardTrigger(c,cm.op)
 end
+function cm.op(e,tp,eg,ep,ev,re,r,rp)
+	local g=vgf.SelectMatchingCard(HINTMSG_VMONSTER,e,tp,vgf.VMonsterFilter,tp,LOCATION_MZONE,0,1,1,nil)
+	Duel.ChangePosition(g,POS_FACEUP_ATTACK)
+end
\ No newline at end of file

c10401014.lua

 local cm,m,o=GetID()
 function cm.initial_effect(c)
 	vgf.VgCard(c)
+	vgd.EffectTypeTrigger(c,m,LOCATION_MZONE,EFFECT_TYPE_SINGLE,EVENT_ATTACK_ANNOUNCE,cm.op,cm.cost,cm.con,nil,1)
 end
+function cm.op(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	Duel.Draw(tp,1,REASON_EFFECT)
+	vgf.OverlayFill(1)(e,tp,eg,ep,ev,re,r,rp)
+	if c:IsRelateToEffect(e) and c:IsFaceup() then
+		vgf.AtkUp(c,c,10000)
+	end
+end
+function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+	local c=e:GetHandler()
+	if chk==0 then return vgf.IsExistingMatchingCard(vgf.RMonsterFilter,tp,LOCATION_MZONE,0,1,c) end
+	local g=vgf.SelectMatchingCard(HINTMSG_XMATERIAL,e,tp,vgf.RMonsterFilter,tp,LOCATION_MZONE,0,1,1,c)
+	vgf.Sendto(LOCATION_OVERLAY,g)
+end
+function cm.con(e,tp,eg,ep,ev,re,r,rp)
+	local ct=Duel.GetFlagEffectLabel(tp,FLAG_CONDITION)
+	return VgF.GetValueType(ct)=="number" and ct==10102001 and vgf.RMonsterCondition(e)
+end
\ No newline at end of file

c10401015.lua

 local cm,m,o=GetID()
 function cm.initial_effect(c)
 	vgf.VgCard(c)
+	vgd.EffectTypeTrigger(c,m,nil,EFFECT_TYPE_SINGLE,EVENT_SPSUMMON_SUCCESS,vgf.OverlayFill(1),nil,vgf.RSummonCondition)
+	vgd.EffectTypeIgnition(c,m,LOCATION_MZONE,cm.op,vgf.OverlayCost(3),vgf.RMonsterCondition,nil,1)
 end
+function cm.op(e,tp,eg,ep,ev,re,r,rp)
+	Duel.Draw(tp,1,REASON_EFFECT)
+end
\ No newline at end of file

c10401016.lua

 local cm,m,o=GetID()
 function cm.initial_effect(c)
 	vgf.VgCard(c)
+	vgd.CardTrigger(c,cm.op)
 end
+function cm.op(e,tp,eg,ep,ev,re,r,rp)
+	local e1=Effect.CreateEffect(e:GetHandler())
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_UPDATE_ATTACK)
+	e1:SetTargetRange(LOCATION_MZONE,0)
+	e1:SetValue(10000)
+	e1:SetCondition(vgf.PlayerEffect)
+	e1:SetTarget(cm.tg)
+	Duel.RegisterEffect(e1,tp)
+	local e2=e1:Clone()
+	e2:SetCode(EFFECT_UPDATE_LSCALE)
+	e2:SetValue(1)
+	Duel.RegisterEffect(e2,tp)
+end
+function cm.tg(e,c)
+	return vgf.VMonsterFilter(c)
+end
\ No newline at end of file

c10401017.lua

 local cm,m,o=GetID()
 function cm.initial_effect(c)
 	vgf.VgCard(c)
+	vgd.EffectTypeIgnition(c,m,LOCATION_MZONE,cm.op,cm.cost,vgf.RMonsterCondition,nil,1)
 end
+function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then
+		return vgf.DamageCost(1)(e,tp,eg,ep,ev,re,r,rp,chk) and vgf.OverlayCost(1)(e,tp,eg,ep,ev,re,r,rp,chk)
+	end
+	vgf.DamageCost(1)(e,tp,eg,ep,ev,re,r,rp,chk)
+	vgf.OverlayCost(1)(e,tp,eg,ep,ev,re,r,rp,chk)
+end
+function cm.op(e,tp,eg,ep,ev,re,r,rp)
+	if not vgf.CheckPrison(tp) then return end
+	local g=vgf.SelectMatchingCard(HINTMSG_IMPRISON,e,tp,vgf.RMonsterFilter,tp,0,LOCATION_MZONE,1,1,nil)
+	vgf.SendtoPrison(g,tp)
+	if vgf.IsExistingMatchingCard(cm.filter,tp,LOCATION_ORDER,0,3,nil) then
+		Duel.Draw(tp,1,REASON_EFFECT)
+	end
+end
+function cm.filter(c)
+	return c:GetFlagEffect(FLAG_IMPRISON)>0
+end
\ No newline at end of file

c10401018.lua

 local cm,m,o=GetID()
 function cm.initial_effect(c)
 	vgf.VgCard(c)
+	vgd.EffectTypeTrigger(c,m,LOCATION_MZONE,EFFECT_TYPE_FIELD,EVENT_BATTLED,vgf.DamageFill(1),cm.cost,cm.con)
 end
+function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+    local c=e:GetHandler()
+    if chk==0 then return true end
+	vgf.Sendto(LOCATION_OVERLAY,c)
+end
+function cm.con(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	return c:GetFlagEffect(FLAG_SUPPORT)>0 and vgf.IsExistingMatchingCard(cm.filter,tp,LOCATION_ORDER,0,1,nil)
+end
+function cm.filter(c)
+	return c:IsFaceup() and c:IsType(TYPE_CONTINUOUS)
+end
\ No newline at end of file

c10401019.lua

 local cm,m,o=GetID()
 function cm.initial_effect(c)
 	vgf.VgCard(c)
+	vgd.CardTrigger(c,cm.op)
 end
+function cm.op(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	local g=vgf.GetMatchingGroup(vgf.FrontFilter,tp,LOCATION_MZONE,0,nil)
+	vgf.AtkUp(c,g,"DOUBLE")
+	vgf.StarUp(c,g,"DOUBLE")
+end
\ No newline at end of file

c10401020.lua

 local cm,m,o=GetID()
 function cm.initial_effect(c)
 	vgf.VgCard(c)
+	vgd.CannotBeTarget(c,vgf.RMonsterCondition)
+	vgd.EffectTypeTriggerWhenHitting(c,m,LOCATION_MZONE,EFFECT_TYPE_SINGLE,cm.op,nil,vgf.RMonsterCondition)
 end
+function cm.op(e,tp,eg,ep,ev,re,r,rp)
+	vgf.DamageFill(1)(e,tp,eg,ep,ev,re,r,rp)
+	vgf.OverlayFill(1)(e,tp,eg,ep,ev,re,r,rp)
+end
\ No newline at end of file

c10401034.lua

 local cm,m,o=GetID()
 function cm.initial_effect(c)
 	vgf.VgCard(c)
-	local e1=Effect.CreateEffect(c)
-    e1:SetType(EFFECT_TYPE_SINGLE)
-    e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-    e1:SetRange(LOCATION_MZONE)
-    e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-	e1:SetCondition(vgf.RMonsterCondition)
-    e1:SetValue(vgf.tgoval)
-    c:RegisterEffect(e1)
+	vgd.CannotBeTarget(c,vgf.RMonsterCondition)
 end
\ No newline at end of file