Skip to content

Commit

Permalink
Show file tree
Hide file tree
Showing 37 changed files with 225 additions and 108 deletions.
165 changes: 164 additions & 1 deletion lflist.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#[2013.9][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1]
#[2013.9][2014.1.1 TCG][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1]
!2013.9
#forbidden
20663556 0 --イレカエル
Expand Down Expand Up @@ -153,6 +153,169 @@
53582587 2 --激流葬
29401950 2 --奈落の落とし穴

!2014.1.1 TCG
#forbidden
20663556 0 --イレカエル
53797637 0 --炎征竜-バーナー
40044918 0 --E·HERO エアーマン
44910027 0 --ヴィクトリー・ドラゴン
82301904 0 --混沌帝龍 -終焉の使者-
08131171 0 --キラー・スネーク
26202165 0 --クリッター
78010363 0 --黒き森のウィッチ
67441435 0 --グローアップ·バルブ
07391448 0 --ゴヨウ·ガーディアン
40737112 0 --混沌の黒魔術師
34124316 0 --サイバーポッド
63519819 0 --サウザンド·アイズ·サクリファイス
81122844 0 --発条空母ゼンマイティ
21593977 0 --処刑人-マキュラ
27415516 0 --水征竜-ストリーム
32646477 0 --ダーク·ダイブ·ボンバー
91020571 0 --地征竜-リアクタン
56570271 0 --D-HERO ディスクガイ
69015963 0 --デビル·フランケン
33184167 0 --同族感染ウィルス
54719828 0 --No.16 色の支配者ショック·ルーラー
52687916 0 --氷結界の龍 トリシューラ
50321796 0 --氷結界の龍 ブリューナク
78706415 0 --ファイバーポッド
93369354 0 --フィッシュボーグ-ガンナー
89185742 0 --風征竜-ライトニング
34206604 0 --魔導サイエンティスト
96782886 0 --メンタルマスター
03078576 0 --八汰烏
14878871 0 --レスキューキャット
41482598 0 --悪夢の蜃気楼
44763025 0 --いたずら好きな双子悪魔
19613556 0 --大嵐
29762407 0 --王家の神殿
17375316 0 --押収
74191942 0 --苦渋の選択
42829885 0 --強引な番兵
45986603 0 --強奪
55144522 0 --強欲な壺
04031928 0 --心変わり
12580477 0 --サンダー·ボルト
23557835 0 --次元融合
83764718 0 --死者蘇生
57953380 0 --生還の宝札
87910978 0 --洗脳-ブレインコントロール
60682203 0 --大寒波
67169062 0 --貪欲な壺
27770341 0 --超再生能力
69243953 0 --蝶の短剣-エルマ
72892473 0 --手札抹殺
79571449 0 --天使の施し
42703248 0 --ハリケーン
18144506 0 --ハーピィの羽根帚
70828912 0 --早すぎた埋葬
34906152 0 --マスドライバー
46448938 0 --魔導書の神判
77565204 0 --未来融合-フューチャー·フュージョン
27970830 0 --六武の門
46411259 0 --突然変異
85602018 0 --遺言状
62265044 0 --竜の渓谷
27174286 0 --異次元からの帰還
61740673 0 --王宮の勅命
93016201 0 --王宮の弾圧
41420027 0 --神の宣告
17484499 0 --現世と冥界の逆転
57728570 0 --死のデッキ破壊ウイルス
57585212 0 --自爆スイッチ
03280747 0 --第六感
64697231 0 --ダスト·シュート
35316708 0 --刻の封印
80604091 0 --血の代償
83555666 0 --破壊輪
28566710 0 --ラストバトル!
#limit
64034255 1 --A·ジェネクス·バードマン
45222299 1 --イビリチュア·ガストクラーケ
11877465 1 --イビリチュア·マインドオーガス
68184115 1 --甲虫装機 ダンセル
69207766 1 --甲虫装機 ホーネット
01662004 1 --炎星師-チョウテン
53804307 1 --焔征竜-ブラスター
37742478 1 --オネスト
74311226 1 --海皇の竜騎隊
72989439 1 --カオス·ソルジャー -開闢の使者-
90411554 1 --巌征竜-レドックス
41470137 1 --剣闘獣ベストロウリィ
78868119 1 --深海のディーヴァ
29981921 1 --真六武衆-シエン
31560081 1 --聖なる魔術師
59297550 1 --ゼンマイマジシャン
65192027 1 --ダーク·アームド·ドラゴン
15341821 1 --ダンディライオン
90953320 1 --TG ハイパー·ライブラリアン
14943837 1 --デブリ·ドラゴン
16226786 1 --深淵の暗殺者
80344569 1 --N·グラン·モール
28297833 1 --ネクロフェイス
26400609 1 --瀑征竜-タイダル
70583986 1 --氷結界の虎王ドゥローレン
33396948 1 --封印されしエクゾディア
07902349 1 --封印されし者の左腕
70903634 1 --封印されし者の右腕
44519536 1 --封印されし者の左足
08124921 1 --封印されし者の右足
50091196 1 --フォーミュラ·シンクロン
02009101 1 --BF-疾風のゲイル
44330098 1 --冥府の使者ゴーズ
33508719 1 --メタモルポット
71564252 1 --ライオウ
89399912 1 --嵐征竜-テンペスト
85138716 1 --レスキューラビット
88264978 1 --レッドアイズ·ダークネスメタルドラゴン
48976825 1 --異次元からの埋葬
33782437 1 --一時休戦
66957584 1 --インフェルニティガン
23701465 1 --原初の種
72405967 1 --王家の生け贄
81439173 1 --おろかな埋葬
97997309 1 --ゲーテの魔導書
45725480 1 --七星の宝刀
95308449 1 --終焉のカウントダウン
37520316 1 --精神操作
32807846 1 --増援
14087893 1 --月の書
81674782 1 --次元の裂け目
94886282 1 --光の援軍
75500286 1 --封印の黄金櫃
53129443 1 --ブラック·ホール
15854426 1 --霞の谷の神風
43040603 1 --モンスターゲート
01475311 1 --闇の誘惑
23171610 1 --リミッター解除
02295440 1 --ワン·フォー·ワン
84749824 1 --神の警告
94192409 1 --強制脱出装置
53582587 1 --激流葬
73599290 1 --ソウルドレイン
36468556 1 --停戦協定
46652477 1 --転生の予言
29401950 1 --奈落の落とし穴
17078030 1 --光の護封壁
30241314 1 --マクロコスモス
32723153 1 --マジカル·エクスプロージョン
54974237 1 --闇のデッキ破壊ウイルス
#semi limit
85087012 2 --カードガンナー
09596126 2 --カオス·ソーサラー
00423585 2 --召喚僧サモンプリースト
98777036 2 --トラゴエディア
10028593 2 --輪廻天狗
48686504 2 --ローンファイア·ブロッサム
46052429 2 --高等儀式術
98494543 2 --魔法石の採掘
58577036 2 --名推理
91623717 2 --連鎖爆撃
29843091 2 --おジャマトリオ
70342110 2 --次元幽閉
44095762 2 --聖なるバリア-ミラーフォース-

