Merge remote-tracking branch 'upstream/master' into mc_master

c19089195.lua

@@ -106,11 +106,9 @@ function c19089195.remop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function c19089195.descon(e,tp,eg,ep,ev,re,r,rp)
-	if not c19089195.econ(e,tp,eg,ep,ev,re,r,rp) then return false end
-	local tc=Duel.GetAttacker()
-	local bc=Duel.GetAttackTarget()
-	if not bc then return false end
-	if tc:IsControler(1-tp) then tc,bc=bc,tc end
+	if not Duel.IsEnvironment(22702055) then return false end
+	local tc,bc=Duel.GetBattleMonster(tp)
+	if not tc or not bc then return false end
 	if tc:IsFaceup() and tc:GetOriginalLevel()>=5 and tc:IsAttribute(ATTRIBUTE_WATER) then
 		e:SetLabelObject(bc)
 		return true

c25750986.lua

@@ -36,10 +36,10 @@ function c25750986.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 		local g=Duel.SelectMatchingCard(tp,c25750986.tgfilter,tp,LOCATION_DECK,0,1,1,nil,tp,atk)
 		local gc=g:GetFirst()
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-		local g1=Duel.SelectMatchingCard(tp,c25750986.tgfilter1,tp,LOCATION_DECK,0,1,1,gc,atk-gc:GetAttack(),gc:GetAttribute())
-		g:Merge(g1)
-		if g:GetCount()>1 then
+		if gc then
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
+			local g1=Duel.SelectMatchingCard(tp,c25750986.tgfilter1,tp,LOCATION_DECK,0,1,1,gc,atk-gc:GetAttack(),gc:GetAttribute())
+			g:Merge(g1)
 			Duel.SendtoGrave(g,REASON_EFFECT)
 		end
 	end