Skip to content

Commit

Permalink
Merge pull request #137 from Wolfteam/feature/inazuma_2.5
Browse files Browse the repository at this point in the history
feature/inazuma_2.5
  • Loading branch information
Wolfteam committed Feb 16, 2022
2 parents 8850a0d + 79ed9b6 commit 25cd052
Show file tree
Hide file tree
Showing 42 changed files with 5,738 additions and 879 deletions.
Binary file added assets/characters/kamisato-ayato.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/characters_full/kamisato-ayato.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/characters_full/yae-miko.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,346 changes: 1,268 additions & 78 deletions assets/db/characters.json

Large diffs are not rendered by default.

201 changes: 201 additions & 0 deletions assets/db/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,73 @@
],
"attributes": null
},
{
"key": "mudra-of-the-malefic-general",
"image": "mudra-of-the-malefic-general.png",
"rarity": 5,
"position": 144,
"level": 0,
"type": "talents",
"hasSiblings": false,
"days": [],
"recipes": [
{
"createsMaterialKey": "tears-of-the-calamitous-god",
"needs": [
{
"key": "mudra-of-the-malefic-general",
"quantity": 1
},
{
"key": "dream-solvent",
"quantity": 1
}
]
},
{
"createsMaterialKey": "the-meaning-of-aeons",
"needs": [
{
"key": "mudra-of-the-malefic-general",
"quantity": 1
},
{
"key": "dream-solvent",
"quantity": 1
}
]
}
],
"obtainedFrom": [
{
"createsMaterialKey": "mudra-of-the-malefic-general",
"needs": [
{
"key": "tears-of-the-calamitous-god",
"quantity": 1
},
{
"key": "dream-solvent",
"quantity": 1
}
]
},
{
"createsMaterialKey": "mudra-of-the-malefic-general",
"needs": [
{
"key": "the-meaning-of-aeons",
"quantity": 1
},
{
"key": "dream-solvent",
"quantity": 1
}
]
}
],
"attributes": null
},
{
"key": "philosophies-of-ballad",
"image": "philosophies-of-ballad.png",
Expand Down Expand Up @@ -1770,6 +1837,140 @@
"obtainedFrom": [],
"attributes": null
},
{
"key": "tears-of-the-calamitous-god",
"image": "tears-of-the-calamitous-god.png",
"rarity": 5,
"position": 145,
"level": 0,
"type": "talents",
"hasSiblings": false,
"days": [],
"recipes": [
{
"createsMaterialKey": "mudra-of-the-malefic-general",
"needs": [
{
"key": "tears-of-the-calamitous-god",
"quantity": 1
},
{
"key": "dream-solvent",
"quantity": 1
}
]
},
{
"createsMaterialKey": "the-meaning-of-aeons",
"needs": [
{
"key": "tears-of-the-calamitous-god",
"quantity": 1
},
{
"key": "dream-solvent",
"quantity": 1
}
]
}
],
"obtainedFrom": [
{
"createsMaterialKey": "tears-of-the-calamitous-god",
"needs": [
{
"key": "mudra-of-the-malefic-general",
"quantity": 1
},
{
"key": "dream-solvent",
"quantity": 1
}
]
},
{
"createsMaterialKey": "tears-of-the-calamitous-god",
"needs": [
{
"key": "the-meaning-of-aeons",
"quantity": 1
},
{
"key": "dream-solvent",
"quantity": 1
}
]
}
],
"attributes": null
},
{
"key": "the-meaning-of-aeons",
"image": "the-meaning-of-aeons.png",
"rarity": 5,
"position": 146,
"level": 0,
"type": "talents",
"hasSiblings": false,
"days": [],
"recipes": [
{
"createsMaterialKey": "mudra-of-the-malefic-general",
"needs": [
{
"key": "the-meaning-of-aeons",
"quantity": 1
},
{
"key": "dream-solvent",
"quantity": 1
}
]
},
{
"createsMaterialKey": "tears-of-the-calamitous-god",
"needs": [
{
"key": "the-meaning-of-aeons",
"quantity": 1
},
{
"key": "dream-solvent",
"quantity": 1
}
]
}
],
"obtainedFrom": [
{
"createsMaterialKey": "the-meaning-of-aeons",
"needs": [
{
"key": "mudra-of-the-malefic-general",
"quantity": 1
},
{
"key": "dream-solvent",
"quantity": 1
}
]
},
{
"createsMaterialKey": "the-meaning-of-aeons",
"needs": [
{
"key": "tears-of-the-calamitous-god",
"quantity": 1
},
{
"key": "dream-solvent",
"quantity": 1
}
]
}
],
"attributes": null
},
{
"key": "tusk-of-monoceros-caeli",
"image": "tusk-of-monoceros-caeli.png",
Expand Down

0 comments on commit 25cd052

Please sign in to comment.