fix

expansions/script/c10111106.lua

@@ -18,7 +18,7 @@ function c10111106.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetCountLimit(1,10111106)
+	e2:SetCountLimit(1)
 	e2:SetCondition(c10111106.rmcon)
 	e2:SetTarget(c10111106.rmtg)
 	e2:SetOperation(c10111106.rmop)
@@ -105,7 +105,7 @@ function c10111106.rmop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function c10111106.atkval(e,c)
-	return Duel.GetMatchingGroupCount(Card.IsType,e:GetHandlerPlayer(),LOCATION_GRAVE,0,nil,TYPE_MONSTER)*400
+	return Duel.GetMatchingGroupCount(Card.IsType,e:GetHandlerPlayer(),LOCATION_GRAVE,0,nil,TYPE_MONSTER)*200
 end
 function c10111106.drcon(e,tp,eg,ep,ev,re,r,rp)
 	return bit.band(r,REASON_DESTROY)~=0 and e:GetHandler():IsPreviousControler(tp)

expansions/script/c10111107.lua

@@ -36,7 +36,7 @@ function c10111107.initial_effect(c)
 	e4:SetCategory(CATEGORY_DRAW)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e4:SetCode(EVENT_DAMAGE_STEP_END)
-	e4:SetCountLimit(1,101111070)
+	e4:SetCountLimit(1)
 	e4:SetCondition(c10111107.atcon)
 	e4:SetTarget(c10111107.attg)
 	e4:SetOperation(c10111107.atop)
@@ -69,7 +69,7 @@ function c10111107.condition(e,tp,eg,ep,ev,re,r,rp)
 end
 function c10111107.atkop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local ct=Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)-Duel.GetFieldGroupCount(tp,0,LOCATION_DECK+LOCATION_HAND+LOCATION_ONFIELD)
+	local ct=Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)-Duel.GetFieldGroupCount(tp,0,LOCATION_DECK+LOCATION_HAND)
 	if c:IsRelateToEffect(e) and c:IsFaceup() and ct>0 then
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c11410000.lua

@@ -117,15 +117,14 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tp=c:GetControler()
 	local g=Duel.GetMatchingGroup(nil,tp,LOCATION_DECK,0,nil)
-	if #g<36 then e:Reset() return end
-	if c:IsLocation(LOCATION_DECK) then
+	if c:IsLocation(LOCATION_DECK) and #g>=36 then
 		Duel.DisableShuffleCheck()
 		if KOISHI_CHECK then
 			Duel.Exile(c,0)
 		else
 			Duel.Remove(c,POS_FACEDOWN,REASON_RULE)
 		end
-	elseif c:IsLocation(LOCATION_HAND) then
+	elseif c:IsLocation(LOCATION_HAND) and #g>=36 then
 		if not cm.r then
 			cm.r=Duel.GetFieldGroup(0,LOCATION_DECK+LOCATION_HAND,LOCATION_DECK+LOCATION_EXTRA):GetSum(Card.GetCode)
 		end
@@ -149,6 +148,12 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
 	if KOISHI_CHECK then
 		Duel.ResetTimeLimit(0,360)
 		Duel.ResetTimeLimit(1,360)
+		local e0=Effect.CreateEffect(c) 
+		e0:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		e0:SetCode(EVENT_PHASE_START+PHASE_DRAW)
+		e0:SetCountLimit(1)
+		e0:SetOperation(function() Duel.ResetTimeLimit(0,360) Duel.ResetTimeLimit(1,360) end)
+		Duel.RegisterEffect(e0,0)
 	end
 	local ag=Duel.GetMatchingGroup(cm.nnfilter,0,0xff,0xff,nil)
 	local _TGetID=GetID

expansions/script/c28315844.lua

@@ -33,7 +33,7 @@ function c28315844.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
-	if Duel.GetLP(tp)>=3000 then
+	if Duel.GetLP(tp)>3000 then
 		Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,2000)
 	end
 end
@@ -42,7 +42,7 @@ function c28315844.spop(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToEffect(e) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
 		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
-	if Duel.GetLP(tp)>=3000 then
+	if Duel.GetLP(tp)>3000 then
 		Duel.Damage(tp,2000,REASON_EFFECT)
 	end
 end

expansions/script/c28316051.lua

@@ -33,7 +33,7 @@ function c28316051.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
-	if Duel.GetLP(tp)>=3000 then
+	if Duel.GetLP(tp)>3000 then
 		Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,2000)
 	end
 end
@@ -42,7 +42,7 @@ function c28316051.spop(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToEffect(e) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
 		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
-	if Duel.GetLP(tp)>=3000 then
+	if Duel.GetLP(tp)>3000 then
 		Duel.Damage(tp,2000,REASON_EFFECT)
 	end
 end

expansions/script/c28316149.lua

@@ -33,7 +33,7 @@ function c28316149.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
-	if Duel.GetLP(tp)>=3000 then
+	if Duel.GetLP(tp)>3000 then
 		Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,2000)
 	end
 end
@@ -42,7 +42,7 @@ function c28316149.spop(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToEffect(e) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
 		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
-	if Duel.GetLP(tp)>=3000 then
+	if Duel.GetLP(tp)>3000 then
 		Duel.Damage(tp,2000,REASON_EFFECT)
 	end
 end

expansions/script/c28316558.lua

@@ -34,7 +34,7 @@ function c28316558.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
-	if Duel.GetLP(tp)>=3000 then
+	if Duel.GetLP(tp)>3000 then
 		Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,2000)
 	end
 end
@@ -51,7 +51,7 @@ function c28316558.spop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ShuffleHand(tp)
 		Duel.Damage(1-tp,500,REASON_EFFECT)
 	end
-	if Duel.GetLP(tp)>=3000 then
+	if Duel.GetLP(tp)>3000 then
 		Duel.Damage(tp,2000,REASON_EFFECT)
 	end
 end

expansions/script/c28317560.lua

@@ -33,7 +33,7 @@ function c28317560.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
-	if Duel.GetLP(tp)>=3000 then
+	if Duel.GetLP(tp)>3000 then
 		Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,2000)
 	end
 end
@@ -42,7 +42,7 @@ function c28317560.spop(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToEffect(e) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
 		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
-	if Duel.GetLP(tp)>=3000 then
+	if Duel.GetLP(tp)>3000 then
 		Duel.Damage(tp,2000,REASON_EFFECT)
 	end
 end

expansions/script/c60010145.lua

@@ -4,7 +4,7 @@ function cm.initial_effect(c)
 	c:EnableCounterPermit(0x629,LOCATION_ONFIELD)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	--e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetOperation(cm.activate)

expansions/script/c60010147.lua

@@ -4,7 +4,7 @@ function cm.initial_effect(c)
 	c:EnableCounterPermit(0x629,LOCATION_ONFIELD)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	--e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetOperation(cm.activate)

expansions/script/c60010148.lua

@@ -40,14 +40,14 @@ if not cm.cnum then
 	cm.cnum=0
 end
 function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
-	--Debug.Message(cm.cnum)
 	local c=e:GetHandler()
 	local i=c:GetControler()
-	--Debug.Message(Duel.GetCounter(i,LOCATION_ONFIELD,0,0x629)-c:GetCounter(0x629))
-	local nnum=Duel.GetCounter(i,LOCATION_ONFIELD,0,0x629)-c:GetCounter(0x629)
+	local cd=Duel.GetMatchingGroup(Card.IsCode,i,LOCATION_ONFIELD,0,nil,m):GetFirst()
+	if cd==nil then return end
+	local nnum=Duel.GetCounter(i,LOCATION_ONFIELD,0,0x629)-cd:GetCounter(0x629)
 	if cm.cnum~=nnum then
 		cm.cnum=nnum
-		Duel.RaiseEvent(c,EVENT_CUSTOM+m,nil,0,i,i,0)
+		Duel.RaiseEvent(cd,EVENT_CUSTOM+m,nil,0,i,i,0)
 	end
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c60010149.lua

@@ -4,7 +4,7 @@ function cm.initial_effect(c)
 	c:EnableCounterPermit(0x629,LOCATION_ONFIELD)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	--e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetOperation(cm.activate)

expansions/script/c60010151.lua

@@ -4,7 +4,7 @@ function cm.initial_effect(c)
 	c:EnableCounterPermit(0x629,LOCATION_ONFIELD)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	--e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetOperation(cm.activate)

expansions/script/c60010153.lua

@@ -4,7 +4,7 @@ function cm.initial_effect(c)
 	c:EnableCounterPermit(0x629,LOCATION_ONFIELD)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	--e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetOperation(cm.activate)

expansions/script/c60010155.lua

@@ -4,7 +4,7 @@ function cm.initial_effect(c)
 	c:EnableCounterPermit(0x629,LOCATION_ONFIELD)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	--e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetOperation(cm.activate)

expansions/script/c60010157.lua

@@ -4,7 +4,7 @@ function cm.initial_effect(c)
 	c:EnableCounterPermit(0x629,LOCATION_ONFIELD)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	--e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetOperation(cm.activate)

expansions/script/c60010159.lua

@@ -4,7 +4,7 @@ function cm.initial_effect(c)
 	c:EnableCounterPermit(0x629,LOCATION_ONFIELD)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	--e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetOperation(cm.activate)

expansions/script/c60010161.lua

@@ -4,7 +4,7 @@ function cm.initial_effect(c)
 	c:EnableCounterPermit(0x629,LOCATION_ONFIELD)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	--e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetOperation(cm.activate)

expansions/script/c60010163.lua

@@ -4,7 +4,7 @@ function cm.initial_effect(c)
 	c:EnableCounterPermit(0x629,LOCATION_ONFIELD)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	--e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetOperation(cm.activate)

expansions/script/c60010165.lua

@@ -4,7 +4,7 @@ function cm.initial_effect(c)
 	c:EnableCounterPermit(0x629,LOCATION_ONFIELD)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	--e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetOperation(cm.activate)
@@ -38,6 +38,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RemoveCounter(tp,1,0,0x629,3,REASON_COST)
 end
 function cm.op(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)