Merge pull request #203 from VanillaSalt/patch21

fix script

script/c10875327.lua

@@ -84,6 +84,7 @@ function c10875327.desop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(c10875327.desfilter,tp,0,LOCATION_MZONE,nil)
 	local ct=Duel.Destroy(g,REASON_EFFECT)
 	if ct~=0 then
+		Duel.BreakEffect()
 		Duel.Damage(1-tp,ct*800,REASON_EFFECT)
 	end
 end

script/c19578592.lua

@@ -61,7 +61,7 @@ function c19578592.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local p=e:GetHandler():GetEquipTarget():GetControler()
 	Duel.SetTargetPlayer(p)
 	Duel.SetTargetParam(500)
-	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,p,500)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,p,500)
 end
 function c19578592.damop(e,tp,eg,ep,ev,re,r,rp)
 	if not e:GetHandler():IsRelateToEffect(e) then return end

script/c2067935.lua

@@ -32,24 +32,26 @@ function c2067935.rmfilter(c)
 	return c:IsSetCard(0x19) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
 end
 function c2067935.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:GetLocation()==LOCATION_GRAVE and chkc:GetControler()==tp and c2067935.rmfilter(chkc) end
-	if chk==0 then return true end
+	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c2067935.rmfilter(chkc) end
+	if chk==0 then return Duel.IsExistingTarget(c2067935.rmfilter,tp,LOCATION_GRAVE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local g=Duel.SelectTarget(tp,c2067935.rmfilter,tp,LOCATION_GRAVE,0,1,1,nil)
-	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,g:GetCount(),0,0)
+	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
 end
 function c2067935.rmop(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if tc and tc:IsRelateToEffect(e) then
+	if tc:IsRelateToEffect(e) then
 		local code=tc:GetOriginalCode()
 		Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
-		local e1=Effect.CreateEffect(e:GetHandler())
+		if c:IsFacedown() or not c:IsRelateToEffect(e) then return end
+		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 		e1:SetCode(EFFECT_CHANGE_CODE)
 		e1:SetValue(code)
 		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
-		e:GetHandler():RegisterEffect(e1)
+		c:RegisterEffect(e1)
 	end
 end
 function c2067935.spcon(e,tp,eg,ep,ev,re,r,rp)

script/c25435080.lua

@@ -30,7 +30,6 @@ function c25435080.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 		e:SetLabel(0)
 		return Duel.IsExistingMatchingCard(c25435080.cfilter,tp,LOCATION_MZONE,0,1,nil,tp)
 	end
-	e:SetLabel(0)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RELEASE)
 	local rg=Duel.SelectMatchingCard(tp,c25435080.cfilter,tp,LOCATION_MZONE,0,1,1,nil,tp)
 	e:SetLabel(rg:GetFirst():GetAttack())

script/c2843014.lua

@@ -16,7 +16,7 @@ function c2843014.condition(e,tp,eg,ep,ev,re,r,rp)
 end
 function c2843014.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,1000)
+	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_DECK)
 end
 function c2843014.filter1(c)
 	return c:IsRace(RACE_FISH) and c:IsAbleToGrave()

script/c2851070.lua

@@ -39,8 +39,8 @@ function c2851070.damop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c2851070.destg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk ==0 then	return e:GetHandler():GetFlagEffect(2851070)~=0 end
-	Duel.SetOperationInfo(0,CATEGORY_DESTROY,e:GetHandler(),0,0,0)
+	if chk==0 then return e:GetHandler():GetFlagEffect(2851070)~=0 end
+	Duel.SetOperationInfo(0,CATEGORY_DESTROY,e:GetHandler(),1,0,0)
 end
 function c2851070.desop(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsRelateToEffect(e) then

script/c30488793.lua

@@ -3,6 +3,7 @@ function c30488793.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
+	e1:SetCategory(CATEGORY_DAMAGE)
 	e1:SetCode(EVENT_ATTACK_DISABLED)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e1:SetCondition(c30488793.condition)
@@ -23,7 +24,7 @@ function c30488793.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if dam<0 then dam=-dam end
 	Duel.SetTargetPlayer(1-tp)
 	Duel.SetTargetParam(dam)
-	Duel.SetOperationInfo(0,CATEGORY_RECOVER,0,0,1-tp,dam)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,0,0,1-tp,dam)
 end
 function c30488793.activate(e,tp,eg,ep,ev,re,r,rp)
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)

