reclean

expansions/script/c12011000.lua

@@ -43,24 +43,26 @@ function c12011000.efop(e,tp,eg,ep,ev,re,r,rp)
 	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT)
 	e3:SetCode(EFFECT_IMMUNE_EFFECT)
 	e3:SetRange(LOCATION_MZONE)
+	e3:SetReset(RESET_EVENT+RESETS_STANDARD)
 	e3:SetTarget(c12011000.target)
 	e3:SetValue(c12011000.efilter)
 	rc:RegisterEffect(e3,true)
 	--indes
-	local e3=Effect.CreateEffect(rc)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetRange(LOCATION_MZONE)
-	e3:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
-	e3:SetValue(1)
-	rc:RegisterEffect(e3,true)
-	if not rc:IsType(TYPE_EFFECT) then
-		local e2=Effect.CreateEffect(c)
+	local e2=Effect.CreateEffect(rc)
 	e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_ADD_TYPE)
-		e2:SetValue(TYPE_EFFECT)
-		e2:SetReset(RESET_EVENT+0x1fe0000)
+	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e2:SetRange(LOCATION_MZONE)
+	e2:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
+	e2:SetReset(RESET_EVENT+RESETS_STANDARD)
+	e2:SetValue(1)
 	rc:RegisterEffect(e2,true)
+	if not rc:IsType(TYPE_EFFECT) then
+		local e1=Effect.CreateEffect(c)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_ADD_TYPE)
+		e1:SetValue(TYPE_EFFECT)
+		e1:SetReset(RESET_EVENT+0x1fe0000)
+		rc:RegisterEffect(e1,true)
 	end
 end
 function c12011000.target(e,rc)

expansions/script/c12011001.lua

@@ -44,6 +44,7 @@ function c12011001.efop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	e1:SetCountLimit(1,12011201)
 	e1:SetCost(c12011001.cost)
 	e1:SetTarget(c12011001.sptg)

expansions/script/c12011002.lua

