Merge branch 'master' of https://code.moenext.com/mycard/ygopro-rush-duel

script/RDLegend.lua

@@ -19,7 +19,9 @@ RushDuel.LegendCodes = {
     -- 死者苏生
     {120194004, 120195004},
     -- 天使的施舍
-    {120196049, 120195005, 120271001}
+    {120196049, 120195005, 120271001},
+    -- 贪欲之壶
+    {120217100, 120283020}
 }
 
 -- 初始化传说卡

script/c120170036.lua

 local m=120170036
 local cm=_G["c"..m]
-cm.name="魔导机奇少女"
+cm.name="魔力机械奇迹祭司"
 function cm.initial_effect(c)
 	--Special Summon
 	local e1=Effect.CreateEffect(c)

script/c120280001.lua

@@ -3,6 +3,7 @@ local list={120130000}
 local cm=_G["c"..m]
 cm.name="黑混沌之魔术师"
 function cm.initial_effect(c)
+	RD.AddRitualProcedure(c)
 	--Change Code
 	RD.EnableChangeCode(c,list[1],LOCATION_GRAVE)
 end
\ No newline at end of file

script/c120280002.lua

+local m=120280002
+local cm=_G["c"..m]
+cm.name="礼仪的巫师"
+function cm.initial_effect(c)
+	RD.AddRitualProcedure(c)
+	--Destroy
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(m,0))
+	e1:SetCategory(CATEGORY_DESTROY)
+	e1:SetType(EFFECT_TYPE_IGNITION)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetCondition(cm.condition)
+	e1:SetTarget(cm.target)
+	e1:SetOperation(cm.operation)
+	c:RegisterEffect(e1)
+end
+--Destroy
+function cm.confilter(c)
+	return c:IsFaceup() and c:IsType(TYPE_RITUAL) and c:IsLevel(8) and c:IsRace(RACE_SPELLCASTER)
+end
+function cm.condition(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.IsExistingMatchingCard(cm.confilter,tp,LOCATION_MZONE,0,1,nil)
+end
+function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.desfilter,tp,0,LOCATION_ONFIELD,1,nil) end
+	local g=Duel.GetMatchingGroup(cm.desfilter,tp,0,LOCATION_ONFIELD,nil)
+	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
+end
+function cm.operation(e,tp,eg,ep,ev,re,r,rp)
+	RD.SelectAndDoAction(HINTMSG_DESTROY,nil,tp,0,LOCATION_ONFIELD,1,1,nil,function(g)
+		Duel.Destroy(g,REASON_EFFECT)
+	end)
+end
\ No newline at end of file

script/c120280003.lua

