Merge branch 'master' of https://code.mycard.moe/mycard/pre-release-database-cdb

script/c100200244.lua

---灵摆女巫
-local cm,m,o=GetID()
-function cm.initial_effect(c)
-	--pendulum summon
+--coded by Lyris
+--Pendulum Witch
+local s, id, o = GetID()
+function s.initial_effect(c)
 	aux.EnablePendulumAttribute(c)
-	--Destroy P
+	--to extra
+	aux.RegisterMergedDelayedEvent(c,id,EVENT_DESTROYED)
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_DESTROY+CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e1:SetDescription(aux.Stringid(id,0))
+	e1:SetCategory(CATEGORY_TOEXTRA)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e1:SetCode(EVENT_SUMMON_SUCCESS)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
-	e1:SetCountLimit(1,m)
-	e1:SetTarget(cm.destg)
-	e1:SetOperation(cm.desop)
+	e1:SetCode(EVENT_CUSTOM+id)
+	e1:SetRange(LOCATION_PZONE)
+	e1:SetCountLimit(1,id)
+	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
+	e1:SetCondition(s.txcon)
+	e1:SetTarget(s.txtg)
+	e1:SetOperation(s.txop)
 	c:RegisterEffect(e1)
-	local e4=e1:Clone()
-	e4:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e4:SetCondition(cm.condition)
-	c:RegisterEffect(e4)
-	--pendulum
+	--search
 	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(id,1))
+	e2:SetCategory(CATEGORY_DESTROY+CATEGORY_SEARCH+CATEGORY_TOHAND)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetCode(EVENT_DESTROYED)
-	e2:SetProperty(EFFECT_FLAG_DELAY)
-	e2:SetCondition(cm.pencon)
-	e2:SetTarget(cm.pentg)
-	e2:SetOperation(cm.penop)
+	e2:SetCode(EVENT_SUMMON_SUCCESS)
+	e2:SetCountLimit(1,id+o)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
+	e2:SetTarget(s.thtg)
+	e2:SetOperation(s.thop)
 	c:RegisterEffect(e2)
-	--to EX
-	local e3=Effect.CreateEffect(c)
-	e3:SetCategory(CATEGORY_TOEXTRA)
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e3:SetCode(EVENT_DESTROYED)
-	e3:SetProperty(EFFECT_FLAG_DELAY)
-	e3:SetRange(LOCATION_PZONE)
-	e3:SetCountLimit(1,m+o)
-	e3:SetCondition(cm.tecon)
-	e3:SetTarget(cm.tetg)
-	e3:SetOperation(cm.teop)
+	local e3=e2:Clone()
+	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e3:SetCondition(s.thcon)
 	c:RegisterEffect(e3)
+	--to scale
+	local e4=Effect.CreateEffect(c)
+	e4:SetDescription(aux.Stringid(id,2))
+	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e4:SetCode(EVENT_DESTROYED)
+	e4:SetProperty(EFFECT_FLAG_DELAY)
+	e4:SetCondition(s.pzcon)
+	e4:SetTarget(s.pztg)
+	e4:SetOperation(s.pzop)
+	c:RegisterEffect(e4)
+end
+function s.cfilter(c,tp,chk)
+	return c:IsPreviousPosition(POS_FACEUP) and c:GetPreviousTypeOnField()&(TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ)>0
+		and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousControler(tp) and (c:IsReason(REASON_BATTLE)
+			or c:IsReason(REASON_EFFECT) and c:GetReasonPlayer()==1-tp)
+		and (not chk or Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_DECK,0,1,nil,c))
+end
+function s.chk(c,tc)
+	return c:GetOriginalRace()==tc:GetOriginalRace()
+end
+function s.filter(c,r)
+	if not c:IsType(TYPE_PENDULUM) then return false end
+	local t=type(r)
+	if t=='userdata' then
+		local v=aux.GetValueType(r)
+		if v=='Card' then return s.chk(c,r)
+		elseif v=='Group' then return r:IsExists(s.chk,1,c,c)
+		else return false end
+	elseif t=='number' then return c:GetOriginalRace()==r
+	else return false end
+end
+function s.txcon(e,tp,eg,ep,ev,re,r,rp)
+	return eg:IsExists(s.cfilter,1,nil,tp)
+end
+function s.txtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	local g=eg:Filter(s.cfilter,nil,tp,chk==0)
+	if chk==0 then return #g>0 end
+	Duel.SetTargetCard(g)
+	Duel.SetOperationInfo(0,CATEGORY_TOEXTRA,nil,1,tp,LOCATION_DECK)
 end
