upd

expansions/lflist.conf

@@ -355,6 +355,15 @@
 30002065 0
 30010000 0
 30012000 0
+#210530
+33401674 0
+60000101 0
+60001007 0
+60001008 0
+88990171 0
+25000157 1
+33400552 1
+79029466 1
 #210523
 60000005 0
 63790300 0

expansions/script/c29065600.lua

@@ -3,8 +3,9 @@ function c29065600.initial_effect(c)
 	--Equip
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e1:SetCategory(CATEGORY_EQUIP)
+	e1:SetCategory(CATEGORY_EQUIP+CATEGORY_SEARCH)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCountLimit(1,29065600)
 	e1:SetTarget(c29065600.eqtg)
 	e1:SetOperation(c29065600.eqop)

expansions/script/c29065602.lua

@@ -3,7 +3,7 @@ function c29065602.initial_effect(c)
 	--special summon while equipped
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(29065602,0))
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_SEARCH)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCountLimit(1,29065602)

expansions/script/c30000480.lua

@@ -16,6 +16,7 @@ function c30000480.initial_effect(c)
 	e2:SetCategory(CATEGORY_REMOVE+CATEGORY_DRAW)
 	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e2:SetCode(EVENT_REMOVE)
+	e2:SetCountLimit(1,30000481)
 	e2:SetTarget(c30000480.rectg)
 	e2:SetOperation(c30000480.recop)
 	c:RegisterEffect(e2)

expansions/script/c30005005.lua

@@ -19,7 +19,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function cm.hand(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,nil)
+	return Duel.IsExistingMatchingCard(cm.cfilter,e:GetHandlerPlayer(),LOCATION_ONFIELD+LOCATION_HAND,0,1,nil)
 end
 function cm.cfilter(c)
 	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsType(TYPE_RITUAL) and c:IsAbleToRemoveAsCost()
@@ -28,7 +28,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true  end
 	if e:GetHandler():IsStatus(STATUS_ACT_FROM_HAND) then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-		local g=Duel.SelectMatchingCard(tp,cm.cfilter,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,2,nil)  
+		local g=Duel.SelectMatchingCard(tp,cm.cfilter,e:GetHandlerPlayer(),LOCATION_ONFIELD+LOCATION_HAND,0,1,2,nil)  
 		Duel.Remove(g,POS_FACEUP,REASON_COST)
 		local g1=Duel.GetOperatedGroup()
 		g1:KeepAlive()
@@ -40,16 +40,16 @@ function cm.setfilter(c)
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	local flag=Duel.SelectField(tp,1,0,LOCATION_ONFIELD,0xe000e0)
+	Duel.Hint(HINT_SELECTMSG,e:GetHandlerPlayer(),HINTMSG_TARGET)
+	local flag=Duel.SelectField(e:GetHandlerPlayer(),1,0,LOCATION_ONFIELD,0xe000e0)
 	local seq=math.log(flag>>16,2)
 	e:SetLabel(seq)   
-	Duel.Hint(HINT_ZONE,tp,flag)
+	Duel.Hint(HINT_ZONE,e:GetHandlerPlayer(),flag)
 	if e:GetLabelObject() and e:GetLabelObject():GetCount()>0 then
-		Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
+		Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,e:GetHandlerPlayer(),1)
 	end
 	if e:GetLabelObject() and e:GetLabelObject():GetCount()>1 then
-		Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_REMOVED)
+		Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,e:GetHandlerPlayer(),LOCATION_REMOVED)
 	end 
 end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c30005010.lua

@@ -10,7 +10,6 @@ c:EnableReviveLimit()
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCountLimit(1,m)
-	e1:SetCondition(cm.condition)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.operation)
 	c:RegisterEffect(e1)
@@ -42,10 +41,6 @@ c:EnableReviveLimit()
 	e4:SetOperation(cm.indop)
 	c:RegisterEffect(e4) 
 end
