Merge pull request #600 from sidschingis/master

fix

script/c11819616.lua

@@ -18,7 +18,7 @@ function c11819616.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:IsExists(Card.IsOnField,1,nil) and Duel.IsChainNegatable(ev)
+	return tg and tg:IsExists(Card.IsOnField,1,nil) and Duel.IsChainNegatable(ev)
 end
 function c11819616.costfilter(c)
 	return c:IsFaceup() and c:IsRace(RACE_PLANT)

script/c20457551.lua

@@ -55,12 +55,14 @@ function c20457551.atkdown(e,tp,eg,ep,ev,re,r,rp)
 	local eqc=e:GetHandler():GetEquipTarget()
 	if Duel.GetAttacker()~=eqc and Duel.GetAttackTarget()~=eqc then return end
 	local tc=eqc:GetBattleTarget()
+	if tc then
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_UPDATE_ATTACK)
 	e1:SetReset(RESET_PHASE+RESET_DAMAGE_CAL)
 	e1:SetValue(-eqc:GetLevel()*100)
 	tc:RegisterEffect(e1)
+	end
 end
 function c20457551.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetCurrentPhase()==PHASE_END end

script/c22359980.lua

@@ -20,7 +20,7 @@ function c22359980.initial_effect(c)
 	--atkchange
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetCode(EFFECT_SET_ATTACK)
+	e3:SetCode(EFFECT_SET_ATTACK_FINAL)
 	e3:SetRange(LOCATION_SZONE)
 	e3:SetTargetRange(0,LOCATION_MZONE)
 	e3:SetTarget(c22359980.atktg)

script/c27770341.lua

@@ -25,7 +25,7 @@ function c27770341.initial_effect(c)
 		local e4=Effect.CreateEffect(c)
 		e4:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
 		e4:SetCode(EVENT_DISCARD)
-		e4:SetOperation(c27770341.addcount)
+		e4:SetOperation(c27770341.addcount1)
 		Duel.RegisterEffect(e4,0)
 	end
 end
@@ -37,7 +37,15 @@ function c27770341.addcount(e,tp,eg,ep,ev,re,r,rp)
 	local c=eg:GetFirst()
 	while c~=nil do
 		local p=c:GetControler()
-		if c:IsRace(RACE_DRAGON) then c27770341[p]=c27770341[p]+1 end
+		if c:GetPreviousRaceOnField()==RACE_DRAGON then c27770341[p]=c27770341[p]+1 end
+		c=eg:GetNext()
+	end
+end
+function c27770341.addcount1(e,tp,eg,ep,ev,re,r,rp)
+	local c=eg:GetFirst()
+	while c~=nil do
+		local p=c:GetControler()
+		if c:GetOriginalRace()==RACE_DRAGON then c27770341[p]=c27770341[p]+1 end
 		c=eg:GetNext()
 	end
 end

script/c28357177.lua

@@ -21,8 +21,10 @@ function c28357177.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	end
 end
 function c28357177.operation(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS):Filter(Card.IsRelateToEffect,nil,e)
+	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
+	if g then g=g:Filter(Card.IsRelateToEffect,nil,e)
 		if g:GetCount()>0 then
 			Duel.SendtoHand(g,nil,REASON_EFFECT)
 		end
+	end
 end

script/c28423537.lua

@@ -52,6 +52,7 @@ function c28423537.ntop(e,tp,eg,ep,ev,re,r,rp,c)
 	--
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1)
 	e3:SetCode(EVENT_PHASE+PHASE_END)

script/c28912357.lua

@@ -44,6 +44,7 @@ function c28912357.operation(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
+		Duel.ShuffleDeck(tp)
 	end
 end
 function c28912357.spcon(e,tp,eg,ep,ev,re,r,rp)

script/c30929786.lua

@@ -5,7 +5,7 @@ function c30929786.initial_effect(c)
 	e1:SetDescription(aux.Stringid(30929786,0))
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CHAIN_UNIQUE)
+	e1:SetProperty(EFFECT_FLAG_CHAIN_UNIQUE+EFFECT_FLAG_DAMAGE_STEP)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetCondition(c30929786.thcon)
 	e1:SetCost(c30929786.thcost)