script/c32065885.lua

@@ -4,15 +4,14 @@ function c32065885.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_CONTROL)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
-	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
-	e1:SetCode(EVENT_DAMAGE)
+	e1:SetCode(EVENT_BATTLE_DAMAGE)
 	e1:SetCondition(c32065885.ctlcon)
 	e1:SetTarget(c32065885.ctltg)
 	e1:SetOperation(c32065885.ctlop)
 	c:RegisterEffect(e1)
 end
 function c32065885.ctlcon(e,tp,eg,ep,ev,re,r,rp)
-	return ep==tp and bit.band(r,REASON_BATTLE)~=0 and Duel.GetAttackTarget()==nil and Duel.GetAttacker():IsControler(1-tp)
+	return ep==tp and Duel.GetAttackTarget()==nil and Duel.GetAttacker():IsControler(1-tp)
 end
 function c32065885.ctltg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsControlerCanBeChanged,tp,0,LOCATION_MZONE,1,nil) end

script/c32835363.lua

@@ -48,7 +48,7 @@ end
 function c32835363.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsRelateToEffect(e) end
 	Duel.SetTargetParam(800)
-	Duel.SetOperationInfo(0,CATEGORY_RECOVER,0,0,ep,800)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,0,0,ep,800)
 end
 function c32835363.damop(e,tp,eg,ep,ev,re,r,rp)
 	if not e:GetHandler():IsRelateToEffect(e) then return end

script/c35027493.lua

@@ -45,7 +45,7 @@ function c35027493.activate(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetOperation(c35027493.desop)
 	e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,3)
 	Duel.RegisterEffect(e1,tp)
-	local e2=Effect.CreateEffect(c)
+	local e2=Effect.CreateEffect(e:GetHandler())
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetCountLimit(1)

script/c3891471.lua

@@ -81,7 +81,7 @@ function c3891471.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetTargetPlayer(tp)
 	local lv=e:GetHandler():GetFlagEffectLabel(3891471)
 	Duel.SetTargetParam(lv*400)
-	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,lv*400)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,lv*400)
 end
 function c3891471.damop(e,tp,eg,ep,ev,re,r,rp)
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)

script/c41639001.lua

@@ -26,8 +26,7 @@ function c41639001.spfilter(c,e,tp)
 		and not c:IsHasEffect(EFFECT_NECRO_VALLEY)
 end
 function c41639001.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(c41639001.spfilter,tp,0x13,0,1,nil,e,tp) end
+	if chk==0 then return true end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,0x13)
 end
 function c41639001.spop(e,tp,eg,ep,ev,re,r,rp)
@@ -35,7 +34,7 @@ function c41639001.spop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectMatchingCard(tp,c41639001.spfilter,tp,0x13,0,1,1,nil,e,tp)
 	local tc=g:GetFirst()
-	if tc and Duel.SpecialSummonStep(g:GetFirst(),0,tp,tp,false,false,POS_FACEUP) then
+	if tc and Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP) then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_SET_ATTACK)

script/c42425831.lua

@@ -30,12 +30,12 @@ function c42425831.target1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if Duel.IsExistingMatchingCard(c42425831.cfilter,tp,LOCATION_MZONE,0,1,nil)
 		and Duel.IsExistingTarget(Card.IsAbleToRemove,tp,0,LOCATION_GRAVE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(42425831,1)) then
 		e:SetProperty(EFFECT_FLAG_CARD_TARGET)
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 		local cg=Duel.SelectMatchingCard(tp,c42425831.cfilter,tp,LOCATION_MZONE,0,1,1,nil)
 		Duel.SendtoDeck(cg,nil,1,REASON_COST)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 		local g=Duel.SelectTarget(tp,Card.IsAbleToRemove,tp,0,LOCATION_GRAVE,1,2,nil)
-		Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
+		Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,g:GetCount(),0,0)
 		e:GetHandler():RegisterFlagEffect(42425831,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,0,1)
 	else e:SetProperty(0) end
 end

script/c43250041.lua

@@ -20,7 +20,7 @@ function c43250041.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return tg:IsOnField() and tg:IsCanBeEffectTarget(e) end
 	Duel.SetTargetCard(tg)
 	local rec=tg:GetAttack()
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,rec)
+	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,rec)
 end
 function c43250041.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()

script/c4440873.lua

@@ -16,7 +16,7 @@ end
 function c4440873.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.SetTargetCard(eg)
