wadashimo

expansions/script/c12008020.lua

@@ -59,7 +59,7 @@ function c12008020.rmop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetLabel(fid)
 	e1:SetLabelObject(og)
 	e1:SetTargetRange(1,1)
---  e1:SetCondition(c12008020.hdcon)
+	e1:SetCondition(c12008020.hdcon)
 	e1:SetOperation(c12008020.hdop)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)

expansions/script/c12010026.lua

@@ -98,7 +98,7 @@ function c12010026.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 	end
 end
 function c12010026.condition(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c12010048.lua

@@ -74,25 +74,25 @@ function c12010048.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local g=Duel.SelectTarget(tp,c12010048.filter,tp,LOCATION_GRAVE,0,1,1,nil)
 end
 function c12010048.activate(e,tp,eg,ep,ev,re,r,rp)
-    local c=e:GetHandler()
-    if not c:IsRelateToEffect(e) then return false end
-    if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return false end
-    local tc=Duel.GetFirstTarget()
-    if tc:IsType(TYPE_MONSTER) then
-        Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
-        local e1=Effect.CreateEffect(e:GetHandler())
-        e1:SetCode(EFFECT_CHANGE_TYPE)
-        e1:SetType(EFFECT_TYPE_SINGLE)
-        e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-        e1:SetReset(RESET_EVENT+0x1fc0000)
-        e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS)
-        tc:RegisterEffect(e1)
-    else
-      if tc:IsRelateToEffect(e) then
-        Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
-        Duel.RaiseEvent(tc,EVENT_CHAIN_SOLVED,tc:GetActivateEffect(),0,tp,tp,Duel.GetCurrentChain())
-      end
-    end
+	local c=e:GetHandler()
+	if not c:IsRelateToEffect(e) then return false end
+	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return false end
+	local tc=Duel.GetFirstTarget()
+	if tc:IsType(TYPE_MONSTER) then
+		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		local e1=Effect.CreateEffect(e:GetHandler())
+		e1:SetCode(EFFECT_CHANGE_TYPE)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+		e1:SetReset(RESET_EVENT+0x1fc0000)
+		e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS)
+		tc:RegisterEffect(e1)
+	else
+	  if tc:IsRelateToEffect(e) then
+		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+		Duel.RaiseEvent(tc,EVENT_CHAIN_SOLVED,tc:GetActivateEffect(),0,tp,tp,Duel.GetCurrentChain())
+	  end
+	end
 end
 function c12010048.nfilter(c)
 	return c:IsFaceup() and not c:IsDisabled()
@@ -194,5 +194,5 @@ end
 function c12010048.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return end
 	local c=e:GetHandler()
-	Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+	Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 end

expansions/script/c12029034.lua

@@ -2,17 +2,18 @@
 local m=12029034
 local cm=_G["c"..m]
 function cm.initial_effect(c)
+	Duel.EnableGlobalFlag(GLOBALFLAG_BRAINWASHING_CHECK)
 	--fusion material
 	c:EnableReviveLimit()
 	aux.AddFusionProcCodeFunRep(c,12029033,aux.FilterBoolFunction(cm.mfiter,c),1,63,true,true)
 	aux.AddContactFusionProcedure(c,Card.IsAbleToRemoveAsCost,LOCATION_ONFIELD+LOCATION_GRAVE,0,Duel.Remove,POS_FACEUP,REASON_COST)
 	--spsummon condition
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e1:SetValue(cm.splimit)
-	c:RegisterEffect(e1)  
+	local e0=Effect.CreateEffect(c)
+	e0:SetType(EFFECT_TYPE_SINGLE)
+	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e0:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e0:SetValue(cm.splimit)
+	c:RegisterEffect(e0)  
 	--draw
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
@@ -28,6 +29,7 @@ function cm.initial_effect(c)
 	e3:SetDescription(aux.Stringid(m,0))
 	e3:SetCategory(CATEGORY_DRAW)
 	e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
+	e3:SetRange(LOCATION_MZONE)
 	e3:SetCode(EVENT_CONTROL_CHANGED)
 	e3:SetOperation(cm.drop)
 	c:RegisterEffect(e3)
@@ -58,8 +60,8 @@ function cm.cnop(e,tp,eg,ep,ev,re,r,rp)
 	local tg=Group.CreateGroup()
 	local tc=g:GetFirst()
 	while tc do
-		if not tc:IsImmuneToEffect(e) and tc:GetFlagEffect(m)==0 then
-			tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1)
+		if not tc:IsImmuneToEffect(e) and tc:GetFlagEffect(9720537)==0 then
+			tc:RegisterFlagEffect(9720537,RESET_EVENT+RESETS_STANDARD,0,1)
 			tg:AddCard(tc)
 		end
 		tc=g:GetNext()
