ybb

expansions/script/c23000400.lua

@@ -3,7 +3,7 @@ if c23000400 then return end
 c23000400=c23000400 or {}
 local m = 23000400
 local bm = _G["c"..m]
-local Version_Number=20220212
+local Version_Number=20220226
 local tcode=0x364
 --Instructions about how to use this
 --[[
@@ -277,11 +277,16 @@ function bm.e.eqtg(loc,filter_func,target_type,oppos)
 		Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,nil,1,tp,0)
 	end
 end
-function bm.e.eqop(loc,filter_func,target_type,up_atk,oppos,up_def)
+function bm.e.eqop(loc,filter_func,target_type,up_atk,oppos,up_def,eqt_filter_func)
 	return function(e,tp,eg,ep,ev,re,r,rp)
 		if not bm.eqcheck_e(e,tp) then return end
 		local c=e:GetHandler()
-		if not c:IsRelateToEffect(e) then return end
+		if eqt_filter_func then 
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
+			c=Duel.SelectMatchingCard(tp,eqt_filter_func,tp,mz,0,1,1,nil):GetFirst()
+		elseif not c:IsRelateToEffect(e) then 
+			return 
+		end
 		if not (c:IsLocation(mz) or bm.eqfilter_base(c,tp)) then return end
 		local tc=c
 		if target_type then 
@@ -334,13 +339,14 @@ function bm.x.op(loc,filter_func)
 			g=g:Select(tp,1,1,nil)
 			local tc=g:GetFirst()
 			if tc then
-				local gx=Group.CreateGroup()
-				Group.AddCard(gx,c)
-				tc:SetMaterial(gx)
-				Duel.Overlay(tc,gx)
-				if Duel.SpecialSummon(tc,SUMMON_TYPE_XYZ,tp,tp,false,false,POS_FACEUP)~=0 then
-					tc:CompleteProcedure()
+				local mg=c:GetOverlayGroup()
+				if mg:GetCount()~=0 then
+					Duel.Overlay(tc,mg)
 				end
+				tc:SetMaterial(Group.FromCards(c))
+				Duel.Overlay(tc,Group.FromCards(c))
+				Duel.SpecialSummon(tc,SUMMON_TYPE_XYZ,tp,tp,false,false,POS_FACEUP)
+				tc:CompleteProcedure()
 			end
 		end
 	end