-	Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,tp,1)
+	Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,1-tp,1)
 end
 function c4440873.filter(c,e,tp)
 	return c:IsRelateToEffect(e) and c:IsControler(tp)
@@ -27,7 +27,7 @@ function c4440873.activate(e,tp,eg,ep,ev,re,r,rp)
 	elseif sg:GetCount()==1 then
 		Duel.SendtoGrave(sg,REASON_EFFECT+REASON_DISCARD)
 	else
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISCARD)
+		Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_DISCARD)
 		local dg=sg:Select(1-tp,1,1,nil)
 		Duel.SendtoGrave(dg,REASON_EFFECT+REASON_DISCARD)
 	end

script/c45895206.lua

@@ -10,7 +10,7 @@ function c45895206.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c45895206.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsFacedown,tp,0,LOCATION_MZONE,1,nil) end
 	local g=Duel.GetMatchingGroup(Card.IsFacedown,tp,0,LOCATION_MZONE,nil)
 	Duel.SetOperationInfo(0,CATEGORY_POSITION,g,g:GetCount(),0,0)
 end

script/c45985838.lua

@@ -4,6 +4,8 @@ function c45985838.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
+	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c45985838.atklm)
 	e1:SetValue(1)
 	c:RegisterEffect(e1)

script/c46237548.lua

@@ -36,7 +36,7 @@ function c46237548.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	Duel.Remove(g,POS_FACEUP,REASON_COST)
 end
 function c46237548.tgfilter(c,e,tp)
-	return c:IsType(TYPE_NORMAL) and c:GetLevel()<=4 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsType(TYPE_NORMAL) and c:IsLevelBelow(4) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c46237548.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c46237548.tgfilter(chkc,e,tp) end

script/c50091196.lua

@@ -31,7 +31,7 @@ function c50091196.drcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SYNCHRO
 end
 function c50091196.drtarg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(1)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)

script/c51962254.lua

@@ -4,6 +4,8 @@ function c51962254.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
+	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c51962254.atcon)
 	e1:SetValue(1)
 	c:RegisterEffect(e1)

script/c52098461.lua

@@ -28,6 +28,7 @@ function c52098461.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and c52098461.filter(tc)
 		and Duel.SendtoDeck(tc,nil,2,REASON_EFFECT)~=0 and tc:IsLocation(LOCATION_DECK) then
+		Duel.BreakEffect()
 		local g=Duel.GetMatchingGroup(Card.IsDestructable,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,e:GetHandler())
 		Duel.Destroy(g,REASON_EFFECT)
 	end

script/c53828396.lua

@@ -55,7 +55,6 @@ function c53828396.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	ec:CreateEffectRelation(e)
 	e:SetLabelObject(ec)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,ec,1,0,0)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,ec:GetAttack())
 end
 function c53828396.desop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

script/c54974237.lua

@@ -49,7 +49,7 @@ function c54974237.activate(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetLabel(ty)
 	e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,3)
 	Duel.RegisterEffect(e1,tp)
-	local e2=Effect.CreateEffect(c)
+	local e2=Effect.CreateEffect(e:GetHandler())
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetCountLimit(1)

script/c57728570.lua

@@ -45,7 +45,7 @@ function c57728570.activate(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetOperation(c57728570.desop)
 	e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,3)
 	Duel.RegisterEffect(e1,tp)
-	local e2=Effect.CreateEffect(c)
+	local e2=Effect.CreateEffect(e:GetHandler())
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetCountLimit(1)

script/c57728571.lua

@@ -45,7 +45,7 @@ function c57728571.activate(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetOperation(c57728571.desop)
 	e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,3)
 	Duel.RegisterEffect(e1,tp)
-	local e2=Effect.CreateEffect(c)
+	local e2=Effect.CreateEffect(e:GetHandler())
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetCountLimit(1)

script/c61032879.lua

@@ -24,7 +24,7 @@ function c61032879.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.SetTargetPlayer(1-tp)
 	Duel.SetTargetParam(500)
