diff --git a/LICENSE b/LICENSE
index 87fa19d..f4aa842 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,201 +1,619 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
- 1. Definitions.
+ Preamble
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
+ The precise terms and conditions for copying, distribution and
+modification follow.
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
+ TERMS AND CONDITIONS
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
+ 0. Definitions.
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
+ "This License" refers to version 3 of the GNU Affero General Public License.
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
+ 1. Source Code.
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
- END OF TERMS AND CONDITIONS
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
- APPENDIX: How to apply the Apache License to your work.
+ The Corresponding Source for a work in source code form is that
+same work.
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
+ 2. Basic Permissions.
- Copyright 2025 Toastie_t0ast
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
- http://www.apache.org/licenses/LICENSE-2.0
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/src/EllieBot/Bot.cs b/src/EllieBot/Bot.cs
index 4c7a7cb..2972214 100644
--- a/src/EllieBot/Bot.cs
+++ b/src/EllieBot/Bot.cs
@@ -97,7 +97,7 @@ public sealed class Bot : IBot
await using (var uow = _db.GetDbContext())
{
- uow.EnsureUserCreated(bot.Id, bot.Username, bot.Discriminator, bot.AvatarId);
+ uow.EnsureUserCreated(bot.Id, bot.Username, bot.AvatarId);
}
// var svcs = new StandardKernel(new NinjectSettings()
diff --git a/src/EllieBot/Db/Extensions/DiscordUserExtensions.cs b/src/EllieBot/Db/Extensions/DiscordUserExtensions.cs
index f8105c3..cd562dc 100644
--- a/src/EllieBot/Db/Extensions/DiscordUserExtensions.cs
+++ b/src/EllieBot/Db/Extensions/DiscordUserExtensions.cs
@@ -17,7 +17,6 @@ public static class DiscordUserExtensions
this DbContext ctx,
ulong userId,
string username,
- string discrim,
string avatarId)
=> ctx.GetTable<DiscordUser>()
.InsertOrUpdate(
@@ -65,11 +64,10 @@ public static class DiscordUserExtensions
this DbContext ctx,
ulong userId,
string username,
- string discrim,
string avatarId,
Func<IQueryable<DiscordUser>, IQueryable<DiscordUser>> includes = null)
{
- ctx.EnsureUserCreated(userId, username, discrim, avatarId);
+ ctx.EnsureUserCreated(userId, username, avatarId);
IQueryable<DiscordUser> queryable = ctx.Set<DiscordUser>();
if (includes is not null)
@@ -78,13 +76,6 @@ public static class DiscordUserExtensions
}
- public static int GetUserGlobalRank(this DbSet<DiscordUser> users, ulong id)
- => users.AsQueryable()
- .Where(x => x.TotalXp
- > users.AsQueryable().Where(y => y.UserId == id).Select(y => y.TotalXp).FirstOrDefault())
- .Count()
- + 1;
-
public static Task<List<DiscordUser>> GetTopRichest(
this DbSet<DiscordUser> users,
ulong botId,
diff --git a/src/EllieBot/Modules/Gambling/Slot/SlotCommands.cs b/src/EllieBot/Modules/Gambling/Slot/SlotCommands.cs
index c38f646..aac38c4 100644
--- a/src/EllieBot/Modules/Gambling/Slot/SlotCommands.cs
+++ b/src/EllieBot/Modules/Gambling/Slot/SlotCommands.cs
@@ -180,17 +180,17 @@ public partial class Gambling
Color fontColor = Config.Slots.CurrencyFontColor;
- bgImage.Mutate<Rgba32>(x => x.DrawText(new RichTextOptions(_fonts.DottyFont.CreateFont(65))
+ bgImage.Mutate<Rgba32>(x => x.DrawText(new RichTextOptions(_fonts.NotoSans.CreateFont(35))
{
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Center,
WrappingLength = 140,
- Origin = new(298, 100)
+ Origin = new(295, 100)
},
((long)result.Won).ToString(),
fontColor));
- var bottomFont = _fonts.DottyFont.CreateFont(50);
+ var bottomFont = _fonts.NotoSans.CreateFont(50);
bgImage.Mutate(x => x.DrawText(new RichTextOptions(bottomFont)
{
@@ -206,7 +206,7 @@ public partial class Gambling
{
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Center,
- Origin = new(393, 480)
+ Origin = new(393, 479)
},
ownedAmount.ToString(),
fontColor));
diff --git a/src/EllieBot/Modules/Patronage/PatronageService.cs b/src/EllieBot/Modules/Patronage/PatronageService.cs
index 17e418c..3a30c99 100644
--- a/src/EllieBot/Modules/Patronage/PatronageService.cs
+++ b/src/EllieBot/Modules/Patronage/PatronageService.cs
@@ -384,12 +384,9 @@ public sealed class PatronageService
return user.AmountCents switch
{
- >= 10_000 => PatronTier.C,
- >= 5000 => PatronTier.L,
- >= 2000 => PatronTier.XX,
- >= 1000 => PatronTier.X,
- >= 500 => PatronTier.V,
- >= 100 => PatronTier.I,
+ <= 200 => PatronTier.I,
+ <= 1_000 => PatronTier.C,
+ <= 5_000 => PatronTier.L,
_ => PatronTier.None
};
}
@@ -402,12 +399,10 @@ public sealed class PatronageService
public int PercentBonus(long amount)
=> amount switch
{
- >= 10_000 => 100,
- >= 5000 => 50,
- >= 2000 => 30,
- >= 1000 => 20,
- >= 500 => 10,
- _ => 0
+ < 200 => 0,
+ < 1_000 => 10,
+ < 5_000 => 50,
+ _ => 100
};
private async Task SendWelcomeMessage(Patron patron)
diff --git a/src/EllieBot/Modules/Utility/Info/InfoCommands.cs b/src/EllieBot/Modules/Utility/Info/InfoCommands.cs
index c9d4ab2..88232a9 100644
--- a/src/EllieBot/Modules/Utility/Info/InfoCommands.cs
+++ b/src/EllieBot/Modules/Utility/Info/InfoCommands.cs
@@ -1,5 +1,4 @@
#nullable disable
-using System.Text;
using EllieBot.Modules.Patronage;
namespace EllieBot.Modules.Utility;
@@ -34,31 +33,35 @@ public partial class Utility
{
var guild = (IGuild)_client.GetGuild(guildId)
?? await _client.Rest.GetGuildAsync(guildId);
-
+
if (guild is null)
return;
var ownername = await guild.GetUserAsync(guild.OwnerId);
var textchn = (await guild.GetTextChannelsAsync()).Count;
var voicechn = (await guild.GetVoiceChannelsAsync()).Count;
- var channels = $@"{GetText(strs.text_channels(textchn))}
-{GetText(strs.voice_channels(voicechn))}";
+ var channels = $"""
+ {GetText(strs.text_channels(textchn))}
+ {GetText(strs.voice_channels(voicechn))}
+ """;
var createdAt = new DateTime(2015, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(guild.Id >> 22);
var features = guild.Features.Value.ToString();
if (string.IsNullOrWhiteSpace(features))
features = "-";
var embed = CreateEmbed()
- .WithAuthor(GetText(strs.server_info))
- .WithTitle(guild.Name)
- .AddField(GetText(strs.id), guild.Id.ToString(), true)
- .AddField(GetText(strs.owner), ownername.ToString(), true)
- .AddField(GetText(strs.members), (guild as SocketGuild)?.MemberCount.ToString() ?? guild.ApproximateMemberCount?.ToString() ?? "?", true)
- .AddField(GetText(strs.channels), channels, true)
- .AddField(GetText(strs.created_at), $"{createdAt:dd.MM.yyyy HH:mm}", true)
- .AddField(GetText(strs.roles), (guild.Roles.Count - 1).ToString(), true)
- .AddField(GetText(strs.features), features)
- .WithOkColor();
+ .WithAuthor(GetText(strs.server_info))
+ .WithTitle(guild.Name)
+ .AddField(GetText(strs.id), guild.Id.ToString(), true)
+ .AddField(GetText(strs.owner), ownername.ToString(), true)
+ .AddField(GetText(strs.members),
+ (guild as SocketGuild)?.MemberCount.ToString() ?? guild.ApproximateMemberCount?.ToString() ?? "?",
+ true)
+ .AddField(GetText(strs.channels), channels, true)
+ .AddField(GetText(strs.created_at), $"{createdAt:dd.MM.yyyy HH:mm}", true)
+ .AddField(GetText(strs.roles), (guild.Roles.Count - 1).ToString(), true)
+ .AddField(GetText(strs.features), features)
+ .WithOkColor();
if (Uri.IsWellFormedUriString(guild.IconUrl, UriKind.Absolute))
embed.WithThumbnailUrl(guild.IconUrl);
@@ -82,12 +85,12 @@ public partial class Utility
var createdAt = new DateTime(2015, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(ch.Id >> 22);
var usercount = (await ch.GetUsersAsync().FlattenAsync()).Count();
var embed = CreateEmbed()
- .WithTitle(ch.Name)
- .WithDescription(ch.Topic?.SanitizeMentions(true))
- .AddField(GetText(strs.id), ch.Id.ToString(), true)
- .AddField(GetText(strs.created_at), $"{createdAt:dd.MM.yyyy HH:mm}", true)
- .AddField(GetText(strs.users), usercount.ToString(), true)
- .WithOkColor();
+ .WithTitle(ch.Name)
+ .WithDescription(ch.Topic?.SanitizeMentions(true))
+ .AddField(GetText(strs.id), ch.Id.ToString(), true)
+ .AddField(GetText(strs.created_at), $"{createdAt:dd.MM.yyyy HH:mm}", true)
+ .AddField(GetText(strs.users), usercount.ToString(), true)
+ .WithOkColor();
await Response().Embed(embed).SendAsync();
}
@@ -102,17 +105,17 @@ public partial class Utility
.AddMilliseconds(role.Id >> 22);
var usercount = role.Members.LongCount();
var embed = CreateEmbed()
- .WithTitle(role.Name.TrimTo(128))
- .WithDescription(role.Permissions.ToList().Join(" | "))
- .AddField(GetText(strs.id), role.Id.ToString(), true)
- .AddField(GetText(strs.created_at), $"{createdAt:dd.MM.yyyy HH:mm}", true)
- .AddField(GetText(strs.users), usercount.ToString(), true)
- .AddField(GetText(strs.color),
- $"#{role.Color.R:X2}{role.Color.G:X2}{role.Color.B:X2}",
- true)
- .AddField(GetText(strs.mentionable), role.IsMentionable.ToString(), true)
- .AddField(GetText(strs.hoisted), role.IsHoisted.ToString(), true)
- .WithOkColor();
+ .WithTitle(role.Name.TrimTo(128))
+ .WithDescription(role.Permissions.ToList().Join(" | "))
+ .AddField(GetText(strs.id), role.Id.ToString(), true)
+ .AddField(GetText(strs.created_at), $"{createdAt:dd.MM.yyyy HH:mm}", true)
+ .AddField(GetText(strs.users), usercount.ToString(), true)
+ .AddField(GetText(strs.color),
+ $"#{role.Color.R:X2}{role.Color.G:X2}{role.Color.B:X2}",
+ true)
+ .AddField(GetText(strs.mentionable), role.IsMentionable.ToString(), true)
+ .AddField(GetText(strs.hoisted), role.IsHoisted.ToString(), true)
+ .WithOkColor();
if (!string.IsNullOrWhiteSpace(role.GetIconUrl()))
embed = embed.WithThumbnailUrl(role.GetIconUrl());
@@ -130,31 +133,29 @@ public partial class Utility
return;
var embed = CreateEmbed()
- .AddField(GetText(strs.name), $"**{user.Username}**#{user.Discriminator}", true);
+ .AddField(GetText(strs.name), $"**{user.Username}**#{user.Discriminator}", true);
if (!string.IsNullOrWhiteSpace(user.Nickname))
embed.AddField(GetText(strs.nickname), user.Nickname, true);
var joinedAt = GetJoinedAt(user);
embed.AddField(GetText(strs.id), user.Id.ToString(), true)
- .AddField(GetText(strs.joined_server), $"{joinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}", true)
- .AddField(GetText(strs.joined_discord), $"{user.CreatedAt:dd.MM.yyyy HH:mm}", true)
- .AddField(GetText(strs.roles),
- $"**({user.RoleIds.Count - 1})** - {string.Join("\n", user.GetRoles().Take(10).Where(r => r.Id != r.Guild.EveryoneRole.Id).Select(r => r.Name)).SanitizeMentions(true)}",
- true)
- .WithOkColor();
+ .AddField(GetText(strs.joined_server), $"{joinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}", true)
+ .AddField(GetText(strs.joined_discord), $"{user.CreatedAt:dd.MM.yyyy HH:mm}", true)
+ .AddField(GetText(strs.roles),
+ $"**({user.RoleIds.Count - 1})** - {string.Join("\n", user.GetRoles().Take(10).Where(r => r.Id != r.Guild.EveryoneRole.Id).Select(r => r.Name)).SanitizeMentions(true)}",
+ true)
+ .WithOkColor();
var mPatron = await _ps.GetPatronAsync(user.Id);
- if (mPatron is {} patron && patron.Tier != PatronTier.None)
+ if (mPatron is { } patron && patron.Tier != PatronTier.None)
{
- embed.WithFooter(patron.Tier switch
+ embed.WithFooter((int)patron.Tier switch
{
- PatronTier.V => "❤️❤️",
- PatronTier.X => "❤️❤️❤️",
- PatronTier.XX => "❤️❤️❤️❤️",
- PatronTier.L => "❤️❤️❤️❤️❤️",
- _ => "❤️",
+ < (int)PatronTier.X => "❤️",
+ < (int)PatronTier.L => "❤️❤️❤️",
+ _ => "❤️❤️❤️❤️❤️",
});
}
@@ -166,15 +167,6 @@ public partial class Utility
}
private DateTimeOffset? GetJoinedAt(IGuildUser user)
- {
- var joinedAt = user.JoinedAt;
- if (user.GuildId != 117523346618318850)
- return joinedAt;
-
- if (user.Id == 351244576092192778)
- return new DateTimeOffset(2019, 12, 25, 9, 33, 0, TimeSpan.Zero);
-
- return joinedAt;
- }
+ => user.JoinedAt;
}
}
\ No newline at end of file
diff --git a/src/EllieBot/Modules/Xp/Club/ClubService.cs b/src/EllieBot/Modules/Xp/Club/ClubService.cs
index dad45ba..60c4505 100644
--- a/src/EllieBot/Modules/Xp/Club/ClubService.cs
+++ b/src/EllieBot/Modules/Xp/Club/ClubService.cs
@@ -26,10 +26,6 @@ public class ClubService : IEService, IClubService
await using var uow = _db.GetDbContext();
var du = uow.GetOrCreateUser(user);
- var xp = new LevelStats(du.TotalXp);
-
- if (xp.Level < 5)
- return ClubCreateResult.InsufficientLevel;
if (du.ClubId is not null)
return ClubCreateResult.AlreadyInAClub;
diff --git a/src/EllieBot/Modules/Xp/XpService.cs b/src/EllieBot/Modules/Xp/XpService.cs
index a503632..5b0b6b5 100644
--- a/src/EllieBot/Modules/Xp/XpService.cs
+++ b/src/EllieBot/Modules/Xp/XpService.cs
@@ -3,7 +3,6 @@ using LinqToDB;
using Microsoft.EntityFrameworkCore;
using EllieBot.Common.ModuleBehaviors;
using EllieBot.Db.Models;
-using Newtonsoft.Json;
using SixLabors.Fonts;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Drawing.Processing;
@@ -600,17 +599,13 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
{
await using var uow = _db.GetDbContext();
var du = uow.GetOrCreateUser(user, set => set.Include(x => x.Club));
- var totalXp = du.TotalXp;
- var globalRank = uow.Set<DiscordUser>().GetUserGlobalRank(user.Id);
var guildRank = await uow.Set<UserXpStats>().GetUserGuildRanking(user.Id, user.GuildId);
var stats = uow.GetOrCreateUserXpStats(user.GuildId, user.Id);
await uow.SaveChangesAsync();
return new(du,
stats,
- new(totalXp),
new(stats.Xp),
- globalRank,
guildRank);
}
@@ -620,7 +615,6 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
return await GenerateXpImageAsync(stats);
}
-
public Task<(Stream Image, IImageFormat Format)> GenerateXpImageAsync(FullUserStats stats)
=> Task.Run(async () =>
{
@@ -662,8 +656,6 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
}
}
- var outlinePen = new SolidPen(Color.Black, 1f);
-
using var img = Image.Load<Rgba32>(bgBytes);
if (template.User.Name.Show)
@@ -687,8 +679,7 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
Origin = new(template.User.Name.Pos.X, template.User.Name.Pos.Y + 8)
},
"@" + username,
- Brushes.Solid(template.User.Name.Color),
- outlinePen);
+ Brushes.Solid(template.User.Name.Color));
//club name
@@ -707,8 +698,7 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
Origin = new(template.Club.Name.Pos.X + 50, template.Club.Name.Pos.Y - 8)
},
clubName,
- Brushes.Solid(template.Club.Name.Color),
- outlinePen);
+ Brushes.Solid(template.Club.Name.Color));
}
Font GetTruncatedFont(
@@ -728,68 +718,32 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
}
- if (template.User.GlobalLevel.Show)
- {
- // up to 83 width
-
- var globalLevelFont = GetTruncatedFont(
- _fonts.NotoSans,
- template.User.GlobalLevel.FontSize,
- FontStyle.Bold,
- stats.Global.Level.ToString(),
- 75);
-
-
- x.DrawText(stats.Global.Level.ToString(),
- globalLevelFont,
- template.User.GlobalLevel.Color,
- new(template.User.GlobalLevel.Pos.X, template.User.GlobalLevel.Pos.Y)); //level
- }
-
- if (template.User.GuildLevel.Show)
+ if (template.User.Level.Show)
{
var guildLevelFont = GetTruncatedFont(
_fonts.NotoSans,
- template.User.GuildLevel.FontSize,
+ template.User.Level.FontSize,
FontStyle.Bold,
stats.Guild.Level.ToString(),
- 75);
+ 33);
x.DrawText(stats.Guild.Level.ToString(),
guildLevelFont,
- template.User.GuildLevel.Color,
- new(template.User.GuildLevel.Pos.X, template.User.GuildLevel.Pos.Y));
+ template.User.Level.Color,
+ new(template.User.Level.Pos.X, template.User.Level.Pos.Y));
}
- var global = stats.Global;
var guild = stats.Guild;
//xp bar
if (template.User.Xp.Bar.Show)
{
- var xpPercent = global.LevelXp / (float)global.RequiredXp;
- DrawXpBar(xpPercent, template.User.Xp.Bar.Global, img);
- xpPercent = guild.LevelXp / (float)guild.RequiredXp;
+ var xpPercent = guild.LevelXp / (float)guild.RequiredXp;
DrawXpBar(xpPercent, template.User.Xp.Bar.Guild, img);
}
- if (template.User.Xp.Global.Show)
- {
- x.DrawText(
- new RichTextOptions(_fonts.NotoSans.CreateFont(template.User.Xp.Global.FontSize,
- FontStyle.Bold))
- {
- HorizontalAlignment = HorizontalAlignment.Center,
- VerticalAlignment = VerticalAlignment.Center,
- Origin = new(template.User.Xp.Global.Pos.X, template.User.Xp.Global.Pos.Y),
- },
- $"{global.LevelXp}/{global.RequiredXp}",
- Brushes.Solid(template.User.Xp.Global.Color),
- outlinePen);
- }
-
if (template.User.Xp.Guild.Show)
{
x.DrawText(
@@ -801,52 +755,30 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
Origin = new(template.User.Xp.Guild.Pos.X, template.User.Xp.Guild.Pos.Y)
},
$"{guild.LevelXp}/{guild.RequiredXp}",
- Brushes.Solid(template.User.Xp.Guild.Color),
- outlinePen);
+ Brushes.Solid(template.User.Xp.Guild.Color));
}
var rankPen = new SolidPen(Color.White, 1);
//ranking
- if (template.User.GlobalRank.Show)
- {
- var globalRankStr = stats.GlobalRanking.ToString();
- var globalRankFont = GetTruncatedFont(
- _fonts.UniSans,
- template.User.GlobalRank.FontSize,
- FontStyle.Bold,
- globalRankStr,
- 68);
-
- x.DrawText(
- new RichTextOptions(globalRankFont)
- {
- Origin = new(template.User.GlobalRank.Pos.X, template.User.GlobalRank.Pos.Y)
- },
- globalRankStr,
- Brushes.Solid(template.User.GlobalRank.Color),
- rankPen
- );
- }
-
- if (template.User.GuildRank.Show)
+ if (template.User.Rank.Show)
{
var guildRankStr = stats.GuildRanking.ToString();
var guildRankFont = GetTruncatedFont(
- _fonts.UniSans,
- template.User.GuildRank.FontSize,
+ _fonts.NotoSans,
+ template.User.Rank.FontSize,
FontStyle.Bold,
guildRankStr,
- 43);
+ 22);
x.DrawText(
new RichTextOptions(guildRankFont)
{
- Origin = new(template.User.GuildRank.Pos.X, template.User.GuildRank.Pos.Y)
+ Origin = new(template.User.Rank.Pos.X, template.User.Rank.Pos.Y)
},
guildRankStr,
- Brushes.Solid(template.User.GuildRank.Color),
+ Brushes.Solid(template.User.Rank.Color),
rankPen
);
}
@@ -908,19 +840,10 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
private async Task DrawFrame(Image<Rgba32> img, ulong userId)
{
- var patron = await _ps.GetPatronAsync(userId);
-
var item = await GetItemInUse(userId, XpShopItemType.Frame);
Image? frame = null;
- if (item is null)
- {
- if (patron?.Tier == PatronTier.V)
- frame = Image.Load<Rgba32>(File.OpenRead("data/images/frame_silver.png"));
- else if (patron?.Tier >= PatronTier.X || _creds.IsOwner(userId))
- frame = Image.Load<Rgba32>(File.OpenRead("data/images/frame_gold.png"));
- }
- else
+ if (item is not null)
{
var url = _xpConfig.Data.Shop.GetItemUrl(XpShopItemType.Frame, item.ItemKey);
if (!string.IsNullOrWhiteSpace(url))
@@ -1207,7 +1130,7 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
=> type switch
{
Xp.XpShopInputType.F => _xpConfig.Data.Shop.FramesTierRequirement,
- _ => _xpConfig.Data.Shop.BgsTierRequirement,
+ _ => PatronTier.None,
};
public bool IsShopEnabled()
@@ -1246,64 +1169,6 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
}
}
-public sealed class XpTemplateService : IEService, IReadyExecutor
-{
- private const string XP_TEMPLATE_PATH = "./data/xp_template.json";
-
- private readonly IPubSub _pubSub;
- private XpTemplate _template = new();
- private readonly TypedKey<bool> _xpTemplateReloadKey = new("xp.template.reload");
-
- public XpTemplateService(IPubSub pubSub)
- {
- _pubSub = pubSub;
- }
-
- private void InternalReloadXpTemplate()
- {
- try
- {
- var settings = new JsonSerializerSettings
- {
- ContractResolver = new RequireObjectPropertiesContractResolver()
- };
-
- if (!File.Exists(XP_TEMPLATE_PATH))
- {
- var newTemp = new XpTemplate();
- newTemp.Version = 2;
- File.WriteAllText(XP_TEMPLATE_PATH, JsonConvert.SerializeObject(newTemp, Formatting.Indented));
- }
-
- _template = JsonConvert.DeserializeObject<XpTemplate>(
- File.ReadAllText(XP_TEMPLATE_PATH),
- settings)!;
- }
- catch (Exception ex)
- {
- Log.Error(ex, "xp_template.json is invalid. Loaded default values");
- _template = new();
- }
- }
-
- public void ReloadXpTemplate()
- => _pubSub.Pub(_xpTemplateReloadKey, true);
-
- public async Task OnReadyAsync()
- {
- InternalReloadXpTemplate();
- await _pubSub.Sub(_xpTemplateReloadKey,
- _ =>
- {
- InternalReloadXpTemplate();
- return default;
- });
- }
-
- public XpTemplate GetTemplate()
- => _template;
-}
-
public readonly record struct XpQueueEntry(IGuildUser User, long Xp)
{
public bool Equals(XpQueueEntry? other)
diff --git a/src/EllieBot/Modules/Xp/XpTemplateService.cs b/src/EllieBot/Modules/Xp/XpTemplateService.cs
new file mode 100644
index 0000000..4c8f3a9
--- /dev/null
+++ b/src/EllieBot/Modules/Xp/XpTemplateService.cs
@@ -0,0 +1,82 @@
+#nullable disable warnings
+using EllieBot.Common.ModuleBehaviors;
+using Newtonsoft.Json;
+
+namespace EllieBot.Modules.Xp.Services;
+
+public sealed class XpTemplateService : IEService, IReadyExecutor
+{
+ private const string XP_TEMPLATE_PATH = "./data/xp_template.json";
+
+ private readonly IPubSub _pubSub;
+ private XpTemplate _template = new();
+ private readonly TypedKey<bool> _xpTemplateReloadKey = new("xp.template.reload");
+
+ public XpTemplateService(IPubSub pubSub)
+ {
+ _pubSub = pubSub;
+ }
+
+ private void InternalReloadXpTemplate()
+ {
+ try
+ {
+ var settings = new JsonSerializerSettings
+ {
+ ContractResolver = new RequireObjectPropertiesContractResolver()
+ };
+
+ if (!File.Exists(XP_TEMPLATE_PATH))
+ {
+ var newTemp = new XpTemplate();
+ newTemp.Version = 3;
+ File.WriteAllText(XP_TEMPLATE_PATH, JsonConvert.SerializeObject(newTemp, Formatting.Indented));
+ }
+
+ _template = JsonConvert.DeserializeObject<XpTemplate>(
+ File.ReadAllText(XP_TEMPLATE_PATH),
+ settings)!;
+
+ if (_template.Version < 3)
+ {
+ if (_template.OutputSize is
+ {
+ X: 800,
+ Y: 392
+ })
+ {
+ _template.OutputSize = new()
+ {
+ X = 500,
+ Y = 245
+ };
+ _template.Version = 3;
+
+ File.WriteAllText(XP_TEMPLATE_PATH, JsonConvert.SerializeObject(_template, Formatting.Indented));
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Log.Error(ex, "xp_template.json is invalid. Loaded default values");
+ _template = new();
+ }
+ }
+
+ public void ReloadXpTemplate()
+ => _pubSub.Pub(_xpTemplateReloadKey, true);
+
+ public async Task OnReadyAsync()
+ {
+ InternalReloadXpTemplate();
+ await _pubSub.Sub(_xpTemplateReloadKey,
+ _ =>
+ {
+ InternalReloadXpTemplate();
+ return default;
+ });
+ }
+
+ public XpTemplate GetTemplate()
+ => _template;
+}
\ No newline at end of file
diff --git a/src/EllieBot/Modules/Xp/common/FullUserStats.cs b/src/EllieBot/Modules/Xp/common/FullUserStats.cs
index d56a62e..479c5e7 100644
--- a/src/EllieBot/Modules/Xp/common/FullUserStats.cs
+++ b/src/EllieBot/Modules/Xp/common/FullUserStats.cs
@@ -7,23 +7,17 @@ public class FullUserStats
{
public DiscordUser User { get; }
public UserXpStats FullGuildStats { get; }
- public LevelStats Global { get; }
public LevelStats Guild { get; }
- public int GlobalRanking { get; }
public int GuildRanking { get; }
public FullUserStats(
DiscordUser usr,
UserXpStats fullGuildStats,
- LevelStats global,
LevelStats guild,
- int globalRanking,
int guildRanking)
{
User = usr;
- Global = global;
Guild = guild;
- GlobalRanking = globalRanking;
GuildRanking = guildRanking;
FullGuildStats = fullGuildStats;
}
diff --git a/src/EllieBot/Modules/Xp/common/XpTemplate.cs b/src/EllieBot/Modules/Xp/common/XpTemplate.cs
index 077393f..01a2a5f 100644
--- a/src/EllieBot/Modules/Xp/common/XpTemplate.cs
+++ b/src/EllieBot/Modules/Xp/common/XpTemplate.cs
@@ -7,25 +7,25 @@ namespace EllieBot.Modules.Xp;
public class XpTemplate
{
- public int Version { get; set; } = 2;
+ public int Version { get; set; } = 3;
[JsonProperty("output_size")]
public XpTemplatePos OutputSize { get; set; } = new()
{
- X = 800,
- Y = 392
+ X = 500,
+ Y = 245
};
public XpTemplateUser User { get; set; } = new()
{
Name = new()
{
- FontSize = 50,
+ FontSize = 25,
Show = true,
Pos = new()
{
- X = 130,
- Y = 17
+ X = 65,
+ Y = 8
}
},
Icon = new()
@@ -33,53 +33,33 @@ public class XpTemplate
Show = true,
Pos = new()
{
- X = 14,
- Y = 14
+ X = 11,
+ Y = 11
},
Size = new()
{
- X = 72,
- Y = 71
+ X = 38,
+ Y = 38
}
},
- GuildLevel = new()
+ Level = new()
{
Show = true,
- FontSize = 45,
+ FontSize = 22,
Pos = new()
{
- X = 47,
- Y = 308
+ X = 35,
+ Y = 101
}
},
- GlobalLevel = new()
+ Rank = new()
{
Show = true,
- FontSize = 45,
+ FontSize = 20,
Pos = new()
{
- X = 47,
- Y = 160
- }
- },
- GuildRank = new()
- {
- Show = true,
- FontSize = 30,
- Pos = new()
- {
- X = 148,
- Y = 326
- }
- },
- GlobalRank = new()
- {
- Show = true,
- FontSize = 30,
- Pos = new()
- {
- X = 148,
- Y = 179
+ X = 100,
+ Y = 115
}
},
Xp = new()
@@ -87,67 +67,31 @@ public class XpTemplate
Bar = new()
{
Show = true,
- Global = new()
- {
- Direction = XpTemplateDirection.Right,
- Length = 450,
- Color = new(0, 0, 0, 0.4f),
- PointA = new()
- {
- X = 321,
- Y = 104
- },
- PointB = new()
- {
- X = 286,
- Y = 235
- }
- },
Guild = new()
{
Direction = XpTemplateDirection.Right,
- Length = 450,
+ Length = 225,
Color = new(0, 0, 0, 0.4f),
PointA = new()
{
- X = 282,
- Y = 248
+ X = 202,
+ Y = 66
},
PointB = new()
{
- X = 247,
- Y = 379
+ X = 180,
+ Y = 145
}
}
},
- Global = new()
- {
- Show = true,
- FontSize = 50,
- Pos = new()
- {
- X = 528,
- Y = 170
- }
- },
Guild = new()
- {
- Show = true,
- FontSize = 50,
- Pos = new()
- {
- X = 490,
- Y = 313
- }
- },
- Awarded = new()
{
Show = true,
FontSize = 25,
Pos = new()
{
- X = 490,
- Y = 345
+ X = 330,
+ Y = 104
}
}
}
@@ -160,22 +104,22 @@ public class XpTemplate
Show = true,
Pos = new()
{
- X = 722,
- Y = 25
+ X = 451,
+ Y = 15
},
Size = new()
{
- X = 45,
- Y = 45
+ X = 29,
+ Y = 29
}
},
Name = new()
{
- FontSize = 35,
+ FontSize = 20,
Pos = new()
{
- X = 650,
- Y = 49
+ X = 394,
+ Y = 35
},
Show = true
}
@@ -199,10 +143,8 @@ public class XpTemplateUser
{
public XpTemplateText Name { get; set; }
public XpTemplateIcon Icon { get; set; }
- public XpTemplateText GlobalLevel { get; set; }
- public XpTemplateText GuildLevel { get; set; }
- public XpTemplateText GlobalRank { get; set; }
- public XpTemplateText GuildRank { get; set; }
+ public XpTemplateText Level { get; set; }
+ public XpTemplateText Rank { get; set; }
public XpTemplateXp Xp { get; set; }
}
@@ -225,15 +167,12 @@ public class XpTemplateText
public class XpTemplateXp
{
public XpTemplateXpBar Bar { get; set; }
- public XpTemplateText Global { get; set; }
public XpTemplateText Guild { get; set; }
- public XpTemplateText Awarded { get; set; }
}
public class XpTemplateXpBar
{
public bool Show { get; set; }
- public XpBar Global { get; set; }
public XpBar Guild { get; set; }
}
diff --git a/src/EllieBot/_common/Patronage/PatronTier.cs b/src/EllieBot/_common/Patronage/PatronTier.cs
index 0bbe804..a285fec 100644
--- a/src/EllieBot/_common/Patronage/PatronTier.cs
+++ b/src/EllieBot/_common/Patronage/PatronTier.cs
@@ -5,10 +5,7 @@ public enum PatronTier
{
None,
I,
- V,
X,
- XX,
L,
- C,
- ComingSoon
+ C
}
\ No newline at end of file
diff --git a/src/EllieBot/_common/Services/Impl/FontProvider.cs b/src/EllieBot/_common/Services/Impl/FontProvider.cs
index 2bead90..e5d51b5 100644
--- a/src/EllieBot/_common/Services/Impl/FontProvider.cs
+++ b/src/EllieBot/_common/Services/Impl/FontProvider.cs
@@ -5,13 +5,7 @@ namespace EllieBot.Services;
public class FontProvider : IEService
{
- public FontFamily DottyFont { get; }
-
- public FontFamily UniSans { get; }
-
public FontFamily NotoSans { get; }
- //public FontFamily Emojis { get; }
-
public List<FontFamily> FallBackFonts { get; }
private readonly FontCollection _fonts;
@@ -20,12 +14,9 @@ public class FontProvider : IEService
_fonts = new();
NotoSans = _fonts.Add("data/fonts/NotoSans-Bold.ttf");
- UniSans = _fonts.Add("data/fonts/Uni Sans.ttf");
FallBackFonts = new();
- //FallBackFonts.Add(_fonts.Install("data/fonts/OpenSansEmoji.ttf"));
-
// try loading some emoji and jap fonts on windows as fallback fonts
if (Environment.OSVersion.Platform == PlatformID.Win32NT)
{
@@ -48,7 +39,5 @@ public class FontProvider : IEService
else if (font.EndsWith(".ttc"))
FallBackFonts.AddRange(_fonts.AddCollection(font));
}
-
- DottyFont = FallBackFonts.First(x => x.Name == "dotty");
}
}
\ No newline at end of file
diff --git a/src/EllieBot/_common/Services/Impl/ImagesConfig.cs b/src/EllieBot/_common/Services/Impl/ImagesConfig.cs
index c36c20a..ce24072 100644
--- a/src/EllieBot/_common/Services/Impl/ImagesConfig.cs
+++ b/src/EllieBot/_common/Services/Impl/ImagesConfig.cs
@@ -8,7 +8,7 @@ public sealed class ImagesConfig : ConfigServiceBase<ImageUrls>
private static readonly TypedKey<ImageUrls> _changeKey =
new("config.images.updated");
-
+
public override string Name
=> "images";
@@ -20,28 +20,13 @@ public sealed class ImagesConfig : ConfigServiceBase<ImageUrls>
private void Migrate()
{
- if (data.Version < 5)
+ if (data.Version < 10)
{
ModifyConfig(c =>
{
- c.Version = 5;
- });
- }
-
- if (data.Version < 6)
- {
- ModifyConfig(c =>
- {
- if (c.Slots.Emojis?.Length == 6)
- {
- c.Slots.Emojis =
- [
- new("https://cdn.nadeko.bot/slots/15.png"),
- ..c.Slots.Emojis
- ];
- }
-
- c.Version = 6;
+ if (c.Xp.Bg.ToString().Contains("cdn.nadeko.bot"))
+ c.Xp.Bg = new("https://cdn.nadeko.bot/xp/bgs/v6.png");
+ c.Version = 10;
});
}
}
diff --git a/src/EllieBot/_common/_Extensions/DbExtensions.cs b/src/EllieBot/_common/_Extensions/DbExtensions.cs
index 0975a1f..44aec5f 100644
--- a/src/EllieBot/_common/_Extensions/DbExtensions.cs
+++ b/src/EllieBot/_common/_Extensions/DbExtensions.cs
@@ -6,5 +6,5 @@ namespace EllieBot.Extensions;
public static class DbExtensions
{
public static DiscordUser GetOrCreateUser(this DbContext ctx, IUser original, Func<IQueryable<DiscordUser>, IQueryable<DiscordUser>>? includes = null)
- => ctx.GetOrCreateUser(original.Id, original.Username, original.Discriminator, original.AvatarId, includes);
+ => ctx.GetOrCreateUser(original.Id, original.Username, original.AvatarId, includes);
}
\ No newline at end of file
diff --git a/src/EllieBot/data/fonts/Uni Sans.ttf b/src/EllieBot/data/fonts/Uni Sans.ttf
deleted file mode 100644
index a7b39d0..0000000
Binary files a/src/EllieBot/data/fonts/Uni Sans.ttf and /dev/null differ
diff --git a/src/EllieBot/data/fonts/dotty.ttf b/src/EllieBot/data/fonts/dotty.ttf
deleted file mode 100644
index 4ce2814..0000000
Binary files a/src/EllieBot/data/fonts/dotty.ttf and /dev/null differ
diff --git a/src/EllieBot/data/images.yml b/src/EllieBot/data/images.yml
index d3f3d77..6270858 100644
--- a/src/EllieBot/data/images.yml
+++ b/src/EllieBot/data/images.yml
@@ -1,5 +1,5 @@
# DO NOT CHANGE
-version: 6
+version: 10
coins:
heads:
- https://cdn.nadeko.bot/coins/heads3.png
@@ -21,7 +21,7 @@ dice:
- https://cdn.nadeko.bot/other/dice/8.png
- https://cdn.nadeko.bot/other/dice/9.png
xp:
- bg: https://cdn.nadeko.bot/other/xp/bg_k.png
+ bg: https://cdn.nadeko.bot/xp/bgs/v6.png
slots:
emojis:
- https://cdn.nadeko.bot/slots/10.png
diff --git a/src/EllieBot/data/images/frame_gold.png b/src/EllieBot/data/images/frame_gold.png
deleted file mode 100644
index 860129c..0000000
Binary files a/src/EllieBot/data/images/frame_gold.png and /dev/null differ
diff --git a/src/EllieBot/data/images/frame_silver.png b/src/EllieBot/data/images/frame_silver.png
deleted file mode 100644
index 4dcda75..0000000
Binary files a/src/EllieBot/data/images/frame_silver.png and /dev/null differ
diff --git a/src/EllieBot/data/xp_template.json b/src/EllieBot/data/xp_template.json
index 5ebe91b..e86598f 100644
--- a/src/EllieBot/data/xp_template.json
+++ b/src/EllieBot/data/xp_template.json
@@ -1,8 +1,8 @@
{
- "Version": 2,
+ "Version": 3,
"output_size": {
- "X": 800,
- "Y": 392
+ "X": 500,
+ "Y": 245
},
"User": {
"Name": {
@@ -25,58 +25,27 @@
"Y": 71
}
},
- "GlobalLevel": {
+ "Level": {
"Color": "ffffffff",
"Show": true,
- "FontSize": 45,
+ "FontSize": 22,
"Pos": {
- "X": 47,
- "Y": 160
+ "X": 35,
+ "Y": 101
}
},
- "GuildLevel": {
+ "Rank": {
"Color": "ffffffff",
"Show": true,
- "FontSize": 45,
+ "FontSize": 20,
"Pos": {
- "X": 47,
- "Y": 308
- }
- },
- "GlobalRank": {
- "Color": "ffffffff",
- "Show": true,
- "FontSize": 30,
- "Pos": {
- "X": 148,
- "Y": 179
- }
- },
- "GuildRank": {
- "Color": "ffffffff",
- "Show": true,
- "FontSize": 30,
- "Pos": {
- "X": 148,
- "Y": 326
+ "X": 100,
+ "Y": 115
}
},
"Xp": {
"Bar": {
"Show": true,
- "Global": {
- "Color": "00000095",
- "PointA": {
- "X": 321,
- "Y": 104
- },
- "PointB": {
- "X": 286,
- "Y": 235
- },
- "Length": 450,
- "Direction": 3
- },
"Guild": {
"Color": "00000095",
"PointA": {
@@ -91,15 +60,6 @@
"Direction": 3
}
},
- "Global": {
- "Color": "ffffffff",
- "Show": true,
- "FontSize": 50,
- "Pos": {
- "X": 528,
- "Y": 170
- }
- },
"Guild": {
"Color": "ffffffff",
"Show": true,
@@ -108,15 +68,6 @@
"X": 490,
"Y": 313
}
- },
- "Awarded": {
- "Color": "ffffffff",
- "Show": true,
- "FontSize": 25,
- "Pos": {
- "X": 450,
- "Y": 345
- }
}
}
},