Merge remote-tracking branch 'origin/develop' into negue/ui/setting

This commit is contained in:
negue
2023-07-22 22:48:13 +02:00
123 changed files with 1519 additions and 482 deletions
@@ -565,6 +565,11 @@ const backgrounds = {
inside_adventurers_hideout: { },
crater_lake: { },
},
backgrounds072023: {
on_a_paddlewheel_boat: { },
colorful_coral: { },
boardwalk_into_sunset: { },
},
eventBackgrounds: {
birthday_bash: {
price: 0,
@@ -434,6 +434,11 @@ const armor = {
per: 7,
set: 'rainbow',
},
admiralsUniform: {
con: 7,
str: 7,
set: 'admiralsSet',
},
};
const body = {
@@ -869,6 +874,11 @@ const head = {
per: 9,
set: 'painters',
},
admiralsBicorne: {
int: 7,
per: 7,
set: 'admiralsSet',
},
};
const shield = {
@@ -62,6 +62,7 @@ const armor = {
202212: { },
202304: { },
202306: { },
202307: { },
301404: { },
301703: { },
301704: { },
@@ -234,6 +235,7 @@ const headAccessory = {
202203: { },
202212: { },
202205: { },
202307: { },
202302: { },
202305: { },
301405: { },