Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

100 Gold Moon Weapon Skills #303

Merged
merged 49 commits into from
Mar 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
3520a96
Added 100 Gold Moon Weapon Skills
Groovman Jul 14, 2019
1b897af
Extend buff level list for gold moon ougi crit calculation
Groovman Jul 14, 2019
972ac87
Fix charts missing because of typo and nan values
Groovman Jul 15, 2019
ed791e8
Move accuracy debuff for Mjolnir behind the limit calculation.
Groovman Jul 15, 2019
6e6ca6d
Merge branch 'master' into gm100_skills
Groovman Jul 16, 2019
66b7054
Merge remote-tracking branch 'remotes/origin/master' into gm100_skills
Groovman Jul 17, 2019
a7b4204
Add critical cap up for Gae Bulg and Mjolnir.
Groovman Jul 17, 2019
f0249e6
Merge branch 'master' into gm100_skills
Groovman Jul 28, 2019
7c3bdb7
Merge branch 'master' into gm100_skills
Groovman Jul 28, 2019
5ba581c
Merge branch 'master' into gm100_skills
Groovman Jul 28, 2019
396246e
Moved accuracy outside the damage function
Groovman Jul 28, 2019
04204fa
Corrected Damage Limit mods, Ougi cap up is on Exceed and Damage cap …
Groovman Jul 31, 2019
dcde069
Merge branch 'master' into gm100_skills
Groovman Jul 31, 2019
28e75b1
Change skill names to english names.
Groovman Aug 2, 2019
a1f908e
Merge branch 'master' into gm100_skills
Groovman Aug 6, 2019
e96471d
Merge branch 'master' into gm100_skills
Groovman Aug 7, 2019
795d040
Add series
Aug 8, 2019
197e9ef
Add missing cap field
Aug 9, 2019
8e0e5cc
Merge branch 'master' into gm100_skills
Groovman Aug 17, 2019
5448431
Merge branch 'master' into gm100_skills
Groovman Aug 26, 2019
854f70d
Merge branch 'master' into gm100_skills
Groovman Aug 27, 2019
c3b7bcb
Fixed main hand skill not being set to none on sub
Groovman Aug 27, 2019
6efee62
Add stack detail to Ameno Habakiri
Groovman Aug 27, 2019
796a65f
Fix CSV columns
Groovman Aug 27, 2019
e8a09f2
Update Excalibur ougi cap up
Groovman Aug 27, 2019
305ec3e
Prepare Gae Bulg's Victory's Promise to use turn buff counter when ready
Groovman Aug 28, 2019
75a76b6
Label style "non" turning invisible on iOS small devices
Groovman Aug 28, 2019
c33e833
Improve jp translation (translate.js)
Aug 28, 2019
3d13274
Improve jp translation (result.js)
Aug 28, 2019
821640f
Move stack calculation
Groovman Aug 28, 2019
964f6b7
Merge branch 'master' into gm100_skills
Groovman Aug 28, 2019
a2548d3
Merge branch 'master' into gm100_skills
Groovman Sep 7, 2019
2ba8608
Fix translate.js merge
Groovman Sep 7, 2019
8e70176
Merge branch 'master' into gm100_skills
Groovman Sep 22, 2019
86eebae
Merge branch 'master' into gm100_skills
Groovman Oct 14, 2019
f4641df
Merge branch 'master' into gm100_skills
Groovman Oct 14, 2019
0ffe3bd
Fix failed failed armdata merge
Groovman Oct 14, 2019
3a828a4
Addd number of stacks to slaysnakes_mythII
Groovman Oct 19, 2019
f0b50e0
Merge branch 'master' into gm100_skills
Groovman Oct 20, 2019
28f0d5c
Merge branch 'master' into gm100_skills
Groovman Nov 8, 2019
917fc23
Merge remote-tracking branch 'remotes/origin/master' into gm100_skills
Groovman Nov 21, 2019
4148edd
Merge branch 'master' into gm100_skills
Groovman Nov 22, 2019
a4793b4
Merge remote-tracking branch 'remotes/origin/master' into gm100_skills
Groovman Dec 13, 2019
17a2cba
Merge branch 'master' into gm100_skills
Groovman Dec 16, 2019
f89c430
fix translation
Groovman Dec 16, 2019
3e01204
Merge remote-tracking branch 'remotes/origin/master' into gm100_skills
Groovman Feb 2, 2020
ccda5c1
Merge branch 'master' into gm100_skills
Groovman Mar 9, 2020
38e03d0
Added comment
Groovman Mar 14, 2020
acadcc5
Merge remote-tracking branch 'groovman/gm100_skills' into gm100_skills
Groovman Mar 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 53 additions & 53 deletions armData.json
Original file line number Diff line number Diff line change
Expand Up @@ -19483,12 +19483,12 @@
"imageURL": "./imgs/1040911700.png",
"en": "Blade of Purification"
},
"エクスカリバー・属性変更": {
"ja": "エクスカリバー・属性変更",
"エクスカリバー": {
"ja": "エクスカリバー",
"element": "all",
"type": "sword",
"skill1": "non",
"skill2": "non",
"skill2": "rightway_pathfinder",
"element2": "all",
"skill3": "non",
"element3": "all",
Expand All @@ -19502,12 +19502,12 @@
"imageURL": "./imgs/1040007500.png",
"en": "Excalibur"
},
"[4凸]エクスカリバー・属性変更": {
"ja": "[4凸]エクスカリバー・属性変更",
"[4凸]エクスカリバー": {
"ja": "[4凸]エクスカリバー",
"element": "all",
"type": "sword",
"skill1": "non",
"skill2": "non",
"skill2": "rightway_pathfinderII",
"element2": "all",
"skill3": "non",
"element3": "all",
Expand All @@ -19523,8 +19523,8 @@
"imageURL": "./imgs/1040007500.png",
"en": "[4★] Excalibur"
},
"ダマスカスナイフ・属性変更": {
"ja": "ダマスカスナイフ・属性変更",
"ダマスカスナイフ": {
"ja": "ダマスカスナイフ",
"element": "all",
"type": "dagger",
"skill1": "non",
Expand All @@ -19542,8 +19542,8 @@
"imageURL": "./imgs/1040106600.png",
"en": "Damascus Knife"
},
"[4凸]ダマスカスナイフ・属性変更": {
"ja": "[4凸]ダマスカスナイフ・属性変更",
"[4凸]ダマスカスナイフ": {
"ja": "[4凸]ダマスカスナイフ",
"element": "all",
"type": "dagger",
"skill1": "non",
Expand All @@ -19563,12 +19563,12 @@
"imageURL": "./imgs/1040106600.png",
"en": "[4★] Damascus Knife"
},
"ゲイボルグ・属性変更": {
"ja": "ゲイボルグ・属性変更",
"ゲイボルグ": {
"ja": "ゲイボルグ",
"element": "all",
"type": "spear",
"skill1": "non",
"skill2": "non",
"skill1": "victorys_promise",
"skill2": "one_sting_one_kill",
"element2": "all",
"skill3": "non",
"element3": "all",
Expand All @@ -19582,12 +19582,12 @@
"imageURL": "./imgs/1040205500.png",
"en": "Gae Bulg"
},
"[4凸]ゲイボルグ・属性変更": {
"ja": "[4凸]ゲイボルグ・属性変更",
"[4凸]ゲイボルグ": {
"ja": "[4凸]ゲイボルグ",
"element": "all",
"type": "spear",
"skill1": "non",
"skill2": "non",
"skill1": "victorys_promise",
"skill2": "one_sting_one_killII",
"element2": "all",
"skill3": "non",
"element3": "all",
Expand All @@ -19603,12 +19603,12 @@
"imageURL": "./imgs/1040205500.png",
"en": "[4★] Gae Bulg"
},
"ミョルニル・属性変更": {
"ja": "ミョルニル・属性変更",
"ミョルニル": {
"ja": "ミョルニル",
"element": "all",
"type": "axe",
"skill1": "normalL",
"skill2": "non",
"skill2": "god_of_war",
"element2": "all",
"skill3": "non",
"element3": "all",
Expand All @@ -19622,12 +19622,12 @@
"imageURL": "./imgs/1040304400.png",
"en": "Mjolnir"
},
"[4凸]ミョルニル・属性変更": {
"ja": "[4凸]ミョルニル・属性変更",
"[4凸]ミョルニル": {
"ja": "[4凸]ミョルニル",
"element": "all",
"type": "axe",
"skill1": "normalL",
"skill2": "non",
"skill2": "god_of_warII",
"element2": "all",
"skill3": "non",
"element3": "all",
Expand All @@ -19643,8 +19643,8 @@
"imageURL": "./imgs/1040304400.png",
"en": "[4★] Mjolnir"
},
"カドゥケウス・属性変更": {
"ja": "カドゥケウス・属性変更",
"カドゥケウス": {
"ja": "カドゥケウス",
"element": "all",
"type": "wand",
"skill1": "normalKamui",
Expand All @@ -19662,8 +19662,8 @@
"imageURL": "./imgs/1040406900.png",
"en": "Caduceus"
},
"[4凸]カドゥケウス・属性変更": {
"ja": "[4凸]カドゥケウス・属性変更",
"[4凸]カドゥケウス": {
"ja": "[4凸]カドゥケウス",
"element": "all",
"type": "wand",
"skill1": "normalKamui",
Expand All @@ -19683,8 +19683,8 @@
"imageURL": "./imgs/1040406900.png",
"en": "[4★] Caduceus"
},
"フライクーゲル・属性変更": {
"ja": "フライクーゲル・属性変更",
"フライクーゲル": {
"ja": "フライクーゲル",
"element": "all",
"type": "gun",
"skill1": "normalBoukunL",
Expand All @@ -19702,8 +19702,8 @@
"imageURL": "./imgs/1040504400.png",
"en": "Freikugel"
},
"[4凸]フライクーゲル・属性変更": {
"ja": "[4凸]フライクーゲル・属性変更",
"[4凸]フライクーゲル": {
"ja": "[4凸]フライクーゲル",
"element": "all",
"type": "gun",
"skill1": "normalBoukunL",
Expand All @@ -19723,12 +19723,12 @@
"imageURL": "./imgs/1040504400.png",
"en": "[4★] Freikugel"
},
"方天画戟・属性変更": {
"ja": "方天画戟・属性変更",
"方天画戟": {
"ja": "方天画戟",
"element": "all",
"type": "fist",
"skill1": "non",
"skill2": "non",
"skill2": "apocalyptic_power",
"element2": "all",
"skill3": "non",
"element3": "all",
Expand All @@ -19742,12 +19742,12 @@
"imageURL": "./imgs/1040604500.png",
"en": "Sky Piercer"
},
"[4凸]方天画戟・属性変更": {
"ja": "[4凸]方天画戟・属性変更",
"[4凸]方天画戟": {
"ja": "[4凸]方天画戟",
"element": "all",
"type": "fist",
"skill1": "non",
"skill2": "non",
"skill2": "apocalyptic_powerII",
"element2": "all",
"skill3": "non",
"element3": "all",
Expand All @@ -19763,8 +19763,8 @@
"imageURL": "./imgs/1040604500.png",
"en": "[4★] Sky Piercer"
},
"ヘラクレス・属性変更": {
"ja": "ヘラクレス・属性変更",
"ヘラクレス": {
"ja": "ヘラクレス",
"element": "all",
"type": "bow",
"skill1": "normalKatsumiM",
Expand All @@ -19782,8 +19782,8 @@
"imageURL": "./imgs/1040703600.png",
"en": "Hercules"
},
"[4凸]ヘラクレス・属性変更": {
"ja": "[4凸]ヘラクレス・属性変更",
"[4凸]ヘラクレス": {
"ja": "[4凸]ヘラクレス",
"element": "all",
"type": "bow",
"skill1": "normalKatsumiM",
Expand All @@ -19803,8 +19803,8 @@
"imageURL": "./imgs/1040703600.png",
"en": "[4★] Hercules"
},
"ウルリクムミ・属性変更": {
"ja": "ウルリクムミ・属性変更",
"ウルリクムミ": {
"ja": "ウルリクムミ",
"element": "all",
"type": "music",
"skill1": "normalKatsumokuS",
Expand All @@ -19822,8 +19822,8 @@
"imageURL": "./imgs/1040803700.png",
"en": "Ullikummi"
},
"[4凸]ウルリクムミ・属性変更": {
"ja": "[4凸]ウルリクムミ・属性変更",
"[4凸]ウルリクムミ": {
"ja": "[4凸]ウルリクムミ",
"element": "all",
"type": "music",
"skill1": "normalKatsumokuS",
Expand All @@ -19843,12 +19843,12 @@
"imageURL": "./imgs/1040803700.png",
"en": "[4★] Ullikummi"
},
"天羽々斬・属性変更": {
"ja": "天羽々斬・属性変更",
"天羽々斬": {
"ja": "天羽々斬",
"element": "all",
"type": "katana",
"skill1": "normalSetsuna",
"skill2": "non",
"skill2": "slaysnakes_myth",
"element2": "all",
"skill3": "non",
"element3": "all",
Expand All @@ -19862,12 +19862,12 @@
"imageURL": "./imgs/1040904300.png",
"en": "Ameno Habakiri"
},
"[4凸]天羽々斬・属性変更": {
"ja": "[4凸]天羽々斬・属性変更",
"[4凸]天羽々斬": {
"ja": "[4凸]天羽々斬",
"element": "all",
"type": "katana",
"skill1": "normalSetsuna",
"skill2": "non",
"skill2": "slaysnakes_mythII",
"element2": "all",
"skill3": "non",
"element3": "all",
Expand Down Expand Up @@ -26180,4 +26180,4 @@
"imageURL": "./imgs/1039900000.png",
"en": "Fury Stone"
}
}
}
14 changes: 14 additions & 0 deletions scripts/arm_data_converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -1055,6 +1055,20 @@
skillnamelist["normalL"][u"禁忌の悲恋"] = "dark"
skillnamelist["normalL"][u"狙撃の極意"] = "water"

# Superlative skills
# Attribute as a temporary all
skillnamelist["rightway_pathfinderII"] = {u"王道を征く者II": "all"}
skillnamelist["rightway_pathfinder"] = {u"王道を征く者": "all"}
skillnamelist["victorys_promise"] = {u"必勝の誓い": "all"}
skillnamelist["one_sting_one_killII"] = {u"一刺一殺II": "all"}
skillnamelist["one_sting_one_kill"] = {u"一刺一殺": "all"}
skillnamelist["god_of_warII"] = {u"戦神の打擲II": "all"}
skillnamelist["god_of_war"] = {u"戦神の打擲": "all"}
skillnamelist["apocalyptic_powerII"] = {u"万物を砕く剛技II": "all"}
skillnamelist["apocalyptic_power"] = {u"万物を砕く剛技": "all"}
skillnamelist["slaysnakes_mythII"] = {u"戮蛇の神刀II": "all"}
skillnamelist["slaysnakes_myth"] = {u"戮蛇の神刀": "all"}

# Other weapons that require adjustment
skillnamelist["extendedDjeetaNormalDATA30"] = {u"立体機動戦術": "wind"}
skillnamelist["one_night_party"] = {u"ワンナイ・パーリー": "none"}
Expand Down
Loading