ladies and xiangqinmen

expansions/script/c16100000.lua

@@ -10,6 +10,7 @@ function c16100000.initial_effect(c)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,16100000)
+	e1:SetTarget(c16100000.tgtg)
 	e1:SetOperation(c16100000.tgop)
 	c:RegisterEffect(e1)
 	local e2=e1:Clone()

expansions/script/c16100014.lua

@@ -97,6 +97,7 @@ function c16100014.op1(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SendtoDeck(tg,nil,0,REASON_EFFECT)
 	local g=Duel.GetOperatedGroup()
 	local ct0=g:FilterCount(Card.IsLocation,nil,LOCATION_DECK+LOCATION_EXTRA)
+	Duel.ShuffleDeck(tp)
 	if ct0==3 then
 		local ct=Duel.GetMatchingGroupCount(c16100014.sfilter,tp,LOCATION_MZONE,0,nil)
 		if ct<1 or not Duel.SelectYesNo(tp,aux.Stringid(16100014,3)) then
@@ -120,7 +121,7 @@ function c16100014.op1(e,tp,eg,ep,ev,re,r,rp)
 				if Duel.Draw(tp,1,REASON_EFFECT)==0 then return end
 					local dg=Duel.GetOperatedGroup()
 					local dc=dg:GetFirst()
-				if Duel.GetMZoneCount(tp)>0 and dc:IsCanBeSpecialSummoned(e,0,tp,false,false) and dc:IsSetCard(0xcc0)
+				if Duel.GetMZoneCount(tp)>0 and dc:IsCanBeSpecialSummoned(e,0,tp,false,false) and dc:IsSetCard(0xcc0) and ds:IsType(TYPE_MONSTER)
 					and Duel.SelectYesNo(tp,aux.Stringid(16100014,4)) then
 					local lp=Duel.GetLP(tp)   
 							Duel.SetLP(tp,lp-2000) 
@@ -132,7 +133,6 @@ function c16100014.op1(e,tp,eg,ep,ev,re,r,rp)
 						Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
 						sg=g1:Select(tp,1,1,nil)
 						Duel.SendtoHand(sg,1-tp,REASON_EFFECT)
-						Duel.ConfirmCards(tp,sg)
 					end
 			end
 		else
@@ -140,7 +140,7 @@ function c16100014.op1(e,tp,eg,ep,ev,re,r,rp)
 				if Duel.Draw(tp,1,REASON_EFFECT)==0 then return end
 					local dg=Duel.GetOperatedGroup()
 					local dc=dg:GetFirst()
-				if Duel.GetMZoneCount(tp)>0 and dc:IsCanBeSpecialSummoned(e,0,tp,false,false) and dc:IsSetCard(0xcc0)
+				if Duel.GetMZoneCount(tp)>0 and dc:IsCanBeSpecialSummoned(e,0,tp,false,false) and dc:IsSetCard(0xcc0) and ds:IsType(TYPE_MONSTER)
 					and Duel.SelectYesNo(tp,aux.Stringid(16100014,4)) then
 					local lp=Duel.GetLP(tp)   
 							Duel.SetLP(tp,lp-2000) 
@@ -151,7 +151,6 @@ function c16100014.op1(e,tp,eg,ep,ev,re,r,rp)
 						Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
 						sg=g1:Select(tp,1,1,nil)
 						Duel.SendtoHand(sg,1-tp,REASON_EFFECT)
-						Duel.ConfirmCards(tp,sg)
 					end
 		end
 	end

expansions/script/c16100015.lua

@@ -12,13 +12,14 @@ function c16100015.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_CHAINING)
 	e1:SetRange(LOCATION_SZONE)
+	e1:SetCountLimit(1,16100015+100)
 	e1:SetCost(c16100015.coincost)
 	e1:SetCondition(c16100015.coincon)
 	e1:SetOperation(c16100015.coinop)
 	c:RegisterEffect(e1)
 	--dice result
 	local e2=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(16100015,5))
+	e2:SetDescription(aux.Stringid(16100015,5))
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_TOSS_DICE_NEGATE)
 	e2:SetRange(LOCATION_SZONE)