2021/6/14 修正部分卡片，新增KP06新卡

script/c120140017.lua

@@ -5,7 +5,7 @@ function cm.initial_effect(c)
 	--To Hand
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
-	e1:SetCategory(CATEGORY_TOHAND)
+	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_GRAVE_ACTION)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(cm.condition)

script/c120170017.lua

@@ -44,10 +44,10 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 		if Duel.GetLocationCount(tp,LOCATION_SZONE)>0
 			and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(cm.setfilter),tp,LOCATION_GRAVE,0,1,nil)
 			and Duel.SelectYesNo(tp,aux.Stringid(m,2)) then
-			Duel.BreakEffect()
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
 			local sg=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.setfilter),tp,LOCATION_GRAVE,0,1,1,nil)
 			if sg:GetCount()>0 then
+				Duel.BreakEffect()
 				Duel.SSet(tp,sg)
 			end
 		end

script/c120170062.lua

@@ -16,8 +16,11 @@ function cm.initial_effect(c)
 end
 --Activate
 function cm.confilter(c,tp)
-	return (RushDuel.IsLegendCode(c,list[1]) or (c:IsType(TYPE_NORMAL) and c:IsLevelAbove(7) and c:IsRace(RACE_FIEND)))
-		and c:GetPreviousControler()==tp and c==Duel.GetAttackTarget()
+	return (RushDuel.IsLegendCode(c,list[1]) or c:GetPreviousCodeOnField()==list[1] or (
+			bit.band(c:GetPreviousTypeOnField(),TYPE_NORMAL)~=0
+			and c:GetPreviousLevelOnField()>=7
+			and bit.band(c:GetPreviousRaceOnField(),RACE_FIEND)~=0
+		)) and c:GetPreviousControler()==tp and c==Duel.GetAttackTarget()
 end
 function cm.spfilter(c,e,tp)
 	return c:IsType(TYPE_NORMAL) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

script/c120183015.lua

+local m=120183015
+local cm=_G["c"..m]
+cm.name="火雷神 雷击勇士"
+function cm.initial_effect(c)
+	--Atk Up
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(m,0))
+	e1:SetCategory(CATEGORY_ATKCHANGE)
+	e1:SetType(EFFECT_TYPE_IGNITION)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetCondition(cm.condition)
+	e1:SetCost(cm.cost)
+	e1:SetOperation(cm.operation)
+	c:RegisterEffect(e1)
+end
+--Atk Up
+function cm.spfilter(c,e,tp)
+	return c:IsLevel(7) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+end
+function cm.check(g)
+	return g:GetClassCount(Card.GetCode)==g:GetCount()
+end
+function cm.condition(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	return c:IsReason(REASON_SUMMON) and c:IsStatus(STATUS_SUMMON_TURN)
+end
+function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsPlayerCanDiscardDeckAsCost(tp,1) end
+	Duel.DiscardDeck(tp,1,REASON_COST)
+end
+function cm.operation(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	if c:IsFaceup() and c:IsRelateToEffect(e) then
+		local e1=Effect.CreateEffect(c)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_UPDATE_ATTACK)
+		e1:SetValue(300)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE+RESET_PHASE+PHASE_END)
+		c:RegisterEffect(e1)
+		if Duel.GetMZoneCount(tp)<1 then return end
+		local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(cm.spfilter),tp,LOCATION_GRAVE,0,nil,e,tp)
+		if g:CheckSubGroup(aux.dncheck,4,4) and Duel.SelectYesNo(tp,aux.Stringid(m,1)) then
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+			local sg=g:Select(tp,1,1,nil)
+			if sg:GetCount()>0 then
+				Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP)
+			end
+		end
+	end
+end
\ No newline at end of file

script/c120183017.lua

+local m=120183017
+local cm=_G["c"..m]
+cm.name="钢击龙 齿车戒钢龙"
+function cm.initial_effect(c)
+	--Attack Twice
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(m,0))
+	e1:SetType(EFFECT_TYPE_IGNITION)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetCondition(cm.condition)
+	e1:SetCost(cm.cost)
+	e1:SetOperation(cm.operation)
+	c:RegisterEffect(e1)
+end
+--Attack Twice
+function cm.costfilter(c)
+	return c:IsLevelAbove(7) and c:IsRace(RACE_DRAGON) and c:IsAbleToGraveAsCost()
+end
+function cm.condition(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.IsAbleToEnterBP()
+end
+function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.costfilter,tp,LOCATION_HAND,0,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
+	local g=Duel.SelectMatchingCard(tp,cm.costfilter,tp,LOCATION_HAND,0,1,1,nil)
+	Duel.SendtoGrave(g,REASON_COST)
+end
+function cm.operation(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	if c:IsFaceup() and c:IsRelateToEffect(e) then
+		--Indes
+		local e1=Effect.CreateEffect(c)
+		e1:SetDescription(aux.Stringid(m,1))
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
+		e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
+		e1:SetValue(1)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE+RESET_PHASE+PHASE_END)
+		c:RegisterEffect(e1)
+		local e2=Effect.CreateEffect(c)
+		e2:SetDescription(aux.Stringid(m,2))
+		e2:SetType(EFFECT_TYPE_SINGLE)
+		e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+		e2:SetProperty(EFFECT_FLAG_CLIENT_HINT)
+		e2:SetValue(cm.efilter)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE+RESET_PHASE+PHASE_END)
+		c:RegisterEffect(e2)
+		--Extra Attack
+		local e3=Effect.CreateEffect(c)
+		e3:SetDescription(aux.Stringid(m,3))
+		e3:SetType(EFFECT_TYPE_SINGLE)
+		e3:SetCode(EFFECT_EXTRA_ATTACK_MONSTER)
+		e3:SetProperty(EFFECT_FLAG_CLIENT_HINT)
+		e3:SetCondition(cm.atkcon)
+		e3:SetValue(1)
+		e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE+RESET_PHASE+PHASE_END)
+		c:RegisterEffect(e3)
+	end
+end
+function cm.efilter(e,re,rp)
+	return rp==1-e:GetHandlerPlayer() and re:IsActiveType(TYPE_TRAP)
+end
+function cm.atkcon(e)
+	return e:GetHandler():GetAttackedGroupCount()>0
+end
\ No newline at end of file