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

expansions/script/c12005022.lua

@@ -2,7 +2,6 @@
 function c12005022.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_NEGATE+CATEGORY_DAMAGE+CATEGORY_SPECIAL_SUMMON+CATEGORY_TODECK+CATEGORY_TOGRAVE+CATEGORY_DRAW+CATEGORY_TODECK)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_CHAINING)
 	e1:SetCondition(c12005022.condition)
@@ -65,16 +64,20 @@ function c12005022.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,100)
 	local ex=Duel.GetOperationInfo(ev,CATEGORY_REMOVE)
 	if re:IsHasCategory(CATEGORY_SPECIAL_SUMMON) then
+		e:SetCategory(CATEGORY_SPECIAL_SUMMON)
 		Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
 		Duel.SetOperationInfo(0,CATEGORY_TODECK,c,1,0,0)
 	end
 	if re:IsHasCategory(CATEGORY_DRAW+CATEGORY_TOHAND) then
+		e:SetCategory(CATEGORY_DRAW)
 		Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
 	end
 	if re:IsHasCategory(CATEGORY_DESTROY+CATEGORY_REMOVE) or ex then
+		e:SetCategory(CATEGORY_DESTROY)
 		Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,0,LOCATION_ONFIELD)
 	end
 	if re:IsHasCategory(CATEGORY_DISABLE+CATEGORY_NEGATE+CATEGORY_DISABLE_SUMMON) then
+		e:SetCategory(CATEGORY_DISABLE+CATEGORY_NEGATE+CATEGORY_DISABLE_SUMMON)
 		Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
 	end
 end

expansions/script/c12006010.lua

@@ -47,7 +47,7 @@ function c12006010.condition(e,tp,eg,ep,ev,re,r,rp)
 		and c:IsReason(REASON_EFFECT) and c:GetPreviousControler()==tp
 end
 function c12006010.filter(c,e,tp)
-	return c:IsSetCard(08fbd) and (c:IsAbleToHand() or c:IsCanBeSpecialSummoned(e,0,tp,false,false))
+	return c:IsSetCard(0x8fbd) and (c:IsAbleToHand() or c:IsCanBeSpecialSummoned(e,0,tp,false,false))
 end
 function c12006010.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c12006010.filter,tp,LOCATION_DECK,0,1,nil,e,tp) end

expansions/script/c12008018.lua

@@ -83,7 +83,7 @@ function c12008018.desop(e,tp,eg,ep,ev,re,r,rp)
 		local ct=Duel.Destroy(g,REASON_EFFECT)
 		if ct>0 then
 			Duel.Recover(tp,1000,REASON_EFFECT)
-			local fg=Duel.GetMatchingGroup(aux.NecroValleyFilter(c12008018.ffilter),tp,LOCATION_GRAVE,LOCATION_GRAVE,nil)
+			local fg=Duel.GetMatchingGroup(aux.NecroValleyFilter(c12008018.ffilter),tp,LOCATION_DECK+LOCATION_GRAVE,LOCATION_DECK+LOCATION_GRAVE,nil)
 			if fg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(12008018,2)) then
 				Duel.BreakEffect()
 				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)