script/c34471458.lua

@@ -53,7 +53,7 @@ end
 function c34471458.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return c:IsReason(REASON_EFFECT) and not c:IsLocation(LOCATION_DECK)
-		and c:IsPreviousPosition(POS_FACEUP)
+		and (c:IsPreviousPosition(POS_FACEUP) or c:IsLocation(LOCATION_HAND))
 end
 function c34471458.spfilter(c,e,tp)
 	return c:IsSetCard(0x31) and c:IsCanBeSpecialSummoned(e,0x8,tp,false,false)

script/c35183853.lua

@@ -27,5 +27,5 @@ function c35183853.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function c35183853.aclimit(e,re,tp)
-	return re:IsActiveType(TYPE_SPELL+TYPE_TRAP)
+	return re:GetHandler():IsType(TYPE_SPELL+TYPE_TRAP)
 end

script/c36088082.lua

@@ -35,5 +35,8 @@ function c36088082.regop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c36088082.desop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Destroy(e:GetOwner():GetBattleTarget(),REASON_EFFECT)
+	local tg=e:GetOwner():GetBattleTarget()
+	if tg then
+		Duel.Destroy(tg,REASON_EFFECT)
+	end
 end

script/c42155488.lua

@@ -39,7 +39,8 @@ function c42155488.ntop(e,tp,eg,ep,ev,re,r,rp,c)
 	c:RegisterEffect(e2)
 end
 function c42155488.dectg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return true
+	end
 	Duel.Hint(HINT_SELECTMSG,tp,563)
 	local rc=Duel.AnnounceRace(tp,1,0xffffff)
 	e:SetLabel(rc)

script/c4259068.lua

@@ -16,7 +16,7 @@ function c4259068.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c4259068.costchange(e,re,rp,val)
-	if re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetHandler():IsType(TYPE_SPELL) and not re:GetHandler():IsCode(9236985) then
+	if re and re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetHandler():IsType(TYPE_SPELL) and not re:GetHandler():IsCode(9236985) then
 		return 0
 	else
 		return val

script/c440556.lua

@@ -43,6 +43,8 @@ function c440556.spop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e1)
 	elseif cp~=tp then
 		local cg=Duel.GetFieldGroup(cp,LOCATION_EXTRA,0)
+		if cg and cg:GetCount()>0 then
 		Duel.ConfirmCards(cg,tp)
 		end
+	end
 end

script/c44178886.lua

@@ -16,7 +16,6 @@ function c44178886.initial_effect(c)
 	e2:SetDescription(aux.Stringid(44178886,1))
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetCountLimit(1)
 	e2:SetCondition(c44178886.discon)
 	e2:SetTarget(c44178886.distg)
 	e2:SetOperation(c44178886.disop)
@@ -37,7 +36,8 @@ function c44178886.discon(e,tp,eg,ep,ev,re,r,rp)
 	return tp==Duel.GetTurnPlayer()
 end
 function c44178886.distg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return  e:GetHandler():GetFlagEffect(44178886)==0 end
+	e:GetHandler():RegisterFlagEffect(44178886,RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END,EFFECT_FLAG_OATH,1)
 	Duel.SetOperationInfo(0,CATEGORY_DECKDES,nil,0,tp,3)
 end
 function c44178886.disop(e,tp,eg,ep,ev,re,r,rp)

script/c47297616.lua

