tnndx

expansions/script/c12044012.lua

@@ -41,12 +41,14 @@ function cm.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
+	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetValue(1)  
 	c:RegisterEffect(e3)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE)
 	e4:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+	e4:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetValue(1)  
 	c:RegisterEffect(e4)
@@ -76,10 +78,10 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	c:RegisterFlagEffect(m,RESET_CHAIN,0,1)
 end
 function cm.condition1(e,tp,eg,ep,ev,re,r,rp)
-	return not Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0xfb5) 
+	return not Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0x8fb5) 
 end
 function cm.condition2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0xfb5) 
+	return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0x8fb5) 
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_SZONE+LOCATION_GRAVE,LOCATION_SZONE+LOCATION_GRAVE,1,nil) end
@@ -90,12 +92,13 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToEffect(e) then
 	   Duel.SendtoDeck(c,tp,2,REASON_EFFECT)
 	   c:ReverseInDeck()
-	end
+	
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local sg=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,LOCATION_SZONE+LOCATION_GRAVE,LOCATION_SZONE+LOCATION_GRAVE,1,1,nil)
 	if sg:GetCount()>0 then
 		Duel.Remove(sg,POS_FACEUP,REASON_EFFECT)
 	end
+	end
 end
 function cm.spcon(e,c)
 	if c==nil then return true end
@@ -104,7 +107,7 @@ function cm.spcon(e,c)
 	return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsFaceup() and g:IsContains(c)
 end
 function cm.damcon1(e,tp,eg,ep,ev,re,r,rp)
-	return ep==1-tp and eg:GetFirst():IsSetCard(0xfb5)
+	return ep==1-tp and eg:GetFirst():IsSetCard(0x8fb5)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end

expansions/script/c21520184.lua

@@ -31,10 +31,9 @@ function c21520184.initial_effect(c)
 	e3:SetCategory(CATEGORY_TOEXTRA+CATEGORY_SPECIAL_SUMMON)
 --	e3:SetProperty(EFFECT_FLAG_CLIENT_HINT)
 	e3:SetDescription(aux.Stringid(21520184,2))
-	e3:SetType(EFFECT_TYPE_QUICK_O)
-	e3:SetCode(EVENT_FREE_CHAIN)
+	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_SZONE)
-	e3:SetHintTiming(TIMING_BATTLE_START+TIMING_BATTLE_END)
+--	e3:SetHintTiming(TIMING_BATTLE_START+TIMING_BATTLE_END)
 	e3:SetCountLimit(1)
 	e3:SetCondition(c21520184.cscon)
 	e3:SetTarget(c21520184.cstg)