wadashimo

expansions/script/c10900051.lua

@@ -41,7 +41,7 @@ function c10900051.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SendtoGrave(g1,REASON_DISCARD+REASON_EFFECT)
 end
 function c10900051.condition(e,tp,eg,ep,ev,re,r,rp)
-	return return re:IsActiveType(TYPE_MONSTER) and re:GetHandler():GetAttack()==e:GetHandler():GetAttack()
+	return re:IsActiveType(TYPE_MONSTER) and re:GetHandler():GetAttack()==e:GetHandler():GetAttack()
 end
 function c10900051.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsReleasable() end

expansions/script/c10909007.lua

@@ -55,10 +55,10 @@ function c10909007.thop(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 end
 function c10909007.dfilter(c)
-    return c:IsFaceup() and c:IsSetCard(0x23c) and c:IsType(TYPE_FUSION)
+	return c:IsFaceup() and c:IsSetCard(0x23c) and c:IsType(TYPE_FUSION)
 end
 function c10909007.condition(e,tp,eg,ep,ev,re,r,rp)
-    return Duel.IsExistingMatchingCard(c10909006.dfilter,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(c10909006.dfilter,tp,LOCATION_MZONE,0,1,nil)
 end
 function c10909007.spfilter(c,e,tp)
 	return c:IsFaceup() and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
@@ -77,23 +77,23 @@ function c10909007.spop(e,tp,eg,ep,ev,re,r,rp)
 	if ft<=1 then return end
 	local tc=Duel.GetFirstTarget()
 	if tc and tc:IsRelateToEffect(e) and c:IsRelateToEffect(e) and not Duel.IsPlayerAffectedByEffect(tp,59822133) then
-		tc:AddCard(c)
-		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
+	Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP)
+	Duel.SpecialSummonStep(c,0,tp,tp,false,false,POS_FACEUP)
 	end
 end
 function c10909007.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-    if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and chkc:IsFaceup() end
-    if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,0,1,e:GetHandler()) end
-    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
-    Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,0,1,1,nil)
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and chkc:IsFaceup() end
+	if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,0,1,e:GetHandler()) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
+	Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,0,1,1,nil)
 end
 function c10909007.atkop(e,tp,eg,ep,ev,re,r,rp)
-    local tc=Duel.GetFirstTarget()
-    if tc:IsFacedown() or not tc:IsRelateToEffect(e) then return end
-    local e1=Effect.CreateEffect(e:GetHandler())
-    e1:SetType(EFFECT_TYPE_SINGLE)
-    e1:SetCode(EFFECT_UPDATE_ATTACK)
-    e1:SetValue(1500)
-    e1:SetReset(RESET_EVENT+RESETS_STANDARD)
-    tc:RegisterEffect(e1)
+	local tc=Duel.GetFirstTarget()
+	if tc:IsFacedown() or not tc:IsRelateToEffect(e) then return end
+	local e1=Effect.CreateEffect(e:GetHandler())
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_UPDATE_ATTACK)
+	e1:SetValue(1500)
+	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+	tc:RegisterEffect(e1)
 end
\ No newline at end of file

expansions/script/c113059.lua

 --徒手接子弹的铁华团团长奥尔加
-function c33374570.initial_effect(c)
+function c113059.initial_effect(c)
 	c:EnableReviveLimit()
+	--special summon condition
+	local e0=Effect.CreateEffect(c)
+	e0:SetType(EFFECT_TYPE_SINGLE)
+	e0:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e0:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
+	c:RegisterEffect(e0)
 	--
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_QUICK_O+EFFECT_TYPE_FIELD)
@@ -8,25 +14,25 @@ function c33374570.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e1:SetCode(EVENT_CHAINING)
 	e1:SetCategory(CATEGORY_NEGATE+CATEGORY_TODECK)
-	e1:SetCountLimit(1,33374570)
-	e1:SetCondition(c33374570.discon)
-	e1:SetTarget(c33374570.distg)
-	e1:SetOperation(c33374570.disop)
+	e1:SetCountLimit(1,113059)
+	e1:SetCondition(c113059.discon)
+	e1:SetTarget(c113059.distg)
+	e1:SetOperation(c113059.disop)
 	c:RegisterEffect(e1)
 end
-function c33374570.dfilter(c,tp)
+function c113059.dfilter(c,tp)
 	return c:IsRace(RACE_WARRIOR) and c:IsLevelBelow(4) and c:IsOnField() and c:IsControler(tp)
 end
-function c33374570.discon(e,tp,eg,ep,ev,re,r,rp)
+function c113059.discon(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) or not Duel.IsChainNegatable(ev) then return false end
 	local ex,tg,tc=Duel.GetOperationInfo(ev,CATEGORY_NEGATE)
-	return re:IsHasCategory(CATEGORY_NEGATE) and ex and tg~=nil and tc+tg:FilterCount(c33374570.dfilter,nil,tp)-tg:GetCount()>0
+	return re:IsHasCategory(CATEGORY_NEGATE) and ex and tg~=nil and tc+tg:FilterCount(c113059.dfilter,nil,tp)-tg:GetCount()>0
 end
-function c33374570.distg(e,tp,eg,ep,ev,re,r,rp,chk)
+function c113059.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.SetOperationInfo(0,CATEGORY_DISABLE,eg,1,0,0)
 end