+local m=120280003
+local cm=_G["c"..m]
+cm.name="礼仪的骑士"
+function cm.initial_effect(c)
+	RD.AddRitualProcedure(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:SetCost(cm.cost)
+	e1:SetOperation(cm.operation)
+	c:RegisterEffect(e1)
+end
+--Atk Up
+function cm.exfilter(c)
+	return c:IsFaceup() and c:IsType(TYPE_RITUAL) and c:IsLevel(8) and c:IsRace(RACE_SPELLCASTER)
+end
+cm.cost=RD.CostSendDeckTopToGrave(1)
+function cm.operation(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	if c:IsFaceup() and c:IsRelateToEffect(e) then
+		RD.AttachAtkDef(e,c,1000,0,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+		if Duel.IsExistingMatchingCard(cm.exfilter,tp,LOCATION_MZONE,0,1,nil) then
+			local g=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,0,nil)
+			g:ForEach(function(tc)
+				RD.AttachAtkDef(e,tc,500,0,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+			end)
+		end
+	end
+end
\ No newline at end of file

script/c120280007.lua

+local m=120280007
+local cm=_G["c"..m]
+cm.name="进军路易斯"
+function cm.initial_effect(c)
+	--Discard Deck
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(m,0))
+	e1:SetCategory(CATEGORY_DECKDES+CATEGORY_SPECIAL_SUMMON+CATEGORY_GRAVE_SPSUMMON)
+	e1:SetType(EFFECT_TYPE_IGNITION)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetCondition(cm.condition)
+	e1:SetTarget(cm.target)
+	e1:SetOperation(cm.operation)
+	c:RegisterEffect(e1)
+end
+--Discard Deck
+function cm.spfilter(c,e,tp)
+	return ((c:IsAttack(1200) and RD.IsDefense(c,1500)) or (c:IsAttack(1400) and RD.IsDefense(c,1200)))
+		and RD.IsCanBeSpecialSummoned(c,e,tp,POS_FACEUP_DEFENSE)
+end
+function cm.condition(e,tp,eg,ep,ev,re,r,rp)
+	return RD.IsSummonTurn(e:GetHandler())
+end
+function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsPlayerCanDiscardDeck(tp,2) end
+	Duel.SetOperationInfo(0,CATEGORY_DECKDES,nil,0,tp,2)
+end
+function cm.operation(e,tp,eg,ep,ev,re,r,rp)
+	if RD.SendDeckTopToGraveAndExists(tp,2) then
+		RD.CanSelectAndSpecialSummon(aux.Stringid(m,1),aux.NecroValleyFilter(cm.spfilter),tp,LOCATION_GRAVE,0,1,1,nil,e,POS_FACEUP_DEFENSE,true)
+	end
+end
\ No newline at end of file

script/c120280010.lua

@@ -5,7 +5,7 @@ function cm.initial_effect(c)
 	--Special Summon
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_GRAVE_SPSUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCost(cm.cost)
@@ -27,8 +27,8 @@ end
 cm.cost=RD.CostSendGraveSubToDeck(cm.costfilter,cm.costcheck,2,2)
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetMZoneCount(tp)>0
-		and Duel.IsExistingMatchingCard(cm.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
+		and Duel.IsExistingMatchingCard(cm.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE)
 end
 function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	RD.SelectAndSpecialSummon(aux.NecroValleyFilter(cm.spfilter),tp,LOCATION_GRAVE,0,1,1,nil,e,POS_FACEUP)

script/c120280031.lua

+local m=120280031
+local list={120280002,120280003}
+local cm=_G["c"..m]
+cm.name="礼仪的仪式"
+function cm.initial_effect(c)
+	RD.AddCodeList(c,list)
+	--Activate
+	local e1=RD.CreateRitualEffect(c,RITUAL_LEVEL_GREATER,cm.matfilter,cm.spfilter)
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e1:SetType(EFFECT_TYPE_ACTIVATE)
+	e1:SetCode(EVENT_FREE_CHAIN)
+	c:RegisterEffect(e1)
+end
+--Activate
+function cm.matfilter(c)
+	return c:IsFaceup() and c:IsOnField()
+end
+function cm.spfilter(c)
+	return c:IsCode(list[1],list[2])
+end
\ No newline at end of file

script/c120283001.lua

 local m=120283001
 local list={120283001}
 local cm=_G["c"..m]
-cm.name="永劫神导龙"
+cm.name="永劫之神导龙"
 function cm.initial_effect(c)
 	--Destroy
 	local e1=Effect.CreateEffect(c)

script/c120283019.lua

+RD.SameCard(120283019,120255004)
\ No newline at end of file

script/c120283020.lua

+RD.SameCard(120283020,120217100)
\ No newline at end of file

script/c120283025.lua

 local m=120283025
 local list={120105001,120110001}
 local cm=_G["c"..m]
-cm.name="连击龙骑士-七魔导骑士"
+cm.name="连击龙骑士-七魔术骑士"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Fusion Material

script/c120283026.lua

 local m=120283026
 local list={120235003}
 local cm=_G["c"..m]
-cm.name="THE☆完美齿车戒龙"
+cm.name="THE☆完美星齿车戒龙"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Fusion Material

script/c120283029.lua

 local m=120283029
 local list={120263005,120263008,120263007}
 local cm=_G["c"..m]
-cm.name="元素英雄 等离子侠"
+cm.name="元素英雄 日球层侠"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Fusion Material

script/c120283030.lua

@@ -29,6 +29,7 @@ end
 cm.unspecified_funsion=true
 function cm.matfilter(c)
 	return not RD.IsMaximumMode(c) and c:GetBaseAttack()==c:GetBaseDefense()
+		and c:IsFusionAttribute(ATTRIBUTE_EARTH) and c:IsRace(RACE_MACHINE)
 end
 --Material Check
 function cm.exfilter(c)

script/c120283031.lua

 local m=120283031
 local list={120231024}
 local cm=_G["c"..m]
-cm.name="嵌合崩溃龙"
+cm.name="嵌合粉碎龙"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Fusion Material

script/c120283034.lua

 local m=120283034
 local list={120170002,120196050}
 local cm=_G["c"..m]
-cm.name="可能甜心-体现：D"
+cm.name="可能甜心-具象化：D"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Copy Code

script/c120283035.lua

 local m=120283035
 local list={120226023}
 local cm=_G["c"..m]
-cm.name="究极助手·阿炽"
+cm.name="超绝助手·阿炽"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Draw

script/c120283039.lua

 local m=120283039
 local list={120102003,120247002}
 local cm=_G["c"..m]
-cm.name="鹰身小天使 轻短裙"
+cm.name="鹰身小天使 轻装女裙"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Fusion Material

script/c120283041.lua

 local m=120283041
 local cm=_G["c"..m]
-cm.name="黑火山龙"
+cm.name="黑色火山龙"
 function cm.initial_effect(c)
 	--Summon Procedure
 	RD.AddSummonProcedureOne(c,aux.Stringid(m,0),nil,cm.sumfilter)

script/c120283043.lua

@@ -19,7 +19,7 @@ end
 function cm.spfilter(c,e,tp)
 	return (c:IsCode(list[1]) or (c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_DRAGON)
 		and c:IsAttack(1100) and RD.IsDefense(c,500)))
-		and RD.IsCanBeSpecialSummoned(c,e,tp,POS_FACEUP)
+		and RD.IsCanBeSpecialSummoned(c,e,tp,POS_FACEUP_DEFENSE)
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
 	return RD.IsSummonTurn(e:GetHandler())
@@ -30,5 +30,5 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE)
 end
 function cm.operation(e,tp,eg,ep,ev,re,r,rp)
-	RD.SelectAndSpecialSummon(aux.NecroValleyFilter(cm.spfilter),tp,LOCATION_GRAVE,0,1,1,nil,e,POS_FACEUP)
+	RD.SelectAndSpecialSummon(aux.NecroValleyFilter(cm.spfilter),tp,LOCATION_GRAVE,0,1,1,nil,e,POS_FACEUP_DEFENSE)
 end
\ No newline at end of file

script/c120283044.lua

 local m=120283044
 local cm=_G["c"..m]
-cm.name="魔导异想天开"
+cm.name="魔力机械幻想手杖"
 function cm.initial_effect(c)
 	--Special Summon
 	local e1=Effect.CreateEffect(c)
@@ -33,5 +33,5 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_END,0,1)
 end
 function cm.sumlimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return c:IsLevel(2)