-	Duel.SetOperationInfo(0,CATEGORY_RECOVER,0,0,1-tp,500)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,0,0,1-tp,500)
 end
 function c61032879.operation(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsRelateToEffect(e) then

script/c62107981.lua

@@ -17,6 +17,8 @@ function c62107981.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
+	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e3:SetRange(LOCATION_MZONE)
 	e3:SetCondition(c62107981.atcon)
 	e3:SetValue(1)
 	c:RegisterEffect(e3)

script/c62896588.lua

@@ -10,13 +10,13 @@ function c62896588.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c62896588.filter(c)
-	return c:IsFaceup() and c:IsType(TYPE_NORMAL) and c:GetLevel()<=4 and not c:IsType(TYPE_TUNER)
+	return c:IsFaceup() and c:IsType(TYPE_NORMAL) and c:IsLevelBelow(4) and not c:IsType(TYPE_TUNER)
 end
 function c62896588.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c62896588.filter(chkc) end
 	if chk==0 then return Duel.IsExistingTarget(c62896588.filter,tp,LOCATION_MZONE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	local g=Duel.SelectTarget(tp,c62896588.filter,tp,LOCATION_MZONE,0,1,1,nil)
+	Duel.SelectTarget(tp,c62896588.filter,tp,LOCATION_MZONE,0,1,1,nil)
 end
 function c62896588.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()

script/c63012333.lua

@@ -4,6 +4,8 @@ function c63012333.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
+	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c63012333.atklm)
 	e1:SetValue(1)
 	c:RegisterEffect(e1)

script/c67098114.lua

@@ -37,7 +37,7 @@ function c67098114.initial_effect(c)
 	--salvage
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(67098114,2))
-	e4:SetCategory(CATEGORY_DAMAGE)
+	e4:SetCategory(CATEGORY_TOHAND)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e4:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e4:SetCode(EVENT_SPSUMMON_SUCCESS)
@@ -105,15 +105,15 @@ function c67098114.thfilter(c)
 	return c:IsType(TYPE_TRAP) and c:IsAbleToHand()
 end
 function c67098114.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(1-tp) and c67098114.thfilter(chkc) end
-	if chk==0 then return true end
+	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c67098114.thfilter(chkc) end
+	if chk==0 then return Duel.IsExistingTarget(c67098114.thfilter,tp,LOCATION_GRAVE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectTarget(tp,c67098114.thfilter,tp,LOCATION_GRAVE,0,1,1,nil)
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,g:GetCount(),0,0)
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
 end
 function c67098114.thop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc and tc:IsRelateToEffect(e) then
+	if tc:IsRelateToEffect(e) then
 		Duel.SendtoHand(tc,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,tc)
 	end

script/c71315423.lua

@@ -54,7 +54,7 @@ function c71315423.eqlimit(e,c)
 end
 function c71315423.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,e:GetHandler():GetEquipTarget():GetControler(),400)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,e:GetHandler():GetEquipTarget():GetControler(),400)
 end
 function c71315423.damop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Damage(e:GetHandler():GetEquipTarget():GetControler(),400,REASON_EFFECT)

script/c76218643.lua

@@ -36,7 +36,7 @@ function c76218643.rectg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(800)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,800)
+	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,800)
 end
 function c76218643.recop(e,tp,eg,ep,ev,re,r,rp)
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)

script/c76925842.lua

@@ -33,7 +33,7 @@ function c76925842.drcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Remove(g,POS_FACEUP,REASON_COST)
 end
 function c76925842.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(1)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)

script/c77098449.lua

@@ -24,7 +24,7 @@ function c77098449.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.SetTargetPlayer(1-tp)
 	Duel.SetTargetParam(500)
-	Duel.SetOperationInfo(0,CATEGORY_RECOVER,0,0,1-tp,500)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,0,0,1-tp,500)
 end
 function c77098449.operation(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsRelateToEffect(e) then

script/c79979666.lua

@@ -38,13 +38,13 @@ function c79979666.condition(e,tp,eg,ep,ev,re,r,rp)
 	return not Duel.IsExistingMatchingCard(c79979666.filter,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,e:GetHandler())
 end
 function c79979666.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return Duel.IsPlayerCanDraw(tp,2) end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(2)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,2)
 end
 function c79979666.operation(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.IsExistingMatchingCard(c79979666.filter,tp,LOCATION_ONFIELD,0,1,e:GetHandler()) then return end
+	if Duel.IsExistingMatchingCard(c79979666.filter,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,e:GetHandler()) then return end
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
 	Duel.Draw(p,d,REASON_EFFECT)
 end

script/c81218874.lua

@@ -13,7 +13,7 @@ function c81218874.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c81218874.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return Duel.CheckLPCost(tp,500) end
 	Duel.PayLPCost(tp,500)
 end
 function c81218874.filter(c,e,tp)

script/c81913510.lua

@@ -16,7 +16,8 @@ function c81913510.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c81913510.filter1(c,e,tp)
 	local code=c:GetCode()
-	return Duel.IsExistingMatchingCard(c81913510.filter2,tp,LOCATION_EXTRA,0,1,nil,code,e,tp)
+	return c:IsFaceup() and c:IsSetCard(0x1f) and c:IsAbleToGraveAsCost()
+		and Duel.IsExistingMatchingCard(c81913510.filter2,tp,LOCATION_EXTRA,0,1,nil,code,e,tp)
 end
 function c81913510.filter2(c,code,e,tp)
 	return c:IsCode(code) and c:IsCanBeSpecialSummoned(e,0,tp,true,false)

script/c8323633.lua

@@ -11,8 +11,9 @@ function c8323633.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.Hint(HINT_SELECTMSG,tp,564)
 	local ac=Duel.AnnounceCard(tp)
-	--remove
 	local c=e:GetHandler()
+	c:SetHint(CHINT_CARD,ac)
+	--remove
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(8323633,0))
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)

