1.999zz23更新

expansions/strings.conf

@@ -125,6 +125,7 @@
 !setname 0x214	决战符
 !setname 0x221	使魔契约
 !setname 0x222	大恶魔
+!setname 0x22b	心海
 !setname 0x223	秦心
 !setname 0x224	天狗
 !setname 0xa225	八云紫
@@ -136,6 +137,7 @@
 !setname 0x240	青娥
 !setname 0x242	宫古芳香
 !setname 0x246	仙符
+!setname 0x247	宵宫
 !setname 0x249	天理法则
 !setname 0x250	原神
 !setname 0x2521	钟离
@@ -154,6 +156,7 @@
 !setname 0x3256	因幡帝
 !setname 0x257	永夜
 !setname 0x258	月兔
+!setname 0x258a	清兰
 !setname 0x259	小人
 !setname 0x260	正邪
 !setname 0x261	辉夜
@@ -290,6 +293,8 @@
 !setname 0x8a1	魔女
 !setname 0x911	深海栖舰
 !setname 0x403	黄金拼图
+!setname 0x404	甘兔庵/Rabbit
+!setname 0x405	兔子
 
 !setname 0x378	飞落之羽
 !setname 0xaa2	慧音

lflist.conf

-#[1.999zz HCG][2015.10][2015.4.1][2015.4.1 TCG][2015.1.1][2015.1.1 TCG][2014.10.1][2014.10.1 TCG][2014.7.1][2014.7.14 TCG][2014世界赛][2014.4.1][2014.4.1 TCG][2014.2.1][2014.1.1 TCG][2013.9.1][2013.10.11 TCG][2013.9.1 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1][2011.3.1][2010.9.1][2010.3.1][2009.9.1][2009.3.1][2008.9.1][2008.3.1][2007.9.1][2007.3.1][2006.9.1][2006.3.1][2005.9.1][2005.3.1][2004.9.1][2004.3.1][2003.10.15][2003.7.1][2003.4.10][2003.1.1][2002.10.1][2002.1.1][2000.12.1][2000.4.1][1999.8.26]
+#[1.999zz23 HCG][2015.10][2015.4.1][2015.4.1 TCG][2015.1.1][2015.1.1 TCG][2014.10.1][2014.10.1 TCG][2014.7.1][2014.7.14 TCG][2014世界赛][2014.4.1][2014.4.1 TCG][2014.2.1][2014.1.1 TCG][2013.9.1][2013.10.11 TCG][2013.9.1 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1][2011.3.1][2010.9.1][2010.3.1][2009.9.1][2009.3.1][2008.9.1][2008.3.1][2007.9.1][2007.3.1][2006.9.1][2006.3.1][2005.9.1][2005.3.1][2004.9.1][2004.3.1][2003.10.15][2003.7.1][2003.4.10][2003.1.1][2002.10.1][2002.1.1][2000.12.1][2000.4.1][1999.8.26]
 
 
 
-!1.999zz HCG
+!1.999zz23 HCG
 #limit
 23252 0 --暴力取材
 14028 2 --BAD APPLE!!
@@ -49,11 +49,13 @@
 14090027 0 --天顶的魔种
 14000055 1 --源始魔术-始源
 --fw卡
+17035030 0 --臭鼬
 17050932 0 --雷gay
 17052935 1 --假魔兽使
 17060882 0 --多莫维依
-17035030 0 --臭鼬
-17061630 0 --猫耳臭鼬
+17060940 0 --苍空的狙击手·席尔瓦
+17061210 1 --苍空的方舟·格兰塞法号
+17061630 0 --苍空的猫耳魔术师 凯露
 --锅卡
 22200161 0 --无颜者
 --呆卡
@@ -61,7 +63,6 @@
 74561011 2 --暴风文
 74561017 1 --盲目的贤者✿格洛丽亚
 --L卡
-
 --金卡
 86379706 0 --精神✿操作
 86379754 1 --结界『光与暗的网目』
@@ -72,6 +73,7 @@
 86379692 0 --隙间妖怪✿八云紫
 --花草卡？
 99677001 0 --茨歌仙✿
+99677002 1 --茨华仙✿神仙思想喜爱动物的仙人
 --k卡
 66915002 0 --星曜观星台
 66915038 0 --行星女神
@@ -79,6 +81,8 @@
 --C9卡
 20100208 1 --御刀使米露亚
 20100227 0 --御刀使夜见
+--耻卡
+33300305 0 --多线程虚网操作员
 --特殊卡
 13959980 0 --2Pick技能-卡名变换
 13959981 0 --2Pick技能-融合强化

