Merge pull request #238 from DailyShana/patch-8

fix

c1274455.lua

@@ -4,10 +4,10 @@ function c1274455.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(1274455,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetCountLimit(1,1274455)
 	e1:SetCost(c1274455.spcost)
 	e1:SetTarget(c1274455.sptg)
@@ -66,4 +66,4 @@ function c1274455.operation(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsRelateToEffect(e) then
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
 	end
-end
+end
\ No newline at end of file

c2396042.lua

@@ -4,6 +4,7 @@ function c2396042.initial_effect(c)
 	--atk/def
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(2396042,0))
+	e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e1:SetCode(EVENT_BATTLE_START)
 	e1:SetTarget(c2396042.adcon)
@@ -20,12 +21,12 @@ function c2396042.adop(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToEffect(e) and c:IsFaceup() then
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetCode(EFFECT_SET_DEFENCE)
+		e1:SetCode(EFFECT_SET_DEFENCE_FINAL)
 		e1:SetValue(c:GetDefence()/2)
-		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE)
+		e1:SetReset(RESET_EVENT+0x1ff0000+RESET_PHASE+PHASE_DAMAGE)
 		c:RegisterEffect(e1)
-		local e1=e1:Clone()
-		e2:SetCode(EFFECT_UPDATE_ATTACK)
+		local e2=e1:Clone()
+		e2:SetCode(EFFECT_SET_ATTACK_FINAL)
 		e2:SetValue(c:GetAttack()/2)
 		c:RegisterEffect(e2)
 	end

c36956512.lua

@@ -85,4 +85,4 @@ function c36956512.atkop(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e2)
 		tc=tg:GetNext()
 	end
-end
+end
\ No newline at end of file

c37679169.lua

 --Kozmo Delta Shuttle
 function c37679169.initial_effect(c)
-	--to grave
+	--atk/def
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOGRAVE)
+	e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE)
 	e1:SetType(EFFECT_TYPE_IGNITION)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCountLimit(1)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetTarget(c37679169.sgtg)
-	e1:SetOperation(c37679169.sgop)
+	e1:SetCost(c37679169.adcost)
+	e1:SetTarget(c37679169.adtg)
+	e1:SetOperation(c37679169.adop)
 	c:RegisterEffect(e1)
 	--spsummon
 	local e2=Effect.CreateEffect(c)
@@ -22,35 +23,39 @@ function c37679169.initial_effect(c)
 	e2:SetOperation(c37679169.spop)
 	c:RegisterEffect(e2)
 end
-function c37679169.filter(c)
-	return c:IsSetCard(0xd2) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
+function c37679169.cfilter(c)
+	return c:IsSetCard(0xd2) and c:IsType(TYPE_MONSTER) and c:IsAbleToGraveAsCost()
+end
+function c37679169.adcost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(c37679169.cfilter,tp,LOCATION_DECK,0,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
+	local g=Duel.SelectMatchingCard(c37679169.cfilter,tp,LOCATION_DECK,0,1,1,nil)
+	local tc=g:GetFirst()
+	Duel.SendtoGrave(tc,REASON_COST)
+	e:SetLabel(tc:GetLevel())
 end
-function c37679169.sgtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c37679169.filter,tp,LOCATION_DECK,0,1,nil) end
-	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_DECK)
+function c37679169.adtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	if chkc then return chkc:IsFaceup() and chkc:IsLocation(LOCATION_MZONE) end
+	if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
+	Duel.SelectTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 end
-function c37679169.sgop(e,tp,eg,ep,ev,re,r,rp)
+function c37679169.adop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g=Duel.SelectMatchingCard(tp,c37679169.filter,tp,LOCATION_DECK,0,1,1,nil)
-	if g:GetCount()>0 then 
-		local lv=g:GetFirst():GetLevel()
-		Duel.SendtoGrave(g,REASON_EFFECT)
-		if not Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) then return end
-		local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
+	local tc=Duel.GetFirstTarget()
+	if tc:IsFaceup() and tc:IsRelateToEffect(e) then
+		local lv=e:GetLabel()
 		--atkdown
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 		e1:SetCode(EFFECT_UPDATE_ATTACK)
-		e1:SetRange(LOCATION_MZONE)
 		e1:SetValue(-100*lv)
-		e1:SetReset(RESET_EVENT+0x1ff0000)
-		g:GetFirst():RegisterEffect(e1)
+		e1:SetReset(RESET_EVENT+0x1fe0000)
+		tc:RegisterEffect(e1)
 		--defdown
 		local e2=e1:Clone()
 		e2:SetCode(EFFECT_UPDATE_DEFENCE)
-		g:GetFirst():RegisterEffect(e2)
+		tc:RegisterEffect(e2)
 	end
 end
 function c37679169.spcon(e,tp,eg,ep,ev,re,r,rp)