@@ -91,7 +91,6 @@ function c47297616.opspsum(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Destroy(dg,REASON_EFFECT)
 	local tc=Duel.GetFirstTarget()
 	if tc and tc:IsRelateToEffect(e) then
-		Duel.BreakEffect()
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
 	end
 end

script/c47660516.lua

@@ -41,7 +41,7 @@ function c47660516.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Overlay(sc,Group.FromCards(tc))
 		Duel.SpecialSummon(sc,SUMMON_TYPE_XYZ,tp,tp,false,false,POS_FACEUP)
 		sc:CompleteProcedure()
-	end
+
 		if Duel.GetOverlayCount(tp,0,1)~=0 then
 			Duel.BreakEffect()
 			local g1=Duel.GetOverlayGroup(tp,0,1)
@@ -49,4 +49,5 @@ function c47660516.activate(e,tp,eg,ep,ev,re,r,rp)
 			local mg2=g1:Select(tp,1,1,nil)
 			Duel.Overlay(sc,mg2)
 		end
+	end
 end

script/c49587034.lua

@@ -30,10 +30,7 @@ function c49587034.activate(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_STANDBY+RESET_OPPO_TURN,4)
 		e1:SetCondition(c49587034.thcon)
 		e1:SetOperation(c49587034.thop)
-		if cp~=e:GetHandlerPlayer() and ph~=PHASE_DRAW
-			then e1:SetLabel(2)
-			else e1:SetLabel(1)
-		end
+		e1:SetLabel(1)
 		card:RegisterEffect(e1)
 		e:GetHandler():RegisterFlagEffect(1082946,RESET_PHASE+PHASE_END+RESET_OPPO_TURN,0,3)
 		c49587034[e:GetHandler()]=e1

script/c50527144.lua

@@ -19,19 +19,21 @@ function c50527144.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.ShuffleHand(tp)
 end
 function c50527144.activate(e,tp,eg,ep,ev,re,r,rp)
+	local g=Duel.GetMatchingGroup(c50527144.tgfilter,tp,LOCATION_ONFIELD,0,nil)
+	local tc=g:GetFirst()
+	while tc do
 		local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
-	e1:SetTargetRange(LOCATION_ONFIELD,0)
-	e1:SetTarget(c50527144.tgfilter)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END)
 		e1:SetValue(1)
-	e1:SetReset(RESET_PHASE+PHASE_END)
-	Duel.RegisterEffect(e1,tp)
+		tc:RegisterEffect(e1)
 		local e2=e1:Clone()
-	e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
-	Duel.RegisterEffect(e2,tp)
+		e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+		tc:RegisterEffect(e2)
+		tc=g:GetNext()
+	end
 end
-function c50527144.tgfilter(e,c)
+function c50527144.tgfilter(c)
 	return (c:IsFaceup() and c:IsSetCard(0x8d)) or (c:IsFacedown() and c:IsLocation(LOCATION_MZONE))
 end
\ No newline at end of file

script/c54306223.lua

@@ -34,6 +34,7 @@ function c54306223.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c54306223.atkval(e,c)
+	if  c:IsCode(72677437) then return 0 end
 	return c:GetCounter(0x9)*-500
 end
 function c54306223.acop(e,tp,eg,ep,ev,re,r,rp)

script/c54704216.lua

@@ -56,6 +56,13 @@ function c54704216.operation(e,tp,eg,ep,ev,re,r,rp)
 		local e2=e1:Clone()
 		e2:SetCode(EFFECT_CANNOT_CHANGE_POSITION)
 		tc:RegisterEffect(e2,true)
+		local e3=Effect.CreateEffect(c)
+		e3:SetType(EFFECT_TYPE_SINGLE)
+		e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+		e3:SetCode(EFFECT_CANNOT_FLIP_SUMMON)
+		e3:SetReset(RESET_EVENT+0x1fc0000)
+		e3:SetCondition(c54704216.rcon)
+		tc:RegisterEffect(e3)
 	end
 end
 function c54704216.rcon(e)

script/c56981417.lua

@@ -53,7 +53,8 @@ function c56981417.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c56981417.operation(e,tp,eg,ep,ev,re,r,rp)
 	local te=e:GetLabelObject()
-	if not te:GetHandler():IsRelateToEffect(e) then return end
+	if te and te:GetHandler():IsRelateToEffect(e) then  
 		local op=te:GetOperation()
 		if op then op(e,tp,eg,ep,ev,re,r,rp) end
+	end
 end

script/c5818294.lua

