wadashimo

expansions/script/c33500616.lua

@@ -83,7 +83,24 @@ function cm.disop(e,tp,eg,ep,ev,re,r,rp)
 --  local ct=Duel.GetCurrentChain()
 	local rx=Duel.GetMatchingGroup(cm.tdfilter3,rc,LOCATION_MZONE,LOCATION_MZONE,nil)
 	local rxs=rx:GetCount()
-	if loc>=rxs and rc:IsAbleToDeck() and not rc:IsCode(m) then
-		Duel.SendtoDeck(rc,nil,2,REASON_EFFECT)
+	if loc>=rxs then
+		if (rc:IsType(TYPE_SPELL) or rc:IsType(TYPE_TRAP)) then
+			if re:IsHasType(EFFECT_TYPE_ACTIVATE) then
+			rc:CancelToGrave()
+			Duel.SendtoDeck(rc,nil,2,REASON_EFFECT)
+			return 
+		else
+			if rc:IsAbleToDeck() then
+				Duel.SendtoDeck(rc,nil,2,REASON_EFFECT)
+				return 
+			end
+			return  
+		end
+			else
+		if rc:IsAbleToDeck() then
+			Duel.SendtoDeck(rc,nil,2,REASON_EFFECT)
+			return 
+		end
+		end
 	end
 end
\ No newline at end of file

expansions/script/c81027031.lua

@@ -22,16 +22,15 @@ function cm.ritual_filter(c)
 	return c:IsCode(81027000)
 end
 function cm.drfilter(c)
-	return c:IsCode(81027000) and c:IsAbleToDeck()
+	return c:IsCode(81027000) and c:IsAbleToDeck() and not c:IsPublic()
 end
 function cm.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp)
-		and Duel.IsExistingMatchingCard(cm.drfilter,tp,LOCATION_HAND,0,1,nil) end
+		and Duel.IsExistingMatchingCard(cm.drfilter,tp,LOCATION_HAND,0,1,e:GetHandler()) end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_HAND)
 end
 function cm.drop(e,tp,eg,ep,ev,re,r,rp)
-	if not e:GetHandler():IsRelateToEffect(e) then return end
 	local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)
 	Duel.Hint(HINT_SELECTMSG,p,HINTMSG_TODECK)
 	local g=Duel.SelectMatchingCard(p,cm.drfilter,p,LOCATION_HAND,0,1,63,nil)