eme

expansions/script/c12061008.lua

@@ -99,7 +99,7 @@ function cm.setcon(e,c,minc)
 end
 function cm.disop(e,tp,eg,ep,ev,re,r,rp)
 	local rc=re:GetHandler()
-	if rc:IsType(TYPE_MONSTER) and not rc:IsAttribute(ATTRIBUTE_EARTH+ATTRIBUTE_WATER+ATTRIBUTE_WIND) and Duel.IsChainNegatable(ev) then
+	if re:IsActiveType(TYPE_MONSTER) and not rc:IsAttribute(ATTRIBUTE_EARTH+ATTRIBUTE_WATER+ATTRIBUTE_WIND) and Duel.IsChainDisablable(ev) then
 		Duel.NegateEffect(ev)
 	end
 end
\ No newline at end of file

expansions/script/c12061010.lua

@@ -37,20 +37,20 @@ function cm.initial_effect(c)
 	e3:SetOperation(cm.thop)
 	c:RegisterEffect(e3)
 end
-function cm.desfilter(c,e,tp)
-	return c:IsControler(tp) and c:IsDestructable(e) and not c:IsStatus(STATUS_DESTROY_CONFIRMED+STATUS_BATTLE_DESTROYED)
+function cm.desfilter(c,tp)
+	return c:IsControler(tp) and c:IsLocation(LOCATION_ONFIELD)
+		and c:IsReason(REASON_BATTLE+REASON_EFFECT) and not c:IsReason(REASON_REPLACE)
 end
 function cm.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	local g=c:GetLinkedGroup()
-	if chk==0 then return g:IsExists(cm.desfilter,1,nil,e,tp) and Duel.CheckLPCost(tp,1000) end
+	if chk==0 then return eg:IsExists(cm.desfilter,1,nil,tp) and Duel.CheckLPCost(tp,1000) end
 	return Duel.SelectYesNo(tp,aux.Stringid(m,0))
 end
 function cm.desrepval(e,c)
-	return cm.desfilter(c,e,e:GetHandlerPlayer())
+	return cm.desfilter(c,e:GetHandlerPlayer())
 end
 function cm.desrepop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.PayLPCost(tp,1000)
+	Duel.Hint(HINT_CARD,0,m)
 end
 function cm.sumfilter(c)
 	return c:IsRace(RACE_PLANT) and c:IsLevelAbove(5) and c:IsSummonable(true,nil)

expansions/script/c12061021.lua

@@ -57,7 +57,7 @@ function cm.tdop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if not tc:IsRelateToEffect(e) and not e:GetHandler():IsRelateToEffect(e) then return end
 	if Duel.SendtoDeck(tc,nil,2,REASON_EFFECT)>0 and (tc:IsSetCard(0xafac) or tc:IsRace(RACE_PLANT)) then
-    	Duel.Recover(tp,500,REASON_EFFECT)
+		Duel.Recover(tp,500,REASON_EFFECT)
 	end
 end
 function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
@@ -68,12 +68,12 @@ function cm.filter(c,e,tp)
 end
 function cm.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)
+		and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_GRAVE+LOCATION_HAND,0,1,nil,e,tp) end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,LOCATION_GRAVE+LOCATION_HAND)
 end
 function cm.drop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
+	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.filter),tp,LOCATION_GRAVE+LOCATION_HAND,0,1,1,nil,e,tp)
 	if g:GetCount()>0 then
 	   Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 	end

expansions/script/c81011125.lua

@@ -29,18 +29,33 @@ function cm.Mayumi(c)
 	local m=_G["c"..c:GetCode()]
 	return m and m.Attack_Defense_Listed
 end
-function cm.filter(c)
+function cm.thfilter(c)
+	return c:IsCode(81011107) 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_DECK,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
+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)
+	if g:GetCount()>0 then
+		Duel.SendtoHand(g,nil,REASON_EFFECT)
+		Duel.ConfirmCards(1-tp,g)
+	end
+end
+function cm.filter(c,e,tp)
 	return c:IsAttack(1550) and c:IsDefense(1050) and c:IsType(TYPE_PENDULUM)
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
-		local mg=Duel.GetRitualMaterial(tp):Filter(Card.IsType,nil,TYPE_MONSTER)
+		local mg=Duel.GetRitualMaterialEx(tp)
 		return Duel.IsExistingMatchingCard(cm.RitualUltimateFilter,tp,LOCATION_HAND,0,1,nil,cm.filter,e,tp,mg,nil,Card.GetAttack,"Greater")
 	end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
 end
 function cm.operation(e,tp,eg,ep,ev,re,r,rp)
-	local mg=Duel.GetRitualMaterial(tp):Filter(Card.IsType,nil,TYPE_MONSTER)
+	local mg=Duel.GetRitualMaterialEx(tp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local tg=Duel.SelectMatchingCard(tp,cm.RitualUltimateFilter,tp,LOCATION_HAND,0,1,1,nil,cm.filter,e,tp,mg,nil,Card.GetAttack,"Greater")
 	local tc=tg:GetFirst()
@@ -77,20 +92,20 @@ function cm.RitualCheckEqual(g,c,atk)
 end
 function cm.RitualCheck(g,tp,c,atk,greater_or_equal)
 	return cm["RitualCheck"..greater_or_equal](g,c,atk) and Duel.GetMZoneCount(tp,g,tp)>0 and (not c.mat_group_check or c.mat_group_check(g,tp))
-		and (not Auxiliary.RCheckAdditional or Auxiliary.RCheckAdditional(tp,g,c))
+		and (not aux.RCheckAdditional or aux.RCheckAdditional(tp,g,c))
 end
 function cm.RitualCheckAdditional(c,atk,greater_or_equal)
 	if greater_or_equal=="Equal" then
 		return  function(g)
-					return (not Auxiliary.RGCheckAdditional or Auxiliary.RGCheckAdditional(g)) and g:GetSum(Card.GetAttack)<=atk
+					return (not aux.RGCheckAdditional or aux.RGCheckAdditional(g)) and g:GetSum(Card.GetAttack)<=atk
 				end
 	else
 		return  function(g,ec)
 					if atk==0 then return #g<=1 end
 					if ec then
-						return (not Auxiliary.RGCheckAdditional or Auxiliary.RGCheckAdditional(g,ec)) and g:GetSum(Card.GetAttack)-Card.GetAttack(ec)<=atk
+						return (not aux.RGCheckAdditional or aux.RGCheckAdditional(g,ec)) and g:GetSum(Card.GetAttack)-Card.GetAttack(ec)<=atk
 					else
-						return not Auxiliary.RGCheckAdditional or Auxiliary.RGCheckAdditional(g)
+						return not aux.RGCheckAdditional or aux.RGCheckAdditional(g)
 					end
 				end
 	end
@@ -107,23 +122,8 @@ function cm.RitualUltimateFilter(c,filter,e,tp,m1,m2,attack_function,greater_or_
 		mg:RemoveCard(c)
 	end
 	local atk=attack_function(c)
-	Auxiliary.GCheckAdditional=cm.RitualCheckAdditional(c,atk,greater_or_equal)
+	aux.GCheckAdditional=cm.RitualCheckAdditional(c,atk,greater_or_equal)
 	local res=mg:CheckSubGroup(cm.RitualCheck,1,#mg,tp,c,atk,greater_or_equal)
-	Auxiliary.GCheckAdditional=nil
+	aux.GCheckAdditional=nil
 	return res
 end
-function cm.thfilter(c)
-	return c:IsCode(81011107) 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_DECK,0,1,nil) end
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
-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)
-	if g:GetCount()>0 then
-		Duel.SendtoHand(g,nil,REASON_EFFECT)
-		Duel.ConfirmCards(1-tp,g)
-	end
-end