list

expansions/lflist.conf

@@ -1184,6 +1184,15 @@
 4877545 0
 4877549 0
 4877553 0
+#「异神」系列
+30005003 0
+30005005 0
+30005007 0
+30005010 0
+30005030 0
+30005040 0
+30005045 0
+30005000 0
 #Tears are now in Japari Park!
 572850 1
 4928565 0
@@ -1200,6 +1209,23 @@
 60362066 0
 74920585 0
 77103950 1
+#230212
+10173077 0
+14000221 0
+22520004 0
+30008803 0
+30008806 0
+31400104 0
+33701454 0
+40009629 0
+40010810 0
+40010822 0
+60000134 0
+77770004 0
+6100016 1
+33700762 2
+130006025 1
+10113025 2
 #230205
 4877055 0
 12524004 0
@@ -1334,7 +1360,6 @@
 53729018 1
 67200265 1
 67200307 1
-77770004 1
 90307493 1
 31409000 0
 31409100 0
@@ -1419,7 +1444,6 @@
 72101233 0
 114514 0
 22348006 0
-33701454 1
 60009999 0
 87490010 0
 14000219 1
@@ -2832,7 +2856,6 @@
 63790500 0
 63790501 0
 15000182 2
-30005000 2
 #210509
 79029456 0
 40009589 1

expansions/script/c11451001.lua

@@ -344,9 +344,12 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 		end
 	end
 	GetID=_TGetID
-	--if #g1>0 then Duel.ConfirmCards(1-tp,g1) end
-	--if #g2>0 then Duel.ConfirmCards(tp,g2) end
+	g1=g1:Filter(Card.IsLocation,nil,LOCATION_DECK+LOCATION_EXTRA)
+	g2=g2:Filter(Card.IsLocation,nil,LOCATION_DECK+LOCATION_EXTRA)
+	ng1=ng1:Filter(Card.IsLocation,nil,LOCATION_HAND)
+	ng2=ng2:Filter(Card.IsLocation,nil,LOCATION_HAND)
+	if #g1>0 then Duel.ConfirmCards(1-tp,g1) end
+	if #g2>0 then Duel.ConfirmCards(tp,g2) end
 	if #ng1>0 then Duel.ConfirmCards(1-tp,ng1) end
 	if #ng2>0 then Duel.ConfirmCards(tp,ng2) end
-	--e:Reset()
 end
\ No newline at end of file

expansions/script/c33700990.lua

@@ -91,7 +91,13 @@ function rsss.sscon(con)
 end
 function rsss.ssop(e,tp,eg,ep,ev,re,r,rp,c)
 	if c:IsLocation(LOCATION_GRAVE) then
-		local e1=rsef.SV_REDIRECT(c,"leave",LOCATION_REMOVED,nil,rsreset.est-RESET_TOFIELD)
+		local e1=Effect.CreateEffect(c)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
+		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+		e1:SetReset(RESET_EVENT+RESETS_REDIRECT)
+		e1:SetValue(LOCATION_REMOVED)
+		c:RegisterEffect(e1,true)
 	end
 end
 function rsss.MatFunction(c,fun)

expansions/script/c40006881.lua

@@ -64,7 +64,7 @@ function cm.ssop(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return re and cm.AShapeShifter(re)
+	return re and cm.AShapeShifter(re:GetHandler())
 end
 function cm.eqfilter(c)
 	return c:IsRace(RACE_PSYCHO) and c:IsAttribute(ATTRIBUTE_DARK) and not c:IsForbidden()
@@ -103,15 +103,15 @@ function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
 end
 function cm.thfilter(c)
-	return cm.AShapeShifter(c) and c:IsAbleToHand()
+	return cm.AShapeShifter(c) and c:IsAbleToHand() and not c:IsCode(m)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil) end
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_GRAVE,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE)
 end
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_GRAVE,0,1,1,nil)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)

expansions/script/c79029823.lua

@@ -31,6 +31,7 @@ function cm.initial_effect(c)
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_FREE_CHAIN)
+	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP) 
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1,79029823)
 	e3:SetCost(c79029823.seqcost)
@@ -60,8 +61,7 @@ end
 function cm.copyfilter(c)
 	return c:IsFaceup() and c:IsSetCard(0xa991) and c:IsType(TYPE_MONSTER)
 end
-function cm.copytg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and cm.copyfilter(chkc) end
+function cm.copytg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) 
 	if chk==0 then return Duel.IsExistingTarget(cm.copyfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,e:GetHandler()) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	Duel.SelectTarget(tp,cm.copyfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,1,1,e:GetHandler())

expansions/script/c87470001.lua

@@ -52,10 +52,11 @@ function c87470001.xtdop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(c) 
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) 
 	e1:SetCode(EVENT_CHAIN_END) 
-	e1:SetLabelObject(cg) 
+	e1:SetLabel(c:GetFieldID(),tc:GetFieldID())
+	e1:SetLabelObject(tc) 
 	e1:SetCondition(c87470001.tdcon) 
 	e1:SetOperation(c87470001.tdop) 
