From 6d6030f9d32c792342491abb68f5f72497eda797 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 4 Feb 2020 15:52:59 +0000 Subject: [PATCH] Admin menu appearance changes. --- .../dist/game/config/AdminCommands.xml | 4 +- .../dist/game/config/main/Access.ini | 4 - .../dist/game/data/html/admin/admhelp.htm | 7 +- .../dist/game/data/html/admin/announce.htm | 10 +-- .../dist/game/data/html/admin/charinfo.htm | 45 +++++------ .../dist/game/data/html/admin/charlist.htm | 4 +- .../dist/game/data/html/admin/charskills.htm | 20 ++--- .../game/data/html/admin/classic_menu.htm | 44 ----------- .../game/data/html/admin/effects_menu.htm | 20 ++--- .../dist/game/data/html/admin/expsp.htm | 6 +- .../dist/game/data/html/admin/game_menu.htm | 36 ++++----- .../game/data/html/admin/help/changes.htm | 14 ---- .../game/data/html/admin/help/game_menu.htm | 6 +- .../game/data/html/admin/help/license.htm | 14 ---- .../game/data/html/admin/help/license2.htm | 9 --- .../game/data/html/admin/help/main_menu.htm | 8 +- .../game/data/html/admin/help/main_menu5.htm | 6 +- .../dist/game/data/html/admin/help/readme.htm | 10 --- .../dist/game/data/html/admin/help/toa.htm | 20 +++++ .../game/data/html/admin/itemcreation.htm | 52 ++++--------- .../dist/game/data/html/admin/login.htm | 19 +++-- .../dist/game/data/html/admin/main_menu.htm | 17 ++-- .../dist/game/data/html/admin/mods_menu.htm | 16 ++-- .../dist/game/data/html/admin/reload_menu.htm | 48 +++++------- .../dist/game/data/html/admin/server_menu.htm | 33 ++++---- .../dist/game/data/html/admin/shutdown.htm | 12 +-- .../dist/game/data/html/admin/teleports.htm | 12 ++- .../java/org/l2jmobius/Config.java | 2 - .../admincommandhandlers/AdminAdmin.java | 17 +--- .../admincommandhandlers/AdminCreateItem.java | 77 +++++++++++-------- .../admincommandhandlers/AdminShutdown.java | 2 +- .../model/actor/instance/DoorInstance.java | 8 +- .../model/actor/instance/NpcInstance.java | 19 ++--- 33 files changed, 250 insertions(+), 371 deletions(-) delete mode 100644 L2J_Mobius_C6_Interlude/dist/game/data/html/admin/classic_menu.htm delete mode 100644 L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/changes.htm delete mode 100644 L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license.htm delete mode 100644 L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license2.htm delete mode 100644 L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/readme.htm create mode 100644 L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/toa.htm diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/AdminCommands.xml b/L2J_Mobius_C6_Interlude/dist/game/config/AdminCommands.xml index 481a0a1e5f..f548c6b32b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/config/AdminCommands.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/config/AdminCommands.xml @@ -6,7 +6,6 @@ - @@ -66,6 +65,8 @@ + + @@ -187,6 +188,7 @@ + diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Access.ini b/L2J_Mobius_C6_Interlude/dist/game/config/main/Access.ini index e986a6e126..c160b4891c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/config/main/Access.ini +++ b/L2J_Mobius_C6_Interlude/dist/game/config/main/Access.ini @@ -6,10 +6,6 @@ # If next switch set to true every created character will have Admin access. EverybodyHasAdminRights = False -# The way //admin panel looks can be "modern" or "classic" -# (default is modern while classic provides more compatibility) -GMAdminMenuStyle = modern - # Enable GMs to have the glowing aura of a Hero character. GMHeroAura = False diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/admhelp.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/admhelp.htm index 58989ffcfa..dcbf717f73 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/admhelp.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/admhelp.htm @@ -8,14 +8,11 @@
-This is the legacy help system, out of the license and general information, there are some lists with commands but have not been actively maintained and could be out of date.
+This is the legacy help system, out of the TOA, there are some lists with commands but have not been actively maintained and could be out of date.
Despite this information can be of great aid for macroing and whatnot, the inexperienced game master should rely in the admin panels and the information they provide.
- - - - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/announce.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/announce.htm index 9f8d85981e..59e52323c3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/announce.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/announce.htm @@ -4,15 +4,15 @@
Readme
Read Changes of Server
Read Server License
Read Datapack License
Terms Of Agreement
Read GM Commands list Page 1
Read GM Commands list Page 2
Read GM Commands list Page 3
Announcements Menu


