fix

expansions/script/c10100000.lua

@@ -299,7 +299,7 @@ function s.create_timing_list()
 	["DuringBP"] = { EVENT_FREE_CHAIN, scl.cond_during_phase("BP") },
 	["DuringM2"] = { EVENT_FREE_CHAIN, scl.cond_during_phase("M2") },
 	["DuringEP"] = { EVENT_PHASE + PHASE_END },
-	["Move"] = { EVENT_MOVE },
+	["BeMoved"] = { EVENT_MOVE },
 	["BeSummoned"] = { EVENT_SUMMON_SUCCESS, aux.TRUE, aux.TRUE, EVENT_SPSUMMON_SUCCESS, aux.TRUE, aux.TRUE, EVENT_FLIP_SUMMON_SUCCESS, aux.TRUE, aux.TRUE },
 	["BeNormalSummoned"] = { EVENT_SUMMON_SUCCESS },
 	["BeSpecialSummoned"] = { EVENT_SPSUMMON_SUCCESS },
@@ -319,7 +319,7 @@ function s.create_timing_list()
 	["NegateNomralSummon"] = { EVENT_SUMMON_NEGATED },
 	["NegateSpecialSummon"] = { EVENT_SPSUMMON_NEGATED },
 	["NegateFlipSummon"] = { EVENT_FLIP_SUMMON_NEGATED },
-	["BeFlip"] = { EVENT_FLIP },
+	["BeFlippedFaceup"] = { EVENT_FLIP },
 	["DeclareAttack"] = { EVENT_ATTACK_ANNOUNCE },
 	["BeAttackTarget"] = { EVENT_BE_BATTLE_TARGET },
 	["AttackBeNegated"] = { EVENT_ATTACK_DISABLED },
@@ -350,7 +350,7 @@ function s.create_timing_list()
 	["BeReturned2Deck"] = { EVENT_TO_DECK },
 	["BeforeLeavingField"] = { EVENT_LEAVE_FIELD_P },
 	["LeaveField"] = { EVENT_LEAVE_FIELD },
-	["FaceupLeaveField"] = { EVENT_LEAVE_FIELD, { Card.IsPreviousPosition, POS_FACEUP } },
+	["FaceupCardLeavesField"] = { EVENT_LEAVE_FIELD, { Card.IsPreviousPosition, POS_FACEUP } },
 	["SetSpell/Trap"] = { EVENT_SSET },
 	["BeSet"] = { EVENT_SET_SCL },
 	["PositionBeChanged"] = { EVENT_CHANGE_POS },
@@ -660,9 +660,9 @@ function s.create_buff_list()
 	["OpponentTakeBattleDamageInstead"] = { EFFECT_REFLECT_BATTLE_DAMAGE },
 	["ChangeBattleDamage"] = { EFFECT_CHANGE_INVOLVING_BATTLE_DAMAGE },
 	["HalveBattleDamageYouTake"] = { EFFECT_CHANGE_INVOLVING_BATTLE_DAMAGE, false, aux.ChangeBattleDamage(0,HALF_DAMAGE) },
-	["YouTakeNoBattleDamage"] = { EFFECT_AVOID_BATTLE_DAMAGE },	
-	["YourOpponentTakesNoBattleDamage"] = { EFFECT_NO_BATTLE_DAMAGE },	
-	["NeitherPlayerTakesNoBattleDamage"] = { { "YouTakeNoBattleDamage", "YourOpponentTakesNoBattleDamage" } },	
+	["YouTakeNoBattleDamage"] = { EFFECT_AVOID_BATTLE_DAMAGE }, 
+	["YourOpponentTakesNoBattleDamage"] = { EFFECT_NO_BATTLE_DAMAGE },  
+	["NeitherPlayerTakesNoBattleDamage"] = { { "YouTakeNoBattleDamage", "YourOpponentTakesNoBattleDamage" } },  
 	["ActivateQuickPlaySpellFromHand"] = { EFFECT_QP_ACT_IN_NTPHAND },
 	["ActivateQuickPlaySpellInSetTurn"] = { EFFECT_QP_ACT_IN_SET_TURN, false,1, nil, EFFECT_FLAG_SET_AVAILABLE, EFFECT_FLAG_SET_AVAILABLE },
 	["ActivateTrapFromHand"] = { EFFECT_TRAP_ACT_IN_HAND },
@@ -3215,7 +3215,7 @@ end
 			2.extra_check_function: add an additional check to the effect cost/target, call extra_check_function(e, tp, eg, ...) to check.
 		//return list_typ, extra_check_function
 	 4.
-	 { 1.list_typ == "ExtraOperation", 2.extra_operate_function }	  
+	 { 1.list_typ == "ExtraOperation", 2.extra_operate_function }	 
 		Paramas explain: 
 			2.extra_operate_function: add an additional operate to the effect cost/target, call extra_operate_function(current list's selected card(s), all above lists's selected card(s),e, tp, eg, ...) to operate.
 		//return list_typ, extra_operate_function
@@ -3261,7 +3261,7 @@ function s.get_cost_or_target_or_operation_paramas(arr, e, tp, eg, ep, ev, re, r
 		local self_minct = type(arr[3]) == "function" and arr[3](e, tp, eg, ep, ev, re, r, rp) or arr[3]
 		local oppo_minct = type(arr[4]) == "function" and arr[4](e, tp, eg, ep, ev, re, r, rp) or arr[4] or 0
 		local self_maxct = type(arr[5]) == "function" and arr[5](e, tp, eg, ep, ev, re, r, rp) or arr[5] or self_minct
-		local oppo_maxct = type(arr[6]) == "function" and arr[6](e, tp, eg, ep, ev, re, r, rp) or arr[6] or oppo_minct	
+		local oppo_maxct = type(arr[6]) == "function" and arr[6](e, tp, eg, ep, ev, re, r, rp) or arr[6] or oppo_minct  
 		return list_typ, category_str, category, category_arr, category_str_arr, replace_operation, self_minct, self_maxct, oppo_minct, oppo_maxct
 	else
 		local extra_fun = arr[2]
@@ -3407,7 +3407,7 @@ function s.cost_or_target_or_operation_feasibility_check(e, tp, eg, ep, ev, re,
 			if Scl.CheckBoolean(minct, true) then 
 				chk_minct, chk_maxct = #mandatory_group, #mandatory_group
 			end
-			return mandatory_group:CheckSubGroup(s.cost_or_target_or_operation_group_check, chk_minct, chk_maxct, e, tp, eg, ep, ev, re, r, rp, reuse_idx, used_arr2, group_filter, arr2, ...)
+			return mandatory_group:CheckSubGroup(s.cost_or_target_or_operation_group_check, chk_minct, chk_maxct, {e, tp, eg, ep, ev, re, r, rp, reuse_idx, used_arr2, group_filter}, arr2, ...)
 		end
 	end
 end
@@ -3502,7 +3502,7 @@ function s.do_cost_or_target_or_operation(e, tp, eg, ep, ev, re, r, rp, current_
 		else 
 			if need_sel then
 				Scl.SelectHint(tp, category_str)
-				mandatory_group = mandatory_group:SelectSubGroup(tp, s.cost_or_target_or_operation_group_check, false, minct, maxct, e, tp, eg, ep, ev, re, r, rp, reuse_idx, used_arr2, group_filter, arr2, ...)
+				mandatory_group = mandatory_group:SelectSubGroup(tp, s.cost_or_target_or_operation_group_check, false, minct, maxct, {e, tp, eg, ep, ev, re, r, rp, reuse_idx, used_arr2, group_filter}, arr2, ...)
 			end
 		end
 		--case6 no more cards
@@ -3544,7 +3544,9 @@ function s.do_cost_or_target_or_operation(e, tp, eg, ep, ev, re, r, rp, current_
 		return s.do_cost_or_target_or_operation(e, tp, eg, ep, ev, re, r, rp, mandatory_group, total_sel_group2, used_arr2, arr2, ...)
 	end
 end
-function s.cost_or_target_or_operation_group_check(g, e, tp, eg, ep, ev, re, r, rp, reuse_idx, used_arr, group_filter, arr1, ...)
+function s.cost_or_target_or_operation_group_check(g, parama, arr1, ...)
+	--for some shenbi reasons, koshipro will lost paramas during the spell/trap card call this function, so I must use a table to protect the paramas, but original edition ygopro don't have this problem.
+	local e, tp, eg, ep, ev, re, r, rp, reuse_idx, used_arr, group_filter = table.unpack(parama)
 	local used_arr2, used_group_this_reuse_idx = s.cost_or_target_or_operation_reuse_cards_check(used_arr, reuse_idx, g)
 	if not s.operate_filter(group_filter)(g, e, tp, eg, ep, ev, re, r, rp) then 
 		return false 
@@ -4698,7 +4700,7 @@ function Scl.ActivateSepllOrTrap(tc, actp, apply_effect, lim_zone)
 			local tg = te:GetTarget() or aux.TRUE
 			local op = te:GetOperation() or aux.TRUE
 			tg(te, actp, ceg, cep, cev, cre, cr, crp, 1)
-			op(te, actp, ceg, cep, cev, cre, cr, crp)			
+			op(te, actp, ceg, cep, cev, cre, cr, crp)		   
 		end
 		if zone == LOCATION_FZONE then
 			Duel.RaiseEvent(tc, 4179255, te, 0, tp, tp, Duel.GetCurrentChain())
@@ -5072,7 +5074,7 @@ function Scl.GetSurroundingZone(obj, lim_zone_obj, tp, contain_self)
 				srd_zone = srd_zone | zone
 			end
 		end
-	end	
+	end 
 	--ex monster zone 
 	local ex_arr = { 0x20, 0x40, 0x200000, 0x400000 }
 	local ex_arr2 = { 0x400000, 0x200000, 0x40, 0x20 }
@@ -5282,14 +5284,14 @@ end
 --[[
 	>>eg1. Scl.DefineInsideSeries(Love, "YiFanJiang")
 	will create those functions:
-	1. Love.IsSeries(c)	  -- equal to Scl.IsSeries(c, "YiFanJiang") 
+	1. Love.IsSeries(c)   -- equal to Scl.IsSeries(c, "YiFanJiang") 
 	2. Love.IsFusionSeries(c)   -- equal to Scl.IsFusionSeries(c, "YiFanJiang") 
 	3. Love.IsLinkSeries(c)  -- equal to Scl.IsLinkSeries(c, "YiFanJiang") 
 	4. Love.IsPreviousSeries(c) -- equal to Scl.IsPreviousSeries(c, "YiFanJiang")
 	5. Love.IsOriginalSeries(c) -- equal to Scl.IsOriginalSeries(c, "YiFanJiang")
-	6~10 Love.IsXXXXSeriesMonster(c) (XXXX can be "", "Fusion", "Link" ……, see above)	  -- equal to Scl.IsXXXXSeries(c, "YiFanJiang") and c:IsType(TYPE_MONSTER)
+	6~10 Love.IsXXXXSeriesMonster(c) (XXXX can be "", "Fusion", "Link" ……, see above)	 -- equal to Scl.IsXXXXSeries(c, "YiFanJiang") and c:IsType(TYPE_MONSTER)
 	11~15 Love.IsXXXXSeriesSpell(c) (XXXX can be "", "Fusion", "Link" ……, see above)		-- equal to Scl.IsXXXXSeries(c, "YiFanJiang") and c:IsType(TYPE_SPELL)
-	16~20 Love.IsXXXXSeriesTrap(c) (XXXX can be "", "Fusion", "Link" ……, see above)	  -- equal to Scl.IsXXXXSeries(c, "YiFanJiang") and c:IsType(TYPE_TRAP)
+	16~20 Love.IsXXXXSeriesTrap(c) (XXXX can be "", "Fusion", "Link" ……, see above)   -- equal to Scl.IsXXXXSeries(c, "YiFanJiang") and c:IsType(TYPE_TRAP)
 	21~25 Love.IsXXXXSeriesSpellOrTrap(c) (XXXX can be "", "Fusion", "Link" ……, see above)  -- equal to Scl.IsXXXXSeries(c, "YiFanJiang") and c:IsType(TYPE_SPELL + TYPE_TRAP)
 	>>eg2. Scl.DefineInsideSeries(Love, "YiFanJiang", 1)
 		   Scl.DefineInsideSeries(Love, "PlayGame", 2)
@@ -6821,10 +6823,10 @@ Scl.RaiseGlobalSetEvent()
 --<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 --[[
-10100000 -- Scl's library		   QQ852415212
+10100000 -- Scl's library		  QQ852415212
 
 
-60152900 -- LaiBill's library	   QQ529508379
+60152900 -- LaiBill's library	  QQ529508379
 B2Sayaka -- "Miki Sayaka"
 
 ]]--
\ No newline at end of file

expansions/script/c10199990.lua

@@ -716,16 +716,20 @@ rssf.SpecialSummonToken = Scl.SpecialSummonToken
 function rstg.neg(dn_str, ex_tg)
     return function(e, tp, eg, ep, ev, re, r, rp, chk, chkc)
         dn_str = dn_str or "dum"
+		local dn_str2 = s.ctgy_list[dn_str]
         local c = e:GetHandler()
         local rc = re:GetHandler()
         if chkc then return ex_tg(e, tp, eg, ep, ev, re, r, rp, chk, chkc) end
         if chk == 0 then return (dn_str ~= "rm" or aux.nbcon(tp, re)) and (ex_tg(e, tp, eg, ep, ev, re, r, rp, chk, chkc)) end
-        local op_cate = rscate.cate_selhint_list[dn_str][2]
-        if op_cate and op_cate ~= 0 and rc:IsRelateToEffect(re) then
-            local res = rsop.Operation_Solve(eg, dn_str, REASON_EFFECT, { }, 0, e, tp, eg, ep, ev, re, r, rp) 
-            if res then 
-                Duel.SetOperationInfo(0, op_cate, eg, 1, 0, 0)
-            end
+        local op_cate = Scl.Category_List[dn_str2][2]
+		local ctgy_list = type(op_cate) == "number" and {op_cate} or op_cate
+        if #ctgy_list > 0 and rc:IsRelateToEffect(re) then
+			local res = rsop.Operation_Solve(eg, dn_str, REASON_EFFECT, { }, 0, e, tp, eg, ep, ev, re, r, rp) 
+			if res then
+				for ctgy in pairs(ctgy_list) do
+					Duel.SetOperationInfo(0, ctgy, eg, 1, 0, 0)
+				end
+			end
         end
         ex_tg(e, tp, eg, ep, ev, re, r, rp, 1)
     end
@@ -1323,7 +1327,10 @@ rstg.chainlimit = rstg.chnlim
 rsop.SelectYesNo = rshint.SelectYesNo 
 rsop.SelectOption = rshint.SelectOption
 rsop.eqop = rsop.Equip
-rsop.SelectOC = Scl.SetExtraSelectAndOperateParama
+
+function rsop.SelectOC(would_string, break_able, select_string)
+	return Scl.SetExtraSelectAndOperateParama(not would_string or s.ctgy_list[wolud_string], break_able, select_string)
+end
 
 rsop.CheckOperateSuccess = rsop.CheckOperateCorrectly
 

expansions/script/c14090051.lua

@@ -28,6 +28,12 @@ function cm.initial_effect(c)
 	e3:SetCondition(cm.damcon)
 	e3:SetOperation(cm.damop)
 	c:RegisterEffect(e3)
+	--pierce
+	local e3_1=Effect.CreateEffect(c)
+	e3_1:SetType(EFFECT_TYPE_SINGLE)
+	e3_1:SetCode(EFFECT_PIERCE)
+	e3_1:SetCondition(cm.damcon)
+	c:RegisterEffect(e3_1)
 	--negate
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(m,0))

expansions/script/c33200801.lua

@@ -41,7 +41,7 @@ end
 function c33200801.filter(c,e,tp,lv1)
 	local lv2=c:GetLevel()
 	local lv3=lv1-lv2
-	return lv3>0 and c:IsFaceup() and not c:IsType(TYPE_TUNER) and Duel.IsExistingMatchingCard(c33200801.cfilter,tp,LOCATION_EXTRA,0,1,nil,e,lv3)
+	return lv2>0 and lv3>0 and c:IsFaceup() and not c:IsType(TYPE_TUNER) and Duel.IsExistingMatchingCard(c33200801.cfilter,tp,LOCATION_EXTRA,0,1,nil,e,lv3)
 end
 function c33200801.cfilter(c,e,lv3)
 	return c:IsType(TYPE_SYNCHRO) and c:IsLevel(lv3) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_SYNCHRO,tp,false,false) 

expansions/script/c33200802.lua

@@ -37,7 +37,7 @@ end
 function c33200802.filter(c,e,tp,lv1)
 	local lv2=c:GetLevel()
 	local lv3=lv1-lv2
-	return lv3>0 and c:IsFaceup() and not c:IsType(TYPE_TUNER) and Duel.IsExistingMatchingCard(c33200802.cfilter,tp,LOCATION_EXTRA,0,1,nil,e,lv3)
+	return lv2>0 and lv3>0 and c:IsFaceup() and not c:IsType(TYPE_TUNER) and Duel.IsExistingMatchingCard(c33200802.cfilter,tp,LOCATION_EXTRA,0,1,nil,e,lv3)
 end
 function c33200802.cfilter(c,e,lv3)
 	return c:IsType(TYPE_SYNCHRO) and c:IsLevel(lv3) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_SYNCHRO,tp,false,false) 

expansions/script/c53716001.lua

-if not pcall(function() require("expansions/script/c10199990") end) then require("script/c10199990") end
+if not pcall(function() require("expansions/script/c10100000") end) then require("script/c10100000") end
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 local m=53716001
 local cm=_G["c"..m]
@@ -51,7 +51,7 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
 	for i=1,#list do filter=filter|1<<(list[i]+8) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOZONE)
 	local flag=Duel.SelectDisableField(tp,1,LOCATION_SZONE,0,filter)
-	if flag and rsop.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true,2^(math.log(flag,2)-8)) then
+	if flag and Scl.Place2Field(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true,2^(math.log(flag,2)-8)) then
 		local e1=Effect.CreateEffect(c)
 		e1:SetCode(EFFECT_CHANGE_TYPE)
 		e1:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c53716004.lua

-if not pcall(function() require("expansions/script/c10199990") end) then require("script/c10199990") end
+if not pcall(function() require("expansions/script/c10100000") end) then require("script/c10100000") end
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 local m=53716004
 local cm=_G["c"..m]
@@ -80,7 +80,7 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
 	for i=1,#list do filter=filter|1<<(list[i]+8) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOZONE)
 	local flag=Duel.SelectDisableField(tp,1,LOCATION_SZONE,0,filter)
-	if flag and rsop.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true,2^(math.log(flag,2)-8)) then
+	if flag and Scl.Place2Field(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true,2^(math.log(flag,2)-8)) then
 		local e1=Effect.CreateEffect(c)
 		e1:SetCode(EFFECT_CHANGE_TYPE)
 		e1:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c53716010.lua

-if not pcall(function() require("expansions/script/c10199990") end) then require("script/c10199990") end
+if not pcall(function() require("expansions/script/c10100000") end) then require("script/c10100000") end
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 local m=53716010
 local cm=_G["c"..m]
@@ -58,7 +58,7 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
 	for i=1,#list do filter=filter|1<<(list[i]+8) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOZONE)
 	local flag=Duel.SelectDisableField(tp,1,LOCATION_SZONE,0,filter)
-	if flag and rsop.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true,2^(math.log(flag,2)-8)) then
+	if flag and Scl.Place2Field(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true,2^(math.log(flag,2)-8)) then
 		local e1=Effect.CreateEffect(c)
 		e1:SetCode(EFFECT_CHANGE_TYPE)
 		e1:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c53716011.lua