script/c10907.lua

@@ -24,5 +24,5 @@ function c10907.dcon(e,tp,eg,ep,ev,re,r,rp)
 	return ep~=tp and eg:FilterCount(c10907.cxfilter,nil,tp)>0
 end
 function c10907.dop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.ChangeBattleDamage(ep,ev*1.5)
+	Duel.ChangeBattleDamage(ep,ev*2)
 end

script/c10909.lua

@@ -27,5 +27,5 @@ function c10909.dcon(e,tp,eg,ep,ev,re,r,rp)
 	return ep~=tp and e:GetHandler()==Duel.GetAttacker()
 end
 function c10909.dop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.ChangeBattleDamage(ep,ev*1.5)
+	Duel.ChangeBattleDamage(ep,ev*2)
 end

script/c10923.lua

@@ -16,7 +16,7 @@ function c10923.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c10923.filter(c)
-	return c:IsSetCard(0x9432) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
+	return (c:IsSetCard(0x9432) or c:IsSetCard(0x22b)) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
 end
 function c10923.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c10923.filter,tp,LOCATION_DECK,0,1,nil) end

script/c10925.lua

@@ -16,7 +16,7 @@ function c10925.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c10925.filter(c,e,tp)
-	return c:IsSetCard(0x522) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return (c:IsSetCard(0x522) or c:IsSetCard(0x247)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c10925.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

script/c10927.lua

@@ -40,7 +40,7 @@ function c10927.dcon(e,tp,eg,ep,ev,re,r,rp)
 	return ep~=tp and e:GetHandler()==Duel.GetAttacker()
 end
 function c10927.dop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.ChangeBattleDamage(ep,ev*1.5)
+	Duel.ChangeBattleDamage(ep,ev*2)
 end
 function c10927.econ(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE

script/c10929.lua

@@ -38,6 +38,6 @@ function c10929.activate(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_SET_ATTACK_FINAL)
 		e1:SetReset(res)
-		e1:SetValue(tc:GetBaseAttack()*2)
+		e1:SetValue(tc:GetAttack()*2)
 		tc:RegisterEffect(e1)
 end

script/c20161.lua

 --天空的花之都
 function c20161.initial_effect(c)
+--1
+	aux.AddCodeList(c,1192020)
 --
-    aux.AddCodeList(c,1192020)
---
-    --Activate
-    local e1=Effect.CreateEffect(c)
-    e1:SetType(EFFECT_TYPE_ACTIVATE)
-    e1:SetCode(EVENT_FREE_CHAIN)
-    c:RegisterEffect(e1)
-    --indestructable
-    local e3=Effect.CreateEffect(c)
-    e3:SetType(EFFECT_TYPE_SINGLE)
-    e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-    e3:SetRange(LOCATION_FZONE)
-    e3:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
-    e3:SetCountLimit(1)
-    e3:SetValue(c20161.valcon)
-    c:RegisterEffect(e3)
-    --special summon
-    local e4=Effect.CreateEffect(c)
-    e4:SetDescription(aux.Stringid(20161,0))
-    e4:SetCategory(CATEGORY_SPECIAL_SUMMON)
-    e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-    e4:SetRange(LOCATION_FZONE)
-    e4:SetCode(EVENT_RECOVER)
-    e4:SetCountLimit(1)
-    e4:SetTarget(c20161.target)
-    e4:SetOperation(c20161.operation)
-    c:RegisterEffect(e4)
+	--Activate
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_ACTIVATE)
+	e1:SetCode(EVENT_FREE_CHAIN)
+	c:RegisterEffect(e1)
+	--indestructable
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_SINGLE)
+	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e3:SetRange(LOCATION_FZONE)
+	e3:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
+	e3:SetCountLimit(1)
+	e3:SetValue(c20161.valcon)
+	c:RegisterEffect(e3)
+	--special summon
+	local e4=Effect.CreateEffect(c)
+	e4:SetDescription(aux.Stringid(20161,0))
+	e4:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e4:SetRange(LOCATION_FZONE)
+	e4:SetCode(EVENT_RECOVER)
+	e4:SetCountLimit(1)
+	e4:SetTarget(c20161.target)
+	e4:SetOperation(c20161.operation)
+	c:RegisterEffect(e4)
 end
 function c20161.spfilter(c,e,tp)