@@ -20,7 +20,7 @@ end
 function c5818294.negcon(e,tp,eg,ep,ev,re,r,rp)
 	if not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return false end
 	local g=Duel.GetChainInfo(ev,CHAININFO_TARGET_CARDS)
-	return g:IsExists(c5818294.tfilter,1,nil,tp)
+	return g and g:IsExists(c5818294.tfilter,1,nil,tp)
 end
 function c5818294.negcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost() end

script/c59797187.lua

@@ -11,8 +11,9 @@ function c59797187.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c59797187.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():GetBattleTarget():IsRelateToBattle() end
-	Duel.SetOperationInfo(0,CATEGORY_POSITION,e:GetHandler():GetBattleTarget(),1,0,0)
+	local tg=e:GetHandler():GetBattleTarget()
+	if chk==0 then return tg and tg:IsRelateToBattle() end
+	Duel.SetOperationInfo(0,CATEGORY_POSITION,tg,1,0,0)
 end
 function c59797187.operation(e,tp,eg,ep,ev,re,r,rp)
 	local bc=e:GetHandler():GetBattleTarget()

script/c6178850.lua

@@ -47,8 +47,10 @@ function c6178850.value(e,c)
 	return Duel.GetFieldGroupCount(e:GetHandlerPlayer(),0,LOCATION_MZONE)*300
 end
 function c6178850.destg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return not e:GetHandler():IsStatus(STATUS_DESTROY_CONFIRMED)
-		and e:GetHandler():GetEquipTarget():IsReason(REASON_BATTLE) end
+	local c=e:GetHandler()
+	local tg=c:GetEquipTarget()
+	if chk==0 then return c and not c:IsStatus(STATUS_DESTROY_CONFIRMED)
+		and tg and tg:IsReason(REASON_BATTLE) end
 	return Duel.SelectYesNo(tp,aux.Stringid(6178850,0))
 end
 function c6178850.desop(e,tp,eg,ep,ev,re,r,rp)

script/c68786330.lua

@@ -19,7 +19,7 @@ end
 function c68786330.poscon(e,tp,eg,ep,ev,re,r,rp)
 	local a=Duel.GetAttacker()
 	local d=Duel.GetAttackTarget()
-	return d and a:IsRelateToBattle() and d:IsRelateToBattle() and a:IsRace(RACE_REPTILE) and d:IsDefencePos()
+	return a and d and a:IsRelateToBattle() and d:IsRelateToBattle() and a:IsRace(RACE_REPTILE) and d:IsPosition(POS_DEFENCE)
 end
 function c68786330.posop(e,tp,eg,ep,ev,re,r,rp)
 	if not e:GetHandler():IsRelateToEffect(e) then return end

script/c69042950.lua

@@ -12,9 +12,6 @@ end
 function c69042950.mfilter(c,clv)
 	return c:IsFaceup() and c:GetLevel()==clv
 end
-function c69042950.mfilter2(c)
-	return c:IsFaceup() and c:IsLevelBelow(4)
-end
 function c69042950.spfilter(c,e,tp)
 	local lv=c:GetLevel()
 	return lv>0 and lv<=4 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
@@ -23,7 +20,7 @@ end
 function c69042950.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(c69042950.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp)
-		and Duel.IsExistingMatchingCard(c69042950.mfilter2,tp,0,LOCATION_MZONE,1,nil) end
+	end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
 end
 function c69042950.activate(e,tp,eg,ep,ev,re,r,rp)
@@ -34,7 +31,7 @@ function c69042950.activate(e,tp,eg,ep,ev,re,r,rp)
 			Duel.SpecialSummonStep(g:GetFirst(),0,tp,tp,false,false,POS_FACEUP)
 		end
 	end
-	if Duel.GetLocationCount(1-tp,LOCATION_MZONE)>0 then
+	if Duel.GetLocationCount(1-tp,LOCATION_MZONE)>0 and Duel.SelectYesNo(1-tp,aux.Stringid(69042950,0)) then
 		Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_SPSUMMON)
 		local g=Duel.SelectMatchingCard(1-tp,c69042950.spfilter,1-tp,LOCATION_HAND,0,1,1,nil,e,1-tp)
 		if g:GetCount()~=0 then

script/c69954399.lua

@@ -87,7 +87,7 @@ function c69954399.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c69954399.desop(e,tp,eg,ep,ev,re,r,rp)
 	local ec=e:GetHandler():GetEquipTarget()
-	if ec:IsRelateToEffect(e) and Duel.Destroy(ec,REASON_EFFECT)~=0 then
+	if ec and ec:IsRelateToEffect(e) and Duel.Destroy(ec,REASON_EFFECT)~=0 then
 		Duel.RaiseSingleEvent(e:GetHandler(),69954400,e,0,0,0,0)
 	end
 end

script/c71315423.lua

@@ -57,5 +57,8 @@ function c71315423.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	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)
+	local tg=e:GetHandler():GetEquipTarget()
+	if tg then
+	Duel.Damage(tg:GetControler(),400,REASON_EFFECT)
+	end
 end

script/c72302403.lua

@@ -8,18 +8,6 @@ function c72302403.initial_effect(c)
 	e1:SetTarget(c72302403.target)
 	e1:SetOperation(c72302403.activate)
 	c:RegisterEffect(e1)
-	--cannot attack
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetCode(EFFECT_CANNOT_ATTACK_ANNOUNCE)
-	e2:SetRange(LOCATION_SZONE)
-	e2:SetTargetRange(0,LOCATION_MZONE)
-	c:RegisterEffect(e2)
-	--remain field
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetCode(EFFECT_REMAIN_FIELD)
-	c:RegisterEffect(e3)
 end
 function c72302403.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
@@ -45,6 +33,21 @@ function c72302403.activate(e,tp,eg,ep,ev,re,r,rp)
 	if sg:GetCount()>0 then
 		Duel.ChangePosition(sg,POS_FACEUP_ATTACK,POS_FACEUP_ATTACK,POS_FACEUP_DEFENCE,POS_FACEUP_DEFENCE)
 	end
+	local c=e:GetHandler()
+	
+	c:CancelToGrave()
+	--cannot attack
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetCode(EFFECT_CANNOT_ATTACK_ANNOUNCE)
+	e2:SetRange(LOCATION_SZONE)
+	e2:SetTargetRange(0,LOCATION_MZONE)
+	c:RegisterEffect(e2)
+	--remain field
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_SINGLE)
+	e3:SetCode(EFFECT_REMAIN_FIELD)
+	c:RegisterEffect(e3)
 end
 function c72302403.descon(e,tp,eg,ep,ev,re,r,rp)
 	return tp~=Duel.GetTurnPlayer()

script/c72892473.lua

@@ -14,7 +14,7 @@ function c72892473.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		local h1=Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)
 		if e:GetHandler():IsLocation(LOCATION_HAND) then h1=h1-1 end
 		local h2=Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)
-		return h1>0 and Duel.IsPlayerCanDraw(tp,(h1 > 0) and h1 or 1) and Duel.IsPlayerCanDraw(1-tp,1)
+		return (h1+h2>0)  and Duel.IsPlayerCanDraw(tp,(h1 > 0) and h1 or 1) and Duel.IsPlayerCanDraw(1-tp,1)
 	end
 	Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,PLAYER_ALL,1)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,PLAYER_ALL,1)

script/c73414375.lua

@@ -10,20 +10,26 @@ function c73414375.initial_effect(c)
 	e1:SetOperation(c73414375.operation)
 	c:RegisterEffect(e1)
 end
+
+function c73414375.filter(c)
+	return c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
+end
 function c73414375.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end
 	if chk==0 then return true end
 	local g=Group.CreateGroup()
