Skip to content

Commit

Permalink
feat: fixed deco colors + added new charms
Browse files Browse the repository at this point in the history
  • Loading branch information
CarlosFdez committed Jul 21, 2020
1 parent 631f43e commit 7b83552
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 2 deletions.
3 changes: 3 additions & 0 deletions source_data/charms/charm_base.csv
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
262,Demolition Charm IV,Demolition Charm III,11,Blast Attack,4,,
155,Draw Charm I,,5,Critical Draw,1,,
156,Draw Charm II,Draw Charm I,7,Critical Draw,2,,
301,Draw Charm III,Draw Charm II,12,Critical Draw,3,,
157,Special Shot Charm I,,5,Special Ammo Boost,1,,
158,Special Shot Charm II,Special Shot Charm I,8,Special Ammo Boost,2,,
159,Marathon Charm I,,5,Marathon Runner,1,,
Expand All @@ -192,6 +193,7 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
162,Fitness Charm II,Fitness Charm I,6,Constitution,2,,
163,Fitness Charm III,Fitness Charm II,7,Constitution,3,,
264,Fitness Charm IV,Fitness Charm III,11,Constitution,4,,
303,Fitness Charm V,Fitness Charm IV,12,Constitution,5,,
164,Surge Charm I,,5,Stamina Surge,1,,
165,Surge Charm II,Surge Charm I,7,Stamina Surge,2,,
265,Surge Charm III,Surge Charm II,12,Stamina Surge,3,,
Expand Down Expand Up @@ -294,6 +296,7 @@ id,name_en,previous_en,rarity,skill1_name,skill1_level,skill2_name,skill2_level
290,Guardian Charm III,Guardian Charm II,12,Offensive Guard,3,,
291,Phoenix Charm I,,11,Coalescence,1,,
292,Phoenix Charm II,Phoenix Charm I,12,Coalescence,2,,
302,Phoenix Charm III,Phoenix Charm II,12,Coalescence,3,,
293,Adamantine Charm,,11,Non-elemental Boost,1,Bludgeoner,1
294,Razor Sharp Charm,,11,Razor Sharp/Spare Shot,1,,
295,Sealer's Charm,,11,Elderseal Boost,1,Adrenaline,1
Expand Down
3 changes: 3 additions & 0 deletions source_data/charms/charm_base_translations.csv
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ Demolition Charm III,爆破の護石Ⅲ,Talisman du chaos III,Amuleto schianto I
Demolition Charm IV,爆破の護石Ⅳ,Talisman du chaos IV,Amuleto schianto IV,ZerstörungTalismanIV,Cigua demolición IV,Amuleto de Demolição IV,Amulet niszczenia IV,Оберег разрушителя 4,폭파의 호석Ⅳ,爆破護石Ⅳ,سحر الدمار IV
Draw Charm I,抜刀の護石Ⅰ,Talisman du battosai,Amuleto sfoderata I,Ziehen-Talisman I,Cigua extracción I,Amuleto de Saque I,Amulet dobycia I,Оберег выхвата 1,발도의 호석Ⅰ,拔刀護石Ⅰ,سحر السحب I
Draw Charm II,抜刀の護石Ⅱ,Talisman du battosai II,Amuleto sfoderata II,Ziehen-Talisman II,Cigua extracción II,Amuleto de Saque II,Amulet dobycia II,Оберег выхвата 2,발도의 호석Ⅱ,拔刀護石Ⅱ,سحر السحب II
Draw Charm III,抜刀の護石Ⅲ,Talisman du battosai III,Amuleto sfoderata III,Ziehen-Talisman III,Cigua extracción III,Amuleto de Saque III,Amulet dobycia III,Оберег выхвата 3,발도의 호석Ⅲ,拔刀護石Ⅲ,سحر السحب III
Special Shot Charm I,特射の護石Ⅰ,Talisman du tireur,Amuleto speciale I,SpezialschussTalsmn I,Cigua tiro espec. I,Amuleto Tiro Esp. I,Amulet sp. strzału I,Оберег ос. выстрела 1,특사의 호석Ⅰ,特射護石Ⅰ,طلقة سحر خاصة I
Special Shot Charm II,特射の護石Ⅱ,Talisman du tireur II,Amuleto speciale II,SpezialschussTalsmnII,Cigua tiro espec. II,Amuleto Tiro Esp. II,Amulet sp. strzału II,Оберег ос. выстрела 2,특사의 호석Ⅱ,特射護石Ⅱ,طلقة سحر خاصة II
Marathon Charm I,強走の護石Ⅰ,Talisman d'énergie,Amuleto maratona I,Marathon-Talisman I,Cigua maratón I,Amuleto de Maratona I,Amulet maratonu I,Оберег марафонца 1,강주의 호석Ⅰ,強走護石Ⅰ,سحر الماراثون I
Expand All @@ -192,6 +193,7 @@ Fitness Charm I,体術の護石Ⅰ,Talisman de santé,Amuleto tonico I,Fitness-T
Fitness Charm II,体術の護石Ⅱ,Talisman de santé II,Amuleto tonico II,Fitness-Talisman II,Cigua en forma II,Amuleto de Boa Forma II,Amulet sprawności II,Оберег стройности 2,체술의 호석Ⅱ,體術護石Ⅱ,سحر اللياقة II
Fitness Charm III,体術の護石Ⅲ,Talisman de santé III,Amuleto tonico III,Fitness-Talisman III,Cigua en forma III,Amuleto de Boa Forma III,Amulet sprawności III,Оберег стройности 3,체술의 호석Ⅲ,體術護石Ⅲ,سحر اللياقة III
Fitness Charm IV,体術の護石Ⅳ,Talisman de santé IV,Amuleto tonico IV,Fitness-Talisman IV,Cigua en forma IV,Amuleto de Boa Forma IV,Amulet sprawności IV,Оберег стройности 4,체술의 호석Ⅳ,體術護石Ⅳ,سحر اللياقة IV
Fitness Charm V,体術の護石Ⅴ,Talisman de santé V,Amuleto tonico V,Fitness-Talisman V,Cigua en forma V,Amuleto de Boa Forma V,Amulet sprawności V,Оберег стройности 5,체술의 호석Ⅴ,體術護石Ⅴ,سحر اللياقة V
Surge Charm I,早気の護石Ⅰ,Talisman d'afflux,Amuleto super I,Energie-Talisman I,Cigua recarga I,Amuleto de Surto I,Amulet przypływu I,Оберег выносливости 1,조기의 호석Ⅰ,早氣護石Ⅰ,سحر الاندفاع I
Surge Charm II,早気の護石Ⅱ,Talisman d'afflux II,Amuleto super II,Energie-Talisman II,Cigua recarga II,Amuleto de Surto II,Amulet przypływu II,Оберег выносливости 2,조기의 호석Ⅱ,早氣護石Ⅱ,سحر الاندفاع II
Surge Charm III,早気の護石Ⅲ,Talisman d'afflux III,Amuleto super III,Energie-Talisman III,Cigua recarga III,Amuleto de Surto III,Amulet przypływu III,Оберег выносливости 3,조기의 호석Ⅲ,早氣護石Ⅲ,سحر الاندفاع III
Expand Down Expand Up @@ -294,6 +296,7 @@ Guardian Charm II,守勢の護石Ⅱ,Collier gardien II,Amuleto guardiano II,Wä
Guardian Charm III,守勢の護石Ⅲ,Collier gardien III,Amuleto guardiano III,Wächter-Talisman III,Cigua guardián III,Amuleto Guardião III,Amulet strażnika III,Оберег стража 3,수세의 호석Ⅲ,守勢護石Ⅲ,سحر الحارس III
Phoenix Charm I,転福の護石Ⅰ,Collier phénix,Amuleto fenice I,Phönix-Talisman I,Cigua fénix I,Amuleto da Fênix I,Amulet feniksa I,Оберег феникса 1,전화위복의 호석Ⅰ,轉福護石Ⅰ,سحر العنقاء I
Phoenix Charm II,転福の護石Ⅱ,Collier phénix II,Amuleto fenice II,Phönix-Talisman II,Cigua fénix II,Amuleto da Fênix II,Amulet feniksa II,Оберег феникса 2,전화위복의 호석Ⅱ,轉福護石Ⅱ,سحر العنقاء II
Phoenix Charm III,転福の護石Ⅲ,Collier phénix III,Amuleto fenice III,Phönix-Talisman III,Cigua fénix III,Amuleto da Fênix III,Amulet feniksa III,Оберег феникса 3,전화위복의 호석Ⅲ,轉福護石Ⅲ,سحر العنقاء III
Adamantine Charm,剛力の護石,Collier adamantin,Amuleto adamantino,Diamantener Talisman,Cigua adamantina,Amuleto Adamantino,Amulet niezłomności,Адамантиновый оберег,굳센 힘의 호석,剛力護石,سحر الصلابة
Razor Sharp Charm,業物の護石,Collier samouraï,Amuleto acutezza,Rasiermesser-Talisman,Cigua afilada,Amuleto Fio da Navalha,Amulet naostrzenia,Оберег бритвы,명검의 호석,利刃護石,سحر شحذ حاد
Sealer's Charm,封印の護石,Collier greffier,Amuleto sigillo,Versiegler-Talisman,Cigua selladora,Amuleto do Selador,Amulet pieczętującego,Оберег печати,봉인의 호석,封印護石,سحر الخاتم
Expand Down
3 changes: 3 additions & 0 deletions source_data/charms/charm_craft.csv
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ Demolition Charm III,Upgrade,Teostra Gem,1,Xeno'jiiva Shell,3,Firecell Stone,1,D
Demolition Charm IV,Upgrade,Rubbery Shell,3,Reef Crystal,3,Phantomcore Ore,1,,
Draw Charm I,Create,Diablos Marrow,1,Diablos Fang,3,Earth Crystal,3,Spiritcore Ore,1
Draw Charm II,Upgrade,Teostra Gem,1,Teostra Horn+,2,Fucium Ore,1,Dreamcore Ore,1
Draw Charm III,Upgrade,Azure Dragonsphire,1,Large Elder Dragon Gem,1,Great Spiritvein Gem,1,Shadowcore Ore,1
Special Shot Charm I,Create,Anjanath Plate,1,Anjanath Fang,2,Warped Bone,3,Spiritcore Ore,1
Special Shot Charm II,Upgrade,Bazelgeuse Gem,1,Xeno'jiiva Wing,2,Novacrystal,1,Dreamcore Ore,1
Marathon Charm I,Create,Barroth Scalp,2,Barroth Claw+,2,Dragonvein Crystal,3,Spiritcore Ore,1
Expand All @@ -192,6 +193,7 @@ Fitness Charm I,Create,Tobi-Kadachi Electrode+,2,Tobi-Kadachi Claw+,2,Dragonvein
Fitness Charm II,Upgrade,Odogaron Gem,1,Odogaron Claw+,2,Fucium Ore,1,Dreamcore Ore,1
Fitness Charm III,Upgrade,Daora Gem,1,Daora Claw+,1,Coral Crystal,3,Dreamcore Ore,1
Fitness Charm IV,Upgrade,Tempered Rendclaw,3,Guiding Wasteland Crystal,1,Spiritvein Solidbone,4,Phantomcore Ore,1
Fitness Charm V,Upgrade,Frostfang Ticket,3,Silverwhite Frostfang,3,Spiritvein Gem Shard,1,Phantomcore Ore,1
Surge Charm I,Create,Paolumu Wing,2,Paolumu Pelt+,3,Dragonbone Relic,3,Spiritcore Ore,1
Surge Charm II,Upgrade,Nergigante Gem,1,Nergigante Talon,2,Fucium Ore,1,Dreamcore Ore,1
Surge Charm III,Upgrade,Nargacuga Mantle,1,Tempered Cutwing,3,Spiritvein Gem,1,Phantomcore Ore,1
Expand Down Expand Up @@ -294,3 +296,4 @@ Guardian Charm II,Upgrade,Uragaan Pallium,1,Lavasioth Grandfin,2,Dodogama Mandib
Guardian Charm III,Upgrade,Tempered Trancehide,3,Tempered Rubbery Shell,3,Elder Spiritvein Bone,4,Shadowcore Ore,1
Phoenix Charm I,Create,Conqueror's Seal,1,Velkhana Crystal,1,Fey Wyvern Gem,1,Dragoncore Ore,1
Phoenix Charm II,Upgrade,Research Commission Ticket+,1,Tempered Crownhorn,3,Great Spiritvein Gem,1,Shadowcore Ore,1
Phoenix Charm III,Upgrade,Azure Dragonsphire,1,Shara Ishvalda Gem,1,Great Spiritvein Gem,1,Shadowcore Ore,1
4 changes: 2 additions & 2 deletions source_data/decorations/decoration_base.csv
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ id,name_en,slot,rarity,skill1_name,skill1_level,skill2_name,skill2_level,icon_co
217,Grinder/Attack Jewel 4,4,10,Speed Sharpening,1,Attack Boost,1,Yellow
218,Bomber/Attack Jewel 4,4,10,Bombardier,1,Attack Boost,1,Orange
219,Fungiform/Attack Jewel 4,4,10,Mushroomancer,1,Attack Boost,1,Violet
220,Slider/Attack Jewel 4,4,9,Affinity Sliding,1,Attack Boost,1,Res
220,Slider/Attack Jewel 4,4,9,Affinity Sliding,1,Attack Boost,1,Red
221,Guardian/Attack Jewel 4,4,9,Offensive Guard,1,Attack Boost,1,White
222,Drain/Expert Jewel 4,4,10,Stamina Thief,1,Critical Eye,1,Cyan
223,Fortitude/Expert Jewel 4,4,9,Fortify,1,Critical Eye,1,Red
Expand All @@ -239,7 +239,7 @@ id,name_en,slot,rarity,skill1_name,skill1_level,skill2_name,skill2_level,icon_co
239,Slider/Expert Jewel 4,4,9,Affinity Sliding,1,Critical Eye,1,Red
240,Guardian/Expert Jewel 4,4,9,Offensive Guard,1,Critical Eye,1,White
241,Drain/Release Jewel 4,4,11,Stamina Thief,1,Free Elem/Ammo Up,1,Cyan
242,Fortitude/Release Jewel 4,4,10,Fortify,1,Free Elem/Ammo Up,1,red
242,Fortitude/Release Jewel 4,4,10,Fortify,1,Free Elem/Ammo Up,1,Red
243,Crisis/Release Jewel 4,4,10,Resuscitate,1,Free Elem/Ammo Up,1,Cyan
244,Ironwall/Release Jewel 4,4,11,Guard,1,Free Elem/Ammo Up,1,Gray
245,Friendship/Release Jewel 4,4,11,Wide-Range,1,Free Elem/Ammo Up,1,White
Expand Down
2 changes: 2 additions & 0 deletions source_data/items/item_base.csv
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ id,name_en,category,subcategory,rarity,buy_price,sell_price,carry_limit,points,i
873,Barioth Greatspike,material,,10,,6020,,,Body,White
874,Barioth Lash,material,,10,,6130,,,Tail,White
875,Amber Hardfang,material,,10,,6240,,,Fang,Beige
1307,Silverwhite Frostfang,material,,11,,10300,,,,
876,Nargacuga Shard,material,,10,,2940,,,Scale,Gray
877,Nargacuga Blackfur+,material,,10,,4440,,,Hide,Gray
878,Nargacuga Lash,material,,10,,6220,,,Tail,Gray
Expand Down Expand Up @@ -1068,6 +1069,7 @@ id,name_en,category,subcategory,rarity,buy_price,sell_price,carry_limit,points,i
657,Zorah Magdaros Ticket,material,,8,,800,,,Voucher,Gray
658,Xeno'jiiva Ticket,material,,8,,800,,,Voucher,White
1298,Namielle Ticket,material,,12,,1600,,,,
1308,Frostfang Ticket,material,,11,,1400,,,,
519,Black Bandage,material,,6,,400,,,Question,Gray
520,Black Crystal Ticket,material,,6,,400,,,Voucher,Gray
531,First Fleet Ticket,material,,4,,400,,,Voucher,Red
Expand Down
Loading

0 comments on commit 7b83552

Please sign in to comment.