-function cm.desfilter(c)
-	return c:IsType(TYPE_PENDULUM) and c:IsFaceup()
+function s.txop(e,tp,eg,ep,ev,re,r,rp)
+	local g=Duel.GetTargetsRelateToChain()
+	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,3))
+	local tg=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_DECK,1,1,nil,g)
+	Duel.SendtoExtraP(tg,nil,REASON_EFFECT)
 end
-function cm.thfilter(c)
+function s.sfilter(c)
 	return c:IsLevelBelow(4) and c:IsType(TYPE_PENDULUM) and c:IsAbleToHand()
 end
-function cm.destg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chkc then return chkc:IsLocation(LOCATION_PZONE) and cm.desfilter(chkc) and chkc~=e:GetHandler() end
-	if chk==0 then return Duel.IsExistingTarget(cm.desfilter,tp,LOCATION_PZONE,LOCATION_PZONE,1,e:GetHandler())
-		and Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil) end
+function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	if chkc then return chkc:IsLocation(LOCATION_PZONE) and chkc:IsControler(tp) end
+	if chk==0 then return Duel.IsExistingTarget(nil,tp,LOCATION_PZONE,0,1,nil)
+		and Duel.IsExistingMatchingCard(s.sfilter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-	local g=Duel.SelectTarget(tp,cm.desfilter,tp,LOCATION_PZONE,LOCATION_PZONE,1,1,e:GetHandler())
-	g:AddCard(e:GetHandler())
+	local g=Duel.SelectTarget(tp,nil,tp,LOCATION_PZONE,0,1,1,nil)+e:GetHandler()
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,2,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
-function cm.desop(e,tp,eg,ep,ev,re,r,rp)
+function s.thop(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) and e:GetHandler():IsRelateToEffect(e) and Duel.Destroy(Group.FromCards(tc,e:GetHandler()),REASON_EFFECT)==2 then
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-		local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK,0,1,1,nil)
-		if g:GetCount()>0 then
-			Duel.SendtoHand(g,nil,REASON_EFFECT)
-			Duel.ConfirmCards(1-tp,g)
-		end
-	end
+	local g=Group.FromCards(c,tc):Filter(Card.IsRelateToChain,nil)
+	if #g<2 or Duel.Destroy(g,REASON_EFFECT)<2 then return end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+	local sg=Duel.SelectMatchingCard(tp,s.sfilter,tp,LOCATION_DECK,0,1,1,nil)
+	Duel.SendtoHand(sg,nil,REASON_EFFECT)
+	Duel.ConfirmCards(1-tp,sg)
 end
-function cm.condition(e,tp,eg,ep,ev,re,r,rp)
+function s.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM)
 end
-function cm.pencon(e,tp,eg,ep,ev,re,r,rp)
+function s.pzcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsFaceup()
+	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsFaceupEx()
 end
-function cm.pentg(e,tp,eg,ep,ev,re,r,rp,chk)
+function s.pztg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1) end
 end