@@ -51,6 +51,7 @@ function c12011002.efop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCategory(CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	e1:SetCountLimit(1)
 	e1:SetTarget(c12011002.settg)
 	e1:SetOperation(c12011002.setop)

expansions/script/c12011003.lua

@@ -43,6 +43,7 @@ function c12011003.efop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	e1:SetCountLimit(1)
 	e1:SetTarget(c12011003.settg)
 	e1:SetOperation(c12011003.setop)

expansions/script/c12011005.lua

@@ -91,6 +91,7 @@ function c12011005.efop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCode(EFFECT_IMMUNE_EFFECT)
+	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	e1:SetValue(c12011005.efilter)
 	rc:RegisterEffect(e1,true) 
 	--cannot target
@@ -99,22 +100,24 @@ function c12011005.efop(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 	e2:SetValue(aux.tgoval)
 	rc:RegisterEffect(e2,true)
 	--attack all
 	local e3=Effect.CreateEffect(rc)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetCode(EFFECT_ATTACK_ALL)
+	e3:SetReset(RESET_EVENT+RESETS_STANDARD)
 	e3:SetValue(1)
 	rc:RegisterEffect(e3,true)
 
 	if not rc:IsType(TYPE_EFFECT) then
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_ADD_TYPE)
-		e2:SetValue(TYPE_EFFECT)
-		e2:SetReset(RESET_EVENT+0x1fe0000)
-		rc:RegisterEffect(e2,true)
+		local e4=Effect.CreateEffect(c)
+		e4:SetType(EFFECT_TYPE_SINGLE)
+		e4:SetCode(EFFECT_ADD_TYPE)
+		e4:SetValue(TYPE_EFFECT)
+		e4:SetReset(RESET_EVENT+0x1fe0000)
+		rc:RegisterEffect(e4,true)
 	end 
 end
 function c12011005.efilter(e,te)

expansions/script/c12011007.lua

@@ -110,6 +110,7 @@ function c12011007.efop(e,tp,eg,ep,ev,re,r,rp)
 	e5:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e5:SetType(EFFECT_TYPE_IGNITION)
 	e5:SetRange(LOCATION_MZONE)
+	e5:SetReset(RESET_EVENT+RESETS_STANDARD)
 	--e5:SetCountLimit(1)
 	e5:SetCost(function(e,tp,eg,ep,ev,re,r,rp,chk)
 		if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end

expansions/script/c12011008.lua

@@ -127,6 +127,7 @@ function c12011008.efop(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetHintTiming(0,TIMING_MAIN_END+TIMING_BATTLE_START+TIMING_BATTLE_END)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 	e2:SetCountLimit(1,12011008)
 	e2:SetCondition(c12011008.spcon)
 	e2:SetCost(aux.bfgcost)
@@ -134,12 +135,12 @@ function c12011008.efop(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetOperation(c12011008.spop)
 	rc:RegisterEffect(e2,true)
 	if not rc:IsType(TYPE_EFFECT) then
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_ADD_TYPE)
-		e2:SetValue(TYPE_EFFECT)
-		e2:SetReset(RESET_EVENT+0x1fe0000)
-		rc:RegisterEffect(e2,true)
+		local e3=Effect.CreateEffect(c)
+		e3:SetType(EFFECT_TYPE_SINGLE)
+		e3:SetCode(EFFECT_ADD_TYPE)
+		e3:SetValue(TYPE_EFFECT)
+		e3:SetReset(RESET_EVENT+0x1fe0000)
+		rc:RegisterEffect(e3,true)
 	end
 end
 function c12011008.spcon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c12011009.lua

@@ -78,6 +78,7 @@ function c12011009.efop(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetCategory(CATEGORY_ATKCHANGE)
 	e2:SetType(EFFECT_TYPE_TRIGGER_F+EFFECT_TYPE_SINGLE)
 	e2:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
+	e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 	e2:SetCondition(c12011009.atkcon)
 	e2:SetOperation(c12011009.atkop)
 	rc:RegisterEffect(e2,true)
@@ -87,17 +88,18 @@ function c12011009.efop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CLIENT_HINT)
 	e1:SetCode(EFFECT_CANNOT_ACTIVATE)
+	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	e1:SetTargetRange(0,1)
 	e1:SetValue(1)
 	e1:SetCondition(c12011009.actcon)
 	rc:RegisterEffect(e1,true)
 	if not rc:IsType(TYPE_EFFECT) then
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_ADD_TYPE)
-		e2:SetValue(TYPE_EFFECT)
-		e2:SetReset(RESET_EVENT+0x1fe0000)
-		rc:RegisterEffect(e2,true)
+		local e3=Effect.CreateEffect(c)
+		e3:SetType(EFFECT_TYPE_SINGLE)
+		e3:SetCode(EFFECT_ADD_TYPE)
+		e3:SetValue(TYPE_EFFECT)
+		e3:SetReset(RESET_EVENT+0x1fe0000)
+		rc:RegisterEffect(e3,true)
 	end
 end
 function c12011009.atkcon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c12011010.lua

@@ -117,6 +117,7 @@ function c12011010.efop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	e1:SetCost(c12011010.cost)
 	e1:SetTarget(c12011010.target)
 	e1:SetOperation(c12011010.operation)

expansions/script/c18017505.lua

@@ -30,16 +30,16 @@ end
 function c18017505.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c18017505.cfilter,1,nil)
 end
-function c18017505.tfilter(c)
+function c18017505.filter(c)
 	return c:IsSummonType(SUMMON_TYPE_SPECIAL) and c:IsAbleToHand()
 end
 function c18017505.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c18017505.tfilter(chkc) end
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c18017505.filter(chkc) end
 	local c=e:GetHandler()
-	if chk==0 then return Duel.IsExistingTarget(c18017505.tfilter,tp,0,LOCATION_MZONE,1,nil)
+	if chk==0 then return Duel.IsExistingTarget(c18017505.filter,tp,0,LOCATION_MZONE,1,nil)
 		and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
-	local g=Duel.SelectTarget(tp,c18017505.tfilter,tp,0,LOCATION_MZONE,1,1,nil)
+	local g=Duel.SelectTarget(tp,c18017505.filter,tp,0,LOCATION_MZONE,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
 end
@@ -63,14 +63,14 @@ end
 function c18017505.sfilter(c)
 	return c:IsType(TYPE_TRAP) and c:IsSSetable()
 end
-function c18017505.filter(c)
+function c18017505.filter1(c)
 	return c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_DRAGON) and c:IsAttack(2600) and c:IsDefense(1600)
 end
 function c18017505.tgop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetDecktopGroup(tp,3)
 	Duel.DisableShuffleCheck()
 	if Duel.SendtoGrave(g,REASON_EFFECT)~=0 and g:IsExists(Card.IsLocation,1,nil,LOCATION_GRAVE)
-		and Duel.IsExistingMatchingCard(c18017505.filter,tp,LOCATION_GRAVE,0,1,nil) then
+		and Duel.IsExistingMatchingCard(c18017505.filter1,tp,LOCATION_GRAVE,0,1,nil) then
 		local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(c18017505.sfilter),tp,LOCATION_GRAVE,0,nil)
 		if #g>0 and Duel.SelectYesNo(tp,aux.Stringid(18017505,2)) then
 			Duel.BreakEffect()