Merge branch 'master' of github.com:alstroemeria-silentlove/ygopro-222DIY-cards

README.md

-# YGOPro-222DIY-cards
-The custom card data of YGOPro 222DIY Custom Server. see http://koishi.pro/pre.html .
-User QQ Group: 642043095
+# Bloomy!
+まっすぐに感じよう
+いつも わたしらしくいよう
+風が連れてくるよ カルペディエム
+ひらり 舞い上がってゆけbloomy
 # Sound
 https://github.com/purerosefallen/ygopro-222DIY-sound

expansions/script/c14801022.lua

@@ -27,7 +27,6 @@ function c14801022.initial_effect(c)
     e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
     e3:SetCode(EVENT_CHAIN_SOLVED)
     e3:SetRange(LOCATION_MZONE)
-    e3:SetCountLimit(1)
     e3:SetCondition(c14801022.damcon)
     e3:SetOperation(c14801022.damop2)
     c:RegisterEffect(e3)

expansions/script/c33330603.lua

@@ -55,7 +55,7 @@ function c33330603.op(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 		e1:SetTarget(c33330603.distg)
 		e1:SetLabelObject(tc)
-		e1:SetReset(RESET_PHASE+PHASE_END,2)
+		e1:SetReset(RESET_PHASE+PHASE_END)
 		Duel.RegisterEffect(e1,tp)
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
@@ -63,7 +63,7 @@ function c33330603.op(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCondition(c33330603.discon)
 		e2:SetOperation(c33330603.disop)
 		e2:SetLabelObject(tc)
-		e2:SetReset(RESET_PHASE+PHASE_END,2)
+		e2:SetReset(RESET_PHASE+PHASE_END)
 		Duel.RegisterEffect(e2,tp)
 	end
 end

expansions/script/c33330604.lua

@@ -12,6 +12,7 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
+	e1:SetCountLimit(1,m)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.operation)
 	c:RegisterEffect(e1)

expansions/script/c33400306.lua

@@ -36,7 +36,7 @@ function c33400306.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e4:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e4:SetCode(EVENT_TO_GRAVE)
-	e4:SetCondition(c33400306.indcon)
+	e4:SetCondition(c33400306.indcon2)
 	e4:SetTarget(c33400306.adtg)
 	e4:SetOperation(c33400306.adop)
 	c:RegisterEffect(e4)
@@ -45,6 +45,11 @@ function c33400306.mfilter(c)
 	return not c:IsType(TYPE_RITUAL)
 end
 function c33400306.indcon(e)
+	local c=e:GetHandler()
+	local mg=c:GetMaterial()
+	return  c:GetSummonType()==SUMMON_TYPE_SYNCHRO and mg:GetCount()>0 and not mg:IsExists(c33400306.mfilter,1,nil)
+end
+function c33400306.indcon2(e)
 	local c=e:GetHandler()
 	local mg=c:GetMaterial()
 	return c:IsPreviousLocation(LOCATION_ONFIELD) and c:GetSummonType()==SUMMON_TYPE_SYNCHRO and mg:GetCount()>0 and not mg:IsExists(c33400306.mfilter,1,nil)

expansions/script/c33400320.lua

@@ -34,7 +34,7 @@ function c33400320.initial_effect(c)
 	e5:SetCategory(CATEGORY_TOHAND+CATEGORY_REMOVE)
 	e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e5:SetCode(EVENT_BATTLE_DESTROYING)
-	e5:SetCountLimit(1,33400320)
+	e5:SetCountLimit(1,33400320+10000)
 	e5:SetCondition(aux.bdcon)
 	e5:SetOperation(c33400320.desop)
 	c:RegisterEffect(e5)
@@ -140,9 +140,10 @@ function c33400320.thfilter1(c)
 	return  c:IsAbleToHand() and c:IsSetCard(0x5341)
 end
 function c33400320.desop(e,tp,eg,ep,ev,re,r,rp)
-	 if  Duel.GetFieldGroupCount(c:GetControler(),0,LOCATION_ONFIELD)==0 then return end
-	 local g1=GetMatchingGroup(nil,tp,0,LOCATION_ONFIELD,nil)
-	 local g2=GetMatchingGroup(c33400320.thfilter1,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+   
+	 if  Duel.GetFieldGroupCount(tp,0,LOCATION_ONFIELD)==0 then return end
+	 local g1=Duel.GetMatchingGroup(nil,tp,0,LOCATION_ONFIELD,nil)
+	 local g2=Duel.GetMatchingGroup(c33400320.thfilter1,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 		 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 		 local tc=g1:Select(tp,1,1,nil)
 		 Duel.Remove(tc,POS_FACEDOWN,REASON_EFFECT)

expansions/script/c65020058.lua

@@ -6,7 +6,7 @@ function c65020058.initial_effect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND)
-	e1:SetCountLimit(1,65020058)
+	e1:SetCountLimit(1)
 	e1:SetCost(c65020058.cost)
 	e1:SetTarget(c65020058.target)
 	e1:SetOperation(c65020058.activate)

expansions/script/c65020059.lua

@@ -6,7 +6,7 @@ function c65020059.initial_effect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND)
-	e1:SetCountLimit(1,65020059)
+	e1:SetCountLimit(1)
 	e1:SetCost(c65020059.cost)
 	e1:SetTarget(c65020059.target)
 	e1:SetOperation(c65020059.activate)

expansions/script/c65020060.lua

@@ -6,7 +6,7 @@ function c65020060.initial_effect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND)
-	e1:SetCountLimit(1,65020060)
+	e1:SetCountLimit(1)
 	e1:SetCost(c65020060.cost)
 	e1:SetTarget(c65020060.target)
 	e1:SetOperation(c65020060.activate)

expansions/script/c65050199.lua

@@ -28,7 +28,7 @@ function c65050199.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e3:SetCountLimit(1+EFFECT_COUNT_CODE_SINGLE)
+	e3:SetCountLimit(1,EFFECT_COUNT_CODE_SINGLE)
 	e3:SetCondition(c65050199.con1)
 	e3:SetTarget(c65050199.tg)
 	e3:SetOperation(c65050199.op)

expansions/script/c65050208.lua

@@ -36,7 +36,7 @@ function c65050208.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e3:SetCountLimit(1+EFFECT_COUNT_CODE_SINGLE)
+	e3:SetCountLimit(1,EFFECT_COUNT_CODE_SINGLE)
 	e3:SetCondition(c65050208.con1)
 	e3:SetTarget(c65050208.tg)
 	e3:SetOperation(c65050208.op)

expansions/script/c81000000.lua

@@ -23,8 +23,11 @@ end
 --Reika effect condition
 function Tenka.ReikaCon(e,tp,eg,ep,ev,re,r,rp)
 	local tp=e:GetHandlerPlayer()
+	if Duel.IsPlayerAffectedByEffect(tp,81015050) then 
+		return true else
 		for i=0,4 do
 			if Duel.GetFieldCard(tp,LOCATION_SZONE,i) then return false end
 		end
+	end
 	return true
 end