@@ -58,8 +63,9 @@ function c37679169.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return c:IsReason(REASON_DESTROY) and c:IsReason(REASON_BATTLE+REASON_EFFECT)
 end
 function c37679169.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost() and e:GetHandler():IsLocation(LOCATION_GRAVE) end
-	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)
+	local c=e:GetHandler()
+	if chk==0 then return c:IsAbleToRemoveAsCost() and c:IsLocation(LOCATION_GRAVE) end
+	Duel.Remove(c,POS_FACEUP,REASON_COST)
 end
 function c37679169.spfilter(c,e,tp)
 	return c:IsSetCard(0xd2) and c:IsLevelBelow(4) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
@@ -76,4 +82,4 @@ function c37679169.spop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 	end
-end
+end
\ No newline at end of file

c38891741.lua

@@ -2,7 +2,7 @@
 function c38891741.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY+CATEGORY_DRAW)
+	e1:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_CHAINING)
 	e1:SetCondition(c38891741.condition)
@@ -14,19 +14,17 @@ end
 function c38891741.condition(e,tp,eg,ep,ev,re,r,rp)
 	return (re:IsActiveType(TYPE_MONSTER) or re:IsHasType(EFFECT_TYPE_ACTIVATE)) and Duel.IsChainNegatable(ev)
 end
-function c38891741.cfilter(c,typ)
-	return c:IsType(typ) and c:IsDiscardable()
+function c38891741.cfilter(c,type)
+	return c:IsType(type) and c:IsDiscardable()
 end
 function c38891741.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if Duel.IsPlayerAffectedByEffect(tp,EFFECT_DISCARD_COST_CHANGE) then return true end
-	local typ=0
-	if re:IsActiveType(TYPE_MONSTER) then typ=TYPE_MONSTER
-	elseif re:IsActiveType(TYPE_SPELL) then typ=TYPE_SPELL else typ=TYPE_TRAP end
-	if chk==0 then return Duel.IsExistingMatchingCard(c38891741.cfilter,tp,LOCATION_HAND,0,1,nil,typ) end
-	Duel.DiscardHand(tp,c38891741.cfilter,1,1,REASON_COST+REASON_DISCARD,nil,typ)
+	local type=re:GetActiveType()
+	if chk==0 then return Duel.IsExistingMatchingCard(c38891741.cfilter,tp,LOCATION_HAND,0,1,nil,type) end
+	Duel.DiscardHand(tp,c38891741.cfilter,1,1,REASON_COST+REASON_DISCARD,nil,type)
 end
 function c38891741.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
+	if chk==0 then true end
 	Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
 	if re:GetHandler():IsDestructable() and re:GetHandler():IsRelateToEffect(re) then
 		Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0)
@@ -37,4 +35,4 @@ function c38891741.activate(e,tp,eg,ep,ev,re,r,rp)
 	if re:GetHandler():IsRelateToEffect(re) then 
 		Duel.Destroy(eg,REASON_EFFECT)
 	end
-end
+end
\ No newline at end of file

c63941210.lua

@@ -22,10 +22,9 @@ function c63941210.initial_effect(c)
 	--Negate
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(63941210,0))
-	e3:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_QUICK_O)
+	e3:SetCategory(CATEGORY_DISABLE+CATEGORY_DESTROY)
+	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_CHAINING)
-	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCondition(c63941210.discon)
 	e3:SetCost(c63941210.discost)
@@ -57,7 +56,7 @@ function c63941210.discon(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) then return false end
 	if not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return false end
 	local tg=Duel.GetChainInfo(ev,CHAININFO_TARGET_CARDS)
-	return tg and tg:GetCount()==1 and tg:GetFirst():IsOnField() and Duel.IsChainNegatable(ev)
+	return tg and tg:GetCount()==1 and tg:GetFirst():IsOnField() and Duel.IsChainDisablable(ev)
 end
 function c63941210.discost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsCanRemoveCounter(tp,1,1,0x37,3,REASON_COST) end
@@ -65,13 +64,14 @@ function c63941210.discost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c63941210.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_DISABLE,eg,1,0,0)
 end
 function c63941210.disop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.NegateActivation(ev)
-	if Duel.IsExistingMatchingCard(Card.IsDestructable,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(63941210,1)) then
-		local g=Duel.SelectMatchingCard(tp,Card.IsDestructable,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
-		if g:GetCount()==0 then return end
-		Duel.Destroy(g,REASON_EFFECT)
+	Duel.NegateEffect(ev)
+	local g=Duel.GetMatchingGroup(Card.IsDestructable,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
+	if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(63941210,1)) then
+		local tg=g:Select(tp,1,1,nil)
+		Duel.HintSelection(tg)
+		Duel.Destroy(tg,REASON_EFFECT)
 	end
-end
+end
\ No newline at end of file

c64063868.lua

@@ -11,10 +11,10 @@ function c64063868.initial_effect(c)
 	--negate activate
 	local e2=Effect.CreateEffect(c)
 	e2:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
-	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_QUICK_O)
+	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCode(EVENT_CHAINING)
+	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e2:SetCondition(c64063868.condition)
 	e2:SetCost(c64063868.cost)
 	e2:SetTarget(c64063868.target)
