From 717bf3df6d593cc8e9df7341e539b25c48ed375b Mon Sep 17 00:00:00 2001
From: Rumen Nikiforov <unafraid89@gmail.com>
Date: Fri, 27 Apr 2012 23:04:44 +0000
Subject: [PATCH] BETA: DP-Part for [L5289]
---
.../dist/game/data/accessLevels.xml | 14 +
.../dist/game/data/adminCommands.xml | 631 +++++++++++++++++
.../admincommandhandlers/AdminAdmin.java | 11 +-
.../AdminChangeAccessLevel.java | 17 +-
.../admincommandhandlers/AdminEditChar.java | 2 +-
.../AdminEventEngine.java | 8 +-
.../admincommandhandlers/AdminGm.java | 28 +-
.../admincommandhandlers/AdminGmChat.java | 6 +-
.../admincommandhandlers/AdminMenu.java | 6 +-
.../admincommandhandlers/AdminSpawn.java | 8 +-
.../admincommandhandlers/AdminSummon.java | 6 +-
.../handlers/telnethandlers/ChatsHandler.java | 6 +-
.../handlers/telnethandlers/DebugHandler.java | 4 +-
.../telnethandlers/StatusHandler.java | 6 +-
.../voicedcommandhandlers/ChatAdmin.java | 6 +-
.../handlers/voicedcommandhandlers/Debug.java | 4 +-
.../dist/game/data/xsd/adminData.xsd | 40 ++
.../dist/sql/game/access_levels.sql | 71 --
.../sql/game/admin_command_access_rights.sql | 638 ------------------
.../dist/sql/game/updates/20120428update.sql | 7 +
L2J_DataPack_BETA/dist/tools/gs_cleanup.sql | 2 -
21 files changed, 750 insertions(+), 771 deletions(-)
create mode 100644 L2J_DataPack_BETA/dist/game/data/accessLevels.xml
create mode 100644 L2J_DataPack_BETA/dist/game/data/adminCommands.xml
create mode 100644 L2J_DataPack_BETA/dist/game/data/xsd/adminData.xsd
delete mode 100644 L2J_DataPack_BETA/dist/sql/game/access_levels.sql
delete mode 100644 L2J_DataPack_BETA/dist/sql/game/admin_command_access_rights.sql
create mode 100644 L2J_DataPack_BETA/dist/sql/game/updates/20120428update.sql
diff --git a/L2J_DataPack_BETA/dist/game/data/accessLevels.xml b/L2J_DataPack_BETA/dist/game/data/accessLevels.xml
new file mode 100644
index 0000000000..a764e3d422
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/accessLevels.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/adminData.xsd">
+ <!-- Access levels -->
+ <access level="-1" name="Banned" nameColor="FFFFFF" titleColor="FFFFFF" isGM="false" allowPeaceAttack="false" allowFixedRes="false" allowTransaction="false" allowAltg="false" giveDamage="false" takeAggro="false" gainExp="false" />
+ <access level="0" name="User" nameColor="FFFFFF" titleColor="FFFFFF" childAccess="0" isGM="false" allowPeaceAttack="false" allowFixedRes="false" allowTransaction="true" allowAltg="false" giveDamage="true" takeAggro="true" gainExp="true" />
+ <access level="1" name="Chat Moderator" nameColor="FFFFFF" titleColor="FFFFFF" childAccess="0" isGM="false" allowPeaceAttack="false" allowFixedRes="false" allowTransaction="true" allowAltg="false" giveDamage="true" takeAggro="true" gainExp="true" />
+ <access level="2" name="Test GM" nameColor="FFFFFF" titleColor="FFFFFF" childAccess="1" isGM="false" allowPeaceAttack="false" allowFixedRes="true" allowTransaction="false" allowAltg="true" giveDamage="false" takeAggro="false" gainExp="false" />
+ <access level="3" name="General GM" nameColor="0000C0" titleColor="0000C0" childAccess="2" isGM="false" allowPeaceAttack="false" allowFixedRes="true" allowTransaction="false" allowAltg="true" giveDamage="false" takeAggro="false" gainExp="false" />
+ <access level="4" name="Support GM" nameColor="000C00" titleColor="000C00" childAccess="3" isGM="false" allowPeaceAttack="false" allowFixedRes="true" allowTransaction="false" allowAltg="true" giveDamage="false" takeAggro="false" gainExp="false" />
+ <access level="5" name="Event GM" nameColor="00C000" titleColor="00C000" childAccess="4" isGM="false" allowPeaceAttack="false" allowFixedRes="true" allowTransaction="false" allowAltg="true" giveDamage="false" takeAggro="false" gainExp="false" />
+ <access level="6" name="Head GM" nameColor="0C0000" titleColor="0C0000" childAccess="5" isGM="false" allowPeaceAttack="false" allowFixedRes="true" allowTransaction="true" allowAltg="true" giveDamage="true" takeAggro="true" gainExp="true" />
+ <access level="7" name="Admin" nameColor="0FF000" titleColor="0FF000" childAccess="6" isGM="true" allowPeaceAttack="true" allowFixedRes="true" allowTransaction="true" allowAltg="true" giveDamage="true" takeAggro="true" gainExp="true" />
+ <access level="8" name="Master" nameColor="0FF000" titleColor="0FF000" childAccess="7" isGM="true" allowPeaceAttack="true" allowFixedRes="true" allowTransaction="true" allowAltg="true" giveDamage="true" takeAggro="true" gainExp="true" />
+</list>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/adminCommands.xml b/L2J_DataPack_BETA/dist/game/data/adminCommands.xml
new file mode 100644
index 0000000000..64e3286745
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/adminCommands.xml
@@ -0,0 +1,631 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/adminData.xsd">
+ <!-- ADMIN ADMIN -->
+ <admin command="admin_admin" accessLevel="7" />
+ <admin command="admin_admin1" accessLevel="7" />
+ <admin command="admin_admin2" accessLevel="7" />
+ <admin command="admin_admin3" accessLevel="7" />
+ <admin command="admin_admin4" accessLevel="7" />
+ <admin command="admin_admin5" accessLevel="7" />
+ <admin command="admin_admin6" accessLevel="7" />
+ <admin command="admin_admin7" accessLevel="7" />
+ <admin command="admin_admin8" accessLevel="7" />
+ <admin command="admin_gmliston" accessLevel="7" />
+ <admin command="admin_gmlistoff" accessLevel="7" />
+ <admin command="admin_silence" accessLevel="7" />
+ <admin command="admin_diet" accessLevel="7" />
+ <admin command="admin_tradeoff" accessLevel="7" />
+ <admin command="admin_reload" accessLevel="7" confirmDlg="true" />
+ <admin command="admin_set" accessLevel="7" />
+ <admin command="admin_set_mod" accessLevel="7" />
+ <admin command="admin_saveolymp" accessLevel="7" />
+ <admin command="admin_manualhero" accessLevel="7" confirmDlg="true" />
+ <admin command="admin_sethero" accessLevel="7" />
+ <admin command="admin_endolympiad" accessLevel="7" confirmDlg="true" />
+ <admin command="admin_setconfig" accessLevel="7" />
+ <admin command="admin_config_server" accessLevel="7" />
+ <admin command="admin_gmon" accessLevel="7" />
+
+ <!-- ADMIN ANNOUNCEMENTS -->
+ <admin command="admin_list_announcements" accessLevel="7" />
+ <admin command="admin_list_critannouncements" accessLevel="7" />
+ <admin command="admin_reload_announcements" accessLevel="7" />
+ <admin command="admin_announce_announcements" accessLevel="7" />
+ <admin command="admin_add_announcement" accessLevel="7" />
+ <admin command="admin_del_announcement" accessLevel="7" />
+ <admin command="admin_add_critannouncement" accessLevel="7" />
+ <admin command="admin_del_critannouncement" accessLevel="7" />
+ <admin command="admin_announce" accessLevel="7" />
+ <admin command="admin_critannounce" accessLevel="7" />
+ <admin command="admin_announce_menu" accessLevel="7" />
+ <admin command="admin_critannounce_menu" accessLevel="7" />
+ <admin command="admin_list_autoann" accessLevel="7" />
+ <admin command="admin_reload_autoann" accessLevel="7" />
+ <admin command="admin_add_autoann" accessLevel="7" />
+ <admin command="admin_del_autoann" accessLevel="7" />
+
+ <!-- ADMIN BAN -->
+ <admin command="admin_ban" accessLevel="7" />
+ <admin command="admin_ban_acc" accessLevel="7" confirmDlg="true" />
+ <admin command="admin_ban_char" accessLevel="7" />
+ <admin command="admin_ban_chat" accessLevel="7" />
+ <admin command="admin_unban" accessLevel="7" />
+ <admin command="admin_unban_acc" accessLevel="7" />
+ <admin command="admin_unban_char" accessLevel="7" />
+ <admin command="admin_unban_chat" accessLevel="7" />
+ <admin command="admin_jail" accessLevel="7" confirmDlg="true" />
+ <admin command="admin_unjail" accessLevel="7" />
+
+ <!-- ADMIN BBS -->
+ <admin command="admin_bbs" accessLevel="7" />
+
+ <!-- ADMIN BUFFS -->
+ <admin command="admin_getbuffs" accessLevel="7" />
+ <admin command="admin_stopbuff" accessLevel="7" />
+ <admin command="admin_stopallbuffs" accessLevel="7" confirmDlg="true" />
+ <admin command="admin_areacancel" accessLevel="7" />
+ <admin command="admin_removereuse" accessLevel="7" />
+ <admin command="admin_switch_gm_buffs" accessLevel="7" />
+
+ <!-- ADMIN CACHE -->
+ <admin command="admin_cache_htm_rebuild" accessLevel="7" />
+ <admin command="admin_cache_htm_reload" accessLevel="7" />
+ <admin command="admin_cache_reload_path" accessLevel="7" />
+ <admin command="admin_cache_reload_file" accessLevel="7" />
+ <admin command="admin_cache_crest_rebuild" accessLevel="7" />
+ <admin command="admin_cache_crest_reload" accessLevel="7" />
+ <admin command="admin_cache_crest_fix" accessLevel="7" />
+
+ <!-- ADMIN CAMERA -->
+ <admin command="admin_camera" accessLevel="7" />
+
+ <!-- ADMIN CHANGE ACCESS LEVEL -->
+ <admin command="admin_changelvl" accessLevel="7" />
+
+ <!-- ADMIN CH SIEGE -->
+ <admin command="admin_chsiege_siegablehall" accessLevel="7" />
+ <admin command="admin_chsiege_startSiege" accessLevel="7" />
+ <admin command="admin_chsiege_endsSiege" accessLevel="7" />
+ <admin command="admin_chsiege_setSiegeDate" accessLevel="7" />
+ <admin command="admin_chsiege_addAttacker" accessLevel="7" />
+ <admin command="admin_chsiege_removeAttacker" accessLevel="7" />
+ <admin command="admin_chsiege_clearAttackers" accessLevel="7" />
+ <admin command="admin_chsiege_listAttackers" accessLevel="7" />
+ <admin command="admin_chsiege_forwardSiege" accessLevel="7" />
+
+ <!-- ADMIN CLAN -->
+ <admin command="admin_clan_info" accessLevel="7" />
+ <admin command="admin_clan_changeleader" accessLevel="7" confirmDlg="true" />
+
+ <!-- ADMIN CREATE ITEM -->
+ <admin command="admin_itemcreate" accessLevel="7" />
+ <admin command="admin_create_item" accessLevel="7" />
+ <admin command="admin_create_coin" accessLevel="7" />
+ <admin command="admin_give_item_target" accessLevel="7" confirmDlg="true" />
+ <admin command="admin_give_item_to_all" accessLevel="7" confirmDlg="true" />
+
+ <!-- ADMIN CURSED WEAPONS -->
+ <admin command="admin_cw_info" accessLevel="7" />
+ <admin command="admin_cw_remove" accessLevel="7" />
+ <admin command="admin_cw_goto" accessLevel="7" />
+ <admin command="admin_cw_reload" accessLevel="7" />
+ <admin command="admin_cw_add" accessLevel="7" confirmDlg="true" />
+ <admin command="admin_cw_info_menu" accessLevel="7" />
+
+ <!-- ADMIN DEBUG -->
+ <admin command="admin_debug" accessLevel="7" />
+
+ <!-- ADMIN DELETE -->
+ <admin command="admin_delete" accessLevel="7" />
+
+ <!-- ADMIN DISCONNECT -->
+ <admin command="admin_character_disconnect" accessLevel="7" />
+
+ <!-- ADMIN DOOR CONTROL -->
+ <admin command="admin_open" accessLevel="7" />
+ <admin command="admin_close" accessLevel="7" />
+ <admin command="admin_openall" accessLevel="7" />
+ <admin command="admin_closeall" accessLevel="7" />
+
+ <!-- ADMIN EDIT CHAR -->
+ <admin command="admin_edit_character" accessLevel="7" />
+ <admin command="admin_current_player" accessLevel="7" />
+ <admin command="admin_nokarma" accessLevel="7" />
+ <admin command="admin_setkarma" accessLevel="7" />
+ <admin command="admin_setfame" accessLevel="7" />
+ <admin command="admin_character_list" accessLevel="7" />
+ <admin command="admin_character_info" accessLevel="7" />
+ <admin command="admin_show_characters" accessLevel="7" />
+ <admin command="admin_find_character" accessLevel="7" />
+ <admin command="admin_find_ip" accessLevel="7" />
+ <admin command="admin_find_account" accessLevel="7" />
+ <admin command="admin_find_dualbox" accessLevel="7" />
+ <admin command="admin_strict_find_dualbox" accessLevel="7" />
+ <admin command="admin_tracert" accessLevel="7" />
+ <admin command="admin_save_modifications" accessLevel="7" />
+ <admin command="admin_rec" accessLevel="7" />
+ <admin command="admin_settitle" accessLevel="7" />
+ <admin command="admin_changename" accessLevel="7" />
+ <admin command="admin_setsex" accessLevel="7" />
+ <admin command="admin_setcolor" accessLevel="7" />
+ <admin command="admin_settcolor" accessLevel="7" />
+ <admin command="admin_setclass" accessLevel="7" />
+ <admin command="admin_setpk" accessLevel="7" />
+ <admin command="admin_setpvp" accessLevel="7" />
+ <admin command="admin_fullfood" accessLevel="7" />
+ <admin command="admin_remove_clan_penalty" accessLevel="7" />
+ <admin command="admin_summon_info" accessLevel="7" />
+ <admin command="admin_unsummon" accessLevel="7" />
+ <admin command="admin_summon_setlvl" accessLevel="7" />
+ <admin command="admin_show_pet_inv" accessLevel="7" />
+ <admin command="admin_partyinfo" accessLevel="7" />
+ <admin command="admin_setnoble" accessLevel="7" confirmDlg="true" />
+
+ <!-- ADMIN EDIT NPC -->
+ <admin command="admin_edit_npc" accessLevel="7" />
+ <admin command="admin_save_npc" accessLevel="7" />
+ <admin command="admin_show_droplist" accessLevel="7" />
+ <admin command="admin_edit_drop" accessLevel="7" />
+ <admin command="admin_add_drop" accessLevel="7" />
+ <admin command="admin_del_drop" accessLevel="7" />
+ <admin command="admin_showShop" accessLevel="7" />
+ <admin command="admin_showShopList" accessLevel="7" />
+ <admin command="admin_addShopItem" accessLevel="7" />
+ <admin command="admin_delShopItem" accessLevel="7" />
+ <admin command="admin_editShopItem" accessLevel="7" />
+ <admin command="admin_close_window" accessLevel="7" />
+ <admin command="admin_show_skilllist_npc" accessLevel="7" />
+ <admin command="admin_add_skill_npc" accessLevel="7" />
+ <admin command="admin_edit_skill_npc" accessLevel="7" />
+ <admin command="admin_del_skill_npc" accessLevel="7" />
+ <admin command="admin_log_npc_spawn" accessLevel="7" />
+
+ <!-- ADMIN EFFECTS -->
+ <admin command="admin_invis" accessLevel="7" />
+ <admin command="admin_invisible" accessLevel="7" />
+ <admin command="admin_vis" accessLevel="7" />
+ <admin command="admin_visible" accessLevel="7" />
+ <admin command="admin_invis_menu" accessLevel="7" />
+ <admin command="admin_earthquake" accessLevel="7" />
+ <admin command="admin_earthquake_menu" accessLevel="7" />
+ <admin command="admin_bighead" accessLevel="7" />
+ <admin command="admin_shrinkhead" accessLevel="7" />
+ <admin command="admin_gmspeed" accessLevel="7" />
+ <admin command="admin_gmspeed_menu" accessLevel="7" />
+ <admin command="admin_unpara_all" accessLevel="7" />
+ <admin command="admin_para_all" accessLevel="7" />
+ <admin command="admin_unpara" accessLevel="7" />
+ <admin command="admin_para" accessLevel="7" />
+ <admin command="admin_unpara_all_menu" accessLevel="7" />
+ <admin command="admin_para_all_menu" accessLevel="7" />
+ <admin command="admin_unpara_menu" accessLevel="7" />
+ <admin command="admin_para_menu" accessLevel="7" />
+ <admin command="admin_polyself" accessLevel="7" />
+ <admin command="admin_unpolyself" accessLevel="7" />
+ <admin command="admin_polyself_menu" accessLevel="7" />
+ <admin command="admin_unpolyself_menu" accessLevel="7" />
+ <admin command="admin_clearteams" accessLevel="7" />
+ <admin command="admin_setteam_close" accessLevel="7" />
+ <admin command="admin_setteam" accessLevel="7" />
+ <admin command="admin_social" accessLevel="7" />
+ <admin command="admin_effect" accessLevel="7" />
+ <admin command="admin_social_menu" accessLevel="7" />
+ <admin command="admin_special" accessLevel="7" />
+ <admin command="admin_special_menu" accessLevel="7" />
+ <admin command="admin_effect_menu" accessLevel="7" />
+ <admin command="admin_abnormal" accessLevel="7" />
+ <admin command="admin_abnormal_menu" accessLevel="7" />
+ <admin command="admin_play_sounds" accessLevel="7" />
+ <admin command="admin_play_sound" accessLevel="7" />
+ <admin command="admin_atmosphere" accessLevel="7" />
+ <admin command="admin_atmosphere_menu" accessLevel="7" />
+ <admin command="admin_set_displayeffect" accessLevel="7" />
+ <admin command="admin_set_displayeffect_menu" accessLevel="7" />
+
+ <!-- ADMIN ELEMENT -->
+ <admin command="admin_setlh" accessLevel="7" />
+ <admin command="admin_setlc" accessLevel="7" />
+ <admin command="admin_setll" accessLevel="7" />
+ <admin command="admin_setlg" accessLevel="7" />
+ <admin command="admin_setlb" accessLevel="7" />
+ <admin command="admin_setlw" accessLevel="7" />
+ <admin command="admin_setls" accessLevel="7" />
+
+ <!-- ADMIN ENCHANT -->
+ <admin command="admin_seteh" accessLevel="7" />
+ <admin command="admin_setec" accessLevel="7" />
+ <admin command="admin_seteg" accessLevel="7" />
+ <admin command="admin_setel" accessLevel="7" />
+ <admin command="admin_seteb" accessLevel="7" />
+ <admin command="admin_setew" accessLevel="7" />
+ <admin command="admin_setes" accessLevel="7" />
+ <admin command="admin_setle" accessLevel="7" />
+ <admin command="admin_setre" accessLevel="7" />
+ <admin command="admin_setlf" accessLevel="7" />
+ <admin command="admin_setrf" accessLevel="7" />
+ <admin command="admin_seten" accessLevel="7" />
+ <admin command="admin_setun" accessLevel="7" />
+ <admin command="admin_setba" accessLevel="7" />
+ <admin command="admin_setbe" accessLevel="7" />
+ <admin command="admin_enchant" accessLevel="7" />
+
+ <!-- ADMIN EVENT ENGINE -->
+ <admin command="admin_event" accessLevel="7" />
+ <admin command="admin_event_new" accessLevel="7" />
+ <admin command="admin_event_choose" accessLevel="7" />
+ <admin command="admin_event_store" accessLevel="7" />
+ <admin command="admin_event_set" accessLevel="7" />
+ <admin command="admin_event_change_teams_number" accessLevel="7" />
+ <admin command="admin_event_announce" accessLevel="7" />
+ <admin command="admin_event_panel" accessLevel="7" />
+ <admin command="admin_event_control_begin" accessLevel="7" />
+ <admin command="admin_event_control_teleport" accessLevel="7" />
+ <admin command="admin_add" accessLevel="7" />
+ <admin command="admin_event_see" accessLevel="7" />
+ <admin command="admin_event_del" accessLevel="7" />
+ <admin command="admin_delete_buffer" accessLevel="7" />
+ <admin command="admin_event_control_sit" accessLevel="7" />
+ <admin command="admin_event_name" accessLevel="7" />
+ <admin command="admin_event_control_kill" accessLevel="7" />
+ <admin command="admin_event_control_res" accessLevel="7" />
+ <admin command="admin_event_control_poly" accessLevel="7" />
+ <admin command="admin_event_control_unpoly" accessLevel="7" />
+ <admin command="admin_event_control_transform" accessLevel="7" />
+ <admin command="admin_event_control_untransform" accessLevel="7" />
+ <admin command="admin_event_control_prize" accessLevel="7" />
+ <admin command="admin_event_control_chatban" accessLevel="7" />
+ <admin command="admin_event_control_kick" accessLevel="7" />
+ <admin command="admin_event_control_finish" accessLevel="7" />
+
+ <!-- ADMIN EVENTS -->
+ <admin command="admin_event_menu" accessLevel="7" />
+ <admin command="admin_event_start" accessLevel="7" />
+ <admin command="admin_event_stop" accessLevel="7" />
+ <admin command="admin_event_start_menu" accessLevel="7" />
+ <admin command="admin_event_stop_menu" accessLevel="7" />
+ <admin command="admin_event_bypass" accessLevel="7" />
+
+ <!-- ADMIN EXP SP -->
+ <admin command="admin_add_exp_sp_to_character" accessLevel="7" />
+ <admin command="admin_add_exp_sp" accessLevel="7" />
+ <admin command="admin_remove_exp_sp" accessLevel="7" />
+
+ <!-- ADMIN FIGHT CALCULATOR -->
+ <admin command="admin_fight_calculator" accessLevel="7" />
+ <admin command="admin_fight_calculator_show" accessLevel="7" />
+ <admin command="admin_fcs" accessLevel="7" />
+
+ <!-- ADMIN FORT SIEGE -->
+ <admin command="admin_fortsiege" accessLevel="7" />
+ <admin command="admin_add_fortattacker" accessLevel="7" />
+ <admin command="admin_list_fortsiege_clans" accessLevel="7" />
+ <admin command="admin_clear_fortsiege_list" accessLevel="7" />
+ <admin command="admin_spawn_fortdoors" accessLevel="7" />
+ <admin command="admin_endfortsiege" accessLevel="7" />
+ <admin command="admin_startfortsiege" accessLevel="7" />
+ <admin command="admin_setfort" accessLevel="7" />
+ <admin command="admin_removefort" accessLevel="7" />
+
+ <!-- ADMIN GEODATA -->
+ <admin command="admin_geo_z" accessLevel="7" />
+ <admin command="admin_geo_type" accessLevel="7" />
+ <admin command="admin_geo_nswe" accessLevel="7" />
+ <admin command="admin_geo_los" accessLevel="7" />
+ <admin command="admin_geo_position" accessLevel="7" />
+ <admin command="admin_geo_bug" accessLevel="7" />
+ <admin command="admin_geo_load" accessLevel="7" />
+ <admin command="admin_geo_unload" accessLevel="7" />
+
+ <!-- ADMIN GEO EDITOR -->
+ <admin command="admin_ge_status" accessLevel="7" />
+ <admin command="admin_ge_mode" accessLevel="7" />
+ <admin command="admin_ge_join" accessLevel="7" />
+ <admin command="admin_ge_leave" accessLevel="7" />
+
+ <!-- ADMIN GM -->
+ <admin command="admin_gm" accessLevel="7" />
+
+ <!-- ADMIN GM CHAT -->
+ <admin command="admin_gmchat" accessLevel="7" />
+ <admin command="admin_snoop" accessLevel="7" />
+ <admin command="admin_gmchat_menu" accessLevel="7" />
+
+ <!-- ADMIN GRACIA SEEDS -->
+ <admin command="admin_gracia_seeds" accessLevel="7" />
+ <admin command="admin_kill_tiat" accessLevel="7" />
+ <admin command="admin_set_sodstate" accessLevel="7" />
+
+ <!-- ADMIN HEAL -->
+ <admin command="admin_heal" accessLevel="7" />
+
+ <!-- ADMIN HELLBOUND -->
+ <admin command="admin_hellbound_setlevel" accessLevel="7" />
+ <admin command="admin_hellbound" accessLevel="7" />
+
+ <!-- ADMIN HELP PAGE -->
+ <admin command="admin_help" accessLevel="7" />
+
+ <!-- ADMIN INSTANCE -->
+ <admin command="admin_setinstance" accessLevel="7" />
+ <admin command="admin_ghoston" accessLevel="7" />
+ <admin command="admin_ghostoff" accessLevel="7" />
+ <admin command="admin_createinstance" accessLevel="7" />
+ <admin command="admin_destroyinstance" accessLevel="7" />
+ <admin command="admin_listinstances" accessLevel="7" />
+
+ <!-- ADMIN INSTANCE ZONE -->
+ <admin command="admin_instancezone" accessLevel="7" />
+ <admin command="admin_instancezone_clear" accessLevel="7" />
+
+ <!-- ADMIN INVUL -->
+ <admin command="admin_invul" accessLevel="7" />
+ <admin command="admin_setinvul" accessLevel="7" />
+
+ <!-- ADMIN KICK -->
+ <admin command="admin_kick" accessLevel="7" confirmDlg="true" />
+ <admin command="admin_kick_non_gm" accessLevel="7" />
+
+ <!-- ADMIN KILL -->
+ <admin command="admin_kill" accessLevel="7" />
+ <admin command="admin_kill_monster" accessLevel="7" />
+
+ <!-- ADMIN LEVEL -->
+ <admin command="admin_add_level" accessLevel="7" />
+ <admin command="admin_set_level" accessLevel="7" />
+
+ <!-- ADMIN LOGIN -->
+ <admin command="admin_server_gm_only" accessLevel="7" />
+ <admin command="admin_server_all" accessLevel="7" />
+ <admin command="admin_server_max_player" accessLevel="7" />
+ <admin command="admin_server_list_type" accessLevel="7" />
+ <admin command="admin_server_list_age" accessLevel="7" />
+ <admin command="admin_server_login" accessLevel="7" />
+
+ <!-- ADMIN MAMMON -->
+ <admin command="admin_mammon_find" accessLevel="7" />
+ <admin command="admin_mammon_respawn" accessLevel="7" />
+
+ <!-- ADMIN MANOR -->
+ <admin command="admin_manor" accessLevel="7" />
+ <admin command="admin_manor_approve" accessLevel="7" />
+ <admin command="admin_manor_setnext" accessLevel="7" />
+ <admin command="admin_manor_reset" accessLevel="7" />
+ <admin command="admin_manor_setmaintenance" accessLevel="7" />
+ <admin command="admin_manor_save" accessLevel="7" />
+ <admin command="admin_manor_disable" accessLevel="7" />
+
+ <!-- ADMIN MENU -->
+ <admin command="admin_char_manage" accessLevel="7" />
+ <admin command="admin_teleport_character_to_menu" accessLevel="7" />
+ <admin command="admin_recall_char_menu" accessLevel="7" confirmDlg="true" />
+ <admin command="admin_recall_party_menu" accessLevel="7" />
+ <admin command="admin_recall_clan_menu" accessLevel="7" />
+ <admin command="admin_goto_char_menu" accessLevel="7" />
+ <admin command="admin_kick_menu" accessLevel="7" />
+ <admin command="admin_kill_menu" accessLevel="7" />
+ <admin command="admin_ban_menu" accessLevel="7" />
+ <admin command="admin_unban_menu" accessLevel="7" />
+
+ <!-- ADMIN MESSAGES -->
+ <admin command="admin_msg" accessLevel="7" />
+
+ <!-- ADMIN MOB GROUP -->
+ <admin command="admin_mobmenu" accessLevel="7" />
+ <admin command="admin_mobgroup_list" accessLevel="7" />
+ <admin command="admin_mobgroup_create" accessLevel="7" />
+ <admin command="admin_mobgroup_remove" accessLevel="7" />
+ <admin command="admin_mobgroup_delete" accessLevel="7" />
+ <admin command="admin_mobgroup_spawn" accessLevel="7" />
+ <admin command="admin_mobgroup_unspawn" accessLevel="7" />
+ <admin command="admin_mobgroup_kill" accessLevel="7" />
+ <admin command="admin_mobgroup_idle" accessLevel="7" />
+ <admin command="admin_mobgroup_attack" accessLevel="7" />
+ <admin command="admin_mobgroup_rnd" accessLevel="7" />
+ <admin command="admin_mobgroup_return" accessLevel="7" />
+ <admin command="admin_mobgroup_follow" accessLevel="7" />
+ <admin command="admin_mobgroup_casting" accessLevel="7" />
+ <admin command="admin_mobgroup_nomove" accessLevel="7" />
+ <admin command="admin_mobgroup_attackgrp" accessLevel="7" />
+ <admin command="admin_mobgroup_invul" accessLevel="7" />
+
+ <!-- ADMIN MONSTER RACE -->
+ <admin command="admin_mons" accessLevel="7" />
+
+ <!-- ADMIN PATH NODE -->
+ <admin command="admin_pn_info" accessLevel="7" />
+ <admin command="admin_show_path" accessLevel="7" />
+ <admin command="admin_path_debug" accessLevel="7" />
+ <admin command="admin_show_pn" accessLevel="7" />
+ <admin command="admin_find_path" accessLevel="7" />
+
+ <!-- ADMIN PETITION -->
+ <admin command="admin_view_petitions" accessLevel="7" />
+ <admin command="admin_view_petition" accessLevel="7" />
+ <admin command="admin_accept_petition" accessLevel="7" />
+ <admin command="admin_reject_petition" accessLevel="7" />
+ <admin command="admin_reset_petitions" accessLevel="7" />
+ <admin command="admin_force_peti" accessLevel="7" />
+
+ <!-- ADMIN P FORGE -->
+ <admin command="admin_forge" accessLevel="7" />
+ <admin command="admin_forge2" accessLevel="7" />
+ <admin command="admin_forge3" accessLevel="7" />
+
+ <!-- ADMIN PLEDGE -->
+ <admin command="admin_pledge" accessLevel="7" />
+
+ <!-- ADMIN POLYMORPH -->
+ <admin command="admin_polymorph" accessLevel="7" />
+ <admin command="admin_unpolymorph" accessLevel="7" />
+ <admin command="admin_polymorph_menu" accessLevel="7" />
+ <admin command="admin_unpolymorph_menu" accessLevel="7" />
+ <admin command="admin_transform" accessLevel="7" />
+ <admin command="admin_untransform" accessLevel="7" />
+ <admin command="admin_transform_menu" accessLevel="7" />
+ <admin command="admin_untransform_menu" accessLevel="7" />
+
+ <!-- ADMIN QUEST -->
+ <admin command="admin_quest_reload" accessLevel="7" />
+ <admin command="admin_script_load" accessLevel="7" />
+
+ <!-- ADMIN REPAIR CHAR -->
+ <admin command="admin_restore" accessLevel="7" />
+ <admin command="admin_repair" accessLevel="7" />
+
+ <!-- ADMIN RES -->
+ <admin command="admin_res" accessLevel="7" />
+ <admin command="admin_res_monster" accessLevel="7" />
+
+ <!-- ADMIN RIDE -->
+ <admin command="admin_ride_horse" accessLevel="7" />
+ <admin command="admin_ride_bike" accessLevel="7" />
+ <admin command="admin_ride_wyvern" accessLevel="7" />
+ <admin command="admin_ride_strider" accessLevel="7" />
+ <admin command="admin_unride_wyvern" accessLevel="7" />
+ <admin command="admin_unride_strider" accessLevel="7" />
+ <admin command="admin_unride" accessLevel="7" />
+ <admin command="admin_ride_wolf" accessLevel="7" />
+ <admin command="admin_unride_wolf" accessLevel="7" />
+
+ <!-- ADMIN SHOP -->
+ <admin command="admin_buy" accessLevel="7" />
+ <admin command="admin_gmshop" accessLevel="7" />
+
+ <!-- ADMIN SHOW QUEST -->
+ <admin command="admin_charquestmenu" accessLevel="7" />
+ <admin command="admin_setcharquest" accessLevel="7" />
+
+ <!-- ADMIN SHUTDOWN -->
+ <admin command="admin_server_shutdown" accessLevel="7" confirmDlg="true" />
+ <admin command="admin_server_restart" accessLevel="7" confirmDlg="true" />
+ <admin command="admin_server_abort" accessLevel="7" />
+
+ <!-- ADMIN SIEGE -->
+ <admin command="admin_siege" accessLevel="7" />
+ <admin command="admin_add_attacker" accessLevel="7" />
+ <admin command="admin_add_defender" accessLevel="7" />
+ <admin command="admin_add_guard" accessLevel="7" />
+ <admin command="admin_list_siege_clans" accessLevel="7" />
+ <admin command="admin_clear_siege_list" accessLevel="7" />
+ <admin command="admin_move_defenders" accessLevel="7" />
+ <admin command="admin_spawn_doors" accessLevel="7" />
+ <admin command="admin_endsiege" accessLevel="7" />
+ <admin command="admin_startsiege" accessLevel="7" />
+ <admin command="admin_setsiegetime" accessLevel="7" />
+ <admin command="admin_setcastle" accessLevel="7" />
+ <admin command="admin_removecastle" accessLevel="7" />
+ <admin command="admin_clanhall" accessLevel="7" />
+ <admin command="admin_clanhallset" accessLevel="7" />
+ <admin command="admin_clanhalldel" accessLevel="7" />
+ <admin command="admin_clanhallopendoors" accessLevel="7" />
+ <admin command="admin_clanhallclosedoors" accessLevel="7" />
+ <admin command="admin_clanhallteleportself" accessLevel="7" />
+
+ <!-- ADMIN SKILL -->
+ <admin command="admin_show_skills" accessLevel="7" />
+ <admin command="admin_remove_skills" accessLevel="7" />
+ <admin command="admin_skill_list" accessLevel="7" />
+ <admin command="admin_skill_index" accessLevel="7" />
+ <admin command="admin_add_skill" accessLevel="7" />
+ <admin command="admin_remove_skill" accessLevel="7" />
+ <admin command="admin_get_skills" accessLevel="7" />
+ <admin command="admin_reset_skills" accessLevel="7" />
+ <admin command="admin_give_all_skills" accessLevel="7" />
+ <admin command="admin_give_all_skills_fs" accessLevel="7" />
+ <admin command="admin_give_all_clan_skills" accessLevel="7" />
+ <admin command="admin_remove_all_skills" accessLevel="7" />
+ <admin command="admin_add_clan_skill" accessLevel="7" />
+ <admin command="admin_setskill" accessLevel="7" />
+
+ <!-- ADMIN SPAWN -->
+ <admin command="admin_show_spawns" accessLevel="7" />
+ <admin command="admin_spawn" accessLevel="7" />
+ <admin command="admin_spawn_monster" accessLevel="7" />
+ <admin command="admin_spawn_index" accessLevel="7" />
+ <admin command="admin_unspawnall" accessLevel="7" />
+ <admin command="admin_respawnall" accessLevel="7" />
+ <admin command="admin_spawn_reload" accessLevel="7" />
+ <admin command="admin_npc_index" accessLevel="7" />
+ <admin command="admin_spawn_once" accessLevel="7" />
+ <admin command="admin_show_npcs" accessLevel="7" />
+ <admin command="admin_teleport_reload" accessLevel="7" />
+ <admin command="admin_spawnnight" accessLevel="7" />
+ <admin command="admin_spawnday" accessLevel="7" />
+ <admin command="admin_instance_spawns" accessLevel="7" />
+ <admin command="admin_list_spawns" accessLevel="7" />
+ <admin command="admin_list_positions" accessLevel="7" />
+ <admin command="admin_spawn_debug_menu" accessLevel="7" />
+ <admin command="admin_spawn_debug_print" accessLevel="7" />
+ <admin command="admin_spawn_debug_print_menu" accessLevel="7" />
+
+ <!-- ADMIN SUMMON -->
+ <admin command="admin_summon" accessLevel="7" />
+
+ <!-- ADMIN TARGET -->
+ <admin command="admin_target" accessLevel="7" />
+
+ <!-- ADMIN TARGETSAY -->
+ <admin command="admin_targetsay" accessLevel="7" />
+
+ <!-- ADMIN TELEPORT -->
+ <admin command="admin_show_moves" accessLevel="7" />
+ <admin command="admin_show_moves_other" accessLevel="7" />
+ <admin command="admin_show_teleport" accessLevel="7" />
+ <admin command="admin_teleport_to_character" accessLevel="7" />
+ <admin command="admin_teleportto" accessLevel="7" />
+ <admin command="admin_move_to" accessLevel="7" />
+ <admin command="admin_teleport_character" accessLevel="7" />
+ <admin command="admin_recall" accessLevel="7" />
+ <admin command="admin_walk" accessLevel="7" />
+ <admin command="teleportto" accessLevel="7" />
+ <admin command="recall" accessLevel="7" />
+ <admin command="admin_recall_npc" accessLevel="7" />
+ <admin command="admin_gonorth" accessLevel="7" />
+ <admin command="admin_gosouth" accessLevel="7" />
+ <admin command="admin_goeast" accessLevel="7" />
+ <admin command="admin_gowest" accessLevel="7" />
+ <admin command="admin_goup" accessLevel="7" />
+ <admin command="admin_godown" accessLevel="7" />
+ <admin command="admin_tele" accessLevel="7" />
+ <admin command="admin_teleto" accessLevel="7" />
+ <admin command="admin_instant_move" accessLevel="7" />
+ <admin command="admin_sendhome" accessLevel="7" confirmDlg="true" />
+
+ <!-- ADMIN TERRITORY WAR -->
+ <admin command="admin_territory_war" accessLevel="7" />
+ <admin command="admin_territory_war_time" accessLevel="7" />
+ <admin command="admin_territory_war_start" accessLevel="7" />
+ <admin command="admin_territory_war_end" accessLevel="7" />
+ <admin command="admin_territory_wards_list" accessLevel="7" />
+
+ <!-- ADMIN TEST -->
+ <admin command="admin_stats" accessLevel="7" />
+ <admin command="admin_skill_test" accessLevel="7" />
+ <admin command="admin_known" accessLevel="7" />
+
+ <!-- ADMIN TVT EVENT -->
+ <admin command="admin_tvt_add" accessLevel="7" />
+ <admin command="admin_tvt_remove" accessLevel="7" />
+ <admin command="admin_tvt_advance" accessLevel="7" />
+
+ <!-- ADMIN UNBLOCK IP -->
+ <admin command="admin_unblockip" accessLevel="7" />
+
+ <!-- ADMIN VITALITY -->
+ <admin command="admin_set_vitality" accessLevel="7" />
+ <admin command="admin_set_vitality_level" accessLevel="7" />
+ <admin command="admin_full_vitality" accessLevel="7" />
+ <admin command="admin_empty_vitality" accessLevel="7" />
+ <admin command="admin_get_vitality" accessLevel="7" />
+
+ <!-- ADMIN ZONE -->
+ <admin command="admin_zone_check" accessLevel="7" />
+ <admin command="admin_zone_reload" accessLevel="7" />
+ <admin command="admin_zone_visual" accessLevel="7" />
+ <admin command="admin_zone_visual_clear" accessLevel="7" />
+
+ <!-- VOICE COMMANDS -->
+ <admin command="banchat" accessLevel="7" />
+ <admin command="debug" accessLevel="7" />
+ <admin command="unbanchat" accessLevel="7" />
+</list>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index 7e467d8aa3..b6a541cc66 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -20,10 +20,8 @@ import java.util.logging.Logger;
import javolution.text.TextBuilder;
import com.l2jserver.Config;
-import com.l2jserver.gameserver.GmListTable;
import com.l2jserver.gameserver.cache.HtmCache;
-import com.l2jserver.gameserver.datatables.AccessLevels;
-import com.l2jserver.gameserver.datatables.AdminCommandAccessRights;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.datatables.DoorTable;
import com.l2jserver.gameserver.datatables.ItemTable;
import com.l2jserver.gameserver.datatables.MultiSell;
@@ -101,13 +99,13 @@ public class AdminAdmin implements IAdminCommandHandler
}
else if (command.startsWith("admin_gmliston"))
{
- GmListTable.getInstance().showGm(activeChar);
+ AdminTable.getInstance().showGm(activeChar);
activeChar.sendMessage("Registered into gm list");
AdminHelpPage.showHelpPage(activeChar,"gm_menu.htm");
}
else if (command.startsWith("admin_gmlistoff"))
{
- GmListTable.getInstance().hideGm(activeChar);
+ AdminTable.getInstance().hideGm(activeChar);
activeChar.sendMessage("Removed from gm list");
AdminHelpPage.showHelpPage(activeChar,"gm_menu.htm");
}
@@ -294,8 +292,7 @@ public class AdminAdmin implements IAdminCommandHandler
}
else if (type.startsWith("access"))
{
- AccessLevels.getInstance().reloadAccessLevels();
- AdminCommandAccessRights.getInstance().reloadAdminCommandAccessRights();
+ AdminTable.getInstance().reload();
activeChar.sendMessage("Access Rights have been reloaded");
}
else if (type.startsWith("quests"))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java
index c00b159caf..f3ba85f604 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java
@@ -20,6 +20,7 @@ import java.sql.SQLException;
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -125,14 +126,24 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler
*/
private void onLineChange(L2PcInstance activeChar, L2PcInstance player, int lvl)
{
- player.setAccessLevel(lvl);
if (lvl >= 0)
- player.sendMessage("Your access level has been changed to " + lvl);
+ {
+ if (AdminTable.getInstance().hasAccessLevel(lvl))
+ {
+ player.setAccessLevel(lvl);
+ player.sendMessage("Your access level has been changed to " + lvl);
+ activeChar.sendMessage("Character's access level is now set to " + lvl + ". Effects won't be noticeable until next session.");
+ }
+ else
+ {
+ activeChar.sendMessage("You are trying to set unexisting access level: " + lvl + " please try again with a valid one!");
+ }
+ }
else
{
+ player.setAccessLevel(lvl);
player.sendMessage("Your character has been banned. Bye.");
player.logout();
}
- activeChar.sendMessage("Character's access level is now set to " + lvl + ". Effects won't be noticeable until next session.");
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 6f2bd4af5a..48cb2f6f28 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -941,7 +941,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%runspeed%", String.valueOf(player.getRunSpeed()));
adminReply.replace("%patkspd%", String.valueOf(player.getPAtkSpd()));
adminReply.replace("%matkspd%", String.valueOf(player.getMAtkSpd()));
- adminReply.replace("%access%", String.valueOf(player.getAccessLevel().getLevel()));
+ adminReply.replace("%access%", player.getAccessLevel().getLevel() + " (" + player.getAccessLevel().getName() + ")");
adminReply.replace("%account%", account);
adminReply.replace("%ip%", ip);
adminReply.replace("%ai%", String.valueOf(player.getAI().getIntention().name()));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
index 3aecaec186..2b49cb5076 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
@@ -26,7 +26,7 @@ import java.util.StringTokenizer;
import com.l2jserver.Config;
import com.l2jserver.gameserver.Announcements;
-import com.l2jserver.gameserver.GmListTable;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.instancemanager.TransformationManager;
import com.l2jserver.gameserver.model.L2World;
@@ -357,7 +357,9 @@ public class AdminEventEngine implements IAdminCommandHandler
{
int transId = transIds[Rnd.get(transIds.length)];
if (!TransformationManager.getInstance().transformPlayer(transId, player))
- GmListTable.broadcastMessageToGMs("EventEngine: Unknow transformation id: " + transId);
+ {
+ AdminTable.getInstance().broadcastMessageToGMs("EventEngine: Unknow transformation id: " + transId);
+ }
}
showEventControl(activeChar);
}
@@ -410,7 +412,7 @@ public class AdminEventEngine implements IAdminCommandHandler
catch (Exception e)
{
e.printStackTrace();
- GmListTable.broadcastMessageToGMs("EventEngine: Error! Possible blank boxes while executing a command which requires a value in the box?");
+ AdminTable.getInstance().broadcastMessageToGMs("EventEngine: Error! Possible blank boxes while executing a command which requires a value in the box?");
}
return true;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java
index 730a15da14..404a1bb4c5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGm.java
@@ -16,9 +16,7 @@ package handlers.admincommandhandlers;
import java.util.logging.Logger;
-import com.l2jserver.Config;
-import com.l2jserver.gameserver.GmListTable;
-import com.l2jserver.gameserver.datatables.AccessLevels;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -39,10 +37,13 @@ public class AdminGm implements IAdminCommandHandler
@Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
-
- if (command.equals("admin_gm"))
- handleGm(activeChar);
-
+ if (command.equals("admin_gm") && activeChar.isGM())
+ {
+ AdminTable.getInstance().deleteGm(activeChar);
+ activeChar.setAccessLevel(0);
+ activeChar.sendMessage("You no longer have GM status.");
+ _log.info("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") turned his GM status off");
+ }
return true;
}
@@ -51,17 +52,4 @@ public class AdminGm implements IAdminCommandHandler
{
return ADMIN_COMMANDS;
}
-
- private void handleGm(L2PcInstance activeChar)
- {
- if (activeChar.isGM())
- {
- GmListTable.getInstance().deleteGm(activeChar);
- activeChar.setAccessLevel(AccessLevels._userAccessLevelNum);
- activeChar.sendMessage("You no longer have GM status.");
-
- if (Config.DEBUG)
- _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") turned his GM status off");
- }
- }
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
index c703195270..1789436db2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
@@ -14,7 +14,7 @@
*/
package handlers.admincommandhandlers;
-import com.l2jserver.gameserver.GmListTable;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2World;
@@ -103,11 +103,11 @@ public class AdminGmChat implements IAdminCommandHandler
offset = 13;
text = command.substring(offset);
CreatureSay cs = new CreatureSay(0, Say2.ALLIANCE, activeChar.getName(), text);
- GmListTable.broadcastToGMs(cs);
+ AdminTable.getInstance().broadcastToGMs(cs);
}
catch (StringIndexOutOfBoundsException e)
{
- // empty message.. ignore
+ // Who cares?
}
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
index 8f930c43bf..e305e84392 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
@@ -19,7 +19,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.AdminCommandAccessRights;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.handler.AdminCommandHandler;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2Clan;
@@ -180,7 +180,7 @@ public class AdminMenu implements IAdminCommandHandler
if (st.countTokens() > 1)
{
String subCommand = "admin_ban_char";
- if (!AdminCommandAccessRights.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
+ if (!AdminTable.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
{
activeChar.sendMessage("You don't have the access right to use this command!");
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
@@ -197,7 +197,7 @@ public class AdminMenu implements IAdminCommandHandler
if (st.countTokens() > 1)
{
String subCommand = "admin_unban_char";
- if (!AdminCommandAccessRights.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
+ if (!AdminTable.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
{
activeChar.sendMessage("You don't have the access right to use this command!");
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 9960b443ec..01a370add6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -22,8 +22,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.l2jserver.Config;
-import com.l2jserver.gameserver.GmListTable;
import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.datatables.NpcTable;
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.datatables.TeleportLocationTable;
@@ -218,7 +218,7 @@ public class AdminSpawn implements IAdminCommandHandler
RaidBossSpawnManager.getInstance().cleanUp();
DayNightSpawnManager.getInstance().cleanUp();
L2World.getInstance().deleteVisibleNpcSpawns();
- GmListTable.broadcastMessageToGMs("NPC Unspawn completed!");
+ AdminTable.getInstance().broadcastMessageToGMs("NPC Unspawn completed!");
}
else if (command.startsWith("admin_spawnday"))
{
@@ -242,12 +242,12 @@ public class AdminSpawn implements IAdminCommandHandler
AutoChatHandler.getInstance().reload();
SevenSigns.getInstance().spawnSevenSignsNPC();
QuestManager.getInstance().reloadAllQuests();
- GmListTable.broadcastMessageToGMs("NPC Respawn completed!");
+ AdminTable.getInstance().broadcastMessageToGMs("NPC Respawn completed!");
}
else if (command.startsWith("admin_teleport_reload"))
{
TeleportLocationTable.getInstance().reloadAll();
- GmListTable.broadcastMessageToGMs("Teleport List Table reloaded.");
+ AdminTable.getInstance().broadcastMessageToGMs("Teleport List Table reloaded.");
}
else if (command.startsWith("admin_spawn_monster") || command.startsWith("admin_spawn"))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
index 900c678aeb..49ae9394ce 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
@@ -16,7 +16,7 @@ package handlers.admincommandhandlers;
import java.util.logging.Logger;
-import com.l2jserver.gameserver.datatables.AdminCommandAccessRights;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.handler.AdminCommandHandler;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -64,7 +64,7 @@ public class AdminSummon implements IAdminCommandHandler
if (id < 1000000)
{
subCommand = "admin_create_item";
- if (!AdminCommandAccessRights.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
+ if (!AdminTable.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
{
activeChar.sendMessage("You don't have the access right to use this command!");
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
@@ -76,7 +76,7 @@ public class AdminSummon implements IAdminCommandHandler
else
{
subCommand = "admin_spawn_once";
- if (!AdminCommandAccessRights.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
+ if (!AdminTable.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
{
activeChar.sendMessage("You don't have the access right to use this command!");
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/ChatsHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/ChatsHandler.java
index a92ab8a189..2d15b11a6f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/ChatsHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/ChatsHandler.java
@@ -19,7 +19,7 @@ import java.net.Socket;
import java.util.StringTokenizer;
import com.l2jserver.gameserver.Announcements;
-import com.l2jserver.gameserver.GmListTable;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.handler.ITelnetHandler;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -86,7 +86,7 @@ public class ChatsHandler implements ITelnetHandler
{
command = command.substring(7);
CreatureSay cs = new CreatureSay(0, Say2.ALLIANCE, "Telnet GM Broadcast from " + _cSocket.getInetAddress().getHostAddress(), command);
- GmListTable.broadcastToGMs(cs);
+ AdminTable.getInstance().broadcastToGMs(cs);
_print.println("Your Message Has Been Sent To " + getOnlineGMS() + " GM(s).");
}
catch (StringIndexOutOfBoundsException e)
@@ -99,7 +99,7 @@ public class ChatsHandler implements ITelnetHandler
private int getOnlineGMS()
{
- return GmListTable.getInstance().getAllGms(true).size();
+ return AdminTable.getInstance().getAllGms(true).size();
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
index 76fbba865a..b8e5fe47ef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
@@ -33,9 +33,9 @@ import javolution.util.FastTable;
import com.l2jserver.Config;
import com.l2jserver.gameserver.GameTimeController;
-import com.l2jserver.gameserver.GmListTable;
import com.l2jserver.gameserver.LoginServerThread;
import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.handler.ITelnetHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2World;
@@ -433,7 +433,7 @@ public class DebugHandler implements ITelnetHandler
private int getOnlineGMS()
{
- return GmListTable.getInstance().getAllGms(true).size();
+ return AdminTable.getInstance().getAllGms(true).size();
}
private String getUptime(int time)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java
index df939879a6..44bb6d222a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java
@@ -21,8 +21,8 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import com.l2jserver.gameserver.GameTimeController;
-import com.l2jserver.gameserver.GmListTable;
import com.l2jserver.gameserver.LoginServerThread;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.handler.ITelnetHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2World;
@@ -98,7 +98,7 @@ public class StatusHandler implements ITelnetHandler
int igm = 0;
String gmList = "";
- for (String player : GmListTable.getInstance().getAllGmNames(true))
+ for (String player : AdminTable.getInstance().getAllGmNames(true))
{
gmList = gmList + ", " + player;
igm++;
@@ -197,7 +197,7 @@ public class StatusHandler implements ITelnetHandler
private int getOnlineGMS()
{
- return GmListTable.getInstance().getAllGms(true).size();
+ return AdminTable.getInstance().getAllGms(true).size();
}
private String getUptime(int time)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java
index eb42ec0244..d312c1d492 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java
@@ -16,7 +16,7 @@ package handlers.voicedcommandhandlers;
import java.util.StringTokenizer;
-import com.l2jserver.gameserver.datatables.AdminCommandAccessRights;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
import com.l2jserver.gameserver.model.L2World;
@@ -33,7 +33,7 @@ public class ChatAdmin implements IVoicedCommandHandler
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
- if (!AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel()))
+ if (!AdminTable.getInstance().hasAccess(command, activeChar.getAccessLevel()))
{
return false;
}
@@ -91,7 +91,7 @@ public class ChatAdmin implements IVoicedCommandHandler
activeChar.sendMessage("You can't ban GM !");
return false;
}
- if (AdminCommandAccessRights.getInstance().hasAccess(command, player.getAccessLevel()))
+ if (AdminTable.getInstance().hasAccess(command, player.getAccessLevel()))
{
activeChar.sendMessage("You can't ban moderator !");
return false;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java
index 8dea10343a..ca90ef85d7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java
@@ -14,7 +14,7 @@
*/
package handlers.voicedcommandhandlers;
-import com.l2jserver.gameserver.datatables.AdminCommandAccessRights;
+import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -28,7 +28,7 @@ public class Debug implements IVoicedCommandHandler
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
- if (!AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel()))
+ if (!AdminTable.getInstance().hasAccess(command, activeChar.getAccessLevel()))
{
return false;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/xsd/adminData.xsd b/L2J_DataPack_BETA/dist/game/data/xsd/adminData.xsd
new file mode 100644
index 0000000000..cdd7df6fb7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/xsd/adminData.xsd
@@ -0,0 +1,40 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="list">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="access" maxOccurs="unbounded" minOccurs="0">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:integer" name="level" use="required" />
+ <xs:attribute type="xs:string" name="name" use="required" />
+ <xs:attribute type="xs:string" name="nameColor" use="optional" />
+ <xs:attribute type="xs:string" name="titleColor" use="optional" />
+ <xs:attribute type="xs:integer" name="childAccess" use="optional" />
+ <xs:attribute type="xs:boolean" name="isGM" use="optional" />
+ <xs:attribute type="xs:boolean" name="allowPeaceAttack" use="optional" />
+ <xs:attribute type="xs:boolean" name="allowFixedRes" use="optional" />
+ <xs:attribute type="xs:boolean" name="allowTransaction" use="optional" />
+ <xs:attribute type="xs:boolean" name="allowAltg" use="optional" />
+ <xs:attribute type="xs:boolean" name="giveDamage" use="optional" />
+ <xs:attribute type="xs:boolean" name="takeAggro" use="optional" />
+ <xs:attribute type="xs:boolean" name="gainExp" use="optional" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="admin" maxOccurs="unbounded" minOccurs="0">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:string" name="command" use="required" />
+ <xs:attribute type="xs:string" name="accessLevel" use="optional" />
+ <xs:attribute type="xs:boolean" name="confirmDlg" use="optional" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/access_levels.sql b/L2J_DataPack_BETA/dist/sql/game/access_levels.sql
deleted file mode 100644
index 7acf7362fb..0000000000
--- a/L2J_DataPack_BETA/dist/sql/game/access_levels.sql
+++ /dev/null
@@ -1,71 +0,0 @@
--- How to configure the SQL based access level system :
-
--- There are two tables.
-
--- First one is named acess_levels and it's meant to define the different possible
--- groups a GM can belong to.
-
--- You can see in this table six predefined GM groups. Each group has a different
--- accessLevel, and GM's access_level in the characters table should match with
--- one of these. You could define as many groups as needed and give them whatever
--- number you wanted to, from 1 to 255. Nevertheless please note the fact that
--- there is one group that will be reserved for allmighty administrators, and this
--- group is bound to the following rules:
-
--- * There's no need/way to restrict the commands this group is able to run, its
--- members will be able to perform ANY admin_command.
-
--- * One number must be reserved for this group, and by default it is set to 127.
-
--- * In order to change this default group number or its name/title colors,
--- you should look at the Character.properties configuration file and
--- change the value of MasterAccessLevel, MasterNameColor and MasterTitleColor
--- respectively.
-
--- * You should better not use this group as a part of any childs hierarchy.
-
--- In our predefined set of examples, access_level=1 is for the highest admin,
--- and access_level=3 is for Event GMs.
-
--- The rest of the access_levels table columns are expected to be self explanatory.
-
--- And there is a second table named admin_command_access_rights and in this table
--- administrators should add every command they wanted GMs to use.
-
--- We left just one query here to show how commands should be added to the table:
-
--- INSERT IGNORE INTO `admin_command_access_rights` VALUES ('admin_admin','6');
-
--- If an administrator wanted to grant his GMs from group 4 the usage of the //para
--- command, he should just copy our example and replace values like this:
-
--- INSERT IGNORE INTO `admin_command_access_rights` VALUES ('admin_para','4');
-
--- So on, for each command there should be a record in this table. And it would be
--- advisable to use one query per command to avoid messups ;)
-
-CREATE TABLE IF NOT EXISTS `access_levels` (
- `accessLevel` MEDIUMINT(9) NOT NULL,
- `name` VARCHAR(255) NOT NULL DEFAULT '',
- `nameColor` CHAR(6) NOT NULL DEFAULT 'FFFFFF',
- `titleColor` CHAR(6) NOT NULL DEFAULT 'FFFFFF',
- `childAccess` VARCHAR(255) NOT NULL DEFAULT '',
- `isGm` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
- `allowPeaceAttack` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
- `allowFixedRes` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
- `allowTransaction` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
- `allowAltg` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
- `giveDamage` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
- `takeAggro` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
- `gainExp` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
- PRIMARY KEY (`accessLevel`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-INSERT IGNORE INTO `access_levels` VALUES
-(1,'Admin','0FF000','0FF000','2;3;4;5;6;7',1,1,1,1,1,1,1,1),
-(2,'Head GM','0C0000','0C0000','5;6;7',0,0,1,1,1,1,1,1),
-(3,'Event GM','00C000','00C000','5;6;7',0,0,1,0,1,0,0,0),
-(4,'Support GM','000C00','000C00','5;6;7',0,0,1,0,1,0,0,0),
-(5,'General GM','0000C0','0000C0','6;7',0,0,1,0,1,0,0,0),
-(6,'Test GM','FFFFFF','FFFFFF','','0',0,1,0,1,0,0,0),
-(7,'Chat Moderator','-1','-1','','0',0,0,1,0,1,1,1);
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/admin_command_access_rights.sql b/L2J_DataPack_BETA/dist/sql/game/admin_command_access_rights.sql
deleted file mode 100644
index 6fb4953a7a..0000000000
--- a/L2J_DataPack_BETA/dist/sql/game/admin_command_access_rights.sql
+++ /dev/null
@@ -1,638 +0,0 @@
--- For further information on the usage of this table, please refer to the
--- documentation comments in the access_levels.sql file
-CREATE TABLE IF NOT EXISTS `admin_command_access_rights` (
- `adminCommand` varchar(255) NOT NULL DEFAULT 'admin_',
- `accessLevels` tinyint(3) NOT NULL DEFAULT '1',
- `confirmDlg` enum('true','false') NOT NULL DEFAULT 'false',
- PRIMARY KEY (`adminCommand`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-INSERT IGNORE INTO `admin_command_access_rights` VALUES
--- ADMIN ADMIN
-('admin_admin',1,'false'),
-('admin_admin1',1,'false'),
-('admin_admin2',1,'false'),
-('admin_admin3',1,'false'),
-('admin_admin4',1,'false'),
-('admin_admin5',1,'false'),
-('admin_admin6',1,'false'),
-('admin_admin7',1,'false'),
-('admin_admin8',1,'false'),
-('admin_gmliston',1,'false'),
-('admin_gmlistoff',1,'false'),
-('admin_silence',1,'false'),
-('admin_diet',1,'false'),
-('admin_tradeoff',1,'false'),
-('admin_reload',1,'true'),
-('admin_set',1,'false'),
-('admin_set_mod',1,'false'),
-('admin_saveolymp',1,'false'),
-('admin_manualhero',1,'true'),
-('admin_sethero',1,'false'),
-('admin_endolympiad',1,'true'),
-('admin_setconfig',1,'false'),
-('admin_config_server',1,'false'),
-('admin_gmon',1,'false'),
-
--- ADMIN ANNOUNCEMENTS
-('admin_list_announcements',1,'false'),
-('admin_list_critannouncements',1,'false'),
-('admin_reload_announcements',1,'false'),
-('admin_announce_announcements',1,'false'),
-('admin_add_announcement',1,'false'),
-('admin_del_announcement',1,'false'),
-('admin_add_critannouncement',1,'false'),
-('admin_del_critannouncement',1,'false'),
-('admin_announce',1,'false'),
-('admin_critannounce',1,'false'),
-('admin_announce_menu',1,'false'),
-('admin_critannounce_menu',1,'false'),
-('admin_list_autoann',1,'false'),
-('admin_reload_autoann',1,'false'),
-('admin_add_autoann',1,'false'),
-('admin_del_autoann',1,'false'),
-
--- ADMIN BAN
-('admin_ban',1,'false'),
-('admin_ban_acc',1,'true'),
-('admin_ban_char',1,'false'),
-('admin_ban_chat',1,'false'),
-('admin_unban',1,'false'),
-('admin_unban_acc',1,'false'),
-('admin_unban_char',1,'false'),
-('admin_unban_chat',1,'false'),
-('admin_jail',1,'true'),
-('admin_unjail',1,'false'),
-
--- ADMIN BBS
-('admin_bbs',1,'false'),
-
--- ADMIN BUFFS
-('admin_getbuffs',1,'false'),
-('admin_stopbuff',1,'false'),
-('admin_stopallbuffs',1,'true'),
-('admin_areacancel',1,'false'),
-('admin_removereuse',1,'false'),
-('admin_switch_gm_buffs',1,'false'),
-
--- ADMIN CACHE
-('admin_cache_htm_rebuild',1,'false'),
-('admin_cache_htm_reload',1,'false'),
-('admin_cache_reload_path',1,'false'),
-('admin_cache_reload_file',1,'false'),
-('admin_cache_crest_rebuild',1,'false'),
-('admin_cache_crest_reload',1,'false'),
-('admin_cache_crest_fix',1,'false'),
-
--- ADMIN CAMERA
-('admin_camera',1,'false'),
-
--- ADMIN CHANGE ACCESS LEVEL
-('admin_changelvl',1,'false'),
-
--- ADMIN CH SIEGE
-('admin_chsiege_siegablehall', 1, 'false'),
-('admin_chsiege_startSiege', 1, 'false'),
-('admin_chsiege_endsSiege', 1, 'false'),
-('admin_chsiege_setSiegeDate', 1, 'false'),
-('admin_chsiege_addAttacker', 1, 'false'),
-('admin_chsiege_removeAttacker', 1, 'false'),
-('admin_chsiege_clearAttackers', 1, 'false'),
-('admin_chsiege_listAttackers', 1, 'false'),
-('admin_chsiege_forwardSiege', 1, 'false'),
-
--- ADMIN CLAN
-('admin_clan_info',1,'false'),
-('admin_clan_changeleader',1,'true'),
-
--- ADMIN CREATE ITEM
-('admin_itemcreate',1,'false'),
-('admin_create_item',1,'false'),
-('admin_create_coin',1,'false'),
-('admin_give_item_target',1,'true'),
-('admin_give_item_to_all',1,'true'),
-
--- ADMIN CURSED WEAPONS
-('admin_cw_info',1,'false'),
-('admin_cw_remove',1,'false'),
-('admin_cw_goto',1,'false'),
-('admin_cw_reload',1,'false'),
-('admin_cw_add',1,'true'),
-('admin_cw_info_menu',1,'false'),
-
--- ADMIN DEBUG
-('admin_debug',1,'false'),
-
--- ADMIN DELETE
-('admin_delete',1,'false'),
-
--- ADMIN DISCONNECT
-('admin_character_disconnect',1,'false'),
-
--- ADMIN DOOR CONTROL
-('admin_open',1,'false'),
-('admin_close',1,'false'),
-('admin_openall',1,'false'),
-('admin_closeall',1,'false'),
-
--- ADMIN EDIT CHAR
-('admin_edit_character',1,'false'),
-('admin_current_player',1,'false'),
-('admin_nokarma',1,'false'),
-('admin_setkarma',1,'false'),
-('admin_setfame',1,'false'),
-('admin_character_list',1,'false'),
-('admin_character_info',1,'false'),
-('admin_show_characters',1,'false'),
-('admin_find_character',1,'false'),
-('admin_find_ip',1,'false'),
-('admin_find_account',1,'false'),
-('admin_find_dualbox',1,'false'),
-('admin_strict_find_dualbox',1,'false'),
-('admin_tracert',1,'false'),
-('admin_save_modifications',1,'false'),
-('admin_rec',1,'false'),
-('admin_settitle',1,'false'),
-('admin_changename',1,'false'),
-('admin_setsex',1,'false'),
-('admin_setcolor',1,'false'),
-('admin_settcolor',1,'false'),
-('admin_setclass',1,'false'),
-('admin_setpk',1,'false'),
-('admin_setpvp',1,'false'),
-('admin_fullfood',1,'false'),
-('admin_remove_clan_penalty',1,'false'),
-('admin_summon_info',1,'false'),
-('admin_unsummon',1,'false'),
-('admin_summon_setlvl',1,'false'),
-('admin_show_pet_inv',1,'false'),
-('admin_partyinfo',1,'false'),
-('admin_setnoble',1,'true'),
-
--- ADMIN EDIT NPC
-('admin_edit_npc',1,'false'),
-('admin_save_npc',1,'false'),
-('admin_show_droplist',1,'false'),
-('admin_edit_drop',1,'false'),
-('admin_add_drop',1,'false'),
-('admin_del_drop',1,'false'),
-('admin_showShop',1,'false'),
-('admin_showShopList',1,'false'),
-('admin_addShopItem',1,'false'),
-('admin_delShopItem',1,'false'),
-('admin_editShopItem',1,'false'),
-('admin_close_window',1,'false'),
-('admin_show_skilllist_npc',1,'false'),
-('admin_add_skill_npc',1,'false'),
-('admin_edit_skill_npc',1,'false'),
-('admin_del_skill_npc',1,'false'),
-('admin_log_npc_spawn',1,'false'),
-
--- ADMIN EFFECTS
-('admin_invis',1,'false'),
-('admin_invisible',1,'false'),
-('admin_vis',1,'false'),
-('admin_visible',1,'false'),
-('admin_invis_menu',1,'false'),
-('admin_earthquake',1,'false'),
-('admin_earthquake_menu',1,'false'),
-('admin_bighead',1,'false'),
-('admin_shrinkhead',1,'false'),
-('admin_gmspeed',1,'false'),
-('admin_gmspeed_menu',1,'false'),
-('admin_unpara_all',1,'false'),
-('admin_para_all',1,'false'),
-('admin_unpara',1,'false'),
-('admin_para',1,'false'),
-('admin_unpara_all_menu',1,'false'),
-('admin_para_all_menu',1,'false'),
-('admin_unpara_menu',1,'false'),
-('admin_para_menu',1,'false'),
-('admin_polyself',1,'false'),
-('admin_unpolyself',1,'false'),
-('admin_polyself_menu',1,'false'),
-('admin_unpolyself_menu',1,'false'),
-('admin_clearteams',1,'false'),
-('admin_setteam_close',1,'false'),
-('admin_setteam',1,'false'),
-('admin_social',1,'false'),
-('admin_effect',1,'false'),
-('admin_social_menu',1,'false'),
-('admin_special',1,'false'),
-('admin_special_menu',1,'false'),
-('admin_effect_menu',1,'false'),
-('admin_abnormal',1,'false'),
-('admin_abnormal_menu',1,'false'),
-('admin_play_sounds',1,'false'),
-('admin_play_sound',1,'false'),
-('admin_atmosphere',1,'false'),
-('admin_atmosphere_menu',1,'false'),
-('admin_set_displayeffect',1,'false'),
-('admin_set_displayeffect_menu',1,'false'),
-
--- ADMIN ELEMENT
-('admin_setlh',1,'false'),
-('admin_setlc',1,'false'),
-('admin_setll',1,'false'),
-('admin_setlg',1,'false'),
-('admin_setlb',1,'false'),
-('admin_setlw',1,'false'),
-('admin_setls',1,'false'),
-
--- ADMIN ENCHANT
-('admin_seteh',1,'false'),
-('admin_setec',1,'false'),
-('admin_seteg',1,'false'),
-('admin_setel',1,'false'),
-('admin_seteb',1,'false'),
-('admin_setew',1,'false'),
-('admin_setes',1,'false'),
-('admin_setle',1,'false'),
-('admin_setre',1,'false'),
-('admin_setlf',1,'false'),
-('admin_setrf',1,'false'),
-('admin_seten',1,'false'),
-('admin_setun',1,'false'),
-('admin_setba',1,'false'),
-('admin_setbe',1,'false'),
-('admin_enchant',1,'false'),
-
--- ADMIN EVENT ENGINE
-('admin_event',1,'false'),
-('admin_event_new',1,'false'),
-('admin_event_choose',1,'false'),
-('admin_event_store',1,'false'),
-('admin_event_set',1,'false'),
-('admin_event_change_teams_number',1,'false'),
-('admin_event_announce',1,'false'),
-('admin_event_panel',1,'false'),
-('admin_event_control_begin',1,'false'),
-('admin_event_control_teleport',1,'false'),
-('admin_add',1,'false'),
-('admin_event_see',1,'false'),
-('admin_event_del',1,'false'),
-('admin_delete_buffer',1,'false'),
-('admin_event_control_sit',1,'false'),
-('admin_event_name',1,'false'),
-('admin_event_control_kill',1,'false'),
-('admin_event_control_res',1,'false'),
-('admin_event_control_poly',1,'false'),
-('admin_event_control_unpoly',1,'false'),
-('admin_event_control_transform',1,'false'),
-('admin_event_control_untransform',1,'false'),
-('admin_event_control_prize',1,'false'),
-('admin_event_control_chatban',1,'false'),
-('admin_event_control_kick',1,'false'),
-('admin_event_control_finish',1,'false'),
-
--- ADMIN EVENTS
-('admin_event_menu',1,'false'),
-('admin_event_start',1,'false'),
-('admin_event_stop',1,'false'),
-('admin_event_start_menu',1,'false'),
-('admin_event_stop_menu',1,'false'),
-('admin_event_bypass',1,'false'),
-
--- ADMIN EXP SP
-('admin_add_exp_sp_to_character',1,'false'),
-('admin_add_exp_sp',1,'false'),
-('admin_remove_exp_sp',1,'false'),
-
--- ADMIN FIGHT CALCULATOR
-('admin_fight_calculator',1,'false'),
-('admin_fight_calculator_show',1,'false'),
-('admin_fcs',1,'false'),
-
--- ADMIN FORT SIEGE
-('admin_fortsiege',1,'false'),
-('admin_add_fortattacker',1,'false'),
-('admin_list_fortsiege_clans',1,'false'),
-('admin_clear_fortsiege_list',1,'false'),
-('admin_spawn_fortdoors',1,'false'),
-('admin_endfortsiege',1,'false'),
-('admin_startfortsiege',1,'false'),
-('admin_setfort',1,'false'),
-('admin_removefort',1,'false'),
-
--- ADMIN GEODATA
-('admin_geo_z',1,'false'),
-('admin_geo_type',1,'false'),
-('admin_geo_nswe',1,'false'),
-('admin_geo_los',1,'false'),
-('admin_geo_position',1,'false'),
-('admin_geo_bug',1,'false'),
-('admin_geo_load',1,'false'),
-('admin_geo_unload',1,'false'),
-
--- ADMIN GEO EDITOR
-('admin_ge_status',1,'false'),
-('admin_ge_mode',1,'false'),
-('admin_ge_join',1,'false'),
-('admin_ge_leave',1,'false'),
-
--- ADMIN GM
-('admin_gm',1,'false'),
-
--- ADMIN GM CHAT
-('admin_gmchat',1,'false'),
-('admin_snoop',1,'false'),
-('admin_gmchat_menu',1,'false'),
-
--- ADMIN GRACIA SEEDS
-('admin_gracia_seeds',1,'false'),
-('admin_kill_tiat',1,'false'),
-('admin_set_sodstate',1,'false'),
-
--- ADMIN HEAL
-('admin_heal',1,'false'),
-
--- HELLBOUND
-('admin_hellbound_setlevel',1,'false'),
-('admin_hellbound',1,'false'),
-
--- ADMIN HELP PAGE
-('admin_help',1,'false'),
-
--- ADMIN INSTANCE
-('admin_setinstance',1,'false'),
-('admin_ghoston',1,'false'),
-('admin_ghostoff',1,'false'),
-('admin_createinstance',1,'false'),
-('admin_destroyinstance',1,'false'),
-('admin_listinstances',1,'false'),
-
--- ADMIN INSTANCE ZONE
-('admin_instancezone',1,'false'),
-('admin_instancezone_clear',1,'false'),
-
--- ADMIN INVUL
-('admin_invul',1,'false'),
-('admin_setinvul',1,'false'),
-
--- ADMIN KICK
-('admin_kick',1,'true'),
-('admin_kick_non_gm',1,'false'),
-
--- ADMIN KILL
-('admin_kill',1,'false'),
-('admin_kill_monster',1,'false'),
-
--- ADMIN LEVEL
-('admin_add_level',1,'false'),
-('admin_set_level',1,'false'),
-
--- ADMIN LOGIN
-('admin_server_gm_only',1,'false'),
-('admin_server_all',1,'false'),
-('admin_server_max_player',1,'false'),
-('admin_server_list_type',1,'false'),
-('admin_server_list_age',1,'false'),
-('admin_server_login',1,'false'),
-
--- ADMIN MAMMON
-('admin_mammon_find',1,'false'),
-('admin_mammon_respawn',1,'false'),
-
--- ADMIN MANOR
-('admin_manor',1,'false'),
-('admin_manor_approve',1,'false'),
-('admin_manor_setnext',1,'false'),
-('admin_manor_reset',1,'false'),
-('admin_manor_setmaintenance',1,'false'),
-('admin_manor_save',1,'false'),
-('admin_manor_disable',1,'false'),
-
--- ADMIN MENU
-('admin_char_manage',1,'false'),
-('admin_teleport_character_to_menu',1,'false'),
-('admin_recall_char_menu',1,'true'),
-('admin_recall_party_menu',1,'false'),
-('admin_recall_clan_menu',1,'false'),
-('admin_goto_char_menu',1,'false'),
-('admin_kick_menu',1,'false'),
-('admin_kill_menu',1,'false'),
-('admin_ban_menu',1,'false'),
-('admin_unban_menu',1,'false'),
-
--- ADMIN MESSAGES
-('admin_msg',1,'false'),
-
--- ADMIN MOB GROUP
-('admin_mobmenu',1,'false'),
-('admin_mobgroup_list',1,'false'),
-('admin_mobgroup_create',1,'false'),
-('admin_mobgroup_remove',1,'false'),
-('admin_mobgroup_delete',1,'false'),
-('admin_mobgroup_spawn',1,'false'),
-('admin_mobgroup_unspawn',1,'false'),
-('admin_mobgroup_kill',1,'false'),
-('admin_mobgroup_idle',1,'false'),
-('admin_mobgroup_attack',1,'false'),
-('admin_mobgroup_rnd',1,'false'),
-('admin_mobgroup_return',1,'false'),
-('admin_mobgroup_follow',1,'false'),
-('admin_mobgroup_casting',1,'false'),
-('admin_mobgroup_nomove',1,'false'),
-('admin_mobgroup_attackgrp',1,'false'),
-('admin_mobgroup_invul',1,'false'),
-
--- ADMIN MONSTER RACE
-('admin_mons',1,'false'),
-
--- ADMIN PATH NODE
-('admin_pn_info',1,'false'),
-('admin_show_path',1,'false'),
-('admin_path_debug',1,'false'),
-('admin_show_pn',1,'false'),
-('admin_find_path',1,'false'),
-
--- ADMIN PETITION
-('admin_view_petitions',1,'false'),
-('admin_view_petition',1,'false'),
-('admin_accept_petition',1,'false'),
-('admin_reject_petition',1,'false'),
-('admin_reset_petitions',1,'false'),
-('admin_force_peti',1,'false'),
-
--- ADMIN P FORGE
-('admin_forge',1,'false'),
-('admin_forge2',1,'false'),
-('admin_forge3',1,'false'),
-
--- ADMIN PLEDGE
-('admin_pledge',1,'false'),
-
--- ADMIN POLYMORPH
-('admin_polymorph',1,'false'),
-('admin_unpolymorph',1,'false'),
-('admin_polymorph_menu',1,'false'),
-('admin_unpolymorph_menu',1,'false'),
-('admin_transform',1,'false'),
-('admin_untransform',1,'false'),
-('admin_transform_menu',1,'false'),
-('admin_untransform_menu',1,'false'),
-
--- ADMIN QUEST
-('admin_quest_reload',1,'false'),
-('admin_script_load',1,'false'),
-
--- ADMIN REPAIR CHAR
-('admin_restore',1,'false'),
-('admin_repair',1,'false'),
-
--- ADMIN RES
-('admin_res',1,'false'),
-('admin_res_monster',1,'false'),
-
--- ADMIN RIDE
-('admin_ride_horse',1,'false'),
-('admin_ride_bike',1,'false'),
-('admin_ride_wyvern',1,'false'),
-('admin_ride_strider',1,'false'),
-('admin_unride_wyvern',1,'false'),
-('admin_unride_strider',1,'false'),
-('admin_unride',1,'false'),
-('admin_ride_wolf',1,'false'),
-('admin_unride_wolf',1,'false'),
-
--- ADMIN SHOP
-('admin_buy',1,'false'),
-('admin_gmshop',1,'false'),
-
--- ADMIN SHOW QUEST
-('admin_charquestmenu',1,'false'),
-('admin_setcharquest',1,'false'),
-
--- ADMIN SHUTDOWN
-('admin_server_shutdown',1,'true'),
-('admin_server_restart',1,'true'),
-('admin_server_abort',1,'false'),
-
--- ADMIN SIEGE
-('admin_siege',1,'false'),
-('admin_add_attacker',1,'false'),
-('admin_add_defender',1,'false'),
-('admin_add_guard',1,'false'),
-('admin_list_siege_clans',1,'false'),
-('admin_clear_siege_list',1,'false'),
-('admin_move_defenders',1,'false'),
-('admin_spawn_doors',1,'false'),
-('admin_endsiege',1,'false'),
-('admin_startsiege',1,'false'),
-('admin_setsiegetime',1,'false'),
-('admin_setcastle',1,'false'),
-('admin_removecastle',1,'false'),
-('admin_clanhall',1,'false'),
-('admin_clanhallset',1,'false'),
-('admin_clanhalldel',1,'false'),
-('admin_clanhallopendoors',1,'false'),
-('admin_clanhallclosedoors',1,'false'),
-('admin_clanhallteleportself',1,'false'),
-
--- ADMIN SKILL
-('admin_show_skills',1,'false'),
-('admin_remove_skills',1,'false'),
-('admin_skill_list',1,'false'),
-('admin_skill_index',1,'false'),
-('admin_add_skill',1,'false'),
-('admin_remove_skill',1,'false'),
-('admin_get_skills',1,'false'),
-('admin_reset_skills',1,'false'),
-('admin_give_all_skills',1,'false'),
-('admin_give_all_skills_fs',1,'false'),
-('admin_give_all_clan_skills',1,'false'),
-('admin_remove_all_skills',1,'false'),
-('admin_add_clan_skill',1,'false'),
-('admin_setskill',1,'false'),
-
--- ADMIN SPAWN
-('admin_show_spawns',1,'false'),
-('admin_spawn',1,'false'),
-('admin_spawn_monster',1,'false'),
-('admin_spawn_index',1,'false'),
-('admin_unspawnall',1,'false'),
-('admin_respawnall',1,'false'),
-('admin_spawn_reload',1,'false'),
-('admin_npc_index',1,'false'),
-('admin_spawn_once',1,'false'),
-('admin_show_npcs',1,'false'),
-('admin_teleport_reload',1,'false'),
-('admin_spawnnight',1,'false'),
-('admin_spawnday',1,'false'),
-('admin_instance_spawns',1,'false'),
-('admin_list_spawns',1,'false'),
-('admin_list_positions',1,'false'),
-('admin_spawn_debug_menu',1,'false'),
-('admin_spawn_debug_print',1,'false'),
-('admin_spawn_debug_print_menu',1,'false'),
-
--- ADMIN SUMMON
-('admin_summon',1,'false'),
-
--- ADMIN TARGET
-('admin_target',1,'false'),
-
--- ADMIN TARGETSAY
-('admin_targetsay',1,'false'),
-
--- ADMIN TELEPORT
-('admin_show_moves',1,'false'),
-('admin_show_moves_other',1,'false'),
-('admin_show_teleport',1,'false'),
-('admin_teleport_to_character',1,'false'),
-('admin_teleportto',1,'false'),
-('admin_move_to',1,'false'),
-('admin_teleport_character',1,'false'),
-('admin_recall',1,'false'),
-('admin_walk',1,'false'),
-('teleportto',1,'false'),
-('recall',1,'false'),
-('admin_recall_npc',1,'false'),
-('admin_gonorth',1,'false'),
-('admin_gosouth',1,'false'),
-('admin_goeast',1,'false'),
-('admin_gowest',1,'false'),
-('admin_goup',1,'false'),
-('admin_godown',1,'false'),
-('admin_tele',1,'false'),
-('admin_teleto',1,'false'),
-('admin_instant_move',1,'false'),
-('admin_sendhome',1,'true'),
-
--- ADMIN TERRITORY WAR
-('admin_territory_war',1,'false'),
-('admin_territory_war_time',1,'false'),
-('admin_territory_war_start',1,'false'),
-('admin_territory_war_end',1,'false'),
-('admin_territory_wards_list',1,'false'),
-
--- ADMIN TEST
-('admin_stats',1,'false'),
-('admin_skill_test',1,'false'),
-('admin_known',1,'false'),
-
--- ADMIN TVT EVENT
-('admin_tvt_add',1,'false'),
-('admin_tvt_remove',1,'false'),
-('admin_tvt_advance',1,'false'),
-
--- ADMIN UNBLOCK IP
-('admin_unblockip',1,'false'),
-
--- ADMIN VITALITY
-('admin_set_vitality',1,'false'),
-('admin_set_vitality_level',1,'false'),
-('admin_full_vitality',1,'false'),
-('admin_empty_vitality',1,'false'),
-('admin_get_vitality',1,'false'),
-
--- ADMIN ZONE
-('admin_zone_check',1,'false'),
-('admin_zone_reload',1,'false'),
-('admin_zone_visual',1,'false'),
-('admin_zone_visual_clear',1,'false'),
-
--- VOICE COMMANDS
-('banchat', 7,'false'),
-('debug',1,'false'),
-('unbanchat', 7,'false');
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20120428update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20120428update.sql
new file mode 100644
index 0000000000..394754947c
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20120428update.sql
@@ -0,0 +1,7 @@
+UPDATE characters SET accesslevel = 8 WHERE accesslevel >= 127;
+UPDATE characters SET accesslevel = 7 WHERE accesslevel = 1;
+UPDATE characters SET accesslevel = 6 WHERE accesslevel = 2;
+UPDATE characters SET accesslevel = 5 WHERE accesslevel = 3;
+UPDATE characters SET accesslevel = 3 WHERE accesslevel = 5;
+UPDATE characters SET accesslevel = 2 WHERE accesslevel = 6;
+UPDATE characters SET accesslevel = 1 WHERE accesslevel = 7;
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/tools/gs_cleanup.sql b/L2J_DataPack_BETA/dist/tools/gs_cleanup.sql
index 5923cae5f4..4c733a351b 100644
--- a/L2J_DataPack_BETA/dist/tools/gs_cleanup.sql
+++ b/L2J_DataPack_BETA/dist/tools/gs_cleanup.sql
@@ -6,9 +6,7 @@
-- for more details.
DROP TABLE IF EXISTS
-access_levels,
account_gsdata,
-admin_command_access_rights,
airships,
auction,
auction_bid,
--
GitLab