repo 20.15

expansions/script/c16162000.lua

@@ -67,14 +67,14 @@ function cm.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function cm.gfilter(g,tp,c)
 	local ct=g:GetSum(Card.GetLevel)
-	return c:IsCanRemoveCounter(tp,0x100e,ct,REASON_COST)
+	return c:IsCanRemoveCounter(0x100e,ct,REASON_COST)
 end
 function cm.gfilter2(g,lv)
 	local ct=g:GetSum(Card.GetLevel)
 	return ct <= lv
 end
 function cm.spcheck(c,e,tp)
-	return c:IsListedACounter() and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsLevelAbove(1)
+	return c:IsListedACounter() and c:IsCanBeSpecialSummoned(e,0,tp,false,false) 
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
@@ -92,6 +92,7 @@ function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 	local ct1 = c:GetCounter(0x100e)
 	c:RemoveCounter(tp,0x100e,ct1,REASON_COST)
+	Duel.RaiseEvent(e:GetHandler(),EVENT_REMOVE_COUNTER+0x100e,e,REASON_COST,tp,tp,ev)
 	Duel.SetTargetParam(ct1)
 	e:SetLabel(0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_GRAVE)

expansions/script/c33201010.lua

@@ -106,7 +106,7 @@ function MJ_VHisc.op(e,tp,eg,ep,ev,re,r,rp)
 			return
 		end
 		Duel.ConfirmDecktop(tp,dcount-seq)
-		if Duel.SendtoGrave(tgcard,REASON_EFFECT) then
+		if Duel.SendtoGrave(tgcard,REASON_EFFECT) and tgcard:IsLocation(LOCATION_GRAVE) then
 			local token=Duel.CreateToken(tp,33201009)
 			Duel.MoveToField(token,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 			local lv=tgcard:GetOriginalLevel()

expansions/script/c33201014.lua

@@ -15,7 +15,7 @@ function s.initial_effect(c)
 end
 
 function s.rmfilter(c)
-	return c:IsRace(RACE_ZOMBIE) and c:IsAbleToRemove()
+	return c:IsRace(RACE_ZOMBIE) and c:IsLevelAbove(0) and c:IsAbleToRemove()
 end
 function s.rdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_GRAVE) and s.rmfilter(chkc) end

expansions/script/c33201018.lua

@@ -33,7 +33,7 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,0,0,0)
 end
 function s.desfilter(c)
-	return (c:IsRace(RACE_ZOMBIE) or c:IsCode(33201009)) and c:IsFaceup()
+	return ((c:IsRace(RACE_ZOMBIE) and c:IsType(TYPE_MONSTER)) or c:IsCode(33201009)) and c:IsFaceup()
 end
 function s.desop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c33401035.lua

@@ -190,7 +190,7 @@ function cm.op3(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCategory(CATEGORY_RECOVER)
 		e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e2:SetCode(EVENT_DAMAGE)
-		e2:SetReset(RESET_PHASE+PHASE_END)
+		e2:SetReset(RESET_PHASE+Duel.GetCurrentPhase())
 		e2:SetCondition(cm.con11)
 		e2:SetOperation(cm.op11)
 		Duel.RegisterEffect(e2,tp)

expansions/script/c60152906.lua

@@ -14,7 +14,7 @@ function s.initial_effect(c)
 	local e3 = Scl.CreateSingleTriggerOptionalEffect(c, EVENT_RELEASE, 
 		"ShuffleIn2Deck", {1, id + 200}, 
 		"ShuffleIn2Deck&Draw", "Delay", B2Sayaka.ExtraLimit, nil, {
-		{ "~Target", Card.IsAbleToDeck, "ShuffleIn2Deck", "Banish,GY"  },
+		{ "~Target", Card.IsAbleToDeck, "ShuffleIn2Deck", "Banished,GY"  },
 		{ "PlayerTarget", "Draw", 1} }, s.drop)
 end
 function s.damop(e,tp)