2.0pre.b

expansions/strings.conf

@@ -231,6 +231,10 @@
 !setname 0x64b	航空
 !setname 0x666	灵乌路空
 !setname 0x666a	焰星
+!setname 0xa670	学园偶像
+!setname 0xc670	学园啦啦队
+!setname 0x3670	学园女仆
+!setname 0x670	学园
 !setname 0x684	反魂蝶
 !setname 0x700	绯想
 !setname 0x701	天候
@@ -291,6 +295,7 @@
 !setname 0x5345	喔嘟噜星骑士
 !setname 0x351	神秘地点
 !setname 0x412  水桥帕露西
+!setname 0x610	暗符
 !setname 0x611	埴安神袿姫
 !setname 0x612	造形
 !setname 0x3612	造形术

lflist.conf

-#[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]
+#[2.0pre 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
+!2.0pre HCG
 #limit
 23252 0 --暴力取材
 14028 2 --BAD APPLE!!
@@ -56,6 +56,7 @@
 17060940 0 --苍空的狙击手·席尔瓦
 17061210 1 --苍空的方舟·格兰塞法号
 17061630 0 --苍空的猫耳魔术师 凯露
+17060850 0 --苍空的骑士·卡塔丽娜
 --锅卡
 22200161 0 --无颜者
 --呆卡

script/c23150.lua

@@ -10,7 +10,7 @@ function c23150.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
-	e1:SetCountLimit(1,23150+EFFECT_COUNT_CODE_DUEL)
+	e1:SetCountLimit(1,23150)
 	e1:SetTarget(c23150.settg1)
 	e1:SetOperation(c23150.setop1)
 	c:RegisterEffect(e1)
@@ -21,8 +21,7 @@ function c23150.initial_effect(c)
 	e2:SetCategory(CATEGORY_DAMAGE)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetCountLimit(1)
-	e2:SetCondition(c23150.condition)
+	e2:SetCountLimit(1,23150)
 	e2:SetCost(c23150.cost)
 	e2:SetTarget(c23150.target)
 	e2:SetOperation(c23150.operation)