-if not pcall(function() require("expansions/script/c10199990") end) then require("script/c10199990") end
+if not pcall(function() require("expansions/script/c10100000") end) then require("script/c10100000") end
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 local m=53716011
 local cm=_G["c"..m]
@@ -58,7 +58,7 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
 	for i=1,#list do filter=filter|1<<(list[i]+8) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOZONE)
 	local flag=Duel.SelectDisableField(tp,1,LOCATION_SZONE,0,filter)
-	if flag and rsop.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true,2^(math.log(flag,2)-8)) then
+	if flag and Scl.Place2Field(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true,2^(math.log(flag,2)-8)) then
 		local e1=Effect.CreateEffect(c)
 		e1:SetCode(EFFECT_CHANGE_TYPE)
 		e1:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c53716013.lua

-if not pcall(function() require("expansions/script/c10199990") end) then require("script/c10199990") end
+if not pcall(function() require("expansions/script/c10100000") end) then require("script/c10100000") end
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 local m=53716013
 local cm=_G["c"..m]
@@ -54,7 +54,7 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
 	for i=1,#list do filter=filter|1<<(list[i]+8) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOZONE)
 	local flag=Duel.SelectDisableField(tp,1,LOCATION_SZONE,0,filter)
-	if flag and rsop.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true,2^(math.log(flag,2)-8)) then
+	if flag and Scl.Place2Field(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true,2^(math.log(flag,2)-8)) then
 		local e1=Effect.CreateEffect(c)
 		e1:SetCode(EFFECT_CHANGE_TYPE)
 		e1:SetType(EFFECT_TYPE_SINGLE)