list

expansions/lflist.conf

@@ -2073,6 +2073,20 @@
 64832036 0
 64832037 0
 64832038 0
+#「假面骑士 OOO」系列 - 好人
+32100002 0
+32100003 0
+32100004 0
+32100005 0
+32100006 0
+32100007 0
+32100008 0
+32100010 0
+32100011 0
+32100012 0
+32100013 0
+32100015 0
+32100022 0
 #Tears are now in Japari Park Again!
 572850 1
 4928565 0
@@ -2089,6 +2103,11 @@
 60362066 0
 74920585 0
 77103950 1
+#240505
+15000683 0
+91010023 1
+30000510 2
+40009734 2
 #240421
 21070004 0
 57300106 0
@@ -2197,7 +2216,6 @@
 79029550 0
 82204264 0
 82209146 0
-91010023 0
 9911075 1
 11799915 1
 60002185 1
@@ -4216,7 +4234,6 @@
 130006009 0
 130006011 0
 #14010035 1
-30000510 1
 130006010 1
 #210131
 14010116 0
@@ -6089,7 +6106,6 @@
 871100006 1
 75030002 1
 75030028 1
-40009734 1
 40009748 1
 98920592 1
 98920664 1
@@ -6434,7 +6450,6 @@
 #forbidden
 #230806
 11560321 0
-11560323 0
 72100025 0
 72100125 0
 90700058 0
@@ -8392,7 +8407,6 @@
 30000430 0
 30000470 0
 30000480 0
-30000510 1
 30000600 0
 30000605 0
 30000615 0

expansions/script/c25000030.lua

@@ -20,14 +20,25 @@ end
 function s.spfilter(c,e,tp)
 	return aux.IsCodeListed(c,80280737) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
+function s.thfilter(c)
+	return aux.IsCodeListed(c,80280737) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) 
-		and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
+		and (not Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) 
+		or Duel.SelectYesNo(tp,aux.Stringid(id,0))) then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 		local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
 		if g:GetCount()>0 then
 			Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 		end
+	else
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+		local g=Duel.SelectMatchingCard(tp,s.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
 	if e:IsHasType(EFFECT_TYPE_ACTIVATE) then
 		local e1=Effect.CreateEffect(e:GetHandler())