emergency

expansions/lflist.conf

@@ -91,8 +91,9 @@
 10221015 0 --ALO 镀金的勇士 桐人
 10221031 1 --ALO 勇气的龙使 西莉卡
 10222013 1 --GGO 徘徊于内心的恐惧
-10222025 1 --GGO 强大的意义 桐子
-10222035 1 --GGO 抛弃自卑 莲
+10222015 0 --GGO 红色的记忆 诗乃
+10222025 0 --GGO 强大的意义 桐子
+10222035 0 --GGO 抛弃自卑 莲
 10222045 0 --GGO 疯狂的杀戮 林鵙鹟
 #109
 10900014 0 --无限之天使
@@ -253,6 +254,7 @@
 #143
 14370004 0 --灰烬少女的原核
 #148
+14801271 0 --星际战舰 电力干扰器
 14801734 0 --星际战舰 环绕级工业舰
 #160
 16001007 0 --Ⅷ集团军 破阵之歌姬

expansions/script/c16104210.lua

@@ -59,7 +59,7 @@ function cm.sprcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 end
 function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not (c:IsRace(RACE_WARRIOR) or c:IsLocation(LOCATION_EXTRA))
+	return c:IsLocation(LOCATION_EXTRA) or not c:IsRace(RACE_WARRIOR)  
 end
 function cm.sprtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then

expansions/script/c16104212.lua

@@ -36,7 +36,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e2,tp)
 end
 function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not (c:IsRace(RACE_WARRIOR) or c:IsLocation(LOCATION_EXTRA))
+	return c:IsLocation(LOCATION_EXTRA) or not c:IsRace(RACE_WARRIOR)
 end
 function cm.thfilter(c)
 	return c:CheckSetCard("CHURCH") and c:IsAbleToHand()

expansions/script/c16104218.lua

@@ -52,7 +52,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e2,tp)
 end
 function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not (c:IsRace(RACE_WARRIOR) or c:IsLocation(LOCATION_EXTRA))
+	return  (not c:IsRace(RACE_WARRIOR)) or c:IsLocation(LOCATION_EXTRA)
 end
 function cm.filter(c)
 	return c:CheckSetCard("CHURCH_KNIGHT") and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
@@ -70,7 +70,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.filter1(c)
-	return c:CheckSetCard("CHURCH_KNIGHT") and c:IsSummonable(true,nil) and c:IsType(TYPE_MONSTER)
+	return c:CheckSetCard("CHURCH") and c:IsSummonable(true,nil) and c:IsType(TYPE_MONSTER)
 end
 function cm.target1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter1,tp,LOCATION_HAND,0,1,nil) end

expansions/script/c16104220.lua

@@ -8,16 +8,6 @@ function cm.initial_effect(c)
 	e0:SetType(EFFECT_TYPE_ACTIVATE)
 	e0:SetCode(EVENT_FREE_CHAIN)
 	c:RegisterEffect(e0)
-	--cannot ChangePosition
-	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(m,0))
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetRange(LOCATION_SZONE)
-	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
-	e1:SetCode(EFFECT_CANNOT_CHANGE_POSITION)
-	e1:SetTarget(cm.postg)
-	e1:SetCondition(cm.poscon)
-	c:RegisterEffect(e1)
 	--SpecialSummon
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,1))
@@ -57,12 +47,6 @@ end
 function cm.sumlimit(e,c,sump,sumtype,sumpos,targetp)
 	return not c:IsRace(RACE_WARRIOR)
 end
-function cm.postg(e,c)
-	return c:CheckSetCard("CHURCH")
-end
-function cm.poscon(e)
-	return e:GetHandler():IsAttackPos()
-end
 function cm.spfilter(c)
 	return c:CheckSetCard("CHURCH") and c:IsAbleToRemove() and c:IsType(TYPE_MONSTER)
 end
@@ -139,7 +123,7 @@ function cm.spop2(e,tp,eg,ep,ev,re,r,rp)
 				e1_2:SetDescription(aux.Stringid(m,5))
 				e1_2:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT)
 				e1_2:SetRange(LOCATION_MZONE)
-				e1_2:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD)
+				e1_2:SetReset(RESET_EVENT+RESETS_STANDARD)
 				tc:RegisterEffect(e1_2,true)
 			end
 			Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
@@ -156,9 +140,6 @@ function cm.spop2(e,tp,eg,ep,ev,re,r,rp)
 			e1_3:SetOperation(cm.thop)
 			Duel.RegisterEffect(e1_3,tp)
 end
-function cm.condition(e,c)
-	return c:CheckSetCard("CHURCH")
-end
 function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetLabelObject()
 	if tc:GetFlagEffectLabel(m)~=e:GetLabel() then

expansions/script/c16104232.lua

@@ -68,7 +68,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e2,tp)
 end
 function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return (not c:IsRace(RACE_WARRIOR)) or c:IsLocation(LOCATION_EXTRA)
+	return c:IsLocation(LOCATION_EXTRA) or not c:IsRace(RACE_WARRIOR)
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.setfilter,tp,LOCATION_DECK,0,3,nil) and Duel.GetLocationCount(tp,LOCATION_SZONE)>0 end