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

expansions/script/c12003000.lua

@@ -37,7 +37,7 @@ function c12003000.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 	local g=Duel.SelectMatchingCard(tp,c12003000.tgfilter,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 then
-		Duel.SendtoGrave(g,REASON_EFFECT)
+		Duel.SendtoGrave(g,REASON_COST)
 	end
 end
 function c12003000.con2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c12003002.lua

@@ -43,7 +43,7 @@ end
 function c12003002.operation(e,tp,eg,ep,ev,re,r,rp)
 	  local tc=Duel.GetFirstTarget()
 	  if tc:IsRelateToEffect(e) and e:GetHandler():IsRelateToEffect(e) then
-	  Duel.SendtoGrave(tc,REASON_EFFECT)
+	  Duel.SendtoGrave(tc,REASON_COST)
 	end
 end
 function c12003002.extg(e,c)

expansions/script/c50008203.lua

@@ -20,9 +20,9 @@ function cm.initial_effect(c)
         if chk==0 then return Duel.IsExistingTarget(cm.filter,tp,LOCATION_MZONE,0,1,nil)
             and Duel.IsExistingTarget(Card.IsAbleToHand,tp,0,LOCATION_MZONE,1,nil) end
         Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
-		local g1=Duel.SelectTarget(tp,cm.filter,tp,LOCATION_MZONE,0,1,1,nil)
+        local g1=Duel.SelectTarget(tp,cm.filter,tp,LOCATION_ONFIELD,0,1,1,nil)
         Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
-		local g2=Duel.SelectTarget(tp,Card.IsAbleToHand,tp,0,LOCATION_MZONE,1,1,nil)
+        local g2=Duel.SelectTarget(tp,Card.IsAbleToHand,tp,0,LOCATION_ONFIELD,1,1,nil)
         g1:Merge(g2)
         Duel.SetOperationInfo(0,CATEGORY_TOHAND,g1,2,0,0)
     end)

expansions/script/c50008209.lua

@@ -60,8 +60,7 @@ function cm.initial_effect(c)
     end)
     e2:SetOperation(
     function(e,tp,eg,ep,ev,re,r,rp)
-		Duel.NegateActivation(ev)
-		if re:GetHandler():IsRelateToEffect(re) then
+        if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
             Duel.Destroy(eg,REASON_EFFECT)
         end
     end)

expansions/script/c50008210.lua

@@ -55,6 +55,7 @@ function cm.initial_effect(c)
             elseif opt==2 then 
                 sgnum=g:Filter(Card.IsType,nil,TYPE_TRAP):GetCount()
             end
+            Duel.ShuffleHand(1-tp)
             if sgnum>1 then
                 local zone=e:GetHandler():GetLinkedZone()
                 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)

expansions/script/c50008211.lua

@@ -60,13 +60,14 @@ function cm.initial_effect(c)
     e2:SetTarget(
     function(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
         if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and cm.filter(chkc) end
-		if chk==0 then return Duel.IsExistingTarget(cm.filter,tp,LOCATION_GRAVE,0,3,e:GetHandler) end
+        if chk==0 then return Duel.IsExistingTarget(cm.filter,tp,LOCATION_GRAVE,0,3,e:GetHandler()) end
         Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
         local g=Duel.SelectTarget(tp,cm.filter,tp,LOCATION_GRAVE,0,3,3,nil)
         Duel.SetOperationInfo(0,CATEGORY_TODECK,g,3,0,0)
     end)
     e2:SetOperation(
     function(e,tp,eg,ep,ev,re,r,rp)
+        
         local tg=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
         if not tg or tg:FilterCount(Card.IsRelateToEffect,nil,e)~=3 then return end
         Duel.SendtoHand(tg,nil,REASON_EFFECT)
@@ -74,7 +75,7 @@ function cm.initial_effect(c)
         local ct=g:FilterCount(Card.IsLocation,nil,LOCATION_HAND+LOCATION_EXTRA)
         if ct==3 then
             Duel.BreakEffect()
-			local g=Duel.GetMatchingGroup(Card.IsAbleToDeck,p,LOCATION_HAND,0,nil)
+            local g=Duel.GetMatchingGroup(Card.IsAbleToDeck,tp,LOCATION_HAND,0,nil)
             if g:GetCount()>1 then
                 Duel.Hint(HINT_SELECTMSG,p,HINTMSG_TODECK)
                 local sg=g:Select(tp,2,2,nil)