-function cm.penop(e,tp,eg,ep,ev,re,r,rp)
+function s.pzop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
-		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
-	end
-end
-function cm.cfilter(c,tp)
-	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousControler(tp)
-		and c:IsType(TYPE_XYZ+TYPE_SYNCHRO+TYPE_FUSION) and c:IsReason(REASON_DESTROY)
-		and (c:IsReason(REASON_BATTLE) or c:GetReasonPlayer()==1-tp)
-end
-function cm.tefilter(c,race)
-	return c:IsType(TYPE_PENDULUM) and c:GetOriginalRace()&race~=0
-end
-function cm.tecon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(cm.cfilter,1,nil,tp)
-end
-function cm.tetg(e,tp,eg,ep,ev,re,r,rp,chk)
-	local g=eg:Filter(cm.cfilter,nil,tp)
-	local tc=g:GetFirst()
-	local sg=Group.CreateGroup()
-	while tc do
-		local rg=Duel.GetMatchingGroup(cm.tefilter,tp,LOCATION_DECK,0,nil,tc:GetOriginalRace())
-		sg:Merge(rg)
-		tc=g:GetNext()
-	end
-	if chk==0 then return sg:GetCount()>0 end
-end
-function cm.teop(e,tp,eg,ep,ev,re,r,rp)
-	local g=eg:Filter(cm.cfilter,nil,tp)
-	local tc=g:GetFirst()
-	local sg=Group.CreateGroup()
-	while tc do
-		local rg=Duel.GetMatchingGroup(cm.tefilter,tp,LOCATION_DECK,0,nil,tc:GetOriginalRace())
-		sg:Merge(rg)
-		tc=g:GetNext()
-	end
-	if sg:GetCount()>0 then
-		Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(m,0))
-		local exg=sg:Select(tp,1,1,nil)
-		Duel.SendtoExtraP(exg,nil,REASON_EFFECT)
-	end
+	if c:IsRelateToChain() then Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true) end
 end
\ No newline at end of file

script/c100211123.lua

@@ -23,7 +23,7 @@ function s.initial_effect(c)
 	e2:SetTarget(s.etlimit)
 	e2:SetValue(aux.tgoval)
 	c:RegisterEffect(e2)
-  --spsummon
+	--spsummon
 	local e3=Effect.CreateEffect(c)
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
@@ -45,11 +45,10 @@ function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function s.filter(c,e,tp)
 	return c:IsFaceup() and c:IsSetCard(0xb5) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP)
-		and Duel.IsExistingTarget(s.filter2,tp,LOCATION_REMOVED,0,1,c,e,tp)
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
   if chkc then return chkc:IsLocation(LOCATION_REMOVED) and chkc:IsControler(tp) and s.filter(chkc,e,tp) end
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingTarget(s.filter,tp,LOCATION_REMOVED,0,1,nil,e,tp) end
+	if chk==0 then return Duel.GetMZoneCount(tp,e:GetHandler())>0 and Duel.IsExistingTarget(s.filter,tp,LOCATION_REMOVED,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local tc=Duel.SelectTarget(tp,s.filter,tp,LOCATION_REMOVED,0,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,tc,1,0,0)

script/c100212002.lua

@@ -14,6 +14,7 @@ function s.initial_effect(c)
 	e2:SetCode(EFFECT_SPSUMMON_PROC)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetRange(LOCATION_HAND+LOCATION_GRAVE)
+	e2:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
 	e2:SetCondition(s.spcon)
 	e2:SetOperation(s.spop)
 	c:RegisterEffect(e2)
@@ -39,7 +40,7 @@ function s.initial_effect(c)
 end
 s.lvup={57116033,id}
 function s.spfilter(c)
-	return (c:IsCode(57116033) or c:IsSetCard(0x3008)) and c:IsFaceupEx() and c:IsAbleToRemoveAsCost()
+	return (c:IsCode(57116033) or c:IsSetCard(0x3008) and c:IsType(TYPE_FUSION)) and c:IsFaceupEx() and c:IsAbleToRemoveAsCost()
 end
 function s.spcon(e,c)
 	if c==nil then return true end
@@ -72,7 +73,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.descon2(e,tp,eg,ep,ev,re,r,rp)
-	return re:GetHandler():IsOnField() and re:GetHandler():IsRelateToEffect(re) and re:IsActiveType(TYPE_MONSTER)
+	return rp~=tp and re:GetHandler():IsOnField() and re:GetHandler():IsRelateToEffect(re) and re:IsActiveType(TYPE_MONSTER)
 end
 function s.destg2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return re:GetHandler():IsDestructable() end

script/c100214002.lua

@@ -60,9 +60,7 @@ function s.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	local check=Duel.IsExistingMatchingCard(s.checkfilter,tp,LOCATION_ONFIELD,0,1,nil)
 	return Duel.GetLocationCount(tp,LOCATION_MZONE)>-1 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp,check)
   end