-	Duel.RegisterEffect(e1,tp) 
+	Duel.RegisterEffect(e1,tp)
 	--disable search
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
@@ -92,13 +93,17 @@ function c87470001.tdcon(e,tp,eg,ep,ev,re,r,rp)
 end 
 function c87470001.tdop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler() 
-	local cg=e:GetLabelObject()  
+	local tc=e:GetLabelObject()
+	local lab1,lab2=e:GetLabel()
+	local cg=Group.CreateGroup()
+	if lab1==c:GetFieldID() then cg:AddCard(c) end
+	if lab2==tc:GetFieldID() then cg:AddCard(tc) end
 	Duel.Hint(HINT_CARD,0,87470001) 
 	Duel.SendtoDeck(cg,nil,2,REASON_EFFECT) 
 	e:Reset() 
 end 
 function c87470001.dsrtg(e,c) 
-	return c:IsCode(e:GetLabel())   
+	return c:IsCode(e:GetLabel()) and c:IsLocation(LOCATION_DECK)
 end 
 function c87470001.xckfil(c,code)
 	return c:IsCode(code) 

expansions/script/c9910217.lua

@@ -26,7 +26,7 @@ function c9910217.initial_effect(c)
 end
 function c9910217.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local race=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_RACE)
-	return Duel.GetTurnPlayer()~=tp and race&RACE_PSYCHO>0
+	return Duel.GetTurnPlayer()~=tp and re:IsActiveType(TYPE_MONSTER) and race&RACE_PSYCHO>0
 end
 function c9910217.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c9910232.lua

@@ -59,7 +59,7 @@ function c9910232.imop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c9910232.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	local race=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_RACE)
-	return race&RACE_PSYCHO>0 and re:GetHandler()~=e:GetHandler()
+	return re:IsActiveType(TYPE_MONSTER) and race&RACE_PSYCHO>0 and re:GetHandler()~=e:GetHandler()
 end
 function c9910232.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end

expansions/script/c9910238.lua

@@ -52,7 +52,7 @@ function c9910238.tdop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c9910238.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local race=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_RACE)
-	return race&RACE_PSYCHO>0 and re:GetHandler()~=e:GetHandler()
+	return re:IsActiveType(TYPE_MONSTER) and race&RACE_PSYCHO>0 and re:GetHandler()~=e:GetHandler()
 end
 function c9910238.filter(c,e,tp,ft)
 	return c:IsSetCard(0x955) and c:IsType(TYPE_MONSTER)

expansions/strings.conf

@@ -183,7 +183,7 @@
 !setname 0x957 星幽
 !setname 0x3951 甜心机仆
 !setname 0x5951 虹彩偶像
-!setname 0x6951 创生
+!setname 0x6951 曙龙
 !setname 0x9951 月神
 !setname 0xa951 千恋
 !setname 0xc951 混合咖啡
@@ -236,6 +236,7 @@
 !setname 0x563 秘湮伪界
 !setname 0x564 天基兵器
 !setname 0x565 砾岩
+!setname 0x566 虚景
 
 #沃亚森斯奥克斯 2201771890 300 0x920
 !setname 0x920 邪魂
@@ -272,7 +273,6 @@
 !setname 0x4f1d 时隙淑女
 !setname 0x5f1d 机械加工
 !setname 0x6f1d 连波
-!setname 0x7f1d 灾漩
 !setname 0xaf1d 阿尔弗雷德
 !setname 0xbf1d 狂风
 !setname 0xcf1d 暗魔
@@ -893,6 +893,7 @@
 !setname 0x5532 歼世
 !setname 0x6532 异金
 !setname 0x9532 异律
+!setname 0xa532 异铜
 !setname 0x3533 圆盘生物
 !setname 0x5533 心化
 !setname 0x9533 狂喑
@@ -920,11 +921,10 @@
 !counter 0x153a Q指示物
 
 #Ombre
-!setname 0x616 破碎世界
-!setname 0x626 轮回世界
 !setname 0x631 剑装机岚
 !setname 0x632 剑装
 !setname 0x633 剑装拓展模组
+!setname 0x61a 幻峦
 
 #白闻
 !setname 0x48d 微元
@@ -947,6 +947,7 @@
 !setname 0x3703 墓园死者
 !setname 0x5703 墓园守护者
 !setname 0x704 帕露西
+!setname 0x705 奥契丝
 
 #Solid Steve 988 0x980-0x98f
 !setname 0x988 寻芳精
@@ -971,15 +972,4 @@
 !setname 0xac97 虚空制裁大符（Voidictator Rune）
 !setname 0xcc97 虚空制裁大能（Voidictator Energy）
 
-#???
-!setname 0x566 虚景
+#???
\ No newline at end of file
-!setname 0xf40 ÖÕµ® Fina-Emerge
-!setname 0x3f40 ÖÕµ®»½ºËÊ¿ Fina-Emerge Caller
-!setname 0x5f40 ÖÕµ®ºËÉñ Fina-Emerge Ascendant
-!setname 0xca6 灰烬机兵
-!setname 0x622 Î÷ÑóÆåָʾÎï
-!setname 0x979 风雨
-!setname 0x1979 风雨征程
-!setname 0xa532 异铜
-!setname 0x705 奥契丝
-!setname 0x61a 幻峦
\ No newline at end of file