Merge pull request #80 from Kareylo/master

updated for 6.25

Author: MgAl2O4

assets/data/cards.xml

@@ -367,4 +367,9 @@
   <card id="365" icon="082865.png" rarity="3" type="0" up="6" lt="7" dn="7" rt="8" sort="346" group="0" />
   <card id="366" icon="082866.png" rarity="3" type="0" up="5" lt="9" dn="5" rt="8" sort="347" group="0" />
   <card id="367" icon="082867.png" rarity="4" type="0" up="9" lt="4" dn="10" rt="5" sort="348" group="0" />
+  <card id="368" icon="082868.png" rarity="0" type="0" up="1" lt="6" dn="1" rt="5" sort="349" group="0" />
+  <card id="369" icon="082869.png" rarity="1" type="0" up="2" lt="6" dn="6" rt="4" sort="350" group="0" />
+  <card id="370" icon="082870.png" rarity="1" type="0" up="7" lt="5" dn="5" rt="2" sort="351" group="0" />
+  <card id="371" icon="082871.png" rarity="1" type="0" up="4" lt="6" dn="2" rt="7" sort="352" group="0" />
+  <card id="372" icon="082872.png" rarity="2" type="1" up="2" lt="2" dn="8" rt="8" sort="353" group="0" />
 </root>

assets/data/loc.xml

@@ -389,6 +389,11 @@
   <loc type="3" id="365" de="Barbarizia" en="Barbariccia" fr="Barbariccia" ja="バルバリシア" />
   <loc type="3" id="366" de="Lahabrea" en="Chief Keyward Lahabrea" fr="Lahabrea (passé)" ja="ラハブレア" />
   <loc type="3" id="367" de="Hephaistos" en="Hephaistos" fr="Héphaïstos" ja="ヘファイストス" />
+  <loc type="3" id="368" de="N-7000" en="N-7000" fr="N-7000" ja="N-7000" />
+  <loc type="3" id="369" de="Geryon der Gewaltsame" en="Geryon the Steer" fr="Géryon le Dominateur" ja="覇道のゲーリュオン" />
+  <loc type="3" id="370" de="Gladiator von Sil'dih" en="Gladiator of Sil'dih" fr="Gladiateur Sildien" ja="シラディハ・グラディアトル" />
+  <loc type="3" id="371" de="Ritter der Thorne" en="Thorne Knight" fr="Chevalier Mage Des Thorne" ja="ソーン・マジックナイト" />
+  <loc type="3" id="372" de="Zeless Gah" en="Shadowcaster Zeless Gah" fr="Zeless Gah" ja="影火のゼレズ・ガー" />
   <loc type="4" id="1" de="Aurifort Kreuz" en="Aurifort of the Three Clubs" fr="Aurifort l'As de trèfle" ja="クラブのオリフォル" cn="梅花天王欧里福" ko="오리포르" />
   <loc type="4" id="2" de="Baderon" en="Baderon" fr="Baderon" ja="バデロン" cn="巴德龙" ko="바데론" />
   <loc type="4" id="3" de="Botan" en="Botan" fr="Botan" ja="ボタン" cn="牡丹" ko="보탄" />
@@ -499,6 +504,7 @@
   <loc type="4" id="108" de="Celia" en="Celia" fr="Celia" ja="セリア" cn="赛丽亚" ko="셀리아" />
   <loc type="4" id="109" de="Prudence" en="Prudence" fr="Prudence" ja="プルーデンス" cn="普鲁登斯" />
   <loc type="4" id="110" de="Ghasa" en="Ghasa" fr="Ghasa" ja="ガーサ" cn="" />
+  <loc type="4" id="111" de="Kilfufu" en="Kilfufu" fr="Kilfufu" ja="キルフフ" cn="" />
   <loc type="5" id="1" de="Gold Saucer" en="The Gold Saucer" fr="Gold Saucer" ja="ゴールドソーサー" cn="金碟游乐场" ko="골드 소서" />
   <loc type="5" id="2" de="Obere Decks" en="Limsa Lominsa Upper Decks" fr="Limsa Lominsa - Le Tillac" ja="リムサ・ロミンサ：上甲板層" cn="利姆萨·罗敏萨上层甲板" ko="림사 로민사 상층 갑판" />
   <loc type="5" id="3" de="Kugane" en="Kugane" fr="Kugane" ja="クガネ市街" cn="黄金港城区" ko="쿠가네" />
@@ -609,6 +615,7 @@
   <loc type="5" id="108" de="Alt-Sharlayan" en="Old Sharlayan" fr="Vieille Sharlayan" ja="オールド・シャーレアン" cn="旧萨雷安" ko="올드 샬레이안" />
   <loc type="5" id="109" de="Mor Dhona" en="Mor Dhona" fr="Mor Dhona" ja="モードゥナ" cn="摩杜纳" ko="모르도나" />
   <loc type="5" id="110" de="Thavnair" en="Thavnair" fr="Thavnair" ja="サベネア島" cn="萨维奈岛" ko="사베네어 섬" />
+  <loc type="5" id="111" de="Nald-Kreuzgang" en="Ul'dah - Steps of Nald" fr="Ul'dah - Faubourg de Nald" ja="ウルダハ：ナル回廊" cn="乌尔达哈现世回廊" ko="울다하 날 회랑" />
   <loc type="6" id="0" de="Manderville-Masters" en="the Manderville Tournament of Champions" fr="le Championnat des Manderville" ja="マンダヴィル・チャンピオンシップ" cn="曼德维尔锦标赛" ko="맨더빌배 선수권 대회" />
   <loc type="6" id="1" de="Großer Preis von Nymeia" en="the Spinner's Pull" fr="le Grand Prix de la Fileuse" ja="星神ニメーヤ賞典" cn="命运神大奖赛" ko="별의 신 니메이아배" />
   <loc type="6" id="2" de="Orran-Durai-Ehrenturnier" en="the Durai Memorial" fr="le Jubilé Orran Durai" ja="オーラン記念" cn="奥兰纪念赛" ko="오란 기념 대회" />

assets/data/npcs.xml

@@ -850,4 +850,11 @@
     <rule id="8" />
     <reward id="348" />
   </npc>
+  <npc id="111" mx="12" my="8">
+    <deckA id0="358" id1="63" id2="118" id3="0" id4="0" />
+    <deckV id0="28" id1="22" id2="45" id3="178" id4="0" />
+    <rule id="3" />
+    <rule id="8" />
+    <reward id="358" />
+  </npc>
 </root>