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

script/RDAction.lua

@@ -160,7 +160,7 @@ function RushDuel.SelectAndToHandOrSpecialSummon(hint, filter, tp, s_range, o_ra
             end
             return RushDuel.SendToHandAndExists(tc, e, tp, REASON_EFFECT)
         else
-            return RushDuel._special_summon(tc, e, tp, pos, break_effect, target_player)
+            return RushDuel._special_summon(tc, e, tp, pos, break_effect, target_player)~=0
         end
     end, e, tp)
 end
@@ -175,7 +175,7 @@ function RushDuel.CanSelectAndToHandOrSpecialSummon(desc, hint, filter, tp, s_ra
             end
             return RushDuel.SendToHandAndExists(tc, e, tp, REASON_EFFECT)
         else
-            return RushDuel._special_summon(tc, e, tp, pos, break_effect, target_player)
+            return RushDuel._special_summon(tc, e, tp, pos, break_effect, target_player)~=0
         end
     end, e, tp)
 end

script/RDCondition.lua

@@ -124,14 +124,9 @@ function RushDuel.IsCanBeDoubleFusionMaterial(card, code)
     return false
 end
 -- 条件: 可以宣言融合素材的卡名
-function RushDuel.IsCanAnnounceFusionMaterialCode(card, code)
-    local mats = card.material or {}
-    local codes = card.material_codes or {}
-    local count = #codes
-    if code ~= nil and mats[code] then
-        count = count - 1
-    end
-    return count > 0
+function RushDuel.IsCanAnnounceFusionMaterialCode(card, target)
+    local codes = RushDuel.GetAnnouncableFusionMaterialCodes(card, target)
+    return #codes > 0
 end
 
 -- 条件: 位置变化前的控制者

script/RDFusion.lua

@@ -111,12 +111,12 @@ function RushDuel.SetFusionMaterialData(card, codes, min, max)
     local mt = getmetatable(card)
     -- 卡名记述的素材
     if codes ~= nil then
+        RushDuel.AddCodeList(card, codes)
         local mat = {}
         for _, code in ipairs(codes) do
             mat[code] = true
         end
         mt.material = mat
-        mt.material_codes = codes
     end
     -- 素材的数量
     if mt.material_count == nil then
@@ -574,14 +574,21 @@ function RushDuel.FusionToDeckBottom(tp, mat)
     Auxiliary.PlaceCardsOnDeckBottom(tp, mat, REASON_EFFECT + REASON_MATERIAL + REASON_FUSION)
 end
 
--- 获取融合素材的卡名
-function RushDuel.GetFusionMaterialCodes(card)
-    return card.material_codes or {}
+-- 获取可以宣言的融合素材的卡名
+function RushDuel.GetAnnouncableFusionMaterialCodes(card, target)
+    local codes = {}
+    local code = card:GetCode()
+    for code, _ in pairs(target.material or {}) do
+        if not card:IsCode(code) then
+            table.insert(codes, code)
+        end
+    end
+    return codes
 end
 
 -- 宣言融合素材的卡名
-function RushDuel.AnnounceFusionMaterialCode(player, card)
-    local codes = card.material_codes or {}
+function RushDuel.AnnounceFusionMaterialCode(player, card, target)
+    local codes = RushDuel.GetAnnouncableFusionMaterialCodes(card, target)
     if #codes > 0 then
         return RushDuel.AnnounceCodes(player, codes)
     else

script/c120271028.lua

@@ -14,13 +14,13 @@ end
 --Change Code
 function cm.costfilter(c,e)
 	return c:IsType(TYPE_FUSION) and c:IsLevel(9) and c:IsRace(RACE_CYBORG)
-		and RD.IsCanAnnounceFusionMaterialCode(c,e:GetHandler():GetCode())
+		and RD.IsCanAnnounceFusionMaterialCode(e:GetHandler(),c)
 end
 cm.cost=RD.CostShowExtra(cm.costfilter,1,1,nil,Group.GetFirst)
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	local tc=e:GetLabelObject()
-	local ac=RD.AnnounceFusionMaterialCode(tp,tc)
+	local ac=RD.AnnounceFusionMaterialCode(tp,e:GetHandler(),tc)
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,0)
 end

script/c120272065.lua

@@ -13,13 +13,13 @@ function cm.initial_effect(c)
 end
 --Change Code
 function cm.costfilter(c,e)
-	return c:IsType(TYPE_FUSION) and RD.IsCanAnnounceFusionMaterialCode(c,e:GetHandler():GetCode())
+	return c:IsType(TYPE_FUSION) and RD.IsCanAnnounceFusionMaterialCode(e:GetHandler(),c)
 end
 cm.cost=RD.CostShowExtra(cm.costfilter,1,1,nil,Group.GetFirst)
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	local tc=e:GetLabelObject()
-	local ac=RD.AnnounceFusionMaterialCode(tp,tc)
+	local ac=RD.AnnounceFusionMaterialCode(tp,e:GetHandler(),tc)
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,0)
 end

script/c120277007.lua

@@ -16,13 +16,13 @@ end
 --Fusion Code
 function cm.costfilter(c,e)
 	return c:IsType(TYPE_FUSION) and c:IsLevel(9) and c:IsRace(RACE_GALAXY)
-		and RD.IsCanAnnounceFusionMaterialCode(c,e:GetHandler():GetCode())
+		and RD.IsCanAnnounceFusionMaterialCode(e:GetHandler(),c)
 end
 cm.cost=RD.CostShowExtra(cm.costfilter,1,1,nil,Group.GetFirst)
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	local tc=e:GetLabelObject()
-	local ac=RD.AnnounceFusionMaterialCode(tp,tc)
+	local ac=RD.AnnounceFusionMaterialCode(tp,e:GetHandler(),tc)
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,0)
 end

script/c120277064.lua

@@ -38,9 +38,8 @@ 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.activate(e,tp,eg,ep,ev,re,r,rp)
-	local res=RD.SelectAndToHandOrSpecialSummon(aux.Stringid(m,1),aux.NecroValleyFilter(cm.filter),tp,LOCATION_GRAVE,0,nil,e,POS_FACEUP)
-	if res==false or res==0 then return end
-	if Duel.IsExistingMatchingCard(cm.exfilter,tp,LOCATION_MZONE,0,1,nil) then
+	if RD.SelectAndToHandOrSpecialSummon(aux.Stringid(m,1),aux.NecroValleyFilter(cm.filter),tp,LOCATION_GRAVE,0,nil,e,POS_FACEUP)
+		and Duel.IsExistingMatchingCard(cm.exfilter,tp,LOCATION_MZONE,0,1,nil) then
 		RD.CanSelectAndDoAction(aux.Stringid(m,2),HINTMSG_RTOHAND,cm.thfilter,tp,0,LOCATION_MZONE,1,1,nil,function(sg)
 			Duel.BreakEffect()
 			RD.SendToHandAndExists(sg,e,tp,REASON_EFFECT)

script/c120285005.lua

@@ -14,13 +14,13 @@ end
 --Change Code
 function cm.costfilter(c,e)
 	return c:IsType(TYPE_FUSION) and c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_SPELLCASTER)
-		and RD.IsDefense(c,2100) and RD.IsCanAnnounceFusionMaterialCode(c,e:GetHandler():GetCode())
+		and RD.IsDefense(c,2100) and RD.IsCanAnnounceFusionMaterialCode(e:GetHandler(),c)
 end
 cm.cost=RD.CostShowExtra(cm.costfilter,1,1,nil,Group.GetFirst)
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	local tc=e:GetLabelObject()
-	local ac=RD.AnnounceFusionMaterialCode(tp,tc)
+	local ac=RD.AnnounceFusionMaterialCode(tp,e:GetHandler(),tc)
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,0)
 end

script/c120290059.lua

@@ -32,9 +32,8 @@ 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.activate(e,tp,eg,ep,ev,re,r,rp)
-	local res=RD.SelectAndToHandOrSpecialSummon(aux.Stringid(m,1),aux.NecroValleyFilter(cm.filter),tp,LOCATION_GRAVE,0,nil,e,POS_FACEUP)
-	if res==false or res==0 then return end
-	if Duel.IsExistingMatchingCard(cm.exfilter,tp,LOCATION_MZONE,0,1,nil) then
+	if RD.SelectAndToHandOrSpecialSummon(aux.Stringid(m,1),aux.NecroValleyFilter(cm.filter),tp,LOCATION_GRAVE,0,nil,e,POS_FACEUP)
+		and Duel.IsExistingMatchingCard(cm.exfilter,tp,LOCATION_MZONE,0,1,nil) then
 		RD.CanSendOpponentHandToGrave(aux.Stringid(m,1),tp,aux.Stringid(m,2),1,1,true)
 	end
 end
\ No newline at end of file

script/c120294000.lua

@@ -52,7 +52,7 @@ end
 function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	RD.SelectAndSpecialSummon(aux.NecroValleyFilter(cm.spfilter),tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,POS_FACEUP)
 	if Duel.GetFlagEffect(tp,m)~=0 then return end
-	RD.CreateCannotActivateEffect(e,aux.Stringid(m,1),cm.aclimit,tp,1,0,RESET_PHASE+PHASE_END)
+	RD.CreateCannotActivateEffect(e,aux.Stringid(m,2),cm.aclimit,tp,1,0,RESET_PHASE+PHASE_END)
 	Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_END,0,1)
 end
 function cm.aclimit(e,re,tp)

script/c120294008.lua

@@ -14,13 +14,13 @@ end
 --Change Code
 function cm.costfilter(c,e)
 	return c:IsType(TYPE_FUSION) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsRace(RACE_HYDRAGON)
-		and RD.IsCanAnnounceFusionMaterialCode(c,e:GetHandler():GetCode())
+		and RD.IsCanAnnounceFusionMaterialCode(e:GetHandler(),c)
 end
 cm.cost=RD.CostShowExtra(cm.costfilter,1,1,nil,Group.GetFirst)
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	local tc=e:GetLabelObject()
-	local ac=RD.AnnounceFusionMaterialCode(tp,tc)
+	local ac=RD.AnnounceFusionMaterialCode(tp,e:GetHandler(),tc)
 	Duel.SetTargetParam(ac)
 	Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,0)
 end