@@ -36,13 +36,13 @@ function c64063868.condition(e,tp,eg,ep,ev,re,r,rp)
 	return not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED)
 		and re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:IsActiveType(TYPE_TRAP) and Duel.IsChainNegatable(ev)
 end
-function c64063868.kozmo(c) 
+function c64063868.cfilter(c) 
 	return c:IsSetCard(0xd2) and c:IsAbleToRemoveAsCost()
 end
 function c64063868.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c64063868.kozmo,tp,LOCATION_GRAVE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c64063868.cfilter,tp,LOCATION_GRAVE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g=Duel.SelectMatchingCard(tp,c64063868.kozmo,tp,LOCATION_GRAVE,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,c64063868.cfilter,tp,LOCATION_GRAVE,0,1,1,nil)
 	Duel.Remove(g,POS_FACEUP,REASON_COST)
 end
 function c64063868.target(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -79,4 +79,4 @@ function c64063868.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
 	end
-end
+end
\ No newline at end of file

c64280356.lua

@@ -4,17 +4,19 @@ function c64280356.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(64280356,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetCountLimit(1,64280356)
 	e1:SetCost(c64280356.spcost)
 	e1:SetTarget(c64280356.sptg)
 	e1:SetOperation(c64280356.spop)
 	c:RegisterEffect(e1)
+	--to hand
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(64280356,1))
+	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_TOGRAVE)
 	e2:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_FIELD)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
@@ -44,22 +46,22 @@ function c64280356.spop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 	end
 end
-function c64280356.thfil(c)
-	return c:IsAbleToHand() and c:IsSetCard(0xd2)
+function c64280356.thfilter(c)
+	return c:IsSetCard(0xd2) and c:IsAbleToHand()
 end
 function c64280356.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLPCost(tp,500) end
 	Duel.PayLPCost(tp,500)
 end
 function c64280356.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then 
-		local dg=Duel.GetMatchingGroup(c64280356.thfil,tp,LOCATION_DECK,0,nil)
+	if chk==0 then
+		local dg=Duel.GetMatchingGroup(c64280356.thfilter,tp,LOCATION_DECK,0,nil)
 		return dg:GetClassCount(Card.GetCode)>=3
 	end
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,0,LOCATION_DECK)
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
 function c64280356.thop(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(c64280356.thfil,tp,LOCATION_DECK,0,nil)
+	local g=Duel.GetMatchingGroup(c64280356.thfilter,tp,LOCATION_DECK,0,nil)
 	if g:GetClassCount(Card.GetCode)>=3 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
 		local sg1=g:Select(tp,1,1,nil)
@@ -75,10 +77,8 @@ function c64280356.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ShuffleDeck(tp)
 		local cg=sg1:Select(1-tp,1,1,nil)
 		local tc=cg:GetFirst()
-		if tc then
-			Duel.SendtoHand(tc,nil,REASON_EFFECT)
-			sg1:RemoveCard(tc)
-		end
+		Duel.SendtoHand(tc,nil,REASON_EFFECT)
+		sg1:RemoveCard(tc)
 		Duel.SendtoGrave(sg1,REASON_EFFECT)
 	end
-end
+end
\ No newline at end of file

c90452877.lua

 --Kozmojo
 function c90452877.initial_effect(c)
+	--Activate
 	local e1=Effect.CreateEffect(c)
+	e1:SetCategory(CATEGORY_DESTROY+CATEGORY_REMOVE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e1:SetCountLimit(1,90452877)
+	e1:SetCountLimit(1,90452877+EFFECT_COUNT_CODE_OATH)
 	e1:SetTarget(c90452877.destg)
 	e1:SetOperation(c90452877.desop)
 	c:RegisterEffect(e1)
@@ -13,10 +15,12 @@ function c90452877.desfilter(c)
 	return c:IsFaceup() and c:IsSetCard(0xd2) and c:IsDestructable()
 end
 function c90452877.destg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingTarget(c90452877.desfilter,tp,LOCATION_MZONE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingTarget(c90452877.desfilter,tp,LOCATION_MZONE,0,1,nil)
+		and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
 	local g=Duel.SelectTarget(tp,c90452877.desfilter,tp,LOCATION_MZONE,0,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,1-tp,LOCATION_ONFIELD+LOCATION_GRAVE)
 end
 function c90452877.desop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
@@ -40,4 +44,4 @@ function c90452877.desop(e,tp,eg,ep,ev,re,r,rp)
 		end
 		Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
 	end
-end
+end
\ No newline at end of file

c99330325.lua

@@ -2,15 +2,17 @@
 function c99330325.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(99330325,0))
+	e1:SetCategory(CATEGORY_DESTROY+CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetCategory(CATEGORY_DESTROY+CATEGORY_SPECIAL_SUMMON)
 	e1:SetCountLimit(1,99330325+EFFECT_COUNT_CODE_OATH)
 	e1:SetTarget(c99330325.target)
 	e1:SetOperation(c99330325.activate)
 	c:RegisterEffect(e1)
 	--to hand
 	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(99330325,1))
 	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_GRAVE)
@@ -21,42 +23,32 @@ function c99330325.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c99330325.filter1(c,e,tp)
-	if c:IsSetCard(0xd3) and c:IsType(TYPE_MONSTER) then
-		if not c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_ATTACK) then
-			return false
-		else return Duel.IsExistingMatchingCard(c99330325.filter2,tp,LOCATION_DECK,0,1,nil,e,tp,c:GetCode()) end
-	else return false end
+	return c:IsSetCard(0xd3) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+		and Duel.IsExistingMatchingCard(c99330325.filter2,tp,LOCATION_DECK,0,1,nil,e,tp,c:GetCode())
 end
 function c99330325.filter2(c,e,tp,cd)