-	if Duel.IsExistingTarget(Card.IsAbleToRemove,tp,0,LOCATION_GRAVE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(73414375,1)) then
+	if Duel.IsExistingTarget(c73414375.filter,tp,0,LOCATION_GRAVE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(73414375,1)) then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-		local rg=Duel.SelectTarget(tp,Card.IsAbleToRemove,tp,0,LOCATION_GRAVE,1,3,nil)
+		local rg=Duel.SelectTarget(tp,c73414375.filter,tp,0,LOCATION_GRAVE,1,3,nil)
 		g:Merge(rg)
 	end
-	if Duel.IsExistingTarget(Card.IsAbleToRemove,1-tp,0,LOCATION_GRAVE,1,nil) and Duel.SelectYesNo(1-tp,aux.Stringid(73414375,1)) then
+	if Duel.IsExistingTarget(c73414375.filter,1-tp,0,LOCATION_GRAVE,1,nil) and Duel.SelectYesNo(1-tp,aux.Stringid(73414375,1)) then
 		Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_REMOVE)
-		local rg=Duel.SelectTarget(1-tp,Card.IsAbleToRemove,1-tp,0,LOCATION_GRAVE,1,3,nil)
+		local rg=Duel.SelectTarget(1-tp,c73414375.filter,1-tp,0,LOCATION_GRAVE,1,3,nil)
+		if rg then 
 			g:Merge(rg)
 		end
+	end
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,g:GetCount(),0,0)
 end
 function c73414375.operation(e,tp,eg,ep,ev,re,r,rp)

script/c73578229.lua

@@ -42,7 +42,7 @@ function c73578229.adjustop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
 	local ag=g:GetMaxGroup(Card.GetAttack)
 	local preg=e:GetLabelObject()
-	if ag:Equal(preg) then return end
+	if ag and ag:Equal(preg) then return end
 	preg:Clear()
 	preg:Merge(ag)
 	Duel.AdjustInstantly(e:GetHandler())

script/c75292259.lua

@@ -11,7 +11,7 @@ end
 function c75292259.atcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local bc=c:GetBattleTarget()
-	return c==Duel.GetAttacker() and bc:IsRelateToBattle()
+	return c==Duel.GetAttacker() and bc and  bc:IsRelateToBattle()
 		and bc:GetBattlePosition()==POS_FACEUP_ATTACK and c:IsChainAttackable(3)
 		
 end

script/c79965360.lua

@@ -18,9 +18,9 @@ function c79965360.initial_effect(c)
 	c:RegisterEffect(e2)
 	--destroy rep
 	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_EQUIP)
-	e3:SetCode(EFFECT_DESTROY_REPLACE)
-	e3:SetTarget(c79965360.reptg)
+	e3:SetType(EFFECT_TYPE_EQUIP)
+	e3:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
+	e3:SetValue(c79965360.valcon)
 	e3:SetCountLimit(1)
 	c:RegisterEffect(e3)
 	--destroy
@@ -54,11 +54,8 @@ function c79965360.operation(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Equip(tp,e:GetHandler(),tc)
 	end
 end
-function c79965360.reptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	local tc=c:GetEquipTarget()
-	if chk==0 then return tc:IsReason(REASON_BATTLE) end
-	return true
+function c79965360.valcon(e,re,r,rp)
+	return r==REASON_BATTLE
 end
 function c79965360.descon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetEquipTarget()==Duel.GetAttacker() and Duel.GetAttackTarget()

script/c81426505.lua

@@ -26,7 +26,11 @@ function c81426505.filter3(c)
 	return c:IsFacedown() and c:IsDestructable()
 end
 function c81426505.destg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDestructable,tp,0,LOCATION_ONFIELD,1,nil) end
+	if chk==0 then return 
+		Duel.IsExistingMatchingCard(c81426505.filter1,tp,0,LOCATION_MZONE,1,nil) or
+		Duel.IsExistingMatchingCard(c81426505.filter2,tp,0,LOCATION_ONFIELD,1,nil) or
+		Duel.IsExistingMatchingCard(c81426505.filter3,tp,0,LOCATION_SZONE,1,nil)
+	end
 	local t={}
 	local p=1
 	if Duel.IsExistingMatchingCard(c81426505.filter1,tp,0,LOCATION_MZONE,1,nil) then t[p]=aux.Stringid(81426505,0) p=p+1 end