-function cm.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetCurrentPhase()==PHASE_MAIN1 and not Duel.CheckPhaseActivity()
-end
-
 function cm.mfilterf(c,tp,mg,rc)
 	if c:IsControler(tp) and c:IsLocation(LOCATION_MZONE) and c:GetSequence()<5 then
 		Duel.SetSelectedCard(c)
@@ -96,7 +91,7 @@ function cm.thfilter(c)
 	return c:IsType(TYPE_RITUAL) and c:IsAbleToHand()
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_REMOVED,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,e:GetHandlerPlayer(),LOCATION_REMOVED,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_REMOVED)
 end
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33401011.lua

@@ -61,7 +61,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	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)	   
+		Duel.ConfirmCards(1-tp,g)	  
 	end 
 	local e2=Effect.CreateEffect(e:GetHandler())
 	e2:SetType(EFFECT_TYPE_FIELD)
@@ -105,7 +105,9 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,cm.spfilter2,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,tc:GetCode())
 		local tc2=g:GetFirst()
 		tc2:SetMaterial(nil)
-		if Duel.SpecialSummon(tc2,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP)~=0  then
+		local ss=Duel.SpecialSummon(tc2,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP)
+		tc2:CompleteProcedure()
+		if ss~=0  then
 		Duel.Destroy(tc,REASON_EFFECT)
 		end
 	end

expansions/script/c33401322.lua

@@ -105,7 +105,7 @@ function cm.activate2(e,tp,eg,ep,ev,re,r,rp)
 if Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(cm.spfilter2,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,nil,e,tp) then
  Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g2=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil,e,tp)
+	local g2=Duel.SelectMatchingCard(tp,cm.spfilter2,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil,e,tp)
 	local tc=g2:GetFirst()
    if  Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		local g=Duel.GetMatchingGroup(cm.thfilter1,tp,LOCATION_MZONE,LOCATION_MZONE,nil)

expansions/strings.conf

@@ -273,6 +273,7 @@
 !setname 0x5951 虹彩偶像
 !setname 0x6951 创生
 !setname 0x9951 月神
+!counter 0x1951 星辉指示物
 
 #篁楠 10 0x200-0x20f
 !setname 0xc204 Madoka
@@ -353,7 +354,7 @@
 !setname 0xf23 零点龙
 !setname 0xf24 宙蓝
 !setname 0x1f24 睿智宙蓝
-!setname 0xf27 守护天使
+!setname 0xf27 守护天灵
 !setname 0xc016 恶路程式
 
 #Akashic 25 3204027606
@@ -606,6 +607,9 @@
 #Alley 落 707
 !setname 0x901 沃伊
 
+#VHisc 332
+!setname 0x326 机略纵横
+
 #秀儿 087
 !setname 0xafa 端午节
 
@@ -677,6 +681,9 @@
 #counter
 !counter 0x7d2 空枪指示物
 
+#637
+!setname 0x637  Lumen Sages 流明贤者
+!setname 0x638  The Four Cardinal Virtues 四元德
 
 #???
 !setname 0x926 机巧人偶|非「机巧」	マシンドール
@@ -687,16 +694,13 @@
 !setname 0x941 折纸
 !setname 0xc7ca 旧世迷庙
 !setname 0xc7cb 孽驱
-!setname 0x637  Lumen Sages 流明贤者
-!setname 0x638  The Four Cardinal Virtues 四元德
 !counter 0x1f35 龙鳞指示物
 !setname 0x5f3c Divicale(神之鳞)
 !counter 0xf3 陨星指示物
-!counter 0x1951 星辉指示物
 
 #竹子
+!setname 0x6b02 空中连接
 !setname 0x6a00 No Game No Life
-
 !setname 0x6a10 神灵种
 !setname 0x6a11 幻想种
 !setname 0x6a12 精灵种
@@ -713,8 +717,6 @@
 !setname 0x6a1d 兽人种
 !setname 0x6a1e 海栖种
 !setname 0x6a1f 人类种
-
 !setname 0x6a20 种族之棋
-
 !setname 0x6a31 伪典
 !setname 0x6a32 真典
\ No newline at end of file