Merge branch 'master' of https://github.com/purerosefallen/ygopro-222DIY

expansions/script/c12001021.lua

@@ -78,16 +78,9 @@ function c12001021.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ConfirmCards(1-tp,g)
 		Duel.ShuffleDeck(tp)
 	end
-	local tg=Duel.GetMatchingGroup(Card.IsAbleToDeck,p,LOCATION_HAND,0,nil)
-	if tg:GetCount()>1 and tg:IsExists(Card.IsSetCard,1,nil,0xfb0) then
+	local tg=Duel.GetMatchingGroup(Card.IsAbleToDeck,p,			  LOCATION_HAND,0,nil)
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
-			local sg1=tg:Select(tp,Card.IsSetCard,1,1,nil,0xfb0)
+			local sg1=tg:Select(tp,Card.IsSetCard,1,1,nil,nil)
 			Duel.ConfirmCards(1-tp,sg1)
 			Duel.SendtoDeck(sg1,nil,0,REASON_EFFECT)
-	  else
-			local hg=Duel.GetFieldGroup(tp,LOCATION_HAND,0)
-			Duel.ConfirmCards(1-tp,hg)
-			local ct=Duel.SendtoDeck(hg,nil,0,REASON_EFFECT)
-			Duel.SortDecktop(tp,tp,ct)
-	 end
 end
\ No newline at end of file

expansions/script/c13257215.lua

@@ -161,7 +161,7 @@ function c13257215.rmop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c13257215.spcon(e,tp,eg,ep,ev,re,r,rp)
-	local c=s:GetHandler()
+	local c=e:GetHandler()
 	return c:GetReasonPlayer()~=tp and c:IsReason(REASON_EFFECT) and c:GetPreviousControler()==tp
 end
 function c13257215.spfilter(c,e,tp)

expansions/script/c13257307.lua

@@ -63,7 +63,7 @@ function c13257307.efilter(e,re)
 end
 function c13257307.cacon(e,tp,eg,ep,ev,re,r,rp)
 	local ec=e:GetHandler():GetEquipTarget()
-	return ec and eg:IsContains(ec)
+	return ec and ec:IsRelateToBattle() and ec:IsStatus(STATUS_OPPO_BATTLE)
 end
 function c13257307.catg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()