pre-update

.gitlab-ci.yml

@@ -4,8 +4,8 @@ stages:
 
 variables:
   GIT_DEPTH: "1"
-  LAST_UPDATE_DATE: "2020.6.11"
-  CURRENT_UPDATE_DATE: "2020.6.21"
+  LAST_UPDATE_DATE: "2020.6.22"
+  CURRENT_UPDATE_DATE: "2020.7.5"
 
 redtext:
   stage: prepare

expansions/script/c11200047.lua

---土著神的顶点
-function c11200047.initial_effect(c)
-	aux.AddCodeList(c,11200029)
-	--xyz summon
-	aux.AddXyzProcedure(c,nil,2,2,c11200047.ovfilter,aux.Stringid(11200047,0),2,c11200047.xyzop)
-	c:EnableReviveLimit()
-	--atk
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetCode(EFFECT_UPDATE_ATTACK)
-	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e0:SetRange(LOCATION_MZONE)
-	e0:SetValue(c11200047.atkval)
-	c:RegisterEffect(e0)
-	--immune
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_IGNITION)
-	e1:SetCountLimit(1)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCost(c11200047.cost)
-	e1:SetOperation(c11200047.operation)
-	c:RegisterEffect(e1)
-end
-function c11200047.ovfilter(c)
-	return c:IsFaceup() and c:IsCode(11200029)
-end
-function c11200047.xyzop(e,tp,chk)
-	if chk==0 then return Duel.GetFlagEffect(tp,11200047)==0 end
-	Duel.RegisterFlagEffect(tp,11200047,RESET_PHASE+PHASE_END,0,1)
-end
-function c11200047.atkval(e,c)
-	return c:GetOverlayCount()*1000
-end
-function c11200047.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
-	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
-	local ct=Duel.GetOperatedGroup():GetFirst()
-	e:SetLabelObject(ct)
-end
-function c11200047.filter(c)
-	return c:IsFaceup() and c:IsRace(RACE_AQUA)
-end
-function c11200047.operation(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local g=Duel.GetMatchingGroup(c11200047.filter,tp,LOCATION_MZONE,0,nil)
-	local tc=g:GetFirst()
-	while tc do
-		local e1=Effect.CreateEffect(e:GetHandler())
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-		e1:SetRange(LOCATION_MZONE)
-		e1:SetCode(EFFECT_IMMUNE_EFFECT)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
-		e1:SetValue(c11200047.efilter)
-		tc:RegisterEffect(e1)
-		tc=g:GetNext()
-	end
-	if e:GetLabelObject():IsType(TYPE_XYZ) and e:GetLabelObject():IsRace(RACE_AQUA) then
-		local code=e:GetLabelObject():GetCode()
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_CHANGE_CODE)
-		e2:SetValue(code)
-		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
-		c:RegisterEffect(e2)
-		c:CopyEffect(code,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,1)
-	end
-end
-function c11200047.efilter(e,te)
-	return e:GetOwnerPlayer()~=te:GetOwnerPlayer()
-end

expansions/script/c11200049.lua