!2013.10.11 TCG
#forbidden
20663556 0 --イレカエル
Expand Down
4 changes: 2 additions & 2 deletions ocgcore/card.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2156,8 +2156,8 @@ int32 card::is_capable_be_effect_target(effect* peffect, uint8 playerid) {
}
return TRUE;
}
int32 card::is_can_be_fusion_material() {
if(!(get_type()&TYPE_MONSTER))
int32 card::is_can_be_fusion_material(uint8 ignore_mon) {
if(!ignore_mon && !(get_type() & TYPE_MONSTER))
return FALSE;
if(is_affected_by_effect(EFFECT_FORBIDDEN))
return FALSE;
Expand Down
2 changes: 1 addition & 1 deletion ocgcore/card.h
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class card {
int32 is_control_can_be_changed();
int32 is_capable_be_battle_target(card* pcard);
int32 is_capable_be_effect_target(effect* peffect, uint8 playerid);
int32 is_can_be_fusion_material();
int32 is_can_be_fusion_material(uint8 ignore_mon = FALSE);
int32 is_can_be_synchro_material(card* scard, card* tuner = 0);
int32 is_can_be_xyz_material(card* scard);
};
Expand Down
5 changes: 4 additions & 1 deletion ocgcore/libcard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1698,7 +1698,10 @@ int32 scriptlib::card_is_can_be_fusion_material(lua_State *L) {
check_param_count(L, 1);
check_param(L, PARAM_TYPE_CARD, 1);
card* pcard = *(card**) lua_touserdata(L, 1);
lua_pushboolean(L, pcard->is_can_be_fusion_material());
uint32 ign = FALSE;
if(lua_gettop(L) >= 2)
ign = lua_toboolean(L, 2);
lua_pushboolean(L, pcard->is_can_be_fusion_material(ign));
return 1;
}
int32 scriptlib::card_is_can_be_synchro_material(lua_State *L) {
Expand Down
3 changes: 1 addition & 2 deletions script/c12670770.lua
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ function c12670770.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.RegisterEffect(e1,tp)
end
function c12670770.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and Duel.IsExistingMatchingCard(c12670770.spfilter,tp,LOCATION_REMOVED,0,1,nil,e,tp) end
if chk==0 then return true end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_REMOVED)
end
function c12670770.desfilter(c)
Expand Down
4 changes: 1 addition & 3 deletions script/c13455953.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ function c13455953.sumop(e,tp,eg,ep,ev,re,r,rp)
end
function c13455953.thcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local pos=c:GetPreviousPosition()
if c:IsReason(REASON_BATTLE) then pos=c:GetBattlePosition() end
return c:IsPreviousLocation(LOCATION_ONFIELD) and bit.band(pos,POS_FACEUP)~=0
return c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsPreviousPosition(POS_FACEUP)
end
function c13455953.filter(c)
return c:IsSetCard(0x5042) and c:IsAbleToHand()
Expand Down
2 changes: 1 addition & 1 deletion script/c23323812.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function c23323812.initial_effect(c)
c:RegisterEffect(e1)
end
function c23323812.filter(c,tp)
return c:GetPreviousControler()==tp and bit.band(c:GetBattlePosition(),POS_FACEUP)~=0
return c:GetPreviousControler()==tp and c:IsPreviousPosition(POS_FACEUP)
and c==Duel.GetAttackTarget() and c:IsRace(RACE_PSYCHO)
end
function c23323812.condition(e,tp,eg,ep,ev,re,r,rp)
Expand Down
6 changes: 1 addition & 5 deletions script/c24419823.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ function c24419823.initial_effect(c)
end
function c24419823.thcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
if c:IsLocation(LOCATION_DECK) then return false end
if Duel.GetCurrentPhase()==PHASE_DAMAGE and c:GetPreviousLocation()==LOCATION_MZONE then
return bit.band(c:GetBattlePosition(),POS_FACEUP)~=0
end
return bit.band(c:GetPreviousPosition(),POS_FACEUP)~=0
return not c:IsLocation(LOCATION_DECK) and c:IsPreviousPosition(POS_FACEUP)
end
function c24419823.filter(c)
return c:IsType(TYPE_FIELD) and c:IsAbleToHand()
Expand Down
2 changes: 1 addition & 1 deletion script/c27346636.lua
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function c27346636.splimit(e,se,sp,st)
return e:GetHandler():GetLocation()~=LOCATION_EXTRA
end
function c27346636.spfilter1(c,tp)
return c:IsCode(78868776) and c:IsAbleToDeckAsCost() and c:IsCanBeFusionMaterial()
return c:IsCode(78868776) and c:IsAbleToDeckAsCost() and c:IsCanBeFusionMaterial(true)
and Duel.IsExistingMatchingCard(c27346636.spfilter2,tp,LOCATION_MZONE,0,2,c)
end
function c27346636.spfilter2(c)
Expand Down
1 change: 1 addition & 0 deletions script/c2830693.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ function c2830693.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_ATTACK_ANNOUNCE)
e2:SetRange(LOCATION_GRAVE)
e2:SetProperty(EFFECT_FLAG_CHAIN_UNIQUE)
e2:SetCondition(c2830693.spcon)
e2:SetCost(c2830693.spcost)
e2:SetTarget(c2830693.sptg)
Expand Down
7 changes: 2 additions & 5 deletions script/c30604579.lua
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,8 @@ function c30604579.disop(e,tp,eg,ep,ev,re,r,rp)
end
function c30604579.regop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local ctl=c:GetPreviousControler()
local pos=c:GetPreviousPosition()
if c:IsReason(REASON_BATTLE) then pos=c:GetBattlePosition() end
if ctl==tp and rp~=tp and c:IsReason(REASON_DESTROY)
and bit.band(c:GetPreviousLocation(),LOCATION_ONFIELD)~=0 and bit.band(pos,POS_FACEUP)~=0 then
if rp~=tp and c:GetPreviousControler()==tp and c:IsReason(REASON_DESTROY)
and c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsPreviousPosition(POS_FACEUP) then
c:RegisterFlagEffect(30604579,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,0,1)
end
end
Expand Down
4 changes: 2 additions & 2 deletions script/c31480215.lua
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ function c31480215.splimit(e,c,tp,sumtp,sumpos)
return not c:IsAttribute(ATTRIBUTE_WIND)
end
function c31480215.lvcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetFlagEffect(tp,31480215)==0 and Duel.CheckReleaseGroup(tp,Card.IsSetCard,1,nil,0x101b) end
local g=Duel.SelectReleaseGroup(tp,Card.IsSetCard,1,1,nil,0x101b)
if chk==0 then return Duel.GetFlagEffect(tp,31480215)==0 and Duel.CheckReleaseGroup(tp,Card.IsSetCard,1,e:GetHandler(),0x101b) end
local g=Duel.SelectReleaseGroup(tp,Card.IsSetCard,1,1,e:GetHandler(),0x101b)
Duel.Release(g,REASON_COST)
Duel.RegisterFlagEffect(tp,31480215,RESET_PHASE+PHASE_END,0,1)
end
Expand Down
7 changes: 1 addition & 6 deletions script/c31516413.lua
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,7 @@ end
function c31516413.hspop(e,tp,eg,ep,ev,re,r,rp,c)
local g=Duel.SelectReleaseGroup(c:GetControler(),Card.IsSetCard,1,1,nil,0x69)
Duel.Release(g,REASON_COST)
local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(31516413,2))
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetReset(RESET_EVENT+0x4fc0000)
c:RegisterEffect(e1)
c:RegisterFlagEffect(0,RESET_EVENT+0x4fc0000,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(31516413,2))
end
function c31516413.descost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.CheckReleaseGroupEx(tp,Card.IsSetCard,1,e:GetHandler(),0x69) end
Expand Down
7 changes: 1 addition & 6 deletions script/c3300267.lua
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,7 @@ end
function c3300267.hspop(e,tp,eg,ep,ev,re,r,rp,c)
local g=Duel.SelectReleaseGroup(c:GetControler(),Card.IsSetCard,1,1,nil,0x69)
Duel.Release(g,REASON_COST)
local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(3300267,2))
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetReset(RESET_EVENT+0x4fc0000)
c:RegisterEffect(e1)
c:RegisterFlagEffect(0,RESET_EVENT+0x4fc0000,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(3300267,2))
end
function c3300267.descost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.CheckReleaseGroupEx(tp,Card.IsSetCard,1,e:GetHandler(),0x69) end
Expand Down
4 changes: 2 additions & 2 deletions script/c3370104.lua
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ function c3370104.disop(e,tp,eg,ep,ev,re,r,rp)
end
end
function c3370104.condition(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsLocation(LOCATION_GRAVE) and e:GetHandler():IsReason(REASON_BATTLE)
and bit.band(e:GetHandler():GetBattlePosition(),POS_FACEUP)~=0
local c=e:GetHandler()
return c:IsLocation(LOCATION_GRAVE) and c:IsReason(REASON_BATTLE) and c:IsPreviousPosition(POS_FACEUP)
end
function c3370104.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
Expand Down
12 changes: 3 additions & 9 deletions script/c3536537.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,9 @@ function c3536537.initial_effect(c)
c:RegisterEffect(e1)
end
function c3536537.descon(e,tp,eg,ep,ev,re,r,rp)
if bit.band(r,REASON_DESTROY)==0 then return false end
if bit.band(r,REASON_BATTLE)~=0 then
return bit.band(e:GetHandler():GetBattlePosition(),POS_FACEUP)~=0
and e:GetHandler():GetPreviousControler()==tp and rp~=tp
else
return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
and e:GetHandler():IsPreviousPosition(POS_FACEUP)
and e:GetHandler():GetPreviousControler()==tp and rp~=tp
end
local c=e:GetHandler()
return rp~=tp and c:GetPreviousControler()==tp and bit.band(r,REASON_DESTROY)~=0
and c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsPreviousPosition(POS_FACEUP)
end
function c3536537.filter(c)
return c:IsFaceup() and c:IsLevelAbove(5) and bit.band(c:GetSummonType(),SUMMON_TYPE_SPECIAL)~=0 and c:IsDestructable()
Expand Down
8 changes: 2 additions & 6 deletions script/c40343749.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,8 @@ function c40343749.initial_effect(c)
end
function c40343749.condition(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
if c:IsReason(REASON_BATTLE) then
return c:GetReasonPlayer()~=tp and bit.band(c:GetBattlePosition(),POS_FACEUP)~=0
else
return rp~=tp and c:IsReason(REASON_DESTROY) and c:IsPreviousPosition(POS_FACEUP)
and c:IsPreviousLocation(LOCATION_ONFIELD) and c:GetPreviousControler()==tp
end
return rp~=tp and c:IsReason(REASON_DESTROY) and c:IsPreviousPosition(POS_FACEUP)
and c:IsPreviousLocation(LOCATION_ONFIELD) and c:GetPreviousControler()==tp
end
function c40343749.filter(c,e,tp)
return c:IsSetCard(0x80) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
Expand Down
1 change: 0 additions & 1 deletion script/c43642620.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ end
function c43642620.dmcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
return c:IsReason(REASON_DESTROY) and c:IsPreviousPosition(POS_FACEUP)
and (not c:IsReason(REASON_BATTLE) or bit.band(c:GetBattlePosition(),POS_FACEUP)~=0)
end
function c43642620.dmtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end
Expand Down
4 changes: 2 additions & 2 deletions script/c44364207.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ function c44364207.indesval(e,re)
return re:GetHandler():IsType(TYPE_TRAP)
end
function c44364207.condition(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsLocation(LOCATION_GRAVE) and e:GetHandler():IsReason(REASON_BATTLE)
and bit.band(e:GetHandler():GetBattlePosition(),POS_FACEUP)~=0
local c=e:GetHandler()
return c:IsLocation(LOCATION_GRAVE) and c:IsReason(REASON_BATTLE) and c:IsPreviousPosition(POS_FACEUP)
end
function c44364207.filter(c)
return c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:GetLevel()==4 and c:IsAbleToHand()
Expand Down
5 changes: 1 addition & 4 deletions script/c46572756.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ function c46572756.initial_effect(c)
end
function c46572756.condition(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local pos=c:GetPreviousPosition()
if Duel.GetCurrentPhase()==PHASE_DAMAGE and c==Duel.GetAttackTarget() then pos=c:GetBattlePosition() end
return c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsReason(REASON_DESTROY)
and bit.band(pos,POS_FACEUP)~=0
return c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsReason(REASON_DESTROY) and c:IsPreviousPosition(POS_FACEUP)
end
function c46572756.filter(c)
return c:IsSetCard(0x2) and c:IsAbleToDeck()
Expand Down
Loading

0 comments on commit b65abdd

Please sign in to comment.