-
New announcement:
+
Write the message of the announcement.

- - - + + + - +
%announces% diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charinfo.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charinfo.htm index 3e24b3e0f2..7226e52821 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charinfo.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charinfo.htm @@ -1,43 +1,44 @@ - - - - -
Character Information
+ + + + +
Player: %name%

- - - - + + + + - - - - + + + + - +

- - - - - +
Account: %account%IP: %ip%Protocol: %protocol%
Name: %name%Level: %level%
Clan: %clan%Exp: %xp%
Class: %class%SP: %sp%
+ +
Account: %account%IP: %ip%Protocol: %protocol%
+ + + +
Name: %name%Level: %level%
Clan: %clan%Exp: %xp%
Class: %class%SP: %sp%
Character Coordinates: %x% %y% %z%
-
- + -
Current:Maximum:
CurrentMaximum
HP:%currenthp%%maxhp%Karma: %karma%
MP:%currentmp%%maxmp%PvP Flag: %pvpflag%
CP:%currentcp%%maxcp%PvP Kills: %pvpkills%
Load:%currentload%%maxload%
+
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charlist.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charlist.htm index b33abea6a2..3a8649fcac 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charlist.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charlist.htm @@ -5,10 +5,10 @@
Patk: %patk%Matk: %matk%Pdef: %pdef%Mdef: %mdef%
Accu: %accuracy%Evas: %evasion%Crit: %critical%Speed: %runspeed%


-You can find a character by writing his name or a part of it and clicking Find below.
+Search a player by writing his name or a part of it.
- +

diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charskills.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charskills.htm index 6da21b6137..2302046892 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charskills.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/charskills.htm @@ -5,22 +5,18 @@
- \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/game_menu.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/game_menu.htm index 27f888d480..0684873358 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/game_menu.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/game_menu.htm @@ -1,8 +1,8 @@ Effects Panel - - - + + +
Previous: Game PanelUp: IndexNext: Effects PanelPrevious: Game PanelUp: IndexNext: Effects Panel

2-Game Panel Buttons
L2 specifics are here: characters, pledges, cursed weapons and static events.
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license.htm deleted file mode 100644 index 98b3ae0f6b..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license.htm +++ /dev/null @@ -1,14 +0,0 @@ -Admin Help - - - - - - -
Help Menu


- - - - -
License:

This program is free software.
- \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license2.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license2.htm deleted file mode 100644 index fc8688d4ca..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license2.htm +++ /dev/null @@ -1,9 +0,0 @@ -Admin Help - - - - - - -
Help Menu

- \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/main_menu.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/main_menu.htm index 838790eecb..dc2ca805c2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/main_menu.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/main_menu.htm @@ -1,8 +1,8 @@ -L2Scroia Help +Help - - - + + +
Prev: Admin PanelUp: IndexNext: Main Buttons
Prev: Admin Panel
Up: Index
Next: Main Buttons

Panel Help:
0-Introduction
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/main_menu5.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/main_menu5.htm index 5a2d3b2c6a..c5b5706238 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/main_menu5.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/main_menu5.htm @@ -1,9 +1,9 @@ Help - - - + + +
Prev: TargetUp: IndexNext: Game PanelPrev: TargetUp: IndexNext: Game Panel
1-Main Panel Buttons
1-4 The little cool things that can make you feel special.
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/readme.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/readme.htm deleted file mode 100644 index 9985f77462..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/readme.htm +++ /dev/null @@ -1,10 +0,0 @@ -Admin Help - - - - - - -
Help Menu
-
- \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/toa.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/toa.htm new file mode 100644 index 0000000000..953cfa47f2 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/toa.htm @@ -0,0 +1,20 @@ +Terms Of Agreement + + + + + + +
Help Menu


+
TERMS OF AGREEMENT


+Using L2jMobius, you accept the following:

+This is a hobbyist project that is in no way meant to be used for running illegal servers.
+You can't sell L2jMobius pack, customized or not.
+You can't share any revision posterior to current free revision.
+Work deriving from leaked sources may be merged with project under GPLv3 terms.

+L2jMobius forks are allowed for following conditions:
+Your pack stays open source (in order useful fixes can be used in the main pack).
+You can use any of the free versions as base.
+You don't update it with revisions posterior to current free revision.
+Work deriving from forks may be merged with project under GPLv3 terms.
+ \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/itemcreation.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/itemcreation.htm index 139efb1ee7..3d2fbb189a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/itemcreation.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/itemcreation.htm @@ -1,18 +1,14 @@ Items - - - +
+ - - -
Item Creation Menu


+