script/c83438826.lua

@@ -86,9 +86,10 @@ function c83438826.desop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCode(EFFECT_UPDATE_ATTACK)
 	e1:SetValue(-500)
 	e1:SetReset(RESET_EVENT+0x1fe0000)
-	eq:RegisterEffect(e1)
 
+	if eq:RegisterEffect(e1) then
 		Duel.Destroy(tc,REASON_EFFECT)
+	end
 end
 function c83438826.eqcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

script/c85562745.lua

@@ -19,7 +19,7 @@ function c85562745.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c85562745.con(e,tp,eg,ep,ev,re,r,rp)
-	return ep~=tp and bit.band(r,REASON_BATTLE)==0 and re:GetHandler():GetCode()~=85562745
+	return ep~=tp and bit.band(r,REASON_BATTLE)==0 and re and re:GetHandler():GetCode()~=85562745
 end
 function c85562745.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsRelateToEffect(e) end

script/c85668449.lua

@@ -44,6 +44,7 @@ function c85668449.lrcon(e,tp,eg,ep,ev,re,r,rp)
 	if tp~=ep then return false end
 	local lp=Duel.GetLP(ep)
 	if lp<=ev then return false end
+	if not re then return false end
 	local rc=re:GetHandler()
 	return rc:IsRace(RACE_PSYCHO)
 end

script/c88307361.lua

@@ -71,7 +71,7 @@ function c88307361.discon(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsStatus(STATUS_BATTLE_DESTROYED) then return false end
 	if not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return end
 	local tg=Duel.GetChainInfo(ev,CHAININFO_TARGET_CARDS)
-	return tg:IsContains(c) and Duel.IsChainNegatable(ev)
+	return tg and tg:IsContains(c) and Duel.IsChainNegatable(ev)
 end
 function c88307361.discost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckReleaseGroup(tp,Card.IsRace,1,e:GetHandler(),RACE_FISH) end

script/c93599951.lua

@@ -28,6 +28,6 @@ function c93599951.activate(e,tp,eg,ep,ev,re,r,rp)
 		if tc:IsDefencePos() then
 			Duel.ChangePosition(tc,POS_FACEUP_ATTACK)
 		end
-		Duel.ReplaceAttacker(tc)
+		Duel.ChangeAttacker(tc)
 	end
 end

script/c94585852.lua

@@ -32,6 +32,7 @@ function c94585852.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c94585852.repcon(e,tp,eg,ep,ev,re,r,rp)
+	if not re then return false end
 	local rc=re:GetHandler()
 	return Duel.GetCurrentPhase()==PHASE_STANDBY and rc:IsSetCard(0x45) and rc:IsType(TYPE_MONSTER)
 end

script/c99594764.lua

@@ -25,6 +25,7 @@ function c99594764.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c99594764.thop(e,tp,eg,ep,ev,re,r,rp)
 	local eqc=e:GetHandler():GetEquipTarget()
+	if not eqc then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectMatchingCard(tp,c99594764.filter,tp,LOCATION_DECK,0,1,1,nil,eqc:GetRace(),eqc:GetAttribute())
 	if g:GetCount()>0 then

script/c99902789.lua

@@ -14,7 +14,9 @@ function c99902789.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c99902789.discon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.CheckEvent(EVENT_ATTACK_ANNOUNCE) and Duel.GetAttacker():IsControler(tp) and Duel.GetAttackTarget()~=nil
+	local a=Duel.GetAttacker()
+	local at=Duel.GetAttackTarget()
+	return Duel.CheckEvent(EVENT_ATTACK_ANNOUNCE) and at and (a and a:IsControler(tp) or at:IsControler(tp))
 		and ep~=tp and re:GetActiveType()==TYPE_TRAP and re:IsHasType(EFFECT_TYPE_ACTIVATE) and Duel.IsChainNegatable(ev)
 end
 function c99902789.discost(e,tp,eg,ep,ev,re,r,rp,chk)