-function c33374570.disop(e,tp,eg,ep,ev,re,r,rp)
+function c113059.disop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.NegateEffect(ev) then
 	Duel.SendtoDeck(e:GetHandler(),tp,2,REASON_EFFECT)
 	end
@@ -35,11 +41,11 @@ function c33374570.disop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e1:SetTargetRange(1,0)
-	e1:SetTarget(c33374570.splimit)
+	e1:SetTarget(c113059.splimit)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 end
-function c33374570.splimit(e,c)
+function c113059.splimit(e,c)
 	return not c:IsCode(33374565) and c:IsLocation(LOCATION_EXTRA)
 end
 

expansions/script/c12044041.lua

@@ -30,7 +30,7 @@ function cm.initial_effect(c)
 		e3:SetCode(EVENT_PHASE_START+PHASE_STANDBY)
 		e3:SetCountLimit(1)
 		e3:SetOperation(cm.drop)
-		c.RegisterEffect(e3)
+		c:RegisterEffect(e3)
 	--back
 	local e3=srre.backeffect(c)
 end

expansions/script/c16100008.lua

@@ -50,7 +50,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e4)  
 	--
 	local e5=Effect.CreateEffect(c)
-	e5:SetDescription(aux.Stringid(m,0))
+	e5:SetDescription(aux.Stringid(m,2))
 	e5:SetType(EFFECT_TYPE_IGNITION)
 	e5:SetRange(LOCATION_FZONE)
 	e5:SetCategory(CATEGORY_LVCHANGE)
@@ -135,9 +135,9 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
 end
 --
 function cm.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return  Duel.IsCanRemoveCounter(tp,1,1,0xccf,16,REASON_COST) and Duel.IsExistingMatchingCard(cm.fil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end
+	if chk==0 then return  Duel.IsCanRemoveCounter(tp,1,1,0xccf,36,REASON_COST) and Duel.IsExistingMatchingCard(cm.fil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end
 	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
-	Duel.RemoveCounter(tp,1,1,0xccf,16,REASON_COST)
+	Duel.RemoveCounter(tp,1,1,0xccf,36,REASON_COST)
 end
 --
 function cm.op2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c26801016.lua

@@ -8,8 +8,8 @@ function cm.initial_effect(c)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER)
 	e1:SetCountLimit(1,m+EFFECT_COUNT_CODE_OATH)
-	e4:SetTarget(cm.lvtg)
-	e4:SetOperation(cm.lvop)
+	e1:SetTarget(cm.lvtg)
+	e1:SetOperation(cm.lvop)
 	c:RegisterEffect(e1)
 	--destroy replace
 	local e2=Effect.CreateEffect(c)

expansions/script/c33310250.lua

@@ -67,6 +67,13 @@ function cm.setop(e,tp,eg,ep,ev,re,r,rp)
 		e3:SetTarget(cm.destg)
 		e3:SetOperation(cm.desop)
 		token:RegisterEffect(e3)
+		local e4=Effect.CreateEffect(e:GetHandler())
+		e4:SetCode(EFFECT_CHANGE_TYPE)
+		e4:SetType(EFFECT_TYPE_SINGLE)
+		e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+		e4:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET)
+		e4:SetValue(TYPE_TRAP+TYPE_CONTINUOUS)
+		token:RegisterEffect(e4)
 	end
 end
 function cm.dirtg(e,c)

expansions/script/c33310251.lua

@@ -51,7 +51,7 @@ function cm.initial_effect(c)
 end
 --Act In Set Turn
 function cm.actcon(e)
-	local tp=e:GetHandlerPlsayer()
+	local tp=e:GetHandlerPlayer()
 	return Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)<Duel.GetFieldGroupCount(tp,0,LOCATION_MZONE)
 end
 --Immune

expansions/script/c33501011.lua

@@ -29,6 +29,7 @@ function cm.chainlm(e,rp,tp)
 	return not e:GetHandler():IsType(TYPE_MONSTER)
 end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	local g=Duel.GetMatchingGroup(Card.IsAbleToDeck,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
 	if Duel.SendtoDeck(g,nil,0,REASON_EFFECT+REASON_TEMPORARY)~=0 then
 	local tc=g:GetFirst()

expansions/script/c66560000.lua

 --神器使   摩卡
 local m=66560000
 local cm=_G["c"..m]
-function c66660000.initial_effect(c)
+function cm.initial_effect(c)
 	--Activate
 	local e3=Effect.CreateEffect(c)
 	e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)

expansions/script/c66560002.lua

 --神器使  集结   
 local m=66560002
 local cm=_G["c"..m]
-function c66660002.initial_effect(c)
+function cm.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)

expansions/script/c66560003.lua

 --神器使   安托涅瓦
-local m=66660003
+local m=m
 local cm=_G["c"..m]
-function c66660003.initial_effect(c)
+function cm.initial_effect(c)
 	--link summon
 	c:EnableReviveLimit()
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkSetCard,0xf21),3,99)

expansions/strings.conf

@@ -88,7 +88,7 @@
 #AddCodeList(9910376) 丛雨记述
 
 #SCL 2798419987 101 0x330-0x33f
-!setname 0xa335 灰烬
+!setname 0xa335 殆烬
 !setname 0xc335 薪王
 #AddCodeList(10113037) 饥饿狼群卡名记述