-	if c:IsSetCard(0xd3) and c:IsType(TYPE_MONSTER) and not c:IsCode(cd) then
-		if not c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_ATTACK,1-tp) then
-			return false
-		else return true end
-	else return false end
+	return c:IsSetCard(0xd3) and c:IsType(TYPE_MONSTER) and not c:IsCode(cd)
+		and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_ATTACK,1-tp)
 end
 function c99330325.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then
-		if not Duel.IsExistingMatchingCard(Card.IsDestructable,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) then
-			return false
-		else return Duel.IsExistingMatchingCard(c99330325.filter1,tp,LOCATION_DECK,0,1,nil,e,tp) end
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDestructable,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) 
+		and Duel.IsExistingMatchingCard(c99330325.filter1,tp,LOCATION_DECK,0,1,nil,e,tp) end
 	end
 	local g=Duel.GetMatchingGroup(Card.IsDestructable,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,tp,LOCATION_DECK)
 end
 function c99330325.activate(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(Card.IsDestructable,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
-	if g:GetCount()==0 then return end
-	if Duel.Destroy(g,REASON_EFFECT)~=0
-	and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.GetLocationCount(1-tp,LOCATION_MZONE)>0 then
+	local dg=Duel.GetMatchingGroup(Card.IsDestructable,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
+	local sg=Duel.GetMatchingGroup(tp,c99330325.filter1,tp,LOCATION_DECK,0,nil,e,tp)
+	if Duel.Destroy(dg,REASON_EFFECT)~=0 and sg:GetCount()>0
+		and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.GetLocationCount(1-tp,LOCATION_MZONE)>0 then
 		Duel.BreakEffect()
-		Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(99330325,0))
-		local g1=Duel.SelectMatchingCard(tp,c99330325.filter1,tp,LOCATION_DECK,0,1,1,nil,e,tp)
-		if g1:GetCount()==0 then return end
+		Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(99330325,2))
+		local g1=sg:Select(tp,1,1,nil)
 		local tc1=g1:GetFirst()
-		Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(99330325,1))
+		Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(99330325,3))
 		local g2=Duel.SelectMatchingCard(tp,c99330325.filter2,tp,LOCATION_DECK,0,1,1,nil,e,tp,tc1:GetCode())
-		if g2:GetCount()==0 then return end
 		local tc2=g2:GetFirst()
 		Duel.SpecialSummonStep(tc1,0,tp,tp,false,false,POS_FACEUP_ATTACK)
 		Duel.SpecialSummonStep(tc2,0,tp,1-tp,false,false,POS_FACEUP_ATTACK)
@@ -75,11 +67,11 @@ function c99330325.activate(e,tp,eg,ep,ev,re,r,rp)
 		local e5=Effect.CreateEffect(e:GetHandler())
 		e5:SetType(EFFECT_TYPE_FIELD)
 		e5:SetCode(EFFECT_CANNOT_EP)
-		e5:SetReset(RESET_EVENT+0x1fe0000)
 		e5:SetRange(LOCATION_MZONE)
 		e5:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 		e5:SetTargetRange(1,0)
 		e5:SetCondition(c99330325.becon)
+		e5:SetReset(RESET_EVENT+0x1fe0000)
 		tc1:RegisterEffect(e5)
 		local e6=e5:Clone()
 		tc2:RegisterEffect(e6)
@@ -107,4 +99,4 @@ function c99330325.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
 	end
-end
+end
\ No newline at end of file