byd

expansions/script/c40009589.lua

@@ -67,10 +67,15 @@ function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	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)
+	local tc=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK,0,1,1,nil):GetFirst()
+	if tc and Duel.SendtoHand(tc,nil,REASON_EFFECT)>0 and tc:IsLocation(LOCATION_HAND) then
+		Duel.ConfirmCards(1-tp,tc)
+		Duel.ShuffleHand(tp)
+		if c:IsRelateToEffect(e) and Duel.SelectYesNo(tp,aux.Stringid(m,2)) then
+			Duel.SendtoHand(c,nil,REASON_EFFECT)
+			Duel.ConfirmCards(1-tp,c)
+		end
 	end
 end

expansions/script/c81063000.lua

@@ -14,20 +14,20 @@ function cm.initial_effect(c)
 	e1:SetOperation(cm.activate)
 	c:RegisterEffect(e1)
 end
-function cm.spfilter(c)
-	return c:IsRace(RACE_WARRIOR) and c:IsAttribute(ATTRIBUTE_EARTH) and c:IsSummonable(true,nil)
+function cm.sumfilter(c)
+	return c:IsRace(RACE_WARRIOR) and c:IsAttribute(ATTRIBUTE_EARTH) and c:IsLevelAbove(5) and c:IsSummonable(true,nil)
 end
 function cm.thfilter(c)
 	return c:IsSetCard(0x981f) and c:IsType(TYPE_FIELD) and c:IsAbleToHand()
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
-		return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(cm.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp)
+		return Duel.IsExistingMatchingCard(cm.sumfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,nil)
 			or Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil)
 	end
 end
 function cm.setfilter(c)
-	return c:IsType(TYPE_FIELD) and c:IsSSetable()
+	return c:IsType(TYPE_FIELD) and c:IsSSetable(true)
 end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local sel=1
@@ -42,9 +42,8 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_SET)
 		local sg=g:Select(1-tp,1,1,nil)
 		if Duel.SSet(1-tp,sg)~=0 then
-			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SUMMON)
-			local pg=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,1,nil)
-			local tc=pg:GetFirst()
+			local vg=Duel.SelectMatchingCard(tp,cm.sumfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,1,nil)
+			local tc=vg:GetFirst()
 			if tc then
 				Duel.Summon(tp,tc,true,nil)
 			end

expansions/script/c81063001.lua

@@ -9,7 +9,7 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e1:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-	e1:SetTargetRange(LOCATION_FZONE,LOCATION_FZONE)
+	e1:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
 	e1:SetTarget(aux.TargetBoolFunction(Card.IsType,TYPE_FIELD))
 	e1:SetValue(POS_FACEUP_ATTACK)
 	c:RegisterEffect(e1)

expansions/script/c81063002.lua

@@ -9,7 +9,7 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e0:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-	e0:SetTargetRange(LOCATION_FZONE,LOCATION_FZONE)
+	e1:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
 	e0:SetTarget(aux.TargetBoolFunction(Card.IsType,TYPE_FIELD))
 	e0:SetValue(POS_FACEUP_ATTACK)
 	c:RegisterEffect(e0)

expansions/script/c81063003.lua

@@ -9,7 +9,7 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e0:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-	e0:SetTargetRange(LOCATION_FZONE,LOCATION_FZONE)
+	e1:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
 	e0:SetTarget(aux.TargetBoolFunction(Card.IsType,TYPE_FIELD))
 	e0:SetValue(POS_FACEUP_ATTACK)
 	c:RegisterEffect(e0)

expansions/script/c81063004.lua

@@ -9,7 +9,7 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e0:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-	e0:SetTargetRange(LOCATION_FZONE,LOCATION_FZONE)
+	e1:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
 	e0:SetTarget(aux.TargetBoolFunction(Card.IsType,TYPE_FIELD))
 	e0:SetValue(POS_FACEUP_ATTACK)
 	c:RegisterEffect(e0)

expansions/script/c81063005.lua

@@ -9,7 +9,7 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e0:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-	e0:SetTargetRange(LOCATION_FZONE,LOCATION_FZONE)
+	e1:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
 	e0:SetTarget(aux.TargetBoolFunction(Card.IsType,TYPE_FIELD))
 	e0:SetValue(POS_FACEUP_ATTACK)
 	c:RegisterEffect(e0)

expansions/script/c81063006.lua

@@ -9,7 +9,7 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e0:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-	e0:SetTargetRange(LOCATION_FZONE,LOCATION_FZONE)
+	e1:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
 	e0:SetTarget(aux.TargetBoolFunction(Card.IsType,TYPE_FIELD))
 	e0:SetValue(POS_FACEUP_ATTACK)
 	c:RegisterEffect(e0)

expansions/script/c81063016.lua

@@ -9,7 +9,7 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e0:SetCode(EFFECT_ADD_EXTRA_TRIBUTE)
-	e0:SetTargetRange(LOCATION_FZONE,LOCATION_FZONE)
+	e1:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
 	e0:SetTarget(aux.TargetBoolFunction(Card.IsType,TYPE_FIELD))
 	e0:SetValue(POS_FACEUP_ATTACK)
 	c:RegisterEffect(e0)