wadashimo

expansions/script/c12048010.lua

@@ -14,10 +14,10 @@ function cm.initial_effect(c)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.activate)
 	c:RegisterEffect(e1)
-	Duel.AddCustomActivityCounter(m,ACTIVITY_SPSUMMON,cm.chainfilter)
+	Duel.AddCustomActivityCounter(m,ACTIVITY_SPSUMMON,cm.counterfilter)
 end
-function cm.chainfilter(re,tp,cid)
-	return not ( re:GetHandler():IsLocation(LOCATION_EXTRA) )
+function cm.counterfilter(c)
+	return c:GetSummonLocation()~=LOCATION_EXTRA
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return  Duel.GetCustomActivityCount(m,tp,ACTIVITY_CHAIN)==0 and Duel.IsPlayerCanSendtoGrave(tp) end

expansions/script/c33400000.lua

@@ -42,7 +42,7 @@ end
 	if not XY.zs then
 		XY.zs=true
 		local ge1=Effect.GlobalEffect(c)
-		ge1:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)	
+		ge1:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)   
 		ge1:SetCode(EVENT_SPSUMMON_SUCCESS)
 		ge1:SetCondition(XY.zscon1)
 		ge1:SetOperation(XY.zsop1)
@@ -56,7 +56,7 @@ function XY.zsckfilter1(c,rp,re)
 	return c:GetSummonPlayer()==rp and   not c:IsCode(33403500) and (re and not re:GetHandler():IsSetCard(0x5349))
 end
 function XY.zscon1(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(XY.zsfilter1,1,nil,rp)	  
+	return eg:IsExists(XY.zsfilter1,1,nil,rp)	 
 end
 function XY.zsop1(e,tp,eg,ep,ev,re,r,rp)
 	if  eg:IsExists(XY.zsckfilter1,1,nil,rp,re)  then   
@@ -91,7 +91,7 @@ function XY.recon(e,tp,eg,ep,ev,re,r,rp)
  local c=e:GetHandler()
  local ss=Duel.GetFlagEffect(tp,33403501)/2  
 	if ss<4 then ss=4 end 
-	return Duel.GetFlagEffect(tp,33413501)<=ss and Duel.GetFlagEffect(tp,c:GetCode()+20000)==0 and Duel.GetFlagEffect(tp,33443500)==0   
+	return Duel.GetFlagEffect(tp,33413501)<ss and Duel.GetFlagEffect(tp,c:GetCode()+20000)==0 and Duel.GetFlagEffect(tp,33443500)==0   
 end
 function XY.REstfilter(c,m)
 	return c:IsSetCard(0x5349) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSSetable() and not c:IsCode(m)

expansions/script/c33403500.lua

@@ -39,12 +39,12 @@ function cm.initial_effect(c)
 	e4:SetOperation(cm.spop)
 	e4:SetValue(1)
 	c:RegisterEffect(e4)
- --draw
+ --
 	local e5=Effect.CreateEffect(c)
 	e5:SetDescription(aux.Stringid(m,2))
 	e5:SetCategory(CATEGORY_TOGRAVE)
 	e5:SetType(EFFECT_TYPE_QUICK_O)
-	e5:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e5:SetCode(EVENT_FREE_CHAIN)
 	e5:SetRange(LOCATION_MZONE)
 	e5:SetCountLimit(1)
 	e5:SetCondition(cm.tgcon)
@@ -163,7 +163,7 @@ function cm.tgop(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.efcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,33403501)>22
+	return Duel.GetFlagEffect(tp,33403501)>13
 end
 function cm.effectfilter(e,ct)
 	local p=e:GetHandler():GetControler()

expansions/script/c33403501.lua

@@ -16,9 +16,9 @@ function cm.initial_effect(c)
 
 end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
-	local ss=Duel.GetFlagEffect(tp,33403501)/2	
+	local ss=Duel.GetFlagEffect(tp,33403501)/2  
 	if ss<4 then ss=4 end 
-	return Duel.GetFlagEffect(tp,33413501)<=ss and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
+	return Duel.GetFlagEffect(tp,33413501)<ss and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)  
 	e:SetLabel(1)

expansions/script/c33403502.lua

@@ -19,7 +19,7 @@ end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
    local ss=Duel.GetFlagEffect(tp,33403501)/2  
 	if ss<4 then ss=4 end 
