Skip to content

Commit

Permalink
Added some functionnality
Browse files Browse the repository at this point in the history
Added some translation line
Bug fix

See the changelog inside the app for more info
  • Loading branch information
Ward727a committed Mar 1, 2023
1 parent 966b7a0 commit caaaa31
Show file tree
Hide file tree
Showing 54 changed files with 1,939 additions and 737 deletions.
2 changes: 2 additions & 0 deletions assets/icons/cog.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 58 additions & 0 deletions assets/templates/carrack_data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"for": "data/carrack_data.xml",
"versions": [
{
"0.0.1": {
"carrack": {
"boat": {
"advance": {
"image": "advance.png",
"need": {
"%any%": {
"_default": "CherrySeed",
"quantity": "0"
}
}
},
"valor": {
"image": "valor.png",
"need": {
"%any%": {
"_default": "CherrySeed",
"quantity": "0"
}
}
},
"balance": {
"image": "balance.png",
"need": {
"%any%": {
"_default": "CherrySeed",
"quantity": "0"
}
}
},
"volante": {
"image": "volante.png",
"need": {
"%any%": {
"_default": "CherrySeed",
"quantity": "0"
}
}
}
},
"items":{
"%any%": {
"_default": "CherrySeed",
"image": "CherrySeed.png",
"daily": "0",
"coin": "0",
"barter": "0"
}
}
}
}
}
]
}
16 changes: 16 additions & 0 deletions assets/templates/item_data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"for": "data/item_data.xml",
"versions": [
{
"0.0.1": {
"items":{
"%any%":{
"_default": "BlueRose",
"tier": "1",
"image": "BlueRose.png"
}
}
}
}
]
}
15 changes: 15 additions & 0 deletions assets/templates/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"for": "settings.xml",
"versions": [
{
"0.0.3": {
"settings":{
"lang": "en",
"ignoreAncado": "false",
"ignoreIliya": "false",
"ignoreEpheria": "false"
}
}
}
]
}
22 changes: 22 additions & 0 deletions assets/xml/changelog.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": "0.0.3",
"date": "17/02/2023",
"removals": [
"Removed the 'firstLaunch' property from the 'settings' object in the 'settings.json' file."
],
"additions": [
"Added the 'update.xml' file to contain the 'firstLaunch' property.",
"Added the 'changelog.json' file to contain the changelog.",
"Added an changelog window that will open when the program is launched for the first time after an update.",
"Added the ability to drag and drop the items needed in the carrack tracker.",
"You can now use a \"+\" in the search bar to search for multiple item (example: \"blue candle bundle +ancient orders\")."
],
"fixes": [
"Fixed the need to delete all data file every time that we update the program data. Now it will automatically adjust to the new data structure.",
"Fixed some problem with the language selection window. Now it should work properly."
],
"notes": [
"The verification of all the data files is in test, so if you find any problem, please report it on GitHub.",
"This software is still in development, so if you find any problem, please report it on GitHub. Thank you!"
]
}
107 changes: 1 addition & 106 deletions assets/xml/data/carrack_data.xml
Original file line number Diff line number Diff line change
@@ -1,106 +1 @@
<carrack>
<boat>
<advance>
<image>advance.png</image>
<need>
<cherrySeed>
<quantity>100</quantity>
</cherrySeed>
<fishBone>
<quantity>10</quantity>
</fishBone>
<ration>
<quantity>0</quantity>
</ration>
</need>
</advance>
<valor>
<image>valor.png</image>
<need>
<cherrySeed>
<need> <!-- FOR 1 MAIN ITEM WE NEED X OF SUB ITEM -->
<fishBone>50</fishBone>
</need>
<quantity>100</quantity>
</cherrySeed>
<fishBone>
<need> <!-- FOR 1 MAIN ITEM WE NEED X OF SUB ITEM -->
<fishBone>2</fishBone>
</need>
<quantity>10</quantity>
</fishBone>
<ration>
<quantity>0</quantity>
</ration>
</need>
</valor>
<balance>
<image>balance.png</image>
<need>
<cherrySeed>
<quantity>100</quantity>
</cherrySeed>
<fishBone>
<quantity>10</quantity>
</fishBone>
<ration>
<quantity>0</quantity>
</ration>
</need>
</balance>
<volante>
<image>volante.png</image>
<need>
<cherrySeed>
<quantity>100</quantity>
</cherrySeed>
<fishBone>
<quantity>10</quantity>
</fishBone>
<ration>
<quantity>0</quantity>
</ration>
</need>
</volante>
</boat>
<items>
<cherrySeed>
<image>CherrySeed.png</image>
<daily>1</daily>
<coin>0</coin>
<barter>1</barter>
</cherrySeed>
<fishBone>
<image>FishBone.png</image>
<daily>1</daily>
<coin>0</coin>
<barter>1</barter>
</fishBone>
<t>
<image>Ration.png</image>
<daily>1</daily>
<coin>0</coin>
<barter>1</barter>
</t>
<e>
<image>Ration.png</image>
<daily>1</daily>
<coin>0</coin>
<barter>1</barter>
</e>
<x>
<image>Ration.png</image>
<daily>1</daily>
<coin>0</coin>
<barter>1</barter>
</x>
<g>
<image>Ration.png</image>
<daily>1</daily>
<coin>0</coin>
<barter>1</barter>
</g>
</items>


</carrack>
<carrack><boat><advance><image>advance.png</image><need><cherrySeed><quantity>100</quantity></cherrySeed><fishBone><quantity>10</quantity></fishBone><ration><quantity>0</quantity></ration></need></advance><valor><image>valor.png</image><need><cherrySeed><need><fishBone>50</fishBone></need><quantity>100</quantity></cherrySeed><fishBone><need><fishBone>2</fishBone></need><quantity>10</quantity></fishBone><ration><quantity>0</quantity></ration></need></valor><balance><image>balance.png</image><need><cherrySeed><quantity>100</quantity></cherrySeed><fishBone><quantity>10</quantity></fishBone><ration><quantity>0</quantity></ration></need></balance><volante><image>volante.png</image><need><cherrySeed><quantity>100</quantity></cherrySeed><fishBone><quantity>10</quantity></fishBone><ration><quantity>0</quantity></ration></need></volante></boat><items><cherrySeed><image>CherrySeed.png</image><daily>1</daily><coin>0</coin><barter>1</barter></cherrySeed><fishBone><image>FishBone.png</image><daily>1</daily><coin>0</coin><barter>1</barter></fishBone><t><image>Ration.png</image><daily>1</daily><coin>0</coin><barter>1</barter></t><e><image>Ration.png</image><daily>1</daily><coin>0</coin><barter>1</barter></e><x><image>Ration.png</image><daily>1</daily><coin>0</coin><barter>1</barter></x><g><image>Ration.png</image><daily>1</daily><coin>0</coin><barter>1</barter></g></items></carrack>
Loading

0 comments on commit caaaa31

Please sign in to comment.