@@ -69,7 +71,7 @@ function cm.cnop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_REMOVE_BRAINWASHING)
 	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e1:SetTarget(aux.TargetEqualFunction(Card.GetFlagEffect,1,m))
+	e1:SetTarget(aux.TargetEqualFunction(Card.GetFlagEffect,1,9720537))
 	e1:SetLabelObject(tg)
 	Duel.RegisterEffect(e1,tp)
 	--force adjust
@@ -94,7 +96,7 @@ function cm.reset(e,tp,eg,ep,ev,re,r,rp)
 		local e1=e2:GetLabelObject()
 		local tg=e1:GetLabelObject()
 		for tc in aux.Next(tg) do
-			tc:ResetFlagEffect(m)
+			tc:ResetFlagEffect(9720537)
 		end
 		tg:DeleteGroup()
 		e1:Reset()
@@ -103,9 +105,9 @@ function cm.reset(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.drop(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.GetFlagEffect(tp,m)<5 then
-	   Duel.Draw(tp,1)
-	   Duel.RegisterFlagEffect(tp,code,RESET_PHASE+PHASE_END,0,0)
+	if Duel.GetFlagEffect(tp,m+100)<5 then
+	   Duel.Draw(tp,1,REASON_EFFECT)
+	   Duel.RegisterFlagEffect(tp,m+100,RESET_PHASE+PHASE_END,0,0)
 	end
 end
 function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c12037050.lua

@@ -21,7 +21,7 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetCountLimit(1,m)
+	e2:SetCountLimit(1)
 	e2:SetTarget(cm.target)
 	e2:SetOperation(cm.operation)
 	c:RegisterEffect(e2)

expansions/script/c65010516.lua

@@ -59,7 +59,7 @@ function c65010516.rmop(e,tp,eg,ep,ev,re,r,rp)
 			e2:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
 			e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 			e2:SetReset(RESET_EVENT+RESETS_REDIRECT)
-			e2:SetValue(LOCATION_EXTRA)
+			e2:SetValue(LOCATION_DECK)
 			tc:RegisterEffect(e2)
 		if e:GetHandler():GetFlagEffect(65010516)>0 then
 			e:GetHandler():SetCardTarget(tc)

expansions/script/c81041000.lua

 --初恋·樱花
 function c81041000.initial_effect(c)
+	aux.AddCodeList(c,81041005)
 	--
 	local e0=Effect.CreateEffect(c)
 	e0:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)

expansions/script/c81041016.lua

 --那一片真实的天空
 function c81041016.initial_effect(c)
+	aux.AddCodeList(c,81041005)
 	--Activate
 	local e0=Effect.CreateEffect(c)
 	e0:SetCategory(CATEGORY_SPECIAL_SUMMON)

expansions/script/c81041023.lua

 --心中所回响的声音
 function c81041023.initial_effect(c)
+	aux.AddCodeList(c,81041005)
 	--Activate
 	local e0=Effect.CreateEffect(c)
 	e0:SetCategory(CATEGORY_SPECIAL_SUMMON)

expansions/script/c81041033.lua

@@ -3,6 +3,7 @@ local m=81041033
 local cm=_G["c"..m]
 xpcall(function() require("expansions/script/c81000000") end,function() require("script/c81000000") end)
 function cm.initial_effect(c)
+	aux.AddCodeList(c,81041005)
 	--Activate
 	local e0=Effect.CreateEffect(c)
 	e0:SetCategory(CATEGORY_SPECIAL_SUMMON)
@@ -78,7 +79,7 @@ function cm.qactivate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ReleaseRitualMaterial(mat)
 		Duel.BreakEffect()
 		Duel.SpecialSummon(tc,SUMMON_TYPE_RITUAL,tp,tp,false,true,POS_FACEUP)
-		Duel.Hint(HINT_MUSIC,0,aux.Stringid(m,math.random(0,1)))
+		Duel.Hint(HINT_MUSIC,0,aux.Stringid(m,math.random(0,2)))
 		tc:CompleteProcedure()
 	end
 end

expansions/script/c81041034.lua

@@ -2,6 +2,7 @@
 local m=81041034
 local cm=_G["c"..m]
 function cm.initial_effect(c)
+	aux.AddCodeList(c,81041005)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)

expansions/script/c81041036.lua

@@ -2,6 +2,7 @@
 local m=81041036
 local cm=_G["c"..m]
 function cm.initial_effect(c)
+	aux.AddCodeList(c,81041005)
 	--Activate
 	local e0=Effect.CreateEffect(c)
 	e0:SetCategory(CATEGORY_SPECIAL_SUMMON)