---土著神『宝永四年的赤蛙』
-function c11200049.initial_effect(c)
-	aux.AddCodeList(c,11200029)
-	--Activate
-	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetType(EFFECT_TYPE_ACTIVATE)
-	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e1:SetTarget(c11200049.target)
-	e1:SetOperation(c11200049.activate)
-	c:RegisterEffect(e1)
-	--counter
-	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(17030033,0))
-	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_GRAVE)
-	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e2:SetCost(c11200049.ctcost)
-	e2:SetTarget(c11200049.cttg)
-	e2:SetOperation(c11200049.ctop)
-	c:RegisterEffect(e2)
-end
-function c11200049.filter1(c,e,tp)
-	local rk=c:GetRank()
-	return c:IsFaceup() and c:IsType(TYPE_XYZ) and aux.IsCodeListed(c,11200029)
-		and Duel.IsExistingMatchingCard(c11200049.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,rk)
-		and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_XMATERIAL)
-end
-function c11200049.filter2(c,e,tp,mc,rk)
-	return c:IsRank(rk) and c:IsRace(RACE_AQUA) and mc:IsCanBeXyzMaterial(c)
-		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0
-end
-function c11200049.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c11200049.filter1(chkc,e,tp) end
-	if chk==0 then return Duel.IsExistingTarget(c11200049.filter1,tp,LOCATION_MZONE,0,1,nil,e,tp) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	Duel.SelectTarget(tp,c11200049.filter1,tp,LOCATION_MZONE,0,1,1,nil,e,tp)
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
-end
-function c11200049.activate(e,tp,eg,ep,ev,re,r,rp)
-	local tc=Duel.GetFirstTarget()
-	if not aux.MustMaterialCheck(tc,tp,EFFECT_MUST_BE_XMATERIAL) then return end
-	if tc:IsFacedown() or not tc:IsRelateToEffect(e) or tc:IsControler(1-tp) or tc:IsImmuneToEffect(e) then return end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,c11200049.filter2,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,tc,tc:GetRank())
-	local sc=g:GetFirst()
-	if sc then
-		local mg=tc:GetOverlayGroup()
-		if mg:GetCount()~=0 then
-			Duel.Overlay(sc,mg)
-		end
-		sc:SetMaterial(Group.FromCards(tc))
-		Duel.Overlay(sc,Group.FromCards(tc))
-		Duel.SpecialSummon(sc,SUMMON_TYPE_XYZ,tp,tp,false,false,POS_FACEUP)
-		sc:CompleteProcedure()
-	end
-end
-function c11200049.ctcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():IsAbleToDeckAsCost() end
-	Duel.SendtoDeck(e:GetHandler(),nil,2,REASON_COST)
-end
-function c11200049.xyzfilter(c)
-	return c:IsFaceup() and c:IsRace(RACE_AQUA) and c:IsType(TYPE_XYZ)
-end
-function c11200049.matfilter(c)
-	return c:IsRace(RACE_AQUA) and c:IsType(TYPE_XYZ)
-end
-function c11200049.cttg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c11200049.xyzfilter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(c11200049.xyzfilter,tp,LOCATION_MZONE,0,1,nil)
-		and Duel.IsExistingMatchingCard(c11200049.matfilter,tp,LOCATION_EXTRA,0,1,nil) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
-	Duel.SelectTarget(tp,c11200049.xyzfilter,tp,LOCATION_MZONE,0,1,1,nil)
-end
-function c11200049.ctop(e,tp,eg,ep,ev,re,r,rp)
-	local tc=Duel.GetFirstTarget()
-	if tc:IsFaceup() and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
-		local g=Duel.SelectMatchingCard(tp,c11200049.matfilter,tp,LOCATION_EXTRA,0,1,1,nil)
-		if g:GetCount()>0 then
-			Duel.Overlay(tc,g)
-		end
-	end
-end

expansions/script/c1156606.lua