+	return c:IsType(TYPE_EFFECT) and c:IsLevel(2)
 end
\ No newline at end of file

script/c120283045.lua

 local m=120283045
 local list={120257058}
 local cm=_G["c"..m]
-cm.name="接合科技宝贝暴君"
+cm.name="接合科技小机械暴君"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Discard Deck

script/c120283046.lua

 local m=120283046
 local list={120196050,120253051}
 local cm=_G["c"..m]
-cm.name="竖琴骗子"
+cm.name="里拉琴放大掠夺者"
 function cm.initial_effect(c)
 	RD.AddCodeList(c,list)
 	--Summon Procedure

script/c120283047.lua

 local m=120283047
 local cm=_G["c"..m]
-cm.name="西塔尔强盗"
+cm.name="锡塔琴劫掠者"
 function cm.initial_effect(c)
 	--To Hand
 	local e1=Effect.CreateEffect(c)

script/c120283049.lua

 local m=120283049
 local cm=_G["c"..m]
-cm.name="电子巴吉里斯克"
+cm.name="电子蛇尾鸡"
 function cm.initial_effect(c)
 	--Position
 	local e1=Effect.CreateEffect(c)

script/c120283050.lua

 local m=120283050
 local cm=_G["c"..m]
-cm.name="超可爱执行者·女仆"
+cm.name="超可爱执行者伙伴"
 function cm.initial_effect(c)
 	--Level Up
 	local e1=Effect.CreateEffect(c)

script/c120283052.lua

 local m=120283052
 local cm=_G["c"..m]
-cm.name="鹰身羽毛扫"
+cm.name="鹰身女妖的羽毛扫"
 function cm.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)