-    return c:IsSetCard(0x123) and c:IsAttribute(ATTRIBUTE_LIGHT+ATTRIBUTE_DARK) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) 
-        and (c:IsLocation(LOCATION_DECK) and Duel.GetMZoneCount(tp)>0 or c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0)
+	return c:IsSetCard(0x123) and c:IsAttribute(ATTRIBUTE_LIGHT+ATTRIBUTE_DARK) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c20161.target(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.IsExistingMatchingCard(c20161.spfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,nil,e,tp) end
-    Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK+LOCATION_EXTRA)
+	if chk==0 then return ((Duel.GetLocationCountFromEx(tp)>0 and Duel.IsExistingMatchingCard(c20161.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp)) or (Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(c20161.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp))) end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK+LOCATION_EXTRA)
 end
 function c20161.operation(e,tp,eg,ep,ev,re,r,rp)
-    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-    local g=Duel.SelectMatchingCard(tp,c20161.spfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,1,nil,e,tp)
-    if g:GetCount()>0 then
-        local tc=g:GetFirst()
-        Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
-        local e1=Effect.CreateEffect(e:GetHandler())
-        e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-        e1:SetCode(EVENT_BE_MATERIAL)
-        e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-        e1:SetReset(RESET_EVENT+0x1620000)
-        e1:SetCondition(c20161.ccon)
-        e1:SetOperation(c20161.cop)
-        tc:RegisterEffect(e1)
-    end
+	if not e:GetHandler():IsRelateToEffect(e) then return end
+	if Duel.GetLocationCountFromEx(tp)>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+		local g=Duel.SelectMatchingCard(tp,c20161.spfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,1,nil,e,tp)
+		if g:GetCount()>0 then
+			local tc=g:GetFirst()
+			Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP)
+			tc:CompleteProcedure()
+			Duel.SpecialSummonComplete()
+			local e1=Effect.CreateEffect(e:GetHandler())
+			e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+			e1:SetCode(EVENT_BE_MATERIAL)
+			e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+			e1:SetReset(RESET_EVENT+0x1620000)
+			e1:SetCondition(c20161.ccon)
+			e1:SetOperation(c20161.cop)
+			tc:RegisterEffect(e1)
+		end
+	else
+		if Duel.GetLocationCountFromEx(tp)>0 then
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+			local g=Duel.SelectMatchingCard(tp,c20161.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
+			if g:GetCount()>0 then
+				local tc=g:GetFirst()
+				Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP)
+				tc:CompleteProcedure()
+				Duel.SpecialSummonComplete()
+				local e1=Effect.CreateEffect(e:GetHandler())
+				e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+				e1:SetCode(EVENT_BE_MATERIAL)
+				e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+				e1:SetReset(RESET_EVENT+0x1620000)
+				e1:SetCondition(c20161.ccon)
+				e1:SetOperation(c20161.cop)
+				tc:RegisterEffect(e1)
+			end
+		else
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+			local g=Duel.SelectMatchingCard(tp,c20161.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
+			if g:GetCount()>0 then
+				local tc=g:GetFirst()
+				Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP)
+				tc:CompleteProcedure()
+				Duel.SpecialSummonComplete()
+				local e1=Effect.CreateEffect(e:GetHandler())
+				e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+				e1:SetCode(EVENT_BE_MATERIAL)
+				e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+				e1:SetReset(RESET_EVENT+0x1620000)
+				e1:SetCondition(c20161.ccon)
+				e1:SetOperation(c20161.cop)
+				tc:RegisterEffect(e1)
+			end
+		end
+	end
 end
 function c20161.ccon(e,tp,eg,ep,ev,re,r,rp)
-    return r==REASON_SYNCHRO
+	return r==REASON_SYNCHRO
 end
 function c20161.cop(e,tp,eg,ep,ev,re,r,rp)
-    local c=e:GetHandler()
-    --leave redirect
-    local e1=Effect.CreateEffect(c)
-    e1:SetType(EFFECT_TYPE_SINGLE)
-    e1:SetCode(EFFECT_CANNOT_ATTACK)
-    e1:SetReset(RESET_EVENT+0x1fe0000)
-    c:GetReasonCard():RegisterEffect(e1)
+	local c=e:GetHandler()
+	--leave redirect
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_CANNOT_ATTACK)
+	e1:SetReset(RESET_EVENT+0x1fe0000)
+	c:GetReasonCard():RegisterEffect(e1)
 end
 --
 function c20161.valcon(e,re,r,rp)
-    return bit.band(r,REASON_EFFECT)~=0
+	return bit.band(r,REASON_EFFECT)~=0
 end
\ No newline at end of file