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

expansions/script/c50008203.lua

@@ -17,8 +17,8 @@ function cm.initial_effect(c)
     e1:SetTarget(
     function(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
         if chkc then return false end
-        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
+        if chk==0 then return Duel.IsExistingTarget(cm.filter,tp,LOCATION_ONFIELD,0,1,nil)
+            and Duel.IsExistingTarget(Card.IsAbleToHand,tp,0,LOCATION_ONFIELD,1,nil) end
         Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
         local g1=Duel.SelectTarget(tp,cm.filter,tp,LOCATION_ONFIELD,0,1,1,nil)
         Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)

expansions/script/c50008213.lua

@@ -31,7 +31,7 @@ function cm.initial_effect(c)
     end)
     c:RegisterEffect(e1)
     local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_TOHAND)
+    e2:SetCategory(CATEGORY_TODECK)
     e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
     e2:SetProperty(EFFECT_FLAG_DELAY)
     e2:SetCode(EVENT_BATTLE_DESTROYING)
@@ -51,7 +51,7 @@ function cm.initial_effect(c)
         local tc=g:GetFirst()
         local opt=e:GetLabel()
         if (opt==0 and tc:IsType(TYPE_MONSTER)) or (opt==1 and tc:IsType(TYPE_SPELL)) or (opt==2 and tc:IsType(TYPE_TRAP)) then
-			local hg=Duel.GetFieldGroup(p,0,LOCATION_HAND)
+            local hg=Duel.GetFieldGroup(1-tp,0,LOCATION_HAND)
             local sg=hg:RandomSelect(tp,1)
             Duel.SendtoDeck(sg,nil,2,REASON_EFFECT)
             Duel.ShuffleHand(1-tp)