-  if check then Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
-	else Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_GRAVE)
-  end
+  Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_GRAVE)
 end
 function s.spop1(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end

script/c100214007.lua

@@ -48,7 +48,7 @@ function s.initial_effect(c)
 end
 function s.cfilter(c,tp)
 	return c:IsReason(REASON_BATTLE+REASON_EFFECT) and c:IsPreviousControler(tp)
-	and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP)
+		and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP)
 end
 function s.reccon(e,tp,eg,ep,ev,re,r,rp)
   local dg=eg:Filter(s.cfilter,nil,tp)
@@ -68,7 +68,7 @@ function s.recop(e,tp,eg,ep,ev,re,r,rp)
 end
 function s.aufilter(c,tp,e)
 	return c:IsFaceup() and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_GRAVE)
-	and c:IsLocation(LOCATION_MZONE) and (not e or c:IsCanBeEffectTarget(e))
+		and c:IsLocation(LOCATION_MZONE) and (not e or c:IsCanBeEffectTarget(e))
 end
 function s.autg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local g=eg:Filter(s.aufilter,nil,tp,e)
@@ -76,7 +76,7 @@ function s.autg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return #g>0 end
 	local tg=g:Clone()
 	if #g>1 then
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 		tg=g:Select(tp,1,1,nil)
 	end
 	Duel.SetTargetCard(tg)
@@ -95,7 +95,7 @@ function s.auop(e,tp,eg,ep,ev,re,r,rp)
 end
 function s.thfilter(c,tp)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsPreviousControler(tp)
-	and c:IsPreviousLocation(LOCATION_HAND) and c:IsReason(REASON_DISCARD)
+		and c:IsPreviousLocation(LOCATION_HAND) and c:IsReason(REASON_DISCARD)
 end
 function s.thcon(e,tp,eg,ep,ev,re,r,rp)
   return eg:FilterCount(s.thfilter,nil,tp)>0

script/c100214018.lua

@@ -18,7 +18,7 @@ function s.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_SUMMON_SUCCESS)
-	e2:SetProperty(EFFECT_FLAG_DELAY)   
+	e2:SetProperty(EFFECT_FLAG_DELAY)	
 	e2:SetCountLimit(1,id+o)
 	e2:SetTarget(s.sptg2)
 	e2:SetOperation(s.spop2)
@@ -84,10 +84,10 @@ function s.splimit(e,c)
 	return not c:IsRace(RACE_MACHINE) and c:IsLocation(LOCATION_EXTRA)
 end
 function s.thfilter(c,e,tp)
-	return c:IsCode(37351133) and (c:IsAbleToHand() or c:IsCanBeSpecialSummoned(e,0,tp,false,false))
+	return c:IsCode(37351133) and (c:IsAbleToHand() or c:IsCanBeSpecialSummoned(e,0,tp,false,false))  and c:IsFaceupEx()
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
+	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE+LOCATION_REMOVED)
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
@@ -101,4 +101,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 		end
 
 	end
-end
+end
\ No newline at end of file

script/c101202081.lua

---越龙武士 谦
+--Ken the Warrior Dragon
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--to hand

script/c101202082.lua

---斐钻之虎 玄
+--Gen the Diamond Tiger
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--to hand

script/c101202083.lua

---勤劳的山螳螂
+--Asset Mountis
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--special summon
@@ -37,7 +37,7 @@ function s.spfilter(c)
 end
 function s.spcon(e,c)
 	if c==nil then return true end
-	return Duel.IsExistingMatchingCard(s.spfilter,tp,0,LOCATION_MZONE,1,nil)
+	return Duel.IsExistingMatchingCard(s.spfilter,c:GetControler(),0,LOCATION_MZONE,1,nil)
 end
 function s.filter(c)
 	return c:IsFaceup() and c:IsCanChangePosition()

script/c101202084.lua

---维修区骑士 菲莉
+--Pitknight Filly
 local s,id,o=GetID()
 function s.initial_effect(c)
 	c:EnableReviveLimit()