---色彩艳丽的门番
-function c1156606.initial_effect(c)
---
-	c:EnableReviveLimit()
-	aux.AddLinkProcedure(c,c1156606.mfilter,1)
---
-	local e1=Effect.CreateEffect(c)
-	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetTargetRange(LOCATION_MZONE,0)
-	e1:SetTarget(c1156606.tg1)
-	e1:SetValue(1)
-	c:RegisterEffect(e1)
---
-	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(1156606,0))
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e2:SetType(EFFECT_TYPE_QUICK_O)
-	e2:SetCode(EVENT_FREE_CHAIN)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetCountLimit(1)
-	e2:SetTarget(c1156606.tg2)
-	e2:SetOperation(c1156606.op2)
-	c:RegisterEffect(e2)
---
-end
---
-function c1156606.mfilter(c)
-	return c:GetSequence()>4
-end
---
-function c1156606.tg1(e,c)
-	return c~=e:GetHandler()
-end
---
-function c1156606.tfilter2(c)
-	return c:IsSpecialSummonable(SUMMON_TYPE_LINK)
-end
---
-function c1156606.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then
-		local checknum=0
-		local e2_1=Effect.CreateEffect(c)
-		e2_1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-		e2_1:SetType(EFFECT_TYPE_SINGLE)
-		e2_1:SetCode(EFFECT_CANNOT_BE_LINK_MATERIAL)
-		e2_1:SetValue(1)
-		c:RegisterEffect(e2_1,true)
-		if Duel.IsExistingMatchingCard(c1156606.tfilter2,tp,LOCATION_EXTRA,0,1,nil) then checknum=1 end
-		e2_1:Reset()
-		return checknum==1
-	end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,LOCATION_EXTRA)
-end
---
-function c1156606.op2(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local e2_2=Effect.CreateEffect(c)
-	e2_2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e2_2:SetType(EFFECT_TYPE_SINGLE)
-	e2_2:SetCode(EFFECT_CANNOT_BE_LINK_MATERIAL)
-	e2_2:SetValue(1)
-	e2_2:SetReset(RESET_EVENT+0x1fe0000+RESET_CHAIN)
-	c:RegisterEffect(e2_2,true)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local sg=Duel.SelectMatchingCard(tp,c1156606.tfilter2,tp,LOCATION_EXTRA,0,1,1,nil)
-	if sg:GetCount()>0 then
-		local tc=sg:GetFirst()
-		Duel.SpecialSummonRule(tp,tc,SUMMON_TYPE_LINK)
-	end
-end
---

expansions/script/c95288888.lua

---妖怪大贤者·八云紫
-function c95288888.initial_effect(c)
-    --act limit
-    local e1=Effect.CreateEffect(c)
-    e1:SetType(EFFECT_TYPE_FIELD)
-    e1:SetCode(EFFECT_CANNOT_ACTIVATE)
-    e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-    e1:SetRange(LOCATION_PZONE)
-    e1:SetTargetRange(0,1)
-    e1:SetValue(c95288888.limval)
-    c:RegisterEffect(e1)
-    --Increase ATK
-    local e2=Effect.CreateEffect(c)
-    e2:SetType(EFFECT_TYPE_FIELD)
-    e2:SetRange(LOCATION_MZONE)
-    e2:SetCode(EFFECT_UPDATE_ATTACK)
-    e2:SetTargetRange(LOCATION_MZONE,0)
-    e2:SetValue(800)
-    c:RegisterEffect(e2) 
-    --Destroy
-    local e3=Effect.CreateEffect(c)
-    e3:SetDescription(aux.Stringid(95288888,0))
-    e3:SetCategory(CATEGORY_DESTROY)
-    e3:SetType(EFFECT_TYPE_IGNITION)
-    e3:SetCountLimit(1)
-    e3:SetRange(LOCATION_MZONE)
-    e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
-    e3:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
-    e3:SetTarget(c95288888.destg)
-    e3:SetOperation(c95288888.desop)
-    c:RegisterEffect(e3)
-end
-function c95288888.limval(e,re,rp)
-    local rc=re:GetHandler()
-    return rc:IsLocation(LOCATION_MZONE) and re:IsActiveType(TYPE_MONSTER)
-        and rc:IsType(TYPE_FUSION) and not rc:IsImmuneToEffect(e)
-end
-function c95288888.desfilter(c)
-    return c:IsFaceup() and c:IsSetCard(0x9528)
-end
-function c95288888.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-    if chkc then return false end
-    if chk==0 then return Duel.IsExistingTarget(c95288888.desfilter,tp,LOCATION_ONFIELD,0,1,nil)
-        and Duel.IsExistingTarget(nil,tp,0,LOCATION_ONFIELD,1,nil) end
-    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-    local g1=Duel.SelectTarget(tp,c95288888.desfilter,tp,LOCATION_ONFIELD,0,1,1,nil)
-    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-    local g2=Duel.SelectTarget(tp,nil,tp,0,LOCATION_ONFIELD,1,2,nil)
-    g1:Merge(g2)
-    Duel.SetOperationInfo(0,CATEGORY_DESTROY,g1,g1:GetCount(),0,0)
-end
-function c95288888.desop(e,tp,eg,ep,ev,re,r,rp)
-    local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
-    local tg=g:Filter(Card.IsRelateToEffect,nil,e)
-    if tg:GetCount()>0 then
-        Duel.Destroy(tg,REASON_EFFECT)
-    end
-end
\ No newline at end of file

expansions/strings.conf

@@ -4,7 +4,11 @@
 # 禁用 0xff0-0xfff 区间以保证 YGOPro2 上能正常运作
 # 禁用 0x100-0x1ff 区间避免 OCG 卡字段上浮冲突
 
-#某失智の刀客塔 3529764274 1
+#某失智の刀客塔 3529764274 1 0xca0-0xcaf
+!setname 0xca7 爱国者
+!setname 0xca8 霜星
+!setname 0xca9 Hollow Kinght
+!counter 0xca0 空洞指示物
 
 #芙兰 657556329 7
 #is_named_with_cyberaqua 电子水蓝
@@ -219,8 +223,13 @@
 !setname 0x1437 灰烬
 !setname 0x1438 灰烬骑士
 
-#Ruby 917770701 147
+#Ruby 917770701 147 0x2e0-0x2ef
 !setname 0x2e0 薇迪瓦
+!setname 0x2e1 受赞颂者
+!setname 0x12e1 受赞颂者的继承之人
+!setname 0x2e2 哈克
+!setname 0x2e3 假面的持有者
+!setname 0x2e4 维茨亚尔米迪亚
 
 #Candy 1195203843 148 0x800-0x80f
 !setname 0x4800 灾厄
@@ -538,6 +547,8 @@
 !counter 0x5db 暗之力指示物
 !counter 0x5dc 圣盾指示物
 
+#Millux 498433112 500
+
 #积木 ????????? 502 0xcb0-0xcbf
 !setname 0xcb1 数码兽
 !setname 0xcb2 T·F
@@ -549,7 +560,7 @@
 #AD钙 540551322 537 0x530-0x53f
 !setname 0x530 惧轮
 !setname 0x533 圆盘生物
-!setname 0x535 ALC
+!setnema 0x535 ALC
 !setname 0x537 清响
 !counter 0x153a Q指示物
 
@@ -649,12 +660,13 @@
 !setname 0xada9 失络症
 !setname 0xcda9 失控生命
 !setname 0x3daa 界食
-!setname 0x6daa 叹望幻片
+!setname 0x6daa 叹望
 #set_without_id 02
 #set-without-id 眩耀奇景
 #set-without-id 走马幻景
-#setname=RagnaTravellers 终末旅者
+#setname="RagnaTravellers" 终末旅者
 #setname="URBEX" URBEX
+#setname="VrAqua" 虚拟水神
 #AddCodeList(65060050) 幻想异变卡名记述
 #AddCodeList(65010001) 白马零儿卡名记述
 
@@ -701,7 +713,7 @@
 !setname 0xea5 战争机器
 
 #雪花 598403759 777 0x9c0-0x9cf
-!counter 0x9c0 露西菲尼亚指示物
+!setcounter 0x9c0 露西菲尼亚指示物
 !setname 0xa9c0 大罪之器
 !setname 0xb9c0 Evillious
 !setname 0xc9c0 LapisLazuli
@@ -718,6 +730,7 @@
 !setname 0x81b 最上静香
 !setname 0x81c 周子
 !setname 0x81d 望月杏奈
+!setname 0x81e 七草一花
 !counter 0x810 康娜酱指示物
 !counter 0x1810 最上静香指示物
 !counter 0x818 佐城雪美指示物
@@ -734,6 +747,9 @@
 !setname 0x297 亡灵舰队
 !setname 0x1298 荒兽
 !setname 0x3298 堕世魔镜
+!setname 0x5298 时之行者
+!setname 0x6298 虚妄灵
+!setname 0x1299 妖狐
 !setname 0x29b 界王
 !setname 0x29c 邪界幻灵
 !setname 0x29d 植占