Commit d391c9c3 authored by nanahira's avatar nanahira

Merge branch 'master' of git.mycard.moe:mycard/ygopro-database

parents 84d2f804 45573a26
No preview for this file type
...@@ -562,7 +562,7 @@ ...@@ -562,7 +562,7 @@
!victory 0x1f Victory by the effect of Exodia, Master of The Guard !victory 0x1f Victory by the effect of Exodia, Master of The Guard
!victory 0x20 Victory by the effect of True Exodia !victory 0x20 Victory by the effect of True Exodia
!victory 0x21 Victory by the effect of Number iC1000: Numerounius Numerounia !victory 0x21 Victory by the effect of Number iC1000: Numerounius Numerounia
!victory 0x22 Victory by the effect of Sekitori - Musomaru !victory 0x22 Victory by the effect of Musical Sumo Dice Games
!victory 0xffff Match victory by the effect of 「%ls !victory 0xffff Match victory by the effect of 「%ls
#counters #counters
!counter 0x1 Spell Counter !counter 0x1 Spell Counter
...@@ -657,6 +657,8 @@ ...@@ -657,6 +657,8 @@
!counter 0x60 Counter(Ursarctic Radiation) !counter 0x60 Counter(Ursarctic Radiation)
!counter 0x61 Counter(Prisoner of Destiny) !counter 0x61 Counter(Prisoner of Destiny)
!counter 0x62 Counter(Life Shaver) !counter 0x62 Counter(Life Shaver)
!counter 0x1063 Hallucination Counter
!counter 0x64 G Golem Counter
#setnames, using tab for comment #setnames, using tab for comment
!setname 0x1 Ally of Justice !setname 0x1 Ally of Justice
!setname 0x2 Genex !setname 0x2 Genex
...@@ -729,6 +731,7 @@ ...@@ -729,6 +731,7 @@
!setname 0x34 Crystal !setname 0x34 Crystal
!setname 0x1034 Crystal Beast !setname 0x1034 Crystal Beast
!setname 0x2034 Ultimate Crystal !setname 0x2034 Ultimate Crystal
!setname 0x5034 Advanced Crystal Beast
!setname 0x35 Fabled !setname 0x35 Fabled
!setname 0x1035 The Fabled !setname 0x1035 The Fabled
!setname 0x36 Machina !setname 0x36 Machina
...@@ -1137,7 +1140,7 @@ ...@@ -1137,7 +1140,7 @@
!setname 0x176 Barian's !setname 0x176 Barian's
!setname 0x177 Kairyu-Shin !setname 0x177 Kairyu-Shin
!setname 0x178 Sea Stealth !setname 0x178 Sea Stealth
!setname 0x179 Therions !setname 0x179 Therion
!setname 0x17a Scareclaw !setname 0x17a Scareclaw
!setname 0x17b Battleguard !setname 0x17b Battleguard
!setname 0x17c Libromancer !setname 0x17c Libromancer
...@@ -1149,4 +1152,8 @@ ...@@ -1149,4 +1152,8 @@
!setname 0x181 Tearalaments !setname 0x181 Tearalaments
!setname 0x182 Vernalizer Fairy !setname 0x182 Vernalizer Fairy
!setname 0x183 Mokey Mokey !setname 0x183 Mokey Mokey
!setname 0x184 Wingman !setname 0x184 Wingman
\ No newline at end of file #setname 0x185 Doodle
!setname 0x1185 Doodle Beast
!setname 0x2185 Doodlebook
!setname 0x186 G Golem
\ No newline at end of file
No preview for this file type
...@@ -377,7 +377,7 @@ ...@@ -377,7 +377,7 @@
!system 1326 효과 !system 1326 효과
!system 1327 모든 검색 !system 1327 모든 검색
!system 1328 관리 !system 1328 관리
!system 1329 카드군: !system 1329 카드군:
!system 1330 메인: !system 1330 메인:
!system 1331 엑스트라: !system 1331 엑스트라:
!system 1332 사이드: !system 1332 사이드:
...@@ -645,6 +645,7 @@ ...@@ -645,6 +645,7 @@
!counter 0x5f 피스 카운터 !counter 0x5f 피스 카운터
!counter 0x60 카운터(베어루크티 라디에이션) !counter 0x60 카운터(베어루크티 라디에이션)
!counter 0x61 카운터(운명의 수인(囚人)) !counter 0x61 카운터(운명의 수인(囚人))
!counter 0x62 카운터(꺼져가는 생명)
#setnames, using tab for comment #setnames, using tab for comment
!setname 0x1 얼리 오브 저스티스(정발명:A·O·J) !setname 0x1 얼리 오브 저스티스(정발명:A·O·J)
!setname 0x2 제넥스 !setname 0x2 제넥스
...@@ -1133,15 +1134,15 @@ ...@@ -1133,15 +1134,15 @@
!setname 0x177 리바이어던 !setname 0x177 리바이어던
!setname 0x178 씨 스텔스 !setname 0x178 씨 스텔스
!setname 0x179 세리온즈 !setname 0x179 세리온즈
!setname 0x17a 스케어클로 !setname 0x17a 스케어클로
!setname 0x17b 바바리안 !setname 0x17b 바바리안
!setname 0x17c 리브로맨서(Libromancer) !setname 0x17c 리브로맨서(Libromancer)
!setname 0x17d 발리안 !setname 0x17d 밸리언
!setname 0x17e 라뷰린스 !setname 0x17e 라뷰린스
!setname 0x117e 웰컴 라뷰린스 !setname 0x117e 웰컴 라뷰린스
!setname 0x17f 룬(미스터룬) !setname 0x17f 루닉
!setname 0x180 스프라이트 !setname 0x180 스프라이트
!setname 0x181 티아라멘츠 !setname 0x181 티아라멘츠
!setname 0x182 춘화정 !setname 0x182 춘화정
!setname 0x183 모케모케 !setname 0x183 모케모케
!setname 0x184 윙맨 !setname 0x184 윙맨
\ No newline at end of file
No preview for this file type
...@@ -653,6 +653,8 @@ ...@@ -653,6 +653,8 @@
!counter 0x60 指示物(北极天熊辐射) !counter 0x60 指示物(北极天熊辐射)
!counter 0x61 指示物(命运的囚人) !counter 0x61 指示物(命运的囚人)
!counter 0x62 指示物(逐渐削减的生命) !counter 0x62 指示物(逐渐削减的生命)
!counter 0x1063 幻觉指示物
!counter 0x64 G石人指示物
#setnames, using tab for comment #setnames, using tab for comment
!setname 0x1 正义盟军 AOJ !setname 0x1 正义盟军 AOJ
!setname 0x2 次世代 ジェネクス !setname 0x2 次世代 ジェネクス
...@@ -728,6 +730,7 @@ ...@@ -728,6 +730,7 @@
!setname 0x34 宝玉 宝玉 !setname 0x34 宝玉 宝玉
!setname 0x1034 宝玉兽 宝玉獣 !setname 0x1034 宝玉兽 宝玉獣
!setname 0x2034 究极宝玉神 究極宝玉神 !setname 0x2034 究极宝玉神 究極宝玉神
!setname 0x5034 高等宝玉兽 A宝玉獣
!setname 0x35 魔轰神 魔轟神 !setname 0x35 魔轰神 魔轟神
!setname 0x36 机甲 マシンナーズ !setname 0x36 机甲 マシンナーズ
!setname 0x37 霞之谷 霞の谷 !setname 0x37 霞之谷 霞の谷
...@@ -1153,3 +1156,7 @@ ...@@ -1153,3 +1156,7 @@
!setname 0x182 春化精 !setname 0x182 春化精
!setname 0x183 悠悠 もけもけ !setname 0x183 悠悠 もけもけ
!setname 0x184 翼侠 ウィングマン !setname 0x184 翼侠 ウィングマン
#setname 0x185 涂鸦 らくがき
!setname 0x1185 涂鸦兽 らくがきじゅう
!setname 0x2185 涂鸦本 らくがきちょう
!setname 0x186 G石人 Gゴーレム
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment