From 7a93c4bfc9033995a80e37d9efda23d9cf4e9d0f Mon Sep 17 00:00:00 2001 From: Timo Smit Date: Wed, 18 Jan 2017 14:49:48 +0100 Subject: [PATCH] Improved directory structure (fixes #72) and added pk3 contents to repo --- luascripts/license.txt => COPYING.txt | 0 luamods/wolfadmin/COPYING.txt | 674 ++++++++++++++++++ .../wolfadmin}/admin/admin.lua | 16 +- .../wolfadmin}/admin/balancer.lua | 18 +- .../wolfadmin}/admin/bans.lua | 8 +- .../wolfadmin}/admin/history.lua | 8 +- .../wolfadmin}/admin/mutes.lua | 8 +- .../wolfadmin}/admin/rules.lua | 8 +- .../wolfadmin}/auth/acl.lua | 12 +- .../wolfadmin}/auth/auth.lua | 10 +- .../wolfadmin}/auth/shrubbot.lua | 6 +- .../wolfadmin}/commands/admin/admintest.lua | 8 +- .../wolfadmin}/commands/admin/balance.lua | 6 +- .../wolfadmin}/commands/admin/ban.lua | 12 +- .../wolfadmin}/commands/admin/enablevote.lua | 6 +- .../wolfadmin}/commands/admin/finger.lua | 10 +- .../wolfadmin}/commands/admin/gib.lua | 8 +- .../wolfadmin}/commands/admin/greeting.lua | 10 +- .../wolfadmin}/commands/admin/help.lua | 6 +- .../wolfadmin}/commands/admin/incognito.lua | 6 +- .../wolfadmin}/commands/admin/kick.lua | 10 +- .../wolfadmin}/commands/admin/kickbots.lua | 6 +- .../wolfadmin}/commands/admin/listaliases.lua | 14 +- .../wolfadmin}/commands/admin/listlevels.lua | 14 +- .../wolfadmin}/commands/admin/listmaps.lua | 8 +- .../wolfadmin}/commands/admin/listplayers.lua | 16 +- .../wolfadmin}/commands/admin/lock.lua | 12 +- .../wolfadmin}/commands/admin/mute.lua | 16 +- .../wolfadmin}/commands/admin/needbots.lua | 6 +- .../wolfadmin}/commands/admin/nextmap.lua | 6 +- .../wolfadmin}/commands/admin/pause.lua | 8 +- .../wolfadmin}/commands/admin/plock.lua | 8 +- .../wolfadmin}/commands/admin/punlock.lua | 8 +- .../wolfadmin}/commands/admin/put.lua | 10 +- .../wolfadmin}/commands/admin/putbots.lua | 12 +- .../wolfadmin}/commands/admin/readconfig.lua | 10 +- .../wolfadmin}/commands/admin/reset.lua | 6 +- .../wolfadmin}/commands/admin/resetsprees.lua | 10 +- .../wolfadmin}/commands/admin/restart.lua | 8 +- .../wolfadmin}/commands/admin/rules.lua | 6 +- .../wolfadmin}/commands/admin/setlevel.lua | 10 +- .../wolfadmin}/commands/admin/showbans.lua | 14 +- .../wolfadmin}/commands/admin/showhistory.lua | 14 +- .../wolfadmin}/commands/admin/shuffle.lua | 6 +- .../wolfadmin}/commands/admin/slap.lua | 8 +- .../wolfadmin}/commands/admin/sprees.lua | 8 +- .../wolfadmin}/commands/admin/stats.lua | 6 +- .../wolfadmin}/commands/admin/swap.lua | 6 +- .../wolfadmin}/commands/admin/time.lua | 6 +- .../wolfadmin}/commands/admin/unban.lua | 10 +- .../wolfadmin}/commands/admin/unlock.lua | 12 +- .../wolfadmin}/commands/admin/unmute.lua | 10 +- .../wolfadmin}/commands/admin/unpause.lua | 8 +- .../wolfadmin}/commands/admin/vmute.lua | 12 +- .../wolfadmin}/commands/admin/vunmute.lua | 6 +- .../wolfadmin}/commands/admin/warn.lua | 14 +- .../wolfadmin}/commands/client/ac.lua | 6 +- .../wolfadmin}/commands/client/pm.lua | 6 +- .../wolfadmin}/commands/client/r.lua | 6 +- .../wolfadmin}/commands/client/wolfadmin.lua | 4 +- .../wolfadmin}/commands/commands.lua | 18 +- .../wolfadmin}/commands/server/cannounce.lua | 6 +- .../wolfadmin}/commands/server/cchat.lua | 6 +- .../wolfadmin}/commands/server/ccp.lua | 6 +- .../wolfadmin}/commands/server/ccpm.lua | 6 +- .../wolfadmin}/commands/server/cmusic.lua | 6 +- .../wolfadmin}/commands/server/csay.lua | 6 +- {luascripts => luamods/wolfadmin}/db/db.lua | 12 +- .../wolfadmin}/db/mysql.lua | 10 +- .../wolfadmin}/db/sqlite3.lua | 11 +- .../wolfadmin}/game/bots.lua | 8 +- .../wolfadmin}/game/fireteams.lua | 8 +- .../wolfadmin}/game/game.lua | 8 +- .../wolfadmin}/game/sprees.lua | 16 +- .../wolfadmin}/game/teams.lua | 8 +- .../wolfadmin}/game/voting.lua | 16 +- {luascripts => luamods/wolfadmin}/main.lua | 44 +- .../wolfadmin}/players/greetings.lua | 14 +- .../wolfadmin}/players/players.lua | 6 +- .../wolfadmin}/players/stats.lua | 2 +- .../wolfadmin}/util/bits.lua | 0 .../wolfadmin}/util/constants.lua | 0 .../wolfadmin}/util/debug.lua | 6 +- .../wolfadmin}/util/events.lua | 4 +- .../wolfadmin}/util/files.lua | 8 +- .../wolfadmin}/util/pagination.lua | 0 .../wolfadmin}/util/settings.lua | 8 +- .../wolfadmin}/util/tables.lua | 0 .../wolfadmin}/util/timers.lua | 8 +- .../wolfadmin}/util/util.lua | 4 +- pk3/COPYING.txt | 674 ++++++++++++++++++ pk3/ui/ingame_vote.menu | 96 +++ pk3/ui/ingame_vote_wolfadmin.menu | 47 ++ pk3/ui/menus.txt | 90 +++ 94 files changed, 1975 insertions(+), 393 deletions(-) rename luascripts/license.txt => COPYING.txt (100%) create mode 100644 luamods/wolfadmin/COPYING.txt rename {luascripts => luamods/wolfadmin}/admin/admin.lua (90%) rename {luascripts => luamods/wolfadmin}/admin/balancer.lua (91%) rename {luascripts => luamods/wolfadmin}/admin/bans.lua (86%) rename {luascripts => luamods/wolfadmin}/admin/history.lua (87%) rename {luascripts => luamods/wolfadmin}/admin/mutes.lua (91%) rename {luascripts => luamods/wolfadmin}/admin/rules.lua (88%) rename {luascripts => luamods/wolfadmin}/auth/acl.lua (84%) rename {luascripts => luamods/wolfadmin}/auth/auth.lua (92%) rename {luascripts => luamods/wolfadmin}/auth/shrubbot.lua (95%) rename {luascripts => luamods/wolfadmin}/commands/admin/admintest.lua (83%) rename {luascripts => luamods/wolfadmin}/commands/admin/balance.lua (91%) rename {luascripts => luamods/wolfadmin}/commands/admin/ban.lua (90%) rename {luascripts => luamods/wolfadmin}/commands/admin/enablevote.lua (85%) rename {luascripts => luamods/wolfadmin}/commands/admin/finger.lua (89%) rename {luascripts => luamods/wolfadmin}/commands/admin/gib.lua (91%) rename {luascripts => luamods/wolfadmin}/commands/admin/greeting.lua (79%) rename {luascripts => luamods/wolfadmin}/commands/admin/help.lua (94%) rename {luascripts => luamods/wolfadmin}/commands/admin/incognito.lua (95%) rename {luascripts => luamods/wolfadmin}/commands/admin/kick.lua (88%) rename {luascripts => luamods/wolfadmin}/commands/admin/kickbots.lua (85%) rename {luascripts => luamods/wolfadmin}/commands/admin/listaliases.lua (90%) rename {luascripts => luamods/wolfadmin}/commands/admin/listlevels.lua (92%) rename {luascripts => luamods/wolfadmin}/commands/admin/listmaps.lua (84%) rename {luascripts => luamods/wolfadmin}/commands/admin/listplayers.lua (86%) rename {luascripts => luamods/wolfadmin}/commands/admin/lock.lua (87%) rename {luascripts => luamods/wolfadmin}/commands/admin/mute.lua (87%) rename {luascripts => luamods/wolfadmin}/commands/admin/needbots.lua (85%) rename {luascripts => luamods/wolfadmin}/commands/admin/nextmap.lua (85%) rename {luascripts => luamods/wolfadmin}/commands/admin/pause.lua (82%) rename {luascripts => luamods/wolfadmin}/commands/admin/plock.lua (92%) rename {luascripts => luamods/wolfadmin}/commands/admin/punlock.lua (90%) rename {luascripts => luamods/wolfadmin}/commands/admin/put.lua (91%) rename {luascripts => luamods/wolfadmin}/commands/admin/putbots.lua (85%) rename {luascripts => luamods/wolfadmin}/commands/admin/readconfig.lua (80%) rename {luascripts => luamods/wolfadmin}/commands/admin/reset.lua (85%) rename {luascripts => luamods/wolfadmin}/commands/admin/resetsprees.lua (84%) rename {luascripts => luamods/wolfadmin}/commands/admin/restart.lua (84%) rename {luascripts => luamods/wolfadmin}/commands/admin/rules.lua (91%) rename {luascripts => luamods/wolfadmin}/commands/admin/setlevel.lua (92%) rename {luascripts => luamods/wolfadmin}/commands/admin/showbans.lua (85%) rename {luascripts => luamods/wolfadmin}/commands/admin/showhistory.lua (89%) rename {luascripts => luamods/wolfadmin}/commands/admin/shuffle.lua (86%) rename {luascripts => luamods/wolfadmin}/commands/admin/slap.lua (91%) rename {luascripts => luamods/wolfadmin}/commands/admin/sprees.lua (90%) rename {luascripts => luamods/wolfadmin}/commands/admin/stats.lua (97%) rename {luascripts => luamods/wolfadmin}/commands/admin/swap.lua (85%) rename {luascripts => luamods/wolfadmin}/commands/admin/time.lua (85%) rename {luascripts => luamods/wolfadmin}/commands/admin/unban.lua (86%) rename {luascripts => luamods/wolfadmin}/commands/admin/unlock.lua (87%) rename {luascripts => luamods/wolfadmin}/commands/admin/unmute.lua (87%) rename {luascripts => luamods/wolfadmin}/commands/admin/unpause.lua (82%) rename {luascripts => luamods/wolfadmin}/commands/admin/vmute.lua (90%) rename {luascripts => luamods/wolfadmin}/commands/admin/vunmute.lua (92%) rename {luascripts => luamods/wolfadmin}/commands/admin/warn.lua (88%) rename {luascripts => luamods/wolfadmin}/commands/client/ac.lua (92%) rename {luascripts => luamods/wolfadmin}/commands/client/pm.lua (89%) rename {luascripts => luamods/wolfadmin}/commands/client/r.lua (93%) rename {luascripts => luamods/wolfadmin}/commands/client/wolfadmin.lua (92%) rename {luascripts => luamods/wolfadmin}/commands/commands.lua (95%) rename {luascripts => luamods/wolfadmin}/commands/server/cannounce.lua (87%) rename {luascripts => luamods/wolfadmin}/commands/server/cchat.lua (87%) rename {luascripts => luamods/wolfadmin}/commands/server/ccp.lua (87%) rename {luascripts => luamods/wolfadmin}/commands/server/ccpm.lua (87%) rename {luascripts => luamods/wolfadmin}/commands/server/cmusic.lua (87%) rename {luascripts => luamods/wolfadmin}/commands/server/csay.lua (87%) rename {luascripts => luamods/wolfadmin}/db/db.lua (82%) rename {luascripts => luamods/wolfadmin}/db/mysql.lua (97%) rename {luascripts => luamods/wolfadmin}/db/sqlite3.lua (97%) rename {luascripts => luamods/wolfadmin}/game/bots.lua (87%) rename {luascripts => luamods/wolfadmin}/game/fireteams.lua (94%) rename {luascripts => luamods/wolfadmin}/game/game.lua (94%) rename {luascripts => luamods/wolfadmin}/game/sprees.lua (95%) rename {luascripts => luamods/wolfadmin}/game/teams.lua (92%) rename {luascripts => luamods/wolfadmin}/game/voting.lua (91%) rename {luascripts => luamods/wolfadmin}/main.lua (75%) rename {luascripts => luamods/wolfadmin}/players/greetings.lua (90%) rename {luascripts => luamods/wolfadmin}/players/players.lua (97%) rename {luascripts => luamods/wolfadmin}/players/stats.lua (96%) rename {luascripts => luamods/wolfadmin}/util/bits.lua (100%) rename {luascripts => luamods/wolfadmin}/util/constants.lua (100%) rename {luascripts => luamods/wolfadmin}/util/debug.lua (88%) rename {luascripts => luamods/wolfadmin}/util/events.lua (96%) rename {luascripts => luamods/wolfadmin}/util/files.lua (93%) rename {luascripts => luamods/wolfadmin}/util/pagination.lua (100%) rename {luascripts => luamods/wolfadmin}/util/settings.lua (94%) rename {luascripts => luamods/wolfadmin}/util/tables.lua (100%) rename {luascripts => luamods/wolfadmin}/util/timers.lua (89%) rename {luascripts => luamods/wolfadmin}/util/util.lua (98%) create mode 100644 pk3/COPYING.txt create mode 100644 pk3/ui/ingame_vote.menu create mode 100644 pk3/ui/ingame_vote_wolfadmin.menu create mode 100644 pk3/ui/menus.txt diff --git a/luascripts/license.txt b/COPYING.txt similarity index 100% rename from luascripts/license.txt rename to COPYING.txt diff --git a/luamods/wolfadmin/COPYING.txt b/luamods/wolfadmin/COPYING.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/luamods/wolfadmin/COPYING.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is 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. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + 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. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "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. + + 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. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + 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. + + 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. + + 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. + + 1. Source Code. + + 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. + + 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. + + 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. + + 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. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + 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. + + 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. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 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. Use with the GNU Affero General Public License. + + 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 Affero 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 special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 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 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 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 + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/luascripts/admin/admin.lua b/luamods/wolfadmin/admin/admin.lua similarity index 90% rename from luascripts/admin/admin.lua rename to luamods/wolfadmin/admin/admin.lua index 8f60a8d..0b7bac6 100644 --- a/luascripts/admin/admin.lua +++ b/luamods/wolfadmin/admin/admin.lua @@ -15,16 +15,16 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local players = require "luascripts.wolfadmin.players.players" --- local stats = require "luascripts.wolfadmin.players.stats" +local players = require "luamods.wolfadmin.players.players" +-- local stats = require "luamods.wolfadmin.players.stats" -local constants = require "luascripts.wolfadmin.util.constants" -local events = require "luascripts.wolfadmin.util.events" -local files = require "luascripts.wolfadmin.util.files" -local settings = require "luascripts.wolfadmin.util.settings" -local util = require "luascripts.wolfadmin.util.util" +local constants = require "luamods.wolfadmin.util.constants" +local events = require "luamods.wolfadmin.util.events" +local files = require "luamods.wolfadmin.util.files" +local settings = require "luamods.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" local admin = {} diff --git a/luascripts/admin/balancer.lua b/luamods/wolfadmin/admin/balancer.lua similarity index 91% rename from luascripts/admin/balancer.lua rename to luamods/wolfadmin/admin/balancer.lua index 0bcb4ca..2b118f5 100644 --- a/luascripts/admin/balancer.lua +++ b/luamods/wolfadmin/admin/balancer.lua @@ -15,17 +15,17 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local constants = require "luascripts.wolfadmin.util.constants" -local util = require "luascripts.wolfadmin.util.util" -local bits = require "luascripts.wolfadmin.util.bits" -local tables = require "luascripts.wolfadmin.util.tables" -local events = require "luascripts.wolfadmin.util.events" -local timers = require "luascripts.wolfadmin.util.timers" -local settings = require "luascripts.wolfadmin.util.settings" +local constants = require "luamods.wolfadmin.util.constants" +local util = require "luamods.wolfadmin.util.util" +local bits = require "luamods.wolfadmin.util.bits" +local tables = require "luamods.wolfadmin.util.tables" +local events = require "luamods.wolfadmin.util.events" +local timers = require "luamods.wolfadmin.util.timers" +local settings = require "luamods.wolfadmin.util.settings" -local admin = require "luascripts.wolfadmin.admin.admin" +local admin = require "luamods.wolfadmin.admin.admin" -local teams = require "luascripts.wolfadmin.game.teams" +local teams = require "luamods.wolfadmin.game.teams" local balancer = {} diff --git a/luascripts/admin/bans.lua b/luamods/wolfadmin/admin/bans.lua similarity index 86% rename from luascripts/admin/bans.lua rename to luamods/wolfadmin/admin/bans.lua index 71ed7ba..a8376ec 100644 --- a/luascripts/admin/bans.lua +++ b/luamods/wolfadmin/admin/bans.lua @@ -15,12 +15,12 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local events = require "luascripts.wolfadmin.util.events" -local settings = require "luascripts.wolfadmin.util.settings" +local events = require "luamods.wolfadmin.util.events" +local settings = require "luamods.wolfadmin.util.settings" local bans = {} diff --git a/luascripts/admin/history.lua b/luamods/wolfadmin/admin/history.lua similarity index 87% rename from luascripts/admin/history.lua rename to luamods/wolfadmin/admin/history.lua index aaa9001..f0a36ea 100644 --- a/luascripts/admin/history.lua +++ b/luamods/wolfadmin/admin/history.lua @@ -15,12 +15,12 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local events = require "luascripts.wolfadmin.util.events" -local settings = require "luascripts.wolfadmin.util.settings" +local events = require "luamods.wolfadmin.util.events" +local settings = require "luamods.wolfadmin.util.settings" local history = {} diff --git a/luascripts/admin/mutes.lua b/luamods/wolfadmin/admin/mutes.lua similarity index 91% rename from luascripts/admin/mutes.lua rename to luamods/wolfadmin/admin/mutes.lua index 43e606b..68f713f 100644 --- a/luascripts/admin/mutes.lua +++ b/luamods/wolfadmin/admin/mutes.lua @@ -15,12 +15,12 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local events = require "luascripts.wolfadmin.util.events" -local timers = require "luascripts.wolfadmin.util.timers" +local events = require "luamods.wolfadmin.util.events" +local timers = require "luamods.wolfadmin.util.timers" local mutes = {} diff --git a/luascripts/admin/rules.lua b/luamods/wolfadmin/admin/rules.lua similarity index 88% rename from luascripts/admin/rules.lua rename to luamods/wolfadmin/admin/rules.lua index d7e2c4b..ebb8d95 100644 --- a/luascripts/admin/rules.lua +++ b/luamods/wolfadmin/admin/rules.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local events = require "luascripts.wolfadmin.util.events" -local files = require "luascripts.wolfadmin.util.files" -local settings = require "luascripts.wolfadmin.util.settings" +local events = require "luamods.wolfadmin.util.events" +local files = require "luamods.wolfadmin.util.files" +local settings = require "luamods.wolfadmin.util.settings" local rules = {} @@ -54,4 +54,4 @@ function rules.oninit(levelTime, randomSeed, restartMap) end events.handle("onGameInit", rules.oninit) -return rules \ No newline at end of file +return rules diff --git a/luascripts/auth/acl.lua b/luamods/wolfadmin/auth/acl.lua similarity index 84% rename from luascripts/auth/acl.lua rename to luamods/wolfadmin/auth/acl.lua index c981134..754644c 100644 --- a/luascripts/auth/acl.lua +++ b/luamods/wolfadmin/auth/acl.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local events = require "luascripts.wolfadmin.util.events" -local files = require "luascripts.wolfadmin.util.files" -local tables = require "luascripts.wolfadmin.util.tables" +local events = require "luamods.wolfadmin.util.events" +local files = require "luamods.wolfadmin.util.files" +local tables = require "luamods.wolfadmin.util.tables" local acl = {} diff --git a/luascripts/auth/auth.lua b/luamods/wolfadmin/auth/auth.lua similarity index 92% rename from luascripts/auth/auth.lua rename to luamods/wolfadmin/auth/auth.lua index 8ef1f80..1e5ce4a 100644 --- a/luascripts/auth/auth.lua +++ b/luamods/wolfadmin/auth/auth.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local events = require "luascripts.wolfadmin.util.events" -local files = require "luascripts.wolfadmin.util.files" -local settings = require "luascripts.wolfadmin.util.settings" +local events = require "luamods.wolfadmin.util.events" +local files = require "luamods.wolfadmin.util.files" +local settings = require "luamods.wolfadmin.util.settings" local auth = {} @@ -114,9 +114,9 @@ auth.PERM_IMMUNE = "immune" -- this, but it will suffice. function auth.oninit() if settings.get("g_standalone") == 1 then - srv = require "luascripts.wolfadmin.auth.acl" + srv = require "luamods.wolfadmin.auth.acl" else - srv = require "luascripts.wolfadmin.auth.shrubbot" + srv = require "luamods.wolfadmin.auth.shrubbot" end if settings.get("g_standalone") == 1 and et.trap_Cvar_Get("g_shrubbot") ~= "" then diff --git a/luascripts/auth/shrubbot.lua b/luamods/wolfadmin/auth/shrubbot.lua similarity index 95% rename from luascripts/auth/shrubbot.lua rename to luamods/wolfadmin/auth/shrubbot.lua index 90dacb7..917e382 100644 --- a/luascripts/auth/shrubbot.lua +++ b/luamods/wolfadmin/auth/shrubbot.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local events = require "luascripts.wolfadmin.util.events" -local files = require "luascripts.wolfadmin.util.files" +local events = require "luamods.wolfadmin.util.events" +local files = require "luamods.wolfadmin.util.files" -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" local shrubbot = {} diff --git a/luascripts/commands/admin/admintest.lua b/luamods/wolfadmin/commands/admin/admintest.lua similarity index 83% rename from luascripts/commands/admin/admintest.lua rename to luamods/wolfadmin/commands/admin/admintest.lua index 16f987e..e1b342e 100644 --- a/luascripts/commands/admin/admintest.lua +++ b/luamods/wolfadmin/commands/admin/admintest.lua @@ -15,13 +15,13 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local settings = require "luascripts.wolfadmin.util.settings" +local settings = require "luamods.wolfadmin.util.settings" function commandAdminTest(clientId, cmdArguments) local level = auth.getlevel(clientId) diff --git a/luascripts/commands/admin/balance.lua b/luamods/wolfadmin/commands/admin/balance.lua similarity index 91% rename from luascripts/commands/admin/balance.lua rename to luamods/wolfadmin/commands/admin/balance.lua index 954a609..deaf442 100644 --- a/luascripts/commands/admin/balance.lua +++ b/luamods/wolfadmin/commands/admin/balance.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luascripts.wolfadmin.commands.commands" -local auth = require "luascripts.wolfadmin.auth.auth" -local balancer = require "luascripts.wolfadmin.admin.balancer" +local commands = require "luamods.wolfadmin.commands.commands" +local auth = require "luamods.wolfadmin.auth.auth" +local balancer = require "luamods.wolfadmin.admin.balancer" function commandBalance(clientId, cmdArguments) if cmdArguments[1] == "enable" then diff --git a/luascripts/commands/admin/ban.lua b/luamods/wolfadmin/commands/admin/ban.lua similarity index 90% rename from luascripts/commands/admin/ban.lua rename to luamods/wolfadmin/commands/admin/ban.lua index 4dfbd95..bf47ec0 100644 --- a/luascripts/commands/admin/ban.lua +++ b/luamods/wolfadmin/commands/admin/ban.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local bans = require "luascripts.wolfadmin.admin.bans" -local history = require "luascripts.wolfadmin.admin.history" +local bans = require "luamods.wolfadmin.admin.bans" +local history = require "luamods.wolfadmin.admin.history" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local util = require "luascripts.wolfadmin.util.util" -local settings = require "luascripts.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" +local settings = require "luamods.wolfadmin.util.settings" function commandBan(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/enablevote.lua b/luamods/wolfadmin/commands/admin/enablevote.lua similarity index 85% rename from luascripts/commands/admin/enablevote.lua rename to luamods/wolfadmin/commands/admin/enablevote.lua index 1acadb0..e1cf2fe 100644 --- a/luascripts/commands/admin/enablevote.lua +++ b/luamods/wolfadmin/commands/admin/enablevote.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luascripts.wolfadmin.commands.commands" -local auth = require "luascripts.wolfadmin.auth.auth" -local voting = require "luascripts.wolfadmin.game.voting" +local commands = require "luamods.wolfadmin.commands.commands" +local auth = require "luamods.wolfadmin.auth.auth" +local voting = require "luamods.wolfadmin.game.voting" function commandEnableVote(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "chat \"^denablevote: ^9next map voting has been enabled.\";") diff --git a/luascripts/commands/admin/finger.lua b/luamods/wolfadmin/commands/admin/finger.lua similarity index 89% rename from luascripts/commands/admin/finger.lua rename to luamods/wolfadmin/commands/admin/finger.lua index c4751d0..a1ff602 100644 --- a/luascripts/commands/admin/finger.lua +++ b/luamods/wolfadmin/commands/admin/finger.lua @@ -15,14 +15,14 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local settings = require "luascripts.wolfadmin.util.settings" -local util = require "luascripts.wolfadmin.util.util" +local settings = require "luamods.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" function commandFinger(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/gib.lua b/luamods/wolfadmin/commands/admin/gib.lua similarity index 91% rename from luascripts/commands/admin/gib.lua rename to luamods/wolfadmin/commands/admin/gib.lua index d591221..82b559f 100644 --- a/luascripts/commands/admin/gib.lua +++ b/luamods/wolfadmin/commands/admin/gib.lua @@ -15,13 +15,13 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local settings = require "luascripts.wolfadmin.util.settings" +local settings = require "luamods.wolfadmin.util.settings" function commandGib(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/greeting.lua b/luamods/wolfadmin/commands/admin/greeting.lua similarity index 79% rename from luascripts/commands/admin/greeting.lua rename to luamods/wolfadmin/commands/admin/greeting.lua index 0687c4c..a76c8ff 100644 --- a/luascripts/commands/admin/greeting.lua +++ b/luamods/wolfadmin/commands/admin/greeting.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local util = require "luascripts.wolfadmin.util.util" -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local settings = require "luascripts.wolfadmin.util.settings" -local greetings = require "luascripts.wolfadmin.players.greetings" +local util = require "luamods.wolfadmin.util.util" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local settings = require "luamods.wolfadmin.util.settings" +local greetings = require "luamods.wolfadmin.players.greetings" function commandGreeting(clientId, cmdArguments) local greeting = greetings.get(clientId) diff --git a/luascripts/commands/admin/help.lua b/luamods/wolfadmin/commands/admin/help.lua similarity index 94% rename from luascripts/commands/admin/help.lua rename to luamods/wolfadmin/commands/admin/help.lua index 057e7d1..47d1529 100644 --- a/luascripts/commands/admin/help.lua +++ b/luamods/wolfadmin/commands/admin/help.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local settings = require "luascripts.wolfadmin.util.settings" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local settings = require "luamods.wolfadmin.util.settings" function commandHelp(clientId, cmdArguments) local cmds = commands.getadmin() diff --git a/luascripts/commands/admin/incognito.lua b/luamods/wolfadmin/commands/admin/incognito.lua similarity index 95% rename from luascripts/commands/admin/incognito.lua rename to luamods/wolfadmin/commands/admin/incognito.lua index 1ccc9ac..d8d1027 100644 --- a/luascripts/commands/admin/incognito.lua +++ b/luamods/wolfadmin/commands/admin/incognito.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" function commandIncognito(clientId, cmdArguments) local fileName = et.trap_Cvar_Get("g_shrubbot") diff --git a/luascripts/commands/admin/kick.lua b/luamods/wolfadmin/commands/admin/kick.lua similarity index 88% rename from luascripts/commands/admin/kick.lua rename to luamods/wolfadmin/commands/admin/kick.lua index 885309c..e2c8a08 100644 --- a/luascripts/commands/admin/kick.lua +++ b/luamods/wolfadmin/commands/admin/kick.lua @@ -15,14 +15,14 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local admin = require "luascripts.wolfadmin.admin.admin" -local history = require "luascripts.wolfadmin.admin.history" +local admin = require "luamods.wolfadmin.admin.admin" +local history = require "luamods.wolfadmin.admin.history" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local settings = require "luascripts.wolfadmin.util.settings" +local settings = require "luamods.wolfadmin.util.settings" function commandKick(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/kickbots.lua b/luamods/wolfadmin/commands/admin/kickbots.lua similarity index 85% rename from luascripts/commands/admin/kickbots.lua rename to luamods/wolfadmin/commands/admin/kickbots.lua index 8fba30b..3475379 100644 --- a/luascripts/commands/admin/kickbots.lua +++ b/luamods/wolfadmin/commands/admin/kickbots.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local bots = require "luascripts.wolfadmin.game.bots" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local bots = require "luamods.wolfadmin.game.bots" function commandBotsOff(clientId, cmdArguments) bots.enable(false) diff --git a/luascripts/commands/admin/listaliases.lua b/luamods/wolfadmin/commands/admin/listaliases.lua similarity index 90% rename from luascripts/commands/admin/listaliases.lua rename to luamods/wolfadmin/commands/admin/listaliases.lua index e79c338..6182cd7 100644 --- a/luascripts/commands/admin/listaliases.lua +++ b/luamods/wolfadmin/commands/admin/listaliases.lua @@ -15,17 +15,17 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local pagination = require "luascripts.wolfadmin.util.pagination" -local settings = require "luascripts.wolfadmin.util.settings" -local util = require "luascripts.wolfadmin.util.util" +local pagination = require "luamods.wolfadmin.util.pagination" +local settings = require "luamods.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" function commandListAliases(clientId, cmdArguments) if not db.isconnected() then diff --git a/luascripts/commands/admin/listlevels.lua b/luamods/wolfadmin/commands/admin/listlevels.lua similarity index 92% rename from luascripts/commands/admin/listlevels.lua rename to luamods/wolfadmin/commands/admin/listlevels.lua index 0c5e20f..c62cb02 100644 --- a/luascripts/commands/admin/listlevels.lua +++ b/luamods/wolfadmin/commands/admin/listlevels.lua @@ -15,17 +15,17 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local pagination = require "luascripts.wolfadmin.util.pagination" -local settings = require "luascripts.wolfadmin.util.settings" -local util = require "luascripts.wolfadmin.util.util" +local pagination = require "luamods.wolfadmin.util.pagination" +local settings = require "luamods.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" function commandListLevels(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/listmaps.lua b/luamods/wolfadmin/commands/admin/listmaps.lua similarity index 84% rename from luascripts/commands/admin/listmaps.lua rename to luamods/wolfadmin/commands/admin/listmaps.lua index e429572..14f3bbd 100644 --- a/luascripts/commands/admin/listmaps.lua +++ b/luamods/wolfadmin/commands/admin/listmaps.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local util = require "luascripts.wolfadmin.util.util" -local commands = require "luascripts.wolfadmin.commands.commands" -local game = require "luascripts.wolfadmin.game.game" +local auth = require "luamods.wolfadmin.auth.auth" +local util = require "luamods.wolfadmin.util.util" +local commands = require "luamods.wolfadmin.commands.commands" +local game = require "luamods.wolfadmin.game.game" function commandListMaps(clientId, cmdArguments) local output = "" diff --git a/luascripts/commands/admin/listplayers.lua b/luamods/wolfadmin/commands/admin/listplayers.lua similarity index 86% rename from luascripts/commands/admin/listplayers.lua rename to luamods/wolfadmin/commands/admin/listplayers.lua index 9452ec4..c2954d0 100644 --- a/luascripts/commands/admin/listplayers.lua +++ b/luamods/wolfadmin/commands/admin/listplayers.lua @@ -15,18 +15,18 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local game = require "luascripts.wolfadmin.game.game" -local fireteams = require "luascripts.wolfadmin.game.fireteams" +local game = require "luamods.wolfadmin.game.game" +local fireteams = require "luamods.wolfadmin.game.fireteams" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local constants = require "luascripts.wolfadmin.util.constants" -local settings = require "luascripts.wolfadmin.util.settings" -local util = require "luascripts.wolfadmin.util.util" +local constants = require "luamods.wolfadmin.util.constants" +local settings = require "luamods.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" function commandListPlayers(clientId, cmdArguments) local playersOnline = {} diff --git a/luascripts/commands/admin/lock.lua b/luamods/wolfadmin/commands/admin/lock.lua similarity index 87% rename from luascripts/commands/admin/lock.lua rename to luamods/wolfadmin/commands/admin/lock.lua index 5892771..01ef975 100644 --- a/luascripts/commands/admin/lock.lua +++ b/luamods/wolfadmin/commands/admin/lock.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local teams = require "luascripts.wolfadmin.game.teams" +local teams = require "luamods.wolfadmin.game.teams" -local util = require "luascripts.wolfadmin.util.util" -local constants = require "luascripts.wolfadmin.util.constants" -local settings = require "luascripts.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" +local constants = require "luamods.wolfadmin.util.constants" +local settings = require "luamods.wolfadmin.util.settings" function commandLock(clientId, cmdArguments) if cmdArguments[1] == nil or (cmdArguments[1] ~= constants.TEAM_AXIS_SC and cmdArguments[1] ~= constants.TEAM_ALLIES_SC and cmdArguments[1] ~= constants.TEAM_SPECTATORS_SC and cmdArguments[1] ~= "all") then diff --git a/luascripts/commands/admin/mute.lua b/luamods/wolfadmin/commands/admin/mute.lua similarity index 87% rename from luascripts/commands/admin/mute.lua rename to luamods/wolfadmin/commands/admin/mute.lua index 01b0a31..28586f5 100644 --- a/luascripts/commands/admin/mute.lua +++ b/luamods/wolfadmin/commands/admin/mute.lua @@ -15,18 +15,18 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local admin = require "luascripts.wolfadmin.admin.admin" -local history = require "luascripts.wolfadmin.admin.history" -local mutes = require "luascripts.wolfadmin.admin.mutes" +local admin = require "luamods.wolfadmin.admin.admin" +local history = require "luamods.wolfadmin.admin.history" +local mutes = require "luamods.wolfadmin.admin.mutes" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local util = require "luascripts.wolfadmin.util.util" -local settings = require "luascripts.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" +local settings = require "luamods.wolfadmin.util.settings" function commandMute(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/needbots.lua b/luamods/wolfadmin/commands/admin/needbots.lua similarity index 85% rename from luascripts/commands/admin/needbots.lua rename to luamods/wolfadmin/commands/admin/needbots.lua index 1ebf06b..735e5c4 100644 --- a/luascripts/commands/admin/needbots.lua +++ b/luamods/wolfadmin/commands/admin/needbots.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local bots = require "luascripts.wolfadmin.game.bots" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local bots = require "luamods.wolfadmin.game.bots" function commandBotsOn(clientId, cmdArguments) bots.enable(true) diff --git a/luascripts/commands/admin/nextmap.lua b/luamods/wolfadmin/commands/admin/nextmap.lua similarity index 85% rename from luascripts/commands/admin/nextmap.lua rename to luamods/wolfadmin/commands/admin/nextmap.lua index c9e5ad2..e146ffd 100644 --- a/luascripts/commands/admin/nextmap.lua +++ b/luamods/wolfadmin/commands/admin/nextmap.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local settings = require "luascripts.wolfadmin.util.settings" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local settings = require "luamods.wolfadmin.util.settings" function commandNextMap(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dnextmap: ^9next map was loaded.\";") diff --git a/luascripts/commands/admin/pause.lua b/luamods/wolfadmin/commands/admin/pause.lua similarity index 82% rename from luascripts/commands/admin/pause.lua rename to luamods/wolfadmin/commands/admin/pause.lua index 75d4a45..1ae6259 100644 --- a/luascripts/commands/admin/pause.lua +++ b/luamods/wolfadmin/commands/admin/pause.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local game = require "luascripts.wolfadmin.game.game" -local settings = require "luascripts.wolfadmin.util.settings" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local game = require "luamods.wolfadmin.game.game" +local settings = require "luamods.wolfadmin.util.settings" function commandPause(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dpause: ^9map paused.\";") diff --git a/luascripts/commands/admin/plock.lua b/luamods/wolfadmin/commands/admin/plock.lua similarity index 92% rename from luascripts/commands/admin/plock.lua rename to luamods/wolfadmin/commands/admin/plock.lua index 5bae9df..9799233 100644 --- a/luascripts/commands/admin/plock.lua +++ b/luamods/wolfadmin/commands/admin/plock.lua @@ -15,13 +15,13 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local util = require "luascripts.wolfadmin.util.util" +local util = require "luamods.wolfadmin.util.util" function commandPlayerLock(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/punlock.lua b/luamods/wolfadmin/commands/admin/punlock.lua similarity index 90% rename from luascripts/commands/admin/punlock.lua rename to luamods/wolfadmin/commands/admin/punlock.lua index 628c3c9..96daa45 100644 --- a/luascripts/commands/admin/punlock.lua +++ b/luamods/wolfadmin/commands/admin/punlock.lua @@ -15,13 +15,13 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local util = require "luascripts.wolfadmin.util.util" +local util = require "luamods.wolfadmin.util.util" function commandPlayerUnlock(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/put.lua b/luamods/wolfadmin/commands/admin/put.lua similarity index 91% rename from luascripts/commands/admin/put.lua rename to luamods/wolfadmin/commands/admin/put.lua index b7536b7..e98f785 100644 --- a/luascripts/commands/admin/put.lua +++ b/luamods/wolfadmin/commands/admin/put.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local admin = require "luascripts.wolfadmin.admin.admin" -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local constants = require "luascripts.wolfadmin.util.constants" -local util = require "luascripts.wolfadmin.util.util" +local admin = require "luamods.wolfadmin.admin.admin" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local constants = require "luamods.wolfadmin.util.constants" +local util = require "luamods.wolfadmin.util.util" function commandPlayerLock(clientId, cmdArguments) if cmdArguments[2] == nil or (cmdArguments[2] ~= constants.TEAM_AXIS_SC and cmdArguments[2] ~= constants.TEAM_ALLIES_SC and cmdArguments[2] ~= constants.TEAM_SPECTATORS_SC) then diff --git a/luascripts/commands/admin/putbots.lua b/luamods/wolfadmin/commands/admin/putbots.lua similarity index 85% rename from luascripts/commands/admin/putbots.lua rename to luamods/wolfadmin/commands/admin/putbots.lua index e0e28bf..135222f 100644 --- a/luascripts/commands/admin/putbots.lua +++ b/luamods/wolfadmin/commands/admin/putbots.lua @@ -15,12 +15,12 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local constants = require "luascripts.wolfadmin.util.constants" -local util = require "luascripts.wolfadmin.util.util" -local balancer = require "luascripts.wolfadmin.admin.balancer" -local commands = require "luascripts.wolfadmin.commands.commands" -local bots = require "luascripts.wolfadmin.game.bots" +local auth = require "luamods.wolfadmin.auth.auth" +local constants = require "luamods.wolfadmin.util.constants" +local util = require "luamods.wolfadmin.util.util" +local balancer = require "luamods.wolfadmin.admin.balancer" +local commands = require "luamods.wolfadmin.commands.commands" +local bots = require "luamods.wolfadmin.game.bots" function commandPutBots(clientId, cmdArguments) if cmdArguments[1] == nil and cmdArguments[1] ~= constants.TEAM_AXIS_SC and cmdArguments[1] ~= constants.TEAM_ALLIES_SC and cmdArguments[1] ~= constants.TEAM_SPECTATORS_SC then diff --git a/luascripts/commands/admin/readconfig.lua b/luamods/wolfadmin/commands/admin/readconfig.lua similarity index 80% rename from luascripts/commands/admin/readconfig.lua rename to luamods/wolfadmin/commands/admin/readconfig.lua index ecbffda..467beaf 100644 --- a/luascripts/commands/admin/readconfig.lua +++ b/luamods/wolfadmin/commands/admin/readconfig.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local settings = require "luascripts.wolfadmin.util.settings" -local commands = require "luascripts.wolfadmin.commands.commands" -local rules = require "luascripts.wolfadmin.admin.rules" -local greetings = require "luascripts.wolfadmin.players.greetings" +local auth = require "luamods.wolfadmin.auth.auth" +local settings = require "luamods.wolfadmin.util.settings" +local commands = require "luamods.wolfadmin.commands.commands" +local rules = require "luamods.wolfadmin.admin.rules" +local greetings = require "luamods.wolfadmin.players.greetings" function commandReadconfig(clientId, cmdArguments) settings.load() diff --git a/luascripts/commands/admin/reset.lua b/luamods/wolfadmin/commands/admin/reset.lua similarity index 85% rename from luascripts/commands/admin/reset.lua rename to luamods/wolfadmin/commands/admin/reset.lua index a03aa75..a17e2c9 100644 --- a/luascripts/commands/admin/reset.lua +++ b/luamods/wolfadmin/commands/admin/reset.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local settings = require "luascripts.wolfadmin.util.settings" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local settings = require "luamods.wolfadmin.util.settings" function commandReset(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dreset: ^9match reset.\";") diff --git a/luascripts/commands/admin/resetsprees.lua b/luamods/wolfadmin/commands/admin/resetsprees.lua similarity index 84% rename from luascripts/commands/admin/resetsprees.lua rename to luamods/wolfadmin/commands/admin/resetsprees.lua index dc99bc8..b59a1af 100644 --- a/luascripts/commands/admin/resetsprees.lua +++ b/luamods/wolfadmin/commands/admin/resetsprees.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local db = require "luascripts.wolfadmin.db.db" -local commands = require "luascripts.wolfadmin.commands.commands" -local game = require "luascripts.wolfadmin.game.game" -local sprees = require "luascripts.wolfadmin.game.sprees" +local auth = require "luamods.wolfadmin.auth.auth" +local db = require "luamods.wolfadmin.db.db" +local commands = require "luamods.wolfadmin.commands.commands" +local game = require "luamods.wolfadmin.game.game" +local sprees = require "luamods.wolfadmin.game.sprees" function commandResetSprees(clientId, cmdArguments) if not db.isconnected() then diff --git a/luascripts/commands/admin/restart.lua b/luamods/wolfadmin/commands/admin/restart.lua similarity index 84% rename from luascripts/commands/admin/restart.lua rename to luamods/wolfadmin/commands/admin/restart.lua index 7395ff6..ec237f9 100644 --- a/luascripts/commands/admin/restart.lua +++ b/luamods/wolfadmin/commands/admin/restart.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local game = require "luascripts.wolfadmin.game.game" -local settings = require "luascripts.wolfadmin.util.settings" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local game = require "luamods.wolfadmin.game.game" +local settings = require "luamods.wolfadmin.util.settings" function commandRestart(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^drestart: ^9map restarted.\";") diff --git a/luascripts/commands/admin/rules.lua b/luamods/wolfadmin/commands/admin/rules.lua similarity index 91% rename from luascripts/commands/admin/rules.lua rename to luamods/wolfadmin/commands/admin/rules.lua index 823834a..7607213 100644 --- a/luascripts/commands/admin/rules.lua +++ b/luamods/wolfadmin/commands/admin/rules.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local rules = require "luascripts.wolfadmin.admin.rules" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local rules = require "luamods.wolfadmin.admin.rules" function commandRules(clientId, cmdArguments) if #cmdArguments == 0 then diff --git a/luascripts/commands/admin/setlevel.lua b/luamods/wolfadmin/commands/admin/setlevel.lua similarity index 92% rename from luascripts/commands/admin/setlevel.lua rename to luamods/wolfadmin/commands/admin/setlevel.lua index d527ac1..a26b22a 100644 --- a/luascripts/commands/admin/setlevel.lua +++ b/luamods/wolfadmin/commands/admin/setlevel.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local settings = require "luascripts.wolfadmin.util.settings" -local db = require "luascripts.wolfadmin.db.db" -local commands = require "luascripts.wolfadmin.commands.commands" -local admin = require "luascripts.wolfadmin.admin.admin" +local auth = require "luamods.wolfadmin.auth.auth" +local settings = require "luamods.wolfadmin.util.settings" +local db = require "luamods.wolfadmin.db.db" +local commands = require "luamods.wolfadmin.commands.commands" +local admin = require "luamods.wolfadmin.admin.admin" function commandSetLevel(clientId, cmdArguments) if #cmdArguments < 2 then diff --git a/luascripts/commands/admin/showbans.lua b/luamods/wolfadmin/commands/admin/showbans.lua similarity index 85% rename from luascripts/commands/admin/showbans.lua rename to luamods/wolfadmin/commands/admin/showbans.lua index 1886483..93f88c6 100644 --- a/luascripts/commands/admin/showbans.lua +++ b/luamods/wolfadmin/commands/admin/showbans.lua @@ -15,17 +15,17 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local bans = require "luascripts.wolfadmin.admin.bans" +local bans = require "luamods.wolfadmin.admin.bans" -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local pagination = require "luascripts.wolfadmin.util.pagination" -local settings = require "luascripts.wolfadmin.util.settings" -local util = require "luascripts.wolfadmin.util.util" +local pagination = require "luamods.wolfadmin.util.pagination" +local settings = require "luamods.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" function commandShowBans(clientId, cmdArguments) if not db.isconnected() then diff --git a/luascripts/commands/admin/showhistory.lua b/luamods/wolfadmin/commands/admin/showhistory.lua similarity index 89% rename from luascripts/commands/admin/showhistory.lua rename to luamods/wolfadmin/commands/admin/showhistory.lua index 4ed5995..b1950c9 100644 --- a/luascripts/commands/admin/showhistory.lua +++ b/luamods/wolfadmin/commands/admin/showhistory.lua @@ -15,17 +15,17 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local history = require "luascripts.wolfadmin.admin.history" +local history = require "luamods.wolfadmin.admin.history" -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local util = require "luascripts.wolfadmin.util.util" -local pagination = require "luascripts.wolfadmin.util.pagination" -local settings = require "luascripts.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" +local pagination = require "luamods.wolfadmin.util.pagination" +local settings = require "luamods.wolfadmin.util.settings" function commandListHistory(clientId, cmdArguments) if settings.get("g_standalone") == 0 or not db.isconnected() then diff --git a/luascripts/commands/admin/shuffle.lua b/luamods/wolfadmin/commands/admin/shuffle.lua similarity index 86% rename from luascripts/commands/admin/shuffle.lua rename to luamods/wolfadmin/commands/admin/shuffle.lua index 3c4da89..7b6b5e6 100644 --- a/luascripts/commands/admin/shuffle.lua +++ b/luamods/wolfadmin/commands/admin/shuffle.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local settings = require "luascripts.wolfadmin.util.settings" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local settings = require "luamods.wolfadmin.util.settings" function commandShuffle(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dshuffle: ^9teams were shuffled.\";") diff --git a/luascripts/commands/admin/slap.lua b/luamods/wolfadmin/commands/admin/slap.lua similarity index 91% rename from luascripts/commands/admin/slap.lua rename to luamods/wolfadmin/commands/admin/slap.lua index 86d2dc3..3e9e5db 100644 --- a/luascripts/commands/admin/slap.lua +++ b/luamods/wolfadmin/commands/admin/slap.lua @@ -15,13 +15,13 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local settings = require "luascripts.wolfadmin.util.settings" +local settings = require "luamods.wolfadmin.util.settings" function commandSlap(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/sprees.lua b/luamods/wolfadmin/commands/admin/sprees.lua similarity index 90% rename from luascripts/commands/admin/sprees.lua rename to luamods/wolfadmin/commands/admin/sprees.lua index 7dfbf1f..f91b51e 100644 --- a/luascripts/commands/admin/sprees.lua +++ b/luamods/wolfadmin/commands/admin/sprees.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local db = require "luascripts.wolfadmin.db.db" -local sprees = require "luascripts.wolfadmin.game.sprees" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local db = require "luamods.wolfadmin.db.db" +local sprees = require "luamods.wolfadmin.game.sprees" function commandShowSprees(clientId, cmdArguments) if not db.isconnected() then diff --git a/luascripts/commands/admin/stats.lua b/luamods/wolfadmin/commands/admin/stats.lua similarity index 97% rename from luascripts/commands/admin/stats.lua rename to luamods/wolfadmin/commands/admin/stats.lua index 122c575..b079607 100644 --- a/luascripts/commands/admin/stats.lua +++ b/luamods/wolfadmin/commands/admin/stats.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local util = require "luascripts.wolfadmin.util.util" -local commands = require "luascripts.wolfadmin.commands.commands" +local auth = require "luamods.wolfadmin.auth.auth" +local util = require "luamods.wolfadmin.util.util" +local commands = require "luamods.wolfadmin.commands.commands" function commandShowStats(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/swap.lua b/luamods/wolfadmin/commands/admin/swap.lua similarity index 85% rename from luascripts/commands/admin/swap.lua rename to luamods/wolfadmin/commands/admin/swap.lua index 2e80d2a..c89ff17 100644 --- a/luascripts/commands/admin/swap.lua +++ b/luamods/wolfadmin/commands/admin/swap.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local settings = require "luascripts.wolfadmin.util.settings" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local settings = require "luamods.wolfadmin.util.settings" function commandSwap(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dswap: ^9teams swapped.\";") diff --git a/luascripts/commands/admin/time.lua b/luamods/wolfadmin/commands/admin/time.lua similarity index 85% rename from luascripts/commands/admin/time.lua rename to luamods/wolfadmin/commands/admin/time.lua index ef3c6ba..522af76 100644 --- a/luascripts/commands/admin/time.lua +++ b/luamods/wolfadmin/commands/admin/time.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local settings = require "luascripts.wolfadmin.util.settings" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local settings = require "luamods.wolfadmin.util.settings" function commandTime(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dtime: ^9current time is ^7"..os.date("%H:%M:%S").."^9.\";") diff --git a/luascripts/commands/admin/unban.lua b/luamods/wolfadmin/commands/admin/unban.lua similarity index 86% rename from luascripts/commands/admin/unban.lua rename to luamods/wolfadmin/commands/admin/unban.lua index 3dcf56b..85062f7 100644 --- a/luascripts/commands/admin/unban.lua +++ b/luamods/wolfadmin/commands/admin/unban.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local bans = require "luascripts.wolfadmin.admin.bans" +local bans = require "luamods.wolfadmin.admin.bans" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local settings = require "luascripts.wolfadmin.util.settings" +local settings = require "luamods.wolfadmin.util.settings" function commandRemoveBan(clientId, cmdArguments) if settings.get("g_standalone") == 0 or not db.isconnected() then diff --git a/luascripts/commands/admin/unlock.lua b/luamods/wolfadmin/commands/admin/unlock.lua similarity index 87% rename from luascripts/commands/admin/unlock.lua rename to luamods/wolfadmin/commands/admin/unlock.lua index c9bfa38..e02191b 100644 --- a/luascripts/commands/admin/unlock.lua +++ b/luamods/wolfadmin/commands/admin/unlock.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local teams = require "luascripts.wolfadmin.game.teams" +local teams = require "luamods.wolfadmin.game.teams" -local util = require "luascripts.wolfadmin.util.util" -local constants = require "luascripts.wolfadmin.util.constants" -local settings = require "luascripts.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" +local constants = require "luamods.wolfadmin.util.constants" +local settings = require "luamods.wolfadmin.util.settings" function commandUnlock(clientId, cmdArguments) if cmdArguments[1] == nil or (cmdArguments[1] ~= constants.TEAM_AXIS_SC and cmdArguments[1] ~= constants.TEAM_ALLIES_SC and cmdArguments[1] ~= constants.TEAM_SPECTATORS_SC and cmdArguments[1] ~= "all") then diff --git a/luascripts/commands/admin/unmute.lua b/luamods/wolfadmin/commands/admin/unmute.lua similarity index 87% rename from luascripts/commands/admin/unmute.lua rename to luamods/wolfadmin/commands/admin/unmute.lua index 917c87e..20cdcdf 100644 --- a/luascripts/commands/admin/unmute.lua +++ b/luamods/wolfadmin/commands/admin/unmute.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local mutes = require "luascripts.wolfadmin.admin.mutes" +local mutes = require "luamods.wolfadmin.admin.mutes" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local settings = require "luascripts.wolfadmin.util.settings" +local settings = require "luamods.wolfadmin.util.settings" function commandUnmute(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/unpause.lua b/luamods/wolfadmin/commands/admin/unpause.lua similarity index 82% rename from luascripts/commands/admin/unpause.lua rename to luamods/wolfadmin/commands/admin/unpause.lua index 2b6d49d..18fcea7 100644 --- a/luascripts/commands/admin/unpause.lua +++ b/luamods/wolfadmin/commands/admin/unpause.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" -local game = require "luascripts.wolfadmin.game.game" -local settings = require "luascripts.wolfadmin.util.settings" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" +local game = require "luamods.wolfadmin.game.game" +local settings = require "luamods.wolfadmin.util.settings" function commandUnpause(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dpause: ^9map unpaused.\";") diff --git a/luascripts/commands/admin/vmute.lua b/luamods/wolfadmin/commands/admin/vmute.lua similarity index 90% rename from luascripts/commands/admin/vmute.lua rename to luamods/wolfadmin/commands/admin/vmute.lua index a1a8303..e076056 100644 --- a/luascripts/commands/admin/vmute.lua +++ b/luamods/wolfadmin/commands/admin/vmute.lua @@ -15,16 +15,16 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local history = require "luascripts.wolfadmin.admin.history" -local mutes = require "luascripts.wolfadmin.admin.mutes" +local history = require "luamods.wolfadmin.admin.history" +local mutes = require "luamods.wolfadmin.admin.mutes" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local util = require "luascripts.wolfadmin.util.util" +local util = require "luamods.wolfadmin.util.util" function commandVoiceMute(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/vunmute.lua b/luamods/wolfadmin/commands/admin/vunmute.lua similarity index 92% rename from luascripts/commands/admin/vunmute.lua rename to luamods/wolfadmin/commands/admin/vunmute.lua index 4ed40a3..2812298 100644 --- a/luascripts/commands/admin/vunmute.lua +++ b/luamods/wolfadmin/commands/admin/vunmute.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" function commandVoiceUnmute(clientId, cmdArguments) if cmdArguments[1] == nil then diff --git a/luascripts/commands/admin/warn.lua b/luamods/wolfadmin/commands/admin/warn.lua similarity index 88% rename from luascripts/commands/admin/warn.lua rename to luamods/wolfadmin/commands/admin/warn.lua index f761ff0..18a82d5 100644 --- a/luascripts/commands/admin/warn.lua +++ b/luamods/wolfadmin/commands/admin/warn.lua @@ -15,18 +15,18 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local admin = require "luascripts.wolfadmin.admin.admin" -local history = require "luascripts.wolfadmin.admin.history" +local admin = require "luamods.wolfadmin.admin.admin" +local history = require "luamods.wolfadmin.admin.history" -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local settings = require "luascripts.wolfadmin.util.settings" +local settings = require "luamods.wolfadmin.util.settings" function commandWarn(clientId, cmdArguments) if settings.get("g_warnHistory") == 0 or not db.isconnected() then diff --git a/luascripts/commands/client/ac.lua b/luamods/wolfadmin/commands/client/ac.lua similarity index 92% rename from luascripts/commands/client/ac.lua rename to luamods/wolfadmin/commands/client/ac.lua index a2e47a2..93ac448 100644 --- a/luascripts/commands/client/ac.lua +++ b/luamods/wolfadmin/commands/client/ac.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" function commandAdminChat(clientId, cmdArguments) if #cmdArguments == 0 then diff --git a/luascripts/commands/client/pm.lua b/luamods/wolfadmin/commands/client/pm.lua similarity index 89% rename from luascripts/commands/client/pm.lua rename to luamods/wolfadmin/commands/client/pm.lua index 6bac768..01a0e40 100644 --- a/luascripts/commands/client/pm.lua +++ b/luamods/wolfadmin/commands/client/pm.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" function commandPersonalMessage(clientId, cmdArguments) if #cmdArguments > 1 then diff --git a/luascripts/commands/client/r.lua b/luamods/wolfadmin/commands/client/r.lua similarity index 93% rename from luascripts/commands/client/r.lua rename to luamods/wolfadmin/commands/client/r.lua index 365b372..000e201 100644 --- a/luascripts/commands/client/r.lua +++ b/luamods/wolfadmin/commands/client/r.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" function commandR(clientId, cmdArguments) if #cmdArguments == 0 then diff --git a/luascripts/commands/client/wolfadmin.lua b/luamods/wolfadmin/commands/client/wolfadmin.lua similarity index 92% rename from luascripts/commands/client/wolfadmin.lua rename to luamods/wolfadmin/commands/client/wolfadmin.lua index 05b2658..8c3cb58 100644 --- a/luascripts/commands/client/wolfadmin.lua +++ b/luamods/wolfadmin/commands/client/wolfadmin.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local commands = require "luascripts.wolfadmin.commands.commands" +local auth = require "luamods.wolfadmin.auth.auth" +local commands = require "luamods.wolfadmin.commands.commands" function commandWolfAdmin(clientId, cmdArguments) et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^3This server is running ^7Wolf^1Admin ^7"..wolfa_getVersion().." ^3("..wolfa_getRelease().."^3)\";") diff --git a/luascripts/commands/commands.lua b/luamods/wolfadmin/commands/commands.lua similarity index 95% rename from luascripts/commands/commands.lua rename to luamods/wolfadmin/commands/commands.lua index 44dd760..d33fda1 100644 --- a/luascripts/commands/commands.lua +++ b/luamods/wolfadmin/commands/commands.lua @@ -15,19 +15,19 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -require "luascripts.wolfadmin.util.debug" +require "luamods.wolfadmin.util.debug" -local admin = require "luascripts.wolfadmin.admin.admin" +local admin = require "luamods.wolfadmin.admin.admin" -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local teams = require "luascripts.wolfadmin.game.teams" +local teams = require "luamods.wolfadmin.game.teams" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local util = require "luascripts.wolfadmin.util.util" -local events = require "luascripts.wolfadmin.util.events" -local files = require "luascripts.wolfadmin.util.files" +local util = require "luamods.wolfadmin.util.util" +local events = require "luamods.wolfadmin.util.events" +local files = require "luamods.wolfadmin.util.files" local commands = {} @@ -91,7 +91,7 @@ function commands.loadfiles(dir) for _, file in pairs(files) do if string.match(string.lower(file), "^[a-z]+%.lua$") then - require("luascripts/wolfadmin/commands/"..dir.."/"..string.sub(file, 1, string.len(file) - 4)) + require ("luamods.wolfadmin.commands."..dir.."."..string.sub(file, 1, string.len(file) - 4)) amount = amount + 1 end diff --git a/luascripts/commands/server/cannounce.lua b/luamods/wolfadmin/commands/server/cannounce.lua similarity index 87% rename from luascripts/commands/server/cannounce.lua rename to luamods/wolfadmin/commands/server/cannounce.lua index 7f27481..16499b0 100644 --- a/luascripts/commands/server/cannounce.lua +++ b/luamods/wolfadmin/commands/server/cannounce.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luascripts.wolfadmin.commands.commands" -local util = require "luascripts.wolfadmin.util.util" +local commands = require "luamods.wolfadmin.commands.commands" +local util = require "luamods.wolfadmin.util.util" function commandClientAnnounce(clientId, cmdArguments) local clientId = tonumber(cmdArguments[1]) @@ -29,4 +29,4 @@ function commandClientAnnounce(clientId, cmdArguments) return true end -commands.addserver("cannounce", commandClientAnnounce) \ No newline at end of file +commands.addserver("cannounce", commandClientAnnounce) diff --git a/luascripts/commands/server/cchat.lua b/luamods/wolfadmin/commands/server/cchat.lua similarity index 87% rename from luascripts/commands/server/cchat.lua rename to luamods/wolfadmin/commands/server/cchat.lua index f54061a..4bd2017 100644 --- a/luascripts/commands/server/cchat.lua +++ b/luamods/wolfadmin/commands/server/cchat.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luascripts.wolfadmin.commands.commands" -local util = require "luascripts.wolfadmin.util.util" +local commands = require "luamods.wolfadmin.commands.commands" +local util = require "luamods.wolfadmin.util.util" function commandClientChatPrint(clientId, cmdArguments) local clientId = tonumber(cmdArguments[1]) @@ -29,4 +29,4 @@ function commandClientChatPrint(clientId, cmdArguments) return true end -commands.addserver("cchat", commandClientChatPrint) \ No newline at end of file +commands.addserver("cchat", commandClientChatPrint) diff --git a/luascripts/commands/server/ccp.lua b/luamods/wolfadmin/commands/server/ccp.lua similarity index 87% rename from luascripts/commands/server/ccp.lua rename to luamods/wolfadmin/commands/server/ccp.lua index c947183..6f2ba22 100644 --- a/luascripts/commands/server/ccp.lua +++ b/luamods/wolfadmin/commands/server/ccp.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luascripts.wolfadmin.commands.commands" -local util = require "luascripts.wolfadmin.util.util" +local commands = require "luamods.wolfadmin.commands.commands" +local util = require "luamods.wolfadmin.util.util" function commandClientCenterPrint(clientId, cmdArguments) local clientId = tonumber(cmdArguments[1]) @@ -29,4 +29,4 @@ function commandClientCenterPrint(clientId, cmdArguments) return true end -commands.addserver("ccp", commandClientCenterPrint) \ No newline at end of file +commands.addserver("ccp", commandClientCenterPrint) diff --git a/luascripts/commands/server/ccpm.lua b/luamods/wolfadmin/commands/server/ccpm.lua similarity index 87% rename from luascripts/commands/server/ccpm.lua rename to luamods/wolfadmin/commands/server/ccpm.lua index 4e16d94..9c698d4 100644 --- a/luascripts/commands/server/ccpm.lua +++ b/luamods/wolfadmin/commands/server/ccpm.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luascripts.wolfadmin.commands.commands" -local util = require "luascripts.wolfadmin.util.util" +local commands = require "luamods.wolfadmin.commands.commands" +local util = require "luamods.wolfadmin.util.util" function commandClientCPM(clientId, cmdArguments) local clientId = tonumber(cmdArguments[1]) @@ -29,4 +29,4 @@ function commandClientCPM(clientId, cmdArguments) return true end -commands.addserver("ccpm", commandClientCPM) \ No newline at end of file +commands.addserver("ccpm", commandClientCPM) diff --git a/luascripts/commands/server/cmusic.lua b/luamods/wolfadmin/commands/server/cmusic.lua similarity index 87% rename from luascripts/commands/server/cmusic.lua rename to luamods/wolfadmin/commands/server/cmusic.lua index 6298693..2950f34 100644 --- a/luascripts/commands/server/cmusic.lua +++ b/luamods/wolfadmin/commands/server/cmusic.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luascripts.wolfadmin.commands.commands" -local util = require "luascripts.wolfadmin.util.util" +local commands = require "luamods.wolfadmin.commands.commands" +local util = require "luamods.wolfadmin.util.util" function commandClientPlayMusic(clientId, cmdArguments) local clientId = tonumber(cmdArguments[1]) @@ -29,4 +29,4 @@ function commandClientPlayMusic(clientId, cmdArguments) return true end -commands.addserver("cmusic", commandClientPlayMusic) \ No newline at end of file +commands.addserver("cmusic", commandClientPlayMusic) diff --git a/luascripts/commands/server/csay.lua b/luamods/wolfadmin/commands/server/csay.lua similarity index 87% rename from luascripts/commands/server/csay.lua rename to luamods/wolfadmin/commands/server/csay.lua index b810d95..2746feb 100644 --- a/luascripts/commands/server/csay.lua +++ b/luamods/wolfadmin/commands/server/csay.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local commands = require "luascripts.wolfadmin.commands.commands" -local util = require "luascripts.wolfadmin.util.util" +local commands = require "luamods.wolfadmin.commands.commands" +local util = require "luamods.wolfadmin.util.util" function commandClientConsolePrint(clientId, cmdArguments) local clientId = tonumber(cmdArguments[1]) @@ -29,4 +29,4 @@ function commandClientConsolePrint(clientId, cmdArguments) return true end -commands.addserver("csay", commandClientConsolePrint) \ No newline at end of file +commands.addserver("csay", commandClientConsolePrint) diff --git a/luascripts/db/db.lua b/luamods/wolfadmin/db/db.lua similarity index 82% rename from luascripts/db/db.lua rename to luamods/wolfadmin/db/db.lua index cff80d5..92cce2f 100644 --- a/luascripts/db/db.lua +++ b/luamods/wolfadmin/db/db.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local util = require "luascripts.wolfadmin.util.util" -local events = require "luascripts.wolfadmin.util.events" -local settings = require "luascripts.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" +local events = require "luamods.wolfadmin.util.events" +local settings = require "luamods.wolfadmin.util.settings" local db = {} @@ -28,9 +28,9 @@ local con -- this, but it will suffice. function db.oninit() if settings.get("db_type") == "mysql" then - con = require "luascripts.wolfadmin.db.mysql" + con = require "luamods.wolfadmin.db.mysql" elseif settings.get("db_type") == "sqlite3" then - con = require "luascripts.wolfadmin.db.sqlite3" + con = require "luamods.wolfadmin.db.sqlite3" else error("invalid database system (choose mysql, sqlite3)") end @@ -46,4 +46,4 @@ function db.onshutdown(restartMap) end events.handle("onGameShutdown", db.onshutdown) -return db \ No newline at end of file +return db diff --git a/luascripts/db/mysql.lua b/luamods/wolfadmin/db/mysql.lua similarity index 97% rename from luascripts/db/mysql.lua rename to luamods/wolfadmin/db/mysql.lua index d6a7cd4..f731693 100644 --- a/luascripts/db/mysql.lua +++ b/luamods/wolfadmin/db/mysql.lua @@ -15,12 +15,12 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local constants = require "luascripts.wolfadmin.util.constants" -local util = require "luascripts.wolfadmin.util.util" -local settings = require "luascripts.wolfadmin.util.settings" -local tables = require "luascripts.wolfadmin.util.tables" +local constants = require "luamods.wolfadmin.util.constants" +local util = require "luamods.wolfadmin.util.util" +local settings = require "luamods.wolfadmin.util.settings" +local tables = require "luamods.wolfadmin.util.tables" local luasql = require "luasql.mysql" diff --git a/luascripts/db/sqlite3.lua b/luamods/wolfadmin/db/sqlite3.lua similarity index 97% rename from luascripts/db/sqlite3.lua rename to luamods/wolfadmin/db/sqlite3.lua index 1564a26..e549b9e 100644 --- a/luascripts/db/sqlite3.lua +++ b/luamods/wolfadmin/db/sqlite3.lua @@ -15,12 +15,12 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local constants = require "luascripts.wolfadmin.util.constants" -local util = require "luascripts.wolfadmin.util.util" -local settings = require "luascripts.wolfadmin.util.settings" -local tables = require "luascripts.wolfadmin.util.tables" +local constants = require "luamods.wolfadmin.util.constants" +local util = require "luamods.wolfadmin.util.util" +local settings = require "luamods.wolfadmin.util.settings" +local tables = require "luamods.wolfadmin.util.tables" local luasql = require "luasql.sqlite3" @@ -469,6 +469,7 @@ function sqlite3.start() -- enable foreign key enforcement cur = assert(con:execute("PRAGMA foreign_keys=1")) + cur = assert(con:execute("PRAGMA synchronous=0")) end function sqlite3.close(doSave) diff --git a/luascripts/game/bots.lua b/luamods/wolfadmin/game/bots.lua similarity index 87% rename from luascripts/game/bots.lua rename to luamods/wolfadmin/game/bots.lua index d267fe4..a9237d3 100644 --- a/luascripts/game/bots.lua +++ b/luamods/wolfadmin/game/bots.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local events = require "luascripts.wolfadmin.util.events" -local settings = require "luascripts.wolfadmin.util.settings" -local util = require "luascripts.wolfadmin.util.util" +local events = require "luamods.wolfadmin.util.events" +local settings = require "luamods.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" local bots = {} diff --git a/luascripts/game/fireteams.lua b/luamods/wolfadmin/game/fireteams.lua similarity index 94% rename from luascripts/game/fireteams.lua rename to luamods/wolfadmin/game/fireteams.lua index 00ce12f..037a230 100644 --- a/luascripts/game/fireteams.lua +++ b/luamods/wolfadmin/game/fireteams.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local teams = require "luascripts.wolfadmin.game.teams" +local teams = require "luamods.wolfadmin.game.teams" -local bits = require "luascripts.wolfadmin.util.bits" -local constants = require "luascripts.wolfadmin.util.constants" -local events = require "luascripts.wolfadmin.util.events" +local bits = require "luamods.wolfadmin.util.bits" +local constants = require "luamods.wolfadmin.util.constants" +local events = require "luamods.wolfadmin.util.events" local fireteams = {} diff --git a/luascripts/game/game.lua b/luamods/wolfadmin/game/game.lua similarity index 94% rename from luascripts/game/game.lua rename to luamods/wolfadmin/game/game.lua index 2c999db..b59419c 100644 --- a/luascripts/game/game.lua +++ b/luamods/wolfadmin/game/game.lua @@ -15,11 +15,11 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local events = require "luascripts.wolfadmin.util.events" -local settings = require "luascripts.wolfadmin.util.settings" -local util = require "luascripts.wolfadmin.util.util" +local events = require "luamods.wolfadmin.util.events" +local settings = require "luamods.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" local game = {} diff --git a/luascripts/game/sprees.lua b/luamods/wolfadmin/game/sprees.lua similarity index 95% rename from luascripts/game/sprees.lua rename to luamods/wolfadmin/game/sprees.lua index eb1beaa..f18b2d2 100644 --- a/luascripts/game/sprees.lua +++ b/luamods/wolfadmin/game/sprees.lua @@ -15,17 +15,17 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local game = require "luascripts.wolfadmin.game.game" +local game = require "luamods.wolfadmin.game.game" -local players = require "luascripts.wolfadmin.players.players" --- local stats = require "luascripts.wolfadmin.players.stats" +local players = require "luamods.wolfadmin.players.players" +-- local stats = require "luamods.wolfadmin.players.stats" -local constants = require "luascripts.wolfadmin.util.constants" -local events = require "luascripts.wolfadmin.util.events" -local files = require "luascripts.wolfadmin.util.files" -local settings = require "luascripts.wolfadmin.util.settings" +local constants = require "luamods.wolfadmin.util.constants" +local events = require "luamods.wolfadmin.util.events" +local files = require "luamods.wolfadmin.util.files" +local settings = require "luamods.wolfadmin.util.settings" local sprees = {} diff --git a/luascripts/game/teams.lua b/luamods/wolfadmin/game/teams.lua similarity index 92% rename from luascripts/game/teams.lua rename to luamods/wolfadmin/game/teams.lua index 0cae270..f4cfea1 100644 --- a/luascripts/game/teams.lua +++ b/luamods/wolfadmin/game/teams.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local constants = require "luascripts.wolfadmin.util.constants" -local tables = require "luascripts.wolfadmin.util.tables" -local events = require "luascripts.wolfadmin.util.events" +local constants = require "luamods.wolfadmin.util.constants" +local tables = require "luamods.wolfadmin.util.tables" +local events = require "luamods.wolfadmin.util.events" local teams = {} @@ -87,4 +87,4 @@ function teams.onclientteamchange(clientId, old, new) end events.handle("onClientTeamChange", teams.onclientteamchange) -return teams \ No newline at end of file +return teams diff --git a/luascripts/game/voting.lua b/luamods/wolfadmin/game/voting.lua similarity index 91% rename from luascripts/game/voting.lua rename to luamods/wolfadmin/game/voting.lua index 8b475df..34ff657 100644 --- a/luascripts/game/voting.lua +++ b/luamods/wolfadmin/game/voting.lua @@ -15,13 +15,13 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" -local constants = require "luascripts.wolfadmin.util.constants" -local util = require "luascripts.wolfadmin.util.util" -local events = require "luascripts.wolfadmin.util.events" -local timers = require "luascripts.wolfadmin.util.timers" -local settings = require "luascripts.wolfadmin.util.settings" -local bots = require "luascripts.wolfadmin.game.bots" +local auth = require "luamods.wolfadmin.auth.auth" +local constants = require "luamods.wolfadmin.util.constants" +local util = require "luamods.wolfadmin.util.util" +local events = require "luamods.wolfadmin.util.events" +local timers = require "luamods.wolfadmin.util.timers" +local settings = require "luamods.wolfadmin.util.settings" +local bots = require "luamods.wolfadmin.game.bots" local voting = {} @@ -137,4 +137,4 @@ function voting.onpollfinish(passed, poll) end events.handle("onPollFinish", voting.onpollfinish) -return voting \ No newline at end of file +return voting diff --git a/luascripts/main.lua b/luamods/wolfadmin/main.lua similarity index 75% rename from luascripts/main.lua rename to luamods/wolfadmin/main.lua index fee679b..f4d58aa 100644 --- a/luascripts/main.lua +++ b/luamods/wolfadmin/main.lua @@ -15,34 +15,34 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -require "luascripts.wolfadmin.util.debug" +require "luamods.wolfadmin.util.debug" -local constants = require "luascripts.wolfadmin.util.constants" -local util = require "luascripts.wolfadmin.util.util" -local events = require "luascripts.wolfadmin.util.events" -local timers = require "luascripts.wolfadmin.util.timers" -local settings = require "luascripts.wolfadmin.util.settings" +local constants = require "luamods.wolfadmin.util.constants" +local util = require "luamods.wolfadmin.util.util" +local events = require "luamods.wolfadmin.util.events" +local timers = require "luamods.wolfadmin.util.timers" +local settings = require "luamods.wolfadmin.util.settings" -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local admin = require "luascripts.wolfadmin.admin.admin" -local balancer = require "luascripts.wolfadmin.admin.balancer" -local bans = require "luascripts.wolfadmin.admin.bans" -local history = require "luascripts.wolfadmin.admin.history" -local mutes = require "luascripts.wolfadmin.admin.mutes" -local rules = require "luascripts.wolfadmin.admin.rules" +local admin = require "luamods.wolfadmin.admin.admin" +local balancer = require "luamods.wolfadmin.admin.balancer" +local bans = require "luamods.wolfadmin.admin.bans" +local history = require "luamods.wolfadmin.admin.history" +local mutes = require "luamods.wolfadmin.admin.mutes" +local rules = require "luamods.wolfadmin.admin.rules" -local commands = require "luascripts.wolfadmin.commands.commands" +local commands = require "luamods.wolfadmin.commands.commands" -local game = require "luascripts.wolfadmin.game.game" -local bots = require "luascripts.wolfadmin.game.bots" -local sprees = require "luascripts.wolfadmin.game.sprees" -local teams = require "luascripts.wolfadmin.game.teams" -local voting = require "luascripts.wolfadmin.game.voting" +local game = require "luamods.wolfadmin.game.game" +local bots = require "luamods.wolfadmin.game.bots" +local sprees = require "luamods.wolfadmin.game.sprees" +local teams = require "luamods.wolfadmin.game.teams" +local voting = require "luamods.wolfadmin.game.voting" -local greetings = require "luascripts.wolfadmin.players.greetings" -local players = require "luascripts.wolfadmin.players.players" -local stats = require "luascripts.wolfadmin.players.stats" +local greetings = require "luamods.wolfadmin.players.greetings" +local players = require "luamods.wolfadmin.players.players" +local stats = require "luamods.wolfadmin.players.stats" local version = "1.2.0-dev" local release = "TBD" diff --git a/luascripts/players/greetings.lua b/luamods/wolfadmin/players/greetings.lua similarity index 90% rename from luascripts/players/greetings.lua rename to luamods/wolfadmin/players/greetings.lua index 0bda96e..cb1e2a0 100644 --- a/luascripts/players/greetings.lua +++ b/luamods/wolfadmin/players/greetings.lua @@ -15,15 +15,15 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local auth = require "luascripts.wolfadmin.auth.auth" +local auth = require "luamods.wolfadmin.auth.auth" -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" -local constants = require "luascripts.wolfadmin.util.constants" -local util = require "luascripts.wolfadmin.util.util" -local events = require "luascripts.wolfadmin.util.events" -local settings = require "luascripts.wolfadmin.util.settings" -local files = require "luascripts.wolfadmin.util.files" +local constants = require "luamods.wolfadmin.util.constants" +local util = require "luamods.wolfadmin.util.util" +local events = require "luamods.wolfadmin.util.events" +local settings = require "luamods.wolfadmin.util.settings" +local files = require "luamods.wolfadmin.util.files" local greetings = {} diff --git a/luascripts/players/players.lua b/luamods/wolfadmin/players/players.lua similarity index 97% rename from luascripts/players/players.lua rename to luamods/wolfadmin/players/players.lua index 5db8e7d..6d4adc2 100644 --- a/luascripts/players/players.lua +++ b/luamods/wolfadmin/players/players.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local db = require "luascripts.wolfadmin.db.db" +local db = require "luamods.wolfadmin.db.db" -local bits = require "luascripts.wolfadmin.util.bits" -local events = require "luascripts.wolfadmin.util.events" +local bits = require "luamods.wolfadmin.util.bits" +local events = require "luamods.wolfadmin.util.events" local players = {} diff --git a/luascripts/players/stats.lua b/luamods/wolfadmin/players/stats.lua similarity index 96% rename from luascripts/players/stats.lua rename to luamods/wolfadmin/players/stats.lua index 4bcf976..c79eb3f 100644 --- a/luascripts/players/stats.lua +++ b/luamods/wolfadmin/players/stats.lua @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local players = require "luascripts.wolfadmin.players.players" +local players = require "luamods.wolfadmin.players.players" local stats = {} diff --git a/luascripts/util/bits.lua b/luamods/wolfadmin/util/bits.lua similarity index 100% rename from luascripts/util/bits.lua rename to luamods/wolfadmin/util/bits.lua diff --git a/luascripts/util/constants.lua b/luamods/wolfadmin/util/constants.lua similarity index 100% rename from luascripts/util/constants.lua rename to luamods/wolfadmin/util/constants.lua diff --git a/luascripts/util/debug.lua b/luamods/wolfadmin/util/debug.lua similarity index 88% rename from luascripts/util/debug.lua rename to luamods/wolfadmin/util/debug.lua index 8218621..809b0f7 100644 --- a/luascripts/util/debug.lua +++ b/luamods/wolfadmin/util/debug.lua @@ -15,9 +15,9 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local constants = require "luascripts.wolfadmin.util.constants" -local util = require "luascripts.wolfadmin.util.util" -local settings = require "luascripts.wolfadmin.util.settings" +local constants = require "luamods.wolfadmin.util.constants" +local util = require "luamods.wolfadmin.util.util" +local settings = require "luamods.wolfadmin.util.settings" local SEVERITY_LEVELS = { [1] = "^_", -- termination diff --git a/luascripts/util/events.lua b/luamods/wolfadmin/util/events.lua similarity index 96% rename from luascripts/util/events.lua rename to luamods/wolfadmin/util/events.lua index f7b122a..75741f0 100644 --- a/luascripts/util/events.lua +++ b/luamods/wolfadmin/util/events.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local constants = require "luascripts.wolfadmin.util.constants" -local util = require "luascripts.wolfadmin.util.util" +local constants = require "luamods.wolfadmin.util.constants" +local util = require "luamods.wolfadmin.util.util" local events = {} diff --git a/luascripts/util/files.lua b/luamods/wolfadmin/util/files.lua similarity index 93% rename from luascripts/util/files.lua rename to luamods/wolfadmin/util/files.lua index 3c43b24..16b2080 100644 --- a/luascripts/util/files.lua +++ b/luamods/wolfadmin/util/files.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local util = require "luascripts.wolfadmin.util.util" -local settings = require "luascripts.wolfadmin.util.settings" +local util = require "luamods.wolfadmin.util.util" +local settings = require "luamods.wolfadmin.util.settings" local files = {} @@ -25,9 +25,9 @@ function files.ls(directory) local entries = {} if platform == "unix" then - command = 'ls -1 "'..wolfa_getBasePath()..'luascripts/wolfadmin/'..directory..'"' + command = 'ls -1 "'..wolfa_getBasePath()..'luamods/wolfadmin/'..directory..'"' elseif platform == "windows" then - command = 'dir "'..wolfa_getBasePath()..'luascripts/wolfadmin/'..directory..'" /b' + command = 'dir "'..wolfa_getBasePath()..'luamods/wolfadmin/'..directory..'" /b' end for filename in io.popen(command):lines() do diff --git a/luascripts/util/pagination.lua b/luamods/wolfadmin/util/pagination.lua similarity index 100% rename from luascripts/util/pagination.lua rename to luamods/wolfadmin/util/pagination.lua diff --git a/luascripts/util/settings.lua b/luamods/wolfadmin/util/settings.lua similarity index 94% rename from luascripts/util/settings.lua rename to luamods/wolfadmin/util/settings.lua index 260e0ea..9fe8d66 100644 --- a/luascripts/util/settings.lua +++ b/luamods/wolfadmin/util/settings.lua @@ -15,8 +15,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local util = require "luascripts.wolfadmin.util.util" -local events = require "luascripts.wolfadmin.util.events" +local util = require "luamods.wolfadmin.util.util" +local events = require "luamods.wolfadmin.util.events" local settings = {} @@ -73,7 +73,7 @@ function settings.load() end end - local files = require "luascripts.wolfadmin.util.files" + local files = require "luamods.wolfadmin.util.files" local amount, array = files.loadCFG("wolfadmin.cfg", "[a-z]+", true) for blocksname, settings in pairs(array) do @@ -107,4 +107,4 @@ function settings.oninit(levelTime, randomSeed, restartMap) end events.handle("onGameInit", settings.oninit) -return settings \ No newline at end of file +return settings diff --git a/luascripts/util/tables.lua b/luamods/wolfadmin/util/tables.lua similarity index 100% rename from luascripts/util/tables.lua rename to luamods/wolfadmin/util/tables.lua diff --git a/luascripts/util/timers.lua b/luamods/wolfadmin/util/timers.lua similarity index 89% rename from luascripts/util/timers.lua rename to luamods/wolfadmin/util/timers.lua index 7b0b798..867f479 100644 --- a/luascripts/util/timers.lua +++ b/luamods/wolfadmin/util/timers.lua @@ -15,10 +15,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local constants = require "luascripts.wolfadmin.util.constants" -local util = require "luascripts.wolfadmin.util.util" -local events = require "luascripts.wolfadmin.util.events" -local tables = require "luascripts.wolfadmin.util.tables" +local constants = require "luamods.wolfadmin.util.constants" +local util = require "luamods.wolfadmin.util.util" +local events = require "luamods.wolfadmin.util.events" +local tables = require "luamods.wolfadmin.util.tables" local timers = {} diff --git a/luascripts/util/util.lua b/luamods/wolfadmin/util/util.lua similarity index 98% rename from luascripts/util/util.lua rename to luamods/wolfadmin/util/util.lua index 4d6f423..1a0a71a 100644 --- a/luascripts/util/util.lua +++ b/luamods/wolfadmin/util/util.lua @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -local constants = require "luascripts.wolfadmin.util.constants" +local constants = require "luamods.wolfadmin.util.constants" local util = {} @@ -145,4 +145,4 @@ function util.getTimeFromString(str) return multiplier[unit](amount) end -return util \ No newline at end of file +return util diff --git a/pk3/COPYING.txt b/pk3/COPYING.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/pk3/COPYING.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is 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. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + 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. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "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. + + 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. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + 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. + + 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. + + 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. + + 1. Source Code. + + 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. + + 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. + + 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. + + 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. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + 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. + + 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. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 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. Use with the GNU Affero General Public License. + + 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 Affero 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 special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 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 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 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 + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/pk3/ui/ingame_vote.menu b/pk3/ui/ingame_vote.menu new file mode 100644 index 0000000..5a19c47 --- /dev/null +++ b/pk3/ui/ingame_vote.menu @@ -0,0 +1,96 @@ +#include "ui/menudef.h" + +// Defines // +#define WINDOW_X 16 +#define WINDOW_Y 16 +#define WINDOW_WIDTH 160 +#define WINDOW_HEIGHT 152 +#define GROUP_NAME "grpIngameVote" + +// Macros // +#include "ui/menumacros.h" + +// Vote Menu // +menuDef { + name "ingame_vote" + visible 0 + fullscreen 0 + rect WINDOW_X WINDOW_Y WINDOW_WIDTH WINDOW_HEIGHT + style WINDOW_STYLE_FILLED + + onOpen { + uiScript voteInitToggles + } + + onEsc { + close ingame_vote ; + open ingame_main + } + +// Window // + WINDOW( "", 50) + + itemDef { + name "windowtitle" + group GROUP_NAME + rect 2 2 $evalint(WINDOW_WIDTH-4) 24 + text "VOTE" + textfont UI_FONT_ARIBLK_27 + textscale .4 + textalignx 3 + textaligny 20 + forecolor .6 .6 .6 1 + border WINDOW_BORDER_FULL + bordercolor .1 .1 .1 .2 + cvarTest "authLevel" + showCVar { RL_NONE } + visible 1 + decoration + } + + itemDef { + name "windowtitle" + group GROUP_NAME + rect 2 2 $evalint(WINDOW_WIDTH-4) 24 + text "REFEREE" + textfont UI_FONT_ARIBLK_27 + textscale .4 + textalignx 3 + textaligny 20 + forecolor .6 .6 .6 1 + border WINDOW_BORDER_FULL + bordercolor .1 .1 .1 .2 + cvarTest "authLevel" + showCVar { RL_REFEREE } + visible 1 + decoration + } + + itemDef { + name "windowtitle" + group GROUP_NAME + rect 2 2 $evalint(WINDOW_WIDTH-4) 24 + text "RCON" + textfont UI_FONT_ARIBLK_27 + textscale .4 + textalignx 3 + textaligny 20 + forecolor .6 .6 .6 1 + border WINDOW_BORDER_FULL + bordercolor .1 .1 .1 .2 + cvarTest "authLevel" + showCVar { RL_RCON } + visible 1 + decoration + } + +// Buttons // + BUTTONEXT( 6, 32, WINDOW_WIDTH-12, 18, "MISC", .3, 14, close ingame_vote ; open ingame_vote_misc, cvarTest "authLevel" showCVar { RL_NONE } ) + BUTTONEXT( 6, 32, WINDOW_WIDTH-12, 18, "MISC", .3, 14, close ingame_vote ; open ingame_vote_misc_refrcon, cvarTest "authLevel" showCVar { RL_REFEREE RL_RCON } ) + BUTTONEXT( 6, 56, WINDOW_WIDTH-12, 18, "MAP", .3, 14, close ingame_vote ; open ingame_vote_map, cvarTest "authLevel" showCVar { RL_NONE } voteflag CV_SVF_MAP ) + BUTTONEXT( 6, 56, WINDOW_WIDTH-12, 18, "MAP", .3, 14, close ingame_vote ; open ingame_vote_map, cvarTest "authLevel" showCVar { RL_REFEREE RL_RCON } ) + BUTTONEXT( 6, 80, WINDOW_WIDTH-12, 18, "PLAYERS", .3, 14, close ingame_vote ; open ingame_vote_players, cvarTest "authLevel" showCVar { RL_NONE } voteFlag $evalint(CV_SVF_KICK + CV_SVF_REFEREE + CV_SVF_MUTING) ) + BUTTONEXT( 6, 80, WINDOW_WIDTH-12, 18, "PLAYERS", .3, 14, close ingame_vote ; open ingame_vote_players, cvarTest "authLevel" showCVar { RL_REFEREE RL_RCON } ) + BUTTONEXT( 6, 104, WINDOW_WIDTH-12, 18, "^1WOLF^7ADMIN", .3, 14, close ingame_vote ; open ingame_vote_wolfadmin, cvarTest "authLevel" showCVar { RL_NONE } ) + BUTTON( 6, 128, WINDOW_WIDTH-12, 18, "BACK", .3, 14, close ingame_vote ; open ingame_main ) +} diff --git a/pk3/ui/ingame_vote_wolfadmin.menu b/pk3/ui/ingame_vote_wolfadmin.menu new file mode 100644 index 0000000..c48bc86 --- /dev/null +++ b/pk3/ui/ingame_vote_wolfadmin.menu @@ -0,0 +1,47 @@ +#include "ui/menudef.h" + +// Defines // +#define WINDOW_X 16 +#define WINDOW_Y 16 +#define WINDOW_WIDTH 296 +#define WINDOW_HEIGHT 134 +#define GROUP_NAME "grpIngameVoteWolfAdmin" + +// Macros // +#include "ui/menumacros.h" + +// WolfAdmin Vote Menu // +menuDef { + name "ingame_vote_wolfadmin" + visible 0 + fullscreen 0 + rect WINDOW_X WINDOW_Y WINDOW_WIDTH WINDOW_HEIGHT + style WINDOW_STYLE_FILLED + + onOpen { + + } + + onEsc { + close ingame_vote_wolfadmin ; + open ingame_vote + } + +// Window // + WINDOW( "^1WOLF^7ADMIN", 50) + +// Buttons // + BUTTONEXT( 6, 32, WINDOW_WIDTH-12, 14, "ENABLE BOTS", .24, 11, exec "cmd callvote poll enable bots"; uiScript closeingame, voteFlag CV_SVF_POLL ) + BUTTONEXT( 6, 50, WINDOW_WIDTH-12, 14, "DISABLE BOTS", .24, 11, exec "cmd callvote poll disable bots"; uiScript closeingame, voteFlag CV_SVF_POLL ) + + // left side buttons + BUTTONEXT( 6, 68, .5*(WINDOW_WIDTH-18), 14, "PUTBOTS AXIS", .24, 11, exec "cmd callvote poll put bots axis"; uiScript closeingame, voteFlag CV_SVF_POLL ) + + // right side buttons + BUTTONEXT( 6+.5*(WINDOW_WIDTH-18)+6, 68, .5*(WINDOW_WIDTH-18), 14, "PUTBOTS ALLIES", .24, 11, exec "cmd callvote poll put bots allies"; uiScript closeingame, voteFlag CV_SVF_POLL ) + + MULTILEFT( 8, 86+2, .80*(WINDOW_WIDTH-18), 10, "Bot difficulty:", .2, 8, "ui_poll", cvarStrList { "Epic"; "set bot difficulty epic"; "Hard"; "set bot difficulty hard"; "Normal"; "set bot difficulty normal" } voteflag CV_SVF_POLL, "Select the difficulty to vote on" ) + NAMEDBUTTONEXT( "bttnextBotDifficulty", 6+.80*(WINDOW_WIDTH-18)+6, 86, .20*(WINDOW_WIDTH-18), 14, "OK", .24, 11, uiScript votePoll; uiScript closeingame, voteflag CV_SVF_POLL ) + + BUTTON( 6, WINDOW_HEIGHT-24, WINDOW_WIDTH-12, 18, "BACK", .3, 14, close ingame_vote_wolfadmin ; open ingame_vote ) +} diff --git a/pk3/ui/menus.txt b/pk3/ui/menus.txt new file mode 100644 index 0000000..e2f1a07 --- /dev/null +++ b/pk3/ui/menus.txt @@ -0,0 +1,90 @@ +// menu defs +// +{ +loadMenu { "ui/global.menu" } +loadMenu { "ui/main.menu" } +loadMenu { "ui/profile.menu" } +loadMenu { "ui/profile_create.menu" } +loadMenu { "ui/profile_create_initial.menu" } +loadMenu { "ui/profile_rename.menu" } +loadMenu { "ui/profile_delete.menu" } +loadMenu { "ui/profile_delete_error.menu" } +loadMenu { "ui/profile_create_error.menu" } +loadMenu { "ui/playonline.menu" } +loadMenu { "ui/playonline_connecttoip.menu" } +loadMenu { "ui/playonline_serverinfo.menu" } +loadMenu { "ui/playonline_disablepb.menu" } +loadMenu { "ui/playonline_enablepb.menu" } +loadMenu { "ui/hostgame.menu" } +loadMenu { "ui/hostgame_advanced.menu" } +loadMenu { "ui/hostgame_noquarter.menu" } +loadMenu { "ui/hostgame_advanced_default.menu" } +loadMenu { "ui/hostgame_dedicated_warning.menu" } +loadMenu { "ui/mods.menu" } +loadMenu { "ui/viewreplay.menu" } +loadMenu { "ui/viewreplay_delete.menu" } +loadMenu { "ui/options.menu" } +loadMenu { "ui/options_nq.menu" } +loadMenu { "ui/options_nq_controls.menu" } +loadMenu { "ui/options_nq_display.menu" } +loadMenu { "ui/options_nq_hud.menu" } +loadMenu { "ui/options_nq_sound.menu" } +loadMenu { "ui/options_nq_tweak.menu" } +loadMenu { "ui/options_customise_game.menu" } +loadMenu { "ui/options_customise_hud.menu" } +loadMenu { "ui/options_controls.menu" } +loadMenu { "ui/options_controls_default.menu" } +loadMenu { "ui/options_system.menu" } +loadMenu { "ui/options_system_gamma.menu" } +loadMenu { "ui/credits_main.menu" } +loadMenu { "ui/credits_quit.menu" } +loadMenu { "ui/credits_no_quarter.menu" } +loadMenu { "ui/credits_splashdamage.menu" } +loadMenu { "ui/credits_idsoftware.menu" } +loadMenu { "ui/credits_activision.menu" } +loadMenu { "ui/credits_additional.menu" } +loadMenu { "ui/nq_web.menu" } +loadMenu { "ui/quit.menu" } + +// popups +loadMenu { "ui/popup_errormessage.menu" } +loadMenu { "ui/popup_errormessage_pb.menu" } +loadMenu { "ui/popup_hostgameerrormessage.menu" } +loadMenu { "ui/popup_autoupdate.menu" } +loadMenu { "ui/popup_password.menu" } +loadMenu { "ui/popup_serverredirect.menu"} + +// video confirmation +loadMenu { "ui/vid_restart.menu" } +loadMenu { "ui/vid_confirm.menu" } +loadMenu { "ui/rec_restart.menu" } + +// quickchats +loadMenu { "ui/wm_quickmessage.menu" } +loadMenu { "ui/wm_quickmessageAlt.menu" } +loadMenu { "ui/wm_ftquickmessage.menu" } +loadMenu { "ui/wm_ftquickmessageAlt.menu" } + +// class menu +loadMenu { "ui/wm_class.menu" } +loadMenu { "ui/wm_classAlt.menu" } + + +// ingame +loadMenu { "ui/ingame_main.menu" } +loadMenu { "ui/ingame_vote.menu" } +loadMenu { "ui/ingame_vote_disabled.menu" } +loadMenu { "ui/ingame_vote_misc.menu" } +loadMenu { "ui/ingame_vote_misc_refrcon.menu" } +loadMenu { "ui/ingame_vote_map.menu" } +loadMenu { "ui/ingame_vote_players.menu" } +loadMenu { "ui/ingame_vote_players_warn.menu" } +loadMenu { "ui/ingame_serverinfo.menu" } +loadMenu { "ui/ingame_disconnect.menu" } +loadMenu { "ui/ingame_messagemode.menu" } +loadMenu { "ui/ingame_tapout.menu" } +loadMenu { "ui/ingame_tapoutlms.menu" } + +// WolfAdmin +loadMenu { "ui/ingame_vote_wolfadmin.menu") +} \ No newline at end of file