-	return Duel.GetFlagEffect(tp,33413501)<=ss and  Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
+	return Duel.GetFlagEffect(tp,33413501)<ss and  Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)  
  if chk==0 then return true end

expansions/script/c33403503.lua

@@ -19,7 +19,7 @@ end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
   local ss=Duel.GetFlagEffect(tp,33403501)/2  
 	if ss<4 then ss=4 end 
-	return Duel.GetFlagEffect(tp,33413501)<=ss and Duel.GetFlagEffect(tp,m+30000)==0  and Duel.GetFlagEffect(tp,33443500)==0
+	return Duel.GetFlagEffect(tp,33413501)<ss and Duel.GetFlagEffect(tp,m+30000)==0  and Duel.GetFlagEffect(tp,33443500)==0
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)  
 e:SetLabel(1)

expansions/script/c33403504.lua

@@ -33,7 +33,7 @@ local ck=0
 	for i=1,ev do
 		local te,tgp=Duel.GetChainInfo(i,CHAININFO_TRIGGERING_EFFECT,CHAININFO_TRIGGERING_PLAYER)
 		if tgp~=tp and (te:IsActiveType(TYPE_MONSTER) or te:IsHasType(EFFECT_TYPE_ACTIVATE)) and Duel.IsChainNegatable(i) then
-			return Duel.GetFlagEffect(tp,33413501)<=ss and Duel.GetFlagEffect(tp,m+30000)==0   and ck==1 and Duel.GetFlagEffect(tp,33443500)==0
+			return Duel.GetFlagEffect(tp,33413501)<ss and Duel.GetFlagEffect(tp,m+30000)==0   and ck==1 and Duel.GetFlagEffect(tp,33443500)==0
 		end
 	end
 	return false

expansions/script/c33403505.lua

@@ -24,7 +24,7 @@ end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
  local ss=Duel.GetFlagEffect(tp,33403501)/2  
 	if ss<4 then ss=4 end 
-	return Duel.GetFlagEffect(tp,33413501)<=ss  and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
+	return Duel.GetFlagEffect(tp,33413501)<ss  and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)  
  if chk==0 then return true end

expansions/script/c33403506.lua

@@ -19,7 +19,7 @@ end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
 	local ss=Duel.GetFlagEffect(tp,33403501)/2  
 	if ss<4 then ss=4 end 
-	return Duel.GetFlagEffect(tp,33413501)<=ss and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
+	return Duel.GetFlagEffect(tp,33413501)<ss and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)  
 e:SetLabel(1)

expansions/script/c33403507.lua

@@ -19,7 +19,7 @@ function cm.con(e,tp,eg,ep,ev,re,r,rp)
  local ss=Duel.GetFlagEffect(tp,33403501)/2  
 	if ss<4 then ss=4 end 
 	local ph=Duel.GetCurrentPhase()
-	return  ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and  Duel.GetFlagEffect(tp,33413501)<=ss and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
+	return  ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and  Duel.GetFlagEffect(tp,33413501)<ss and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)  
  if chk==0 then return true end

expansions/script/c33403508.lua

@@ -23,7 +23,7 @@ end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
  local ss=Duel.GetFlagEffect(tp,33403501)/2  
 	if ss<4 then ss=4 end 
-	return Duel.GetFlagEffect(tp,33413501)<=ss  and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
+	return Duel.GetFlagEffect(tp,33413501)<ss  and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)  
 e:SetLabel(1)

expansions/script/c33403509.lua

@@ -19,7 +19,7 @@ end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
   local ss=Duel.GetFlagEffect(tp,33403501)/2  
 	if ss<4 then ss=4 end 
-	return Duel.GetFlagEffect(tp,33413501)<=ss  and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
+	return Duel.GetFlagEffect(tp,33413501)<ss  and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)  
  if chk==0 then return true end

expansions/script/c33403510.lua

@@ -17,7 +17,7 @@ end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
    local ss=Duel.GetFlagEffect(tp,33403501)/2  
 	if ss<4 then ss=4 end 
-	return Duel.GetFlagEffect(tp,33413501)<=ss  and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
+	return Duel.GetFlagEffect(tp,33413501)<ss  and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)  
  if chk==0 then return true end