110

expansions/script/c12044021.lua

@@ -35,7 +35,8 @@ function cm.initial_effect(c)
 	
 	local e5=Effect.CreateEffect(c)
 	e5:SetDescription(aux.Stringid(m,3))
-	e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e5:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DESTROY)
+	e5:SetType(EFFECT_TYPE_QUICK_O)
 	e5:SetCode(EVENT_CHAINING)
 	e5:SetRange(LOCATION_MZONE)
 	e5:SetCondition(cm.descon)
@@ -100,7 +101,8 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	Duel.Release(g,REASON_COST)
 end
 function cm.descon(e,tp,eg,ep,ev,re,r,rp)
-	return re:GetHandler():IsSetCard(0x1fbd)
+	local loc=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION)
+	return re:GetHandler():IsSetCard(0x1fbd) and loc==LOCATION_HAND
 end
 function cm.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsPlayerCanSpecialSummonMonster(tp,12044025,0,0x4011,1800,1800,4,RACE_PSYCHO,ATTRIBUTE_DARK) end

expansions/script/c12066000.lua

@@ -117,6 +117,15 @@ function Sr_skyland.commoneffect_spop(e,tp,eg,ep,ev,re,r,rp,c)
 				g:GetFirst():RegisterFlagEffect(tp,12066012,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
 			end
 		else
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISCARD)
+			local g=Duel.SelectMatchingCard(tp,Sr_skyland.commoneffect_filter,tp,LOCATION_HAND,0,1,1,c)
+			Duel.SendtoGrave(g,REASON_COST+REASON_DISCARD)
+		end
+	elseif Duel.IsExistingMatchingCard(Sr_skyland.commoneffect_filter,tp,LOCATION_HAND,0,1,nil) then
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISCARD)
+		local g=Duel.SelectMatchingCard(tp,Sr_skyland.commoneffect_filter,tp,LOCATION_HAND,0,1,1,c)
+		Duel.SendtoGrave(g,REASON_COST+REASON_DISCARD)
+	elseif Duel.IsExistingMatchingCard(Sr_skyland.exfilter,tp,LOCATION_MZONE,0,1,nil) then
 		local g=Duel.GetMatchingGroup(Sr_skyland.exfilter,tp,LOCATION_MZONE,0,nil)
 		if #g>1 then
 				Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(12066012,3))
@@ -125,13 +134,8 @@ function Sr_skyland.commoneffect_spop(e,tp,eg,ep,ev,re,r,rp,c)
 				tg:GetFirst():RegisterFlagEffect(12066012,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
 			else
 				g:GetFirst():RemoveOverlayCard(tp,1,1,REASON_COST)
-				g:GetFirst():RegisterFlagEffect(12066012,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
-			end
+				g:GetFirst():RegisterFlagEffect(tp,12066012,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
 			end
-	else
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISCARD)
-		local g=Duel.SelectMatchingCard(tp,Sr_skyland.commoneffect_filter,tp,LOCATION_HAND,0,1,1,c)
-		Duel.SendtoGrave(g,REASON_COST+REASON_DISCARD)
 	end
 end
 --天境 机动腕的卡雷

expansions/script/c16199990.lua

@@ -17,12 +17,9 @@ end
 
 function rk.check(c,str)
 	local substr=c.rksetcode
-	--Debug.Message(substr)
-	--Debug.Message(str)
-	--Debug.Message(string.find(substr,str))
-	--Debug.Message(string.find(substr,str)==nil)
-	if string.find(substr,str)==nil then return false end
-	return true
+	if substr==nil then return false end
+	if string.match(substr,str)==str then return true end
+	return false
 end
 function rk.effectg(c,code)
 	local tc=c
@@ -43,15 +40,17 @@ function rk.efcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function rk.efop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
+	e:SetOwnerPlayer(tp)
 	local rc=c:GetReasonCard()
 	local code=e:GetLabel()
 	local reset_flag=RESET_EVENT+RESETS_STANDARD
-	rc:CopyEffect(code, reset_flag,1)
+	local cid=rc:CopyEffect(code,0,1)
+	--Debug.Message(e:GetOwnerPlayer()==rc:GetControler())
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e1:SetReset(reset_flag)
-	e1:SetCode(EFFECT_CHANGE_CODE)
+	e1:SetCode(EFFECT_ADD_CODE)
 	e1:SetValue(code)
 	rc:RegisterEffect(e1,true)
 	rc:RegisterFlagEffect(0,reset_flag,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(code,5))

expansions/script/c33400409.lua

@@ -36,7 +36,7 @@ function c33400409.imtg(e,c)
 end
 
 function c33400409.filter1(c,e,tp)
-	return c:IsSetCard(0x5341) and c:IsType(TYPE_XYZ) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x5342) and c:IsType(TYPE_XYZ) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 		and Duel.IsExistingMatchingCard(c33400409.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,c:GetRank()+2)
 end
 function c33400409.filter2(c,e,tp,mc,rk)