script/c101202085.lua

---电气念力斗技传承者
+--Wattsychic Fighting Porter
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--Activate

script/c101202086.lua

---Déchu de Tistina
+--Fallen of the Tistina
 --Coded by Lee
 local s,id,o=GetID()
 function s.initial_effect(c)

script/c101202087.lua

---Revenant de Tistina
+--Returned of the Tistina
 --Coded by Lee
 local s,id,o=GetID()
 function s.initial_effect(c)

script/c101202090.lua

---Jeu De Tistina
+--Play of the Tistina
 --Coded by Lee
 local s,id,o=GetID()
 function s.initial_effect(c)

script/c101202091.lua

---Étreinte de Tistina
+--Embrace of the Tistina
 --Coded by Lee
 local s,id,o=GetID()
 function s.initial_effect(c)

script/c101202092.lua

---Dissonance de Tistina
+--Discordance of the Tistina
 --Coded by Lee
 local s,id,o=GetID()
 function s.initial_effect(c)

script/c101203004.lua

---急袭猛禽-漆黑伯劳
+--RR-ノワール・レイニアス
 --lua by zengsxing
 local s,id,o=GetID()
 function s.initial_effect(c)

script/c101203005.lua

---急袭猛禽-繁盛秃鹫
+--RR-ブルーム・ヴァルチャー
 --lua by zengsxing
 local s,id,o=GetID()
 function s.initial_effect(c)

script/c101203015.lua

@@ -91,13 +91,14 @@ function s.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g2,1,0,0)
 end
 function s.rmop(e,tp,eg,ep,ev,re,r,rp)
-	local ex1,tg1=Duel.GetOperationInfo(0,CATEGORY_REMOVE)
-	local ex2,tg2=Duel.GetOperationInfo(0,CATEGORY_SPECIAL_SUMMON)
-	if tg1:GetFirst():IsRelateToEffect(e) and Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_EFFECT)~=0 then
-	    Duel.Remove(tg1,POS_FACEUP,REASON_EFFECT)
-	end
-	if tg2:GetFirst():IsRelateToEffect(e) and tg2:GetFirst():IsRace(RACE_FISH) then
-		Duel.SpecialSummon(tg2,0,tp,tp,false,false,POS_FACEUP)
+	local res1,tg1=Duel.GetOperationInfo(0,CATEGORY_REMOVE)
+	local res2,tg2=Duel.GetOperationInfo(0,CATEGORY_SPECIAL_SUMMON)
+	local c,rc,sc=e:GetHandler(),tg1:GetFirst(),tg2:GetFirst()
+	if rc:IsRelateToEffect(e) and rc:IsType(TYPE_MONSTER) and c:IsOnField()
+		and Duel.Remove(c,POS_FACEUP,REASON_EFFECT)*Duel.Remove(tg1,POS_FACEUP,REASON_EFFECT)>0 then
+		if sc:IsRelateToEffect(e) and sc:IsRace(RACE_FISH) then
+			Duel.SpecialSummon(sc,0,tp,tp,false,false,POS_FACEUP)
+		end
 	end
 end
 --spsummon

script/c101203044.lua

 --灯魚
