Commit 1444dfb5 authored by songtongtong's avatar songtongtong

fixed

parent 5bb1084a
Pipeline #23773 passed with stages
in 29 minutes and 6 seconds
......@@ -344,8 +344,9 @@
12029016 0 --惩戒双子
12029070 1 --巨蛾娘的宝藏
12030002 1 --乌冬 yatori
12030007 0 --夏私服 yatori
12030008 0 --礼物 yatori
12030009 0 --女仆 yatori
12030009 1 --女仆 yatori
12031000 1 --人形真主 三葉巧可
12031001 1 --幼血鬼 三葉巧可
12031005 1 --懵懂幼女 三葉巧可
......@@ -420,7 +421,7 @@
12087050 1 --响彻人心之歌 罗洛涅萝尔
12087052 2 --花绽的歌声 罗洛涅萝尔
12087055 1 --闪耀的光彩 罗洛涅萝尔
12090082 1 --星界转生
12090082 0 --星界转生
12094005 1 --魔王转生 御影零夜
#122
12200000 1 --神明吞噬者 寰宇之灾厄
......
......@@ -157,17 +157,45 @@ function cm.effop(e,tp,eg,ep,ev,re,r,rp)
e1:SetDescription(aux.Stringid(m,4))
e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_PIERCE)
e1:SetValue(1)
e1:SetCode(EFFECT_CANNOT_REMOVE)
e1:SetRange(LOCATION_MZONE)
e1:SetReset(RESET_EVENT+RESETS_STANDARD)
rc:RegisterEffect(e1,true)
--
local e0_1=Effect.CreateEffect(c)
e0_1:SetType(EFFECT_TYPE_SINGLE)
e0_1:SetDescription(aux.Stringid(m,4))
e0_1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e0_1:SetType(EFFECT_TYPE_SINGLE)
e0_1:SetCode(EFFECT_CANNOT_TO_GRAVE_AS_COST)
e0_1:SetRange(LOCATION_MZONE)
e0_1:SetReset(RESET_EVENT+RESETS_STANDARD)
rc:RegisterEffect(e0_1,true)
local e0_2=Effect.CreateEffect(c)
e0_2:SetType(EFFECT_TYPE_SINGLE)
e0_2:SetDescription(aux.Stringid(m,4))
e0_2:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e0_2:SetType(EFFECT_TYPE_SINGLE)
e0_2:SetCode(EFFECT_CANNOT_TO_GRAVE)
e0_2:SetRange(LOCATION_MZONE)
e0_2:SetReset(RESET_EVENT+RESETS_STANDARD)
rc:RegisterEffect(e0_2,true)
--
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetDescription(aux.Stringid(m,4))
e4:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e4:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
e4:SetValue(LOCATION_EXTRA)
e4:SetReset(RESET_EVENT+RESETS_STANDARD)
rc:RegisterEffect(e4,true)
if not rc:IsType(TYPE_EFFECT) then
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetCode(EFFECT_ADD_TYPE)
e2:SetValue(TYPE_EFFECT)
e2:SetReset(RESET_EVENT+RESETS_STANDARD)
rc:RegisterEffect(e2,true)
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetCode(EFFECT_ADD_TYPE)
e3:SetValue(TYPE_EFFECT)
e3:SetReset(RESET_EVENT+RESETS_STANDARD)
rc:RegisterEffect(e3,true)
end
rc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,4))
end
......
......@@ -249,50 +249,22 @@ function cm.effop(e,tp,eg,ep,ev,re,r,rp)
--
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetDescription(aux.Stringid(m,1))
e1:SetDescription(aux.Stringid(m,4))
e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_CANNOT_REMOVE)
e1:SetRange(LOCATION_MZONE)
e1:SetCode(EFFECT_PIERCE)
e1:SetValue(1)
e1:SetReset(RESET_EVENT+RESETS_STANDARD)
rc:RegisterEffect(e1,true)
--
local e0_1=Effect.CreateEffect(c)
e0_1:SetType(EFFECT_TYPE_SINGLE)
e0_1:SetDescription(aux.Stringid(m,1))
e0_1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e0_1:SetType(EFFECT_TYPE_SINGLE)
e0_1:SetCode(EFFECT_CANNOT_TO_GRAVE_AS_COST)
e0_1:SetRange(LOCATION_MZONE)
e0_1:SetReset(RESET_EVENT+RESETS_STANDARD)
rc:RegisterEffect(e0_1,true)
local e0_2=Effect.CreateEffect(c)
e0_2:SetType(EFFECT_TYPE_SINGLE)
e0_2:SetDescription(aux.Stringid(m,1))
e0_2:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e0_2:SetType(EFFECT_TYPE_SINGLE)
e0_2:SetCode(EFFECT_CANNOT_TO_GRAVE)
e0_2:SetRange(LOCATION_MZONE)
e0_2:SetReset(RESET_EVENT+RESETS_STANDARD)
rc:RegisterEffect(e0_2,true)
--
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetDescription(aux.Stringid(m,1))
e4:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e4:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
e4:SetValue(LOCATION_EXTRA)
e4:SetReset(RESET_EVENT+RESETS_STANDARD)
rc:RegisterEffect(e4,true)
if not rc:IsType(TYPE_EFFECT) then
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetCode(EFFECT_ADD_TYPE)
e3:SetValue(TYPE_EFFECT)
e3:SetReset(RESET_EVENT+RESETS_STANDARD)
rc:RegisterEffect(e3,true)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetCode(EFFECT_ADD_TYPE)
e2:SetValue(TYPE_EFFECT)
e2:SetReset(RESET_EVENT+RESETS_STANDARD)
rc:RegisterEffect(e2,true)
end
rc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,1))
rc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,4))
end
function cm.pencon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment