Merge pull request #11 from Sonic714/master

22.6.11 yume fix

expansions/script/c71400016.lua

@@ -66,7 +66,7 @@ function c71400016.regop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetDescription(aux.Stringid(71400016,2))
 	e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
 	e1:SetValue(aux.imval1)
-	e1:SetReset(RESET_EVENT+0xff0000)
+	e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(lc)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
@@ -80,7 +80,7 @@ function c71400016.regop(e,tp,eg,ep,ev,re,r,rp)
 	e3:SetCode(EVENT_DESTROY)
 	e3:SetLabelObject(e2)
 	e3:SetOperation(c71400016.checkop)
-	e3:SetReset(RESET_EVENT+0xff0000)
+	e3:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD)
 	c:RegisterEffect(e3)
 	e:Reset()
 end
@@ -89,7 +89,7 @@ function c71400016.checkop(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetLabel(1)
 end
 function c71400016.reccon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetLabel()==1 and e:GetHandler():IsPreviousLocation(LOCATION_MZONE)
+	return e:GetLabel()==1
 end
 function c71400016.recop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Recover(tp,e:GetLabelObject():GetBaseAttack(),REASON_EFFECT)

expansions/script/c71400020.lua

@@ -14,11 +14,11 @@ function c71400020.initial_effect(c)
 	e1:SetCountLimit(1,71400020+EFFECT_COUNT_CODE_DUEL+EFFECT_COUNT_CODE_OATH)
 	c:RegisterEffect(e1)
 end
-function c71400020.filter1(c,e,tp)
+function c71400020.filter1sp(c,e,tp)
 	return c:IsSetCard(0x714) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c71400020.con1(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(c71400020.filter1,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(Card.IsSetCard,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil,0x714)
 	local ct=g:GetClassCount(Card.GetCode)
 	return ct>12
 end
@@ -38,9 +38,9 @@ function c71400020.op1(e,tp,eg,ep,ev,re,r,rp)
 		local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
 		if ft<=0 then return end
 		if Duel.IsPlayerAffectedByEffect(tp,59822133) then ft=1 end
-		if Duel.IsExistingMatchingCard(aux.NecroValleyFilter(c71400020.filter3),tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_HAND,0,1,nil,e,tp) and Duel.SelectYesNo(tp,aux.Stringid(71400020,1)) then
+		if Duel.IsExistingMatchingCard(aux.NecroValleyFilter(c71400020.filter1sp),tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_HAND,0,1,nil,e,tp) and Duel.SelectYesNo(tp,aux.Stringid(71400020,1)) then
 			Duel.BreakEffect()
-			local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c71400020.filter3),tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_HAND,0,ft,ft,nil,e,tp)
+			local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c71400020.filter1sp),tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_HAND,0,ft,ft,nil,e,tp)
 			Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 		end
 	end
@@ -56,7 +56,7 @@ end
 function c71400020.rmcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_ONFIELD+LOCATION_GRAVE+LOCATION_HAND,0,1,nil,tp,POS_FACEDOWN)
 end
-function c71400020.flipop(e,tp,eg,ep,ev,re,r,rp)
+function c71400020.rmop(e,tp,eg,ep,ev,re,r,rp)
 	local rg=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,LOCATION_ONFIELD+LOCATION_GRAVE+LOCATION_HAND,0,nil,tp,POS_FACEDOWN)
 	if Duel.Remove(rg,POS_FACEDOWN,REASON_EFFECT)>0 then
 		local ct=Duel.GetMatchingGroupCount(Card.IsFacedown,tp,LOCATION_REMOVED,0,nil)

expansions/script/c71400031.lua

@@ -3,7 +3,7 @@ xpcall(function() require("expansions/script/c71400001") end,function() require(
 function c71400031.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND)
+	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_TODECK)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_INACTIVATE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
@@ -20,7 +20,7 @@ function c71400031.initial_effect(c)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_INACTIVATE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
 	e2:SetDescription(aux.Stringid(71400031,1))
-	e1:SetCountLimit(1,71500031)
+	e2:SetCountLimit(1,71500031)
 	e2:SetCondition(yume.nonYumeCon)
 	e2:SetCost(c71400031.cost2)
 	e2:SetTarget(c71400031.tg2)
@@ -40,11 +40,13 @@ function c71400031.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c71400031.filter1,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.GetMatchingGroup(c71400031.filter1,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local tg=Duel.GetMatchingGroup(c71400031.filter1b,tp,LOCATION_ONFIELD,0,e:GetHandler(),tp)
+	Duel.SetOperationInfo(0,CATEGORY_TODECK,tg,tg:GetCount(),0,0)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
 	Duel.SetChainLimit(aux.FALSE)
 end
 function c71400031.op1(e,tp,eg,ep,ev,re,r,rp)
-	local tg=Duel.GetMatchingGroup(c71400031.filter1,tp,LOCATION_ONFIELD,0,e:GetHandler,tp)
+	local tg=Duel.GetMatchingGroup(c71400031.filter1b,tp,LOCATION_ONFIELD,0,e:GetHandler(),tp)
 	if tg:GetCount()>0 then
 		Duel.SendtoDeck(tg,nil,SEQ_DECKSHUFFLE,REASON_RULE)
 	end

expansions/script/c71400061.lua

@@ -76,7 +76,7 @@ function c71400061.filter3b(c,e,tp,lnk)
 end
 function c71400061.tg3(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
-	local lnk=c:GetReasonCard():GetLink()
+	local lnk=e:GetHandler():GetReasonCard():GetLink()
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c71400061.filter3a(chkc,ft) end
 	if chk==0 then return Duel.IsExistingTarget(c71400061.filter3a,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,ft) and Duel.IsExistingMatchingCard(c71400061.filter3b,tp,LOCATION_GRAVE,0,1,nil,e,tp,lnk) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
@@ -86,7 +86,7 @@ function c71400061.tg3(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c71400061.op3(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	local lnk=c:GetReasonCard():GetLink()
+	local lnk=e:GetHandler():GetReasonCard():GetLink()
 	if tc:IsRelateToEffect(e) then
 		if Duel.SendtoGrave(tc,REASON_EFFECT)~=0 and tc:IsLocation(LOCATION_GRAVE)
 			and Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/strings.conf

@@ -51,17 +51,13 @@
 #少年 714 0x710-0x71f Sonic_714
 !setname 0x714 异梦
 !setname 0x3714 异梦境
-!setname 0xc714 异梦物
+!setname 0xc714 异梦像
 !setname 0xa714 幻异梦
-!setname 0x5714 蚀异梦
+!setname 0x5714 构异梦
 !setname 0xb714 幻异梦境
-!setname 0xe714 幻异梦物
-!setname 0x7714 蚀异梦境
-!setname 0xd714 蚀异梦物
-!setname 0x715 异梦书
-!setname 0x3715 异梦书中
-!setname 0x716 异梦怪物
-!setname 0x717 黑白异梦
+!setname 0xe714 幻异梦像
+!setname 0x7714 构异梦境
+!setname 0xd714 构异梦像
 
 #Viola 011 0xe10-0xe1f