From a4ca3809a9bf18392399848fa88f705c2ca4c12f Mon Sep 17 00:00:00 2001 From: SuntrustDev <19979417+SunTrustDev@users.noreply.github.com> Date: Wed, 4 Mar 2026 20:27:08 +0100 Subject: [PATCH] Fix default guild mark, color and format --- share/locale/english/quest/guild_manage.quest | 33 ++++++++++++------ share/mark/.gitignore | 3 ++ share/mark/default_mark.jpg | Bin 0 -> 9239 bytes 3 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 share/mark/default_mark.jpg diff --git a/share/locale/english/quest/guild_manage.quest b/share/locale/english/quest/guild_manage.quest index be94f82..40fe946 100644 --- a/share/locale/english/quest/guild_manage.quest +++ b/share/locale/english/quest/guild_manage.quest @@ -93,6 +93,18 @@ quest guild_building begin when guild_man1.chat.gameforge.guild_manage._160_npcChat or guild_man2.chat.gameforge.guild_manage._170_npcChat or guild_man3.chat.gameforge.guild_manage._170_npcChat begin local level_limit; local guild_create_item + local withdraw_time_limit + local disband_time_limit + + if is_test_server() then + withdraw_time_limit = 60 + disband_time_limit = 60 + else + withdraw_time_limit = 86400 + disband_time_limit = 86400 + end + + level_limit = 40 guild_create_item = false @@ -100,20 +112,21 @@ quest guild_building begin if pc.hasguild() then return end - if game.get_event_flag("guild_withdraw_delay")*86400 > - get_global_time() - pc.getqf("new_withdraw_time") then + + local withdraw_time = game.get_event_flag("guild_withdraw_delay") * withdraw_time_limit + if withdraw_time > get_global_time() - pc.getqf("new_withdraw_time") then say_title(gameforge.find_squareguard._10_targetVid) say(gameforge.guild_manage._180_say) --- say(string.format(gameforge.guild_manage._190_say, game.get_event_flag("guild_withdraw_delay"))) + -- say(string.format(gameforge.guild_manage._190_say, game.get_event_flag("guild_withdraw_delay"))) return end - - if game.get_event_flag("guild_disband_delay")*86400 > - get_global_time() - pc.getqf("new_withdraw_time") then - say_title(gameforge.find_squareguard._10_targetVid) - say(gameforge.guild_manage._200_say) --- say(string.format(gameforge.guild_manage._190_say, game.get_event_flag("guild_disband_delay"))) - return + + local disband_time = game.get_event_flag("guild_disband_delay") * disband_time_limit + if disband_time > get_global_time() - pc.getqf("new_withdraw_time") then + say_title(gameforge.find_squareguard._10_targetVid) + say(gameforge.guild_manage._200_say) + -- say(string.format(gameforge.guild_manage._190_say, game.get_event_flag("guild_disband_delay"))) + return end say_title(gameforge.find_squareguard._10_targetVid) say(gameforge.guild_manage._210_say) diff --git a/share/mark/.gitignore b/share/mark/.gitignore index c96a04f..fde71da 100644 --- a/share/mark/.gitignore +++ b/share/mark/.gitignore @@ -1,2 +1,5 @@ * +!default_mark.png +!default_mark.jpg +!default_mark.tga !.gitignore \ No newline at end of file diff --git a/share/mark/default_mark.jpg b/share/mark/default_mark.jpg new file mode 100644 index 0000000000000000000000000000000000000000..337d166f93e5c55ff69d9505b4bdf0fe500f30a2 GIT binary patch literal 9239 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 literal 0 HcmV?d00001