script/c83584898.lua

@@ -65,7 +65,7 @@ function c83584898.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local p=e:GetHandler():GetEquipTarget():GetControler()
 	Duel.SetTargetPlayer(p)
 	Duel.SetTargetParam(500)
-	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,p,500)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,p,500)
 end
 function c83584898.damop(e,tp,eg,ep,ev,re,r,rp)
 	if not e:GetHandler():IsRelateToEffect(e) then return end

script/c85138716.lua

@@ -2,9 +2,8 @@
 function c85138716.initial_effect(c)
 	--cannot special summon
 	local e1=Effect.CreateEffect(c)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e1:SetRange(LOCATION_DECK)
 	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
 	c:RegisterEffect(e1)

script/c85519211.lua

@@ -16,7 +16,7 @@ function c85519211.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c85519211.filter,tp,LOCATION_MZONE,0,1,nil) end
 	local g=Duel.GetMatchingGroup(c85519211.filter,tp,LOCATION_MZONE,0,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
-	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,1-tp,g:GetCount()*1000)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,g:GetCount()*1000)
 end
 function c85519211.activate(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(c85519211.filter,tp,LOCATION_MZONE,0,nil)

script/c94215860.lua

@@ -35,15 +35,15 @@ function c94215860.filter(c)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
 end
 function c94215860.srettg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsOnField() and c94215860.filter(chkc) end
-	if chk==0 then return true end
+	if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) and c94215860.filter(chkc) end
+	if chk==0 then return Duel.IsExistingTarget(c94215860.filter,tp,0,LOCATION_ONFIELD,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
 	local g=Duel.SelectTarget(tp,c94215860.filter,tp,0,LOCATION_ONFIELD,1,1,nil)
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,g:GetCount(),0,0)
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
 end
 function c94215860.sretop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc and tc:IsRelateToEffect(e) then
+	if tc:IsRelateToEffect(e) then
 		Duel.SendtoHand(tc,nil,REASON_EFFECT)
 	end
 end

script/c94303232.lua

@@ -57,6 +57,7 @@ function c94303232.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 		and Duel.IsExistingTarget(nil,tp,0,LOCATION_MZONE,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
 	Duel.SelectTarget(tp,c94303232.filter,tp,LOCATION_MZONE,0,1,1,nil)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPPO)
 	local g=Duel.SelectTarget(tp,nil,tp,0,LOCATION_MZONE,1,1,nil)
 	e:SetLabelObject(g:GetFirst())
 end

script/c95905259.lua

@@ -16,7 +16,7 @@ function c95905259.filter(c)
 end
 function c95905259.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_SZONE) and c95905259.filter(chkc) end
-	if chk==0 then return true end
+	if chk==0 then return Duel.IsExistingTarget(c95905259.filter,tp,0,LOCATION_SZONE,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(95905259,1))
 	Duel.SelectTarget(tp,c95905259.filter,tp,0,LOCATION_SZONE,1,1,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)

script/c9633505.lua

@@ -25,6 +25,8 @@ function c9633505.initial_effect(c)
 	local e5=Effect.CreateEffect(c)
 	e5:SetType(EFFECT_TYPE_SINGLE)
 	e5:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
+	e5:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e5:SetRange(LOCATION_MZONE)
 	e5:SetValue(1)
 	c:RegisterEffect(e5)
 end