@@ -36,39 +35,34 @@ function c23150.filter(c)
 	return c:IsType(TYPE_FIELD) and c:IsSSetable()
 end
 function c23150.settg1(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>1
-		and Duel.IsPlayerCanSpecialSummonMonster(tp,231500,0,0x4011,500,2000,10,RACE_ROCK,ATTRIBUTE_EARTH)
-		and Duel.IsExistingMatchingCard(c23150.filter,tp,LOCATION_DECK,0,1,nil) end
-	Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,2,0,0)
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,0,0)
+	if chk==0 then return Duel.IsExistingMatchingCard(c23150.filter,tp,LOCATION_DECK,0,1,nil) end
 end
 function c23150.setop1(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.GetLocationCount(tp,LOCATION_MZONE)<2 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
 	local g=Duel.SelectMatchingCard(tp,c23150.filter,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 then
 		Duel.SSet(tp,g:GetFirst())
 		Duel.ConfirmCards(1-tp,g)
 	end
+	local maxct=Duel.GetLocationCount(tp,LOCATION_MZONE)
+	local smct=0
 	if not Duel.IsPlayerCanSpecialSummonMonster(tp,231500,0,0x4011,500,2000,10,RACE_ROCK,ATTRIBUTE_EARTH) then return end
-	for i=1,2 do
+	while Duel.IsCanRemoveCounter(tp,1,0,0x128a,2,REASON_COST) and maxct>0 do
+		Duel.RemoveCounter(tp,1,0,0x128a,2,REASON_COST)
 		local token=Duel.CreateToken(tp,231500)
 		Duel.SpecialSummonStep(token,0,tp,tp,false,false,POS_FACEUP)
-			local e5=Effect.CreateEffect(e:GetHandler())
-			e5:SetType(EFFECT_TYPE_SINGLE)
-			e5:SetCode(EFFECT_CANNOT_BE_LINK_MATERIAL)
-			e5:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-			e5:SetReset(RESET_EVENT+0x1fe0000)
-			e5:SetValue(1)
-			token:RegisterEffect(e5)
+		local e5=Effect.CreateEffect(e:GetHandler())
+		e5:SetType(EFFECT_TYPE_SINGLE)
+		e5:SetCode(EFFECT_CANNOT_BE_LINK_MATERIAL)
+		e5:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+		e5:SetReset(RESET_EVENT+0x1fe0000)
+		e5:SetValue(1)
+		token:RegisterEffect(e5)
+		smct=smct+1
+	end
+	if smct>0 then
+		Duel.SpecialSummonComplete()
 	end
-	Duel.SpecialSummonComplete()
-end
-function c23150.cfilter(c)
-	return c:IsType(TYPE_FIELD) and c:IsFaceup()
-end
-function c23150.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(c23150.cfilter,tp,LOCATION_SZONE,LOCATION_SZONE,1,nil)
 end
 function c23150.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

script/c23197.lua

@@ -19,7 +19,7 @@ function c23197.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c23197.filter(c)
-	return c:IsFaceup() and c:IsDisabled()
+	return c:IsFaceup() and (c:IsDisabled() or c:IsForbidden())
 end
 function c23197.spcon(e,c)
 	if c==nil then return true end

script/c34501.lua

@@ -44,8 +44,9 @@ end
 
 -- ① 丢弃cost
 function s.negcost(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_HAND,0,1,nil,34013) end
-    Duel.DiscardHand(tp,Card.IsCode,1,1,REASON_COST+REASON_DISCARD,nil,34013)
+    if chk==0 then return Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_HAND,LOCATION_HAND,1,nil,34013) end
+    Duel.SelectMatchingCard(tp,Card.IsCode,tp,LOCATION_HAND,LOCATION_HAND,1,1,nil,34013)
+    Duel.SendtoGrave(sg,REASON_COST+REASON_DISCARD)
 end
 
 -- ① 效果目标

script/c50252.lua

@@ -9,6 +9,7 @@ function c50252.initial_effect(c)
 	e4:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN)
 	e4:SetType(EFFECT_TYPE_IGNITION)
 	e4:SetRange(LOCATION_MZONE)
+	e4:SetCountLimit(1,50252)
     e4:SetCost(c50252.bcost)
 	e4:SetTarget(c50252.btg)
 	e4:SetOperation(c50252.bop)
@@ -18,8 +19,8 @@ function c50252.xyzfilter(c)
 	return c:IsAttribute(ATTRIBUTE_WIND) and c:IsSetCard(0x250) and c:IsFaceup()
 end
 function c50252.bcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,3,REASON_COST) end
-	e:GetHandler():RemoveOverlayCard(tp,3,3,REASON_COST)
+	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,2,REASON_COST) end
+	e:GetHandler():RemoveOverlayCard(tp,2,2,REASON_COST)
 end
 function c50252.btg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -75,7 +76,7 @@ function c50252.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
 		local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)
-        local rec=(e:GetHandler():GetAttack()*2)
+        local rec=e:GetHandler():GetAttack()
 		Duel.Recover(p,rec,REASON_EFFECT)
         Duel.Draw(p,1,REASON_EFFECT)
 	end

script/c70080.lua

@@ -33,7 +33,7 @@ function c70080.cfilter(c)
 	return c:IsFaceup() and c:IsSetCard(0x149) and c:GetDefense()>=1000
 end
 function c70080.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return (e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) or Duel.GetTurnPlayer()~=tp)
+	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)
 		and Duel.IsExistingMatchingCard(c70080.cfilter,tp,LOCATION_MZONE,0,1,nil) end
 	g=Duel.SelectMatchingCard(tp,c70080.cfilter,tp,LOCATION_MZONE,0,1,1,nil)
 	tc=g:GetFirst()
@@ -43,9 +43,7 @@ function c70080.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e1:SetReset(RESET_EVENT+0x1ff0000)
 	e1:SetValue(-1000)
 	tc:RegisterEffect(e1)
-	if Duel.GetTurnPlayer()==tp then
-		e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
-	end
+	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
 end
 function c70080.filter(c)
 	return c:IsFaceup() and not c:IsDisabled()