---Scripted by Crescent0v0
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--synchro summon
@@ -42,14 +41,6 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,0,0)
 end
 function s.spop(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.IsPlayerAffectedByEffect(tp,59822133) then return end
-	if Duel.GetLocationCount(tp,LOCATION_MZONE)<2 then return end
-	if not Duel.IsPlayerCanSpecialSummonMonster(tp,101203144,0,TYPES_TOKEN_MONSTER,0,0,1,RACE_FISH,ATTRIBUTE_FIRE) then return end
-	for i=1,2 do
-		local token=Duel.CreateToken(tp,101203144)
-		Duel.SpecialSummonStep(token,0,tp,tp,false,false,POS_FACEUP)
-	end
-	Duel.SpecialSummonComplete()
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
@@ -58,6 +49,14 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetTarget(s.splimit)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
+	if Duel.IsPlayerAffectedByEffect(tp,59822133) then return end
+	if Duel.GetLocationCount(tp,LOCATION_MZONE)<2 then return end
+	if not Duel.IsPlayerCanSpecialSummonMonster(tp,101203144,0,TYPES_TOKEN_MONSTER,0,0,1,RACE_FISH,ATTRIBUTE_FIRE) then return end
+	for i=1,2 do
+		local token=Duel.CreateToken(tp,101203144+i)
+		Duel.SpecialSummonStep(token,0,tp,tp,false,false,POS_FACEUP)
+	end
+	Duel.SpecialSummonComplete()
 end
 function s.splimit(e,c)
 	return not c:IsRace(RACE_FISH) and c:IsLocation(LOCATION_EXTRA)
@@ -80,4 +79,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsRelateToEffect(e) then
 		Duel.Destroy(tc,REASON_EFFECT)
 	end
-end
\ No newline at end of file
+end

script/c101203045.lua

---急袭猛禽-崛起叛逆猎鹰
---lua by zengsxing
+--RR-ライジング・リベリオン・ファルコン
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--Xyz Summon
@@ -41,18 +40,26 @@ end
 function s.descon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
+function s.damval1(c)
+	if c:GetLocation()~=LOCATION_MZONE then return end
+	return math.max(0,c:GetTextAttack()) 
+end
+function s.damval2(c)
+	if c:GetPreviousLocation()~=LOCATION_MZONE then return end
+	return math.max(0,c:GetTextAttack())
+end
 function s.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=Duel.GetMatchingGroup(aux.TRUE,tp,0,LOCATION_ONFIELD,nil)
 	if chk==0 then return #g>0 end
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
-	local atk=g:Filter(Card.IsType,nil,TYPE_MONSTER):GetSum(Card.GetBaseAttack)
+	local atk=g:GetSum(s.damval1)
 	if atk>0 then Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,0) end
 end
 function s.desop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(aux.TRUE,tp,0,LOCATION_ONFIELD,nil)
 	if Duel.Destroy(g,REASON_EFFECT)>0 and e:GetHandler():GetOverlayGroup():Filter(Card.IsType,nil,TYPE_XYZ):GetClassCount(Card.GetCode)>=3 then
-		local dg=Duel.GetOperatedGroup():Filter(Card.IsType,nil,TYPE_MONSTER)
-		local atk=dg:GetSum(Card.GetBaseAttack)
+		local dg=Duel.GetOperatedGroup()
+		local atk=dg:GetSum(s.damval2)
 		if atk>0 then
 			Duel.BreakEffect()
 			Duel.Damage(1-tp,atk,REASON_EFFECT)
@@ -63,8 +70,10 @@ function s.filter(c)
 	return c:IsSetCard(0xba) and c:IsType(TYPE_MONSTER) and c:IsType(TYPE_XYZ) and not c:IsForbidden()
 end
 function s.copycost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,3,REASON_COST) end
-	e:GetHandler():RemoveOverlayCard(tp,3,3,REASON_COST)
+	local c=e:GetHandler()
+	if chk==0 then return c:GetFlagEffect(id)==0 and c:CheckRemoveOverlayCard(tp,3,REASON_COST) end
+	c:RemoveOverlayCard(tp,3,3,REASON_COST)
+	c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
 end
 function s.copytg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and s.filter(chkc) end

script/c101203046.lua

---急袭猛禽-勇气林鸮
+--RR-ブレイブ・ストリクス
 --lua by zengsxing
 local s,id,o=GetID()
 function s.initial_effect(c)

script/c101203056.lua

---跃升阶魔法-奇袭猛禽之力
+--RRUM-レイド・ラプターズ・フォース
 --lua by zengsxing
 local s,id,o=GetID()
 function s.initial_effect(c)
@@ -45,6 +45,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	local sg=Duel.SelectMatchingCard(tp,s.filter2,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,tg)
 	local sc=sg:GetFirst()
 	if sc and Duel.SpecialSummon(sc,SUMMON_TYPE_XYZ,tp,tp,false,false,POS_FACEUP)~=0 then
+		sc:CompleteProcedure()
 		for tc in aux.Next(tg) do
 			local mg=tc:GetOverlayGroup()
 			if mg:GetCount()~=0 then

script/c101203057.lua

---急袭猛禽-栖所
+--RR-ルースト
 --lua by zengsxing
 local s,id,o=GetID()
 function s.initial_effect(c)

script/c101203074.lua

---急袭猛禽-壮丽之光
+--RR－グロリアス・ブライト
 --lua by zengsxing
 local s,id,o=GetID()
 function s.initial_effect(c)

script/c101203075.lua

@@ -59,7 +59,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0xac) and c:IsType(TYPE_MONSTER)
+	return c:IsFaceup() and c:IsSetCard(0xac) and c:IsType(TYPE_MONSTER) and c:IsType(TYPE_XYZ)
 end
 function s.discon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil)

script/c101203078.lua

 --嗤う黒山羊
---Scripted by Crescent0v0
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--Activate & sumlimit
@@ -48,7 +47,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function s.sumlimit(e,c,sump,sumtype,sumpos,targetp)
-  return c:IsCode(e:GetLabel()) and not c:IsLocation(LOCATION_GRAVE)
+	return c:IsOriginalCodeRule(e:GetLabel()) and not c:IsLocation(LOCATION_GRAVE)
 end
 function s.alop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -65,5 +64,5 @@ function s.alop(e,tp,eg,ep,ev,re,r,rp)
 end
 function s.actlimit(e,re,tp)
 	local rc=re:GetHandler()
-	return rc:IsCode(e:GetLabel()) and (rc:IsOnField() or re:IsHasType(EFFECT_TYPE_ACTIVATE))
+	return rc:IsOriginalCodeRule(e:GetLabel()) and (rc:IsOnField() or re:IsHasType(EFFECT_TYPE_ACTIVATE))
 end
\ No newline at end of file

script/c101204004.lua

@@ -29,7 +29,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function s.srfilter(c)
-	return c:IsCode(101204051) or (aux.IsCodeListed(c,101204051) and c:IsType(TYPE_SPELL+TYPE_TRAP)) and c:IsAbleToHand()
+	return (c:IsCode(101204051) or aux.IsCodeListed(c,101204051) and c:IsType(TYPE_SPELL+TYPE_TRAP)) and c:IsAbleToHand()
 end
 function s.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.srfilter,tp,LOCATION_DECK,0,1,nil) end

script/c101204054.lua

@@ -14,9 +14,9 @@ function s.initial_effect(c)
 	c:RegisterEffect(e1)
 	--Activate without draw
 	local e2=e1:Clone()
-	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_DRAW)
+  e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_DRAW)
 	e2:SetCondition(s.dcon)
-	e2:SetTarget(s.dtarget)
+  e2:SetTarget(s.dtarget)
 	e2:SetOperation(s.dactivate)
 	c:RegisterEffect(e2)
 end
@@ -31,7 +31,7 @@ function s.ndcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function s.dcon(e,tp,eg,ep,ev,re,r,rp)
 	return (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE)
-		and Duel.IsExistingMatchingCard(s.sfilter,tp,LOCATION_ONFIELD,0,1,nil) and Duel.IsExistingMatchingCard(s.mfilter,tp,LOCATION_MZONE,0,1,nil)
+	and Duel.IsExistingMatchingCard(s.sfilter,tp,LOCATION_ONFIELD,0,1,nil) and Duel.IsExistingMatchingCard(s.mfilter,tp,LOCATION_MZONE,0,1,nil)
 end
 function s.filter(c)
 	return aux.IsCodeListed(c,101204051) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
@@ -65,6 +65,7 @@ function s.dactivate(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
+
 	end
 	local ct1=6-Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)
 	local ct2=6-Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)

script/c58132856.lua

@@ -33,7 +33,7 @@ function c58132856.initial_effect(c)
 	e4:SetOperation(c58132856.desop)
 	c:RegisterEffect(e4)
 end
-s.set_as_spell=true
+c58132856.set_as_spell=true
 function c58132856.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsPreviousLocation(LOCATION_SZONE) and c:IsPreviousPosition(POS_FACEDOWN)