metin-server/m2dev-server
3
0
Fork 1
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #33 from SunTrustDev/bugfix/guild-mark

Browse Source 
Fix default guild mark, color and format
This commit is contained in:
d1str4ught
2026-03-09 01:38:02 +01:00
committed by GitHub
parent 6a4144ebcb a4ca3809a9
commit 51da064667
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
share/locale/english/quest/guild_manage.quest
View File

@@ -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 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 level_limit;
local guild_create_item 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 level_limit = 40
guild_create_item = false guild_create_item = false
@@ -100,20 +112,21 @@ quest guild_building begin
if pc.hasguild() then if pc.hasguild() then
return return
end 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_title(gameforge.find_squareguard._10_targetVid)
say(gameforge.guild_manage._180_say) 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 return
end end
if game.get_event_flag("guild_disband_delay")*86400 > local disband_time = game.get_event_flag("guild_disband_delay") * disband_time_limit
get_global_time() - pc.getqf("new_withdraw_time") then if disband_time > get_global_time() - pc.getqf("new_withdraw_time") then
say_title(gameforge.find_squareguard._10_targetVid) say_title(gameforge.find_squareguard._10_targetVid)
say(gameforge.guild_manage._200_say) say(gameforge.guild_manage._200_say)
-- say(string.format(gameforge.guild_manage._190_say, game.get_event_flag("guild_disband_delay"))) -- say(string.format(gameforge.guild_manage._190_say, game.get_event_flag("guild_disband_delay")))
return return
end end
say_title(gameforge.find_squareguard._10_targetVid) say_title(gameforge.find_squareguard._10_targetVid)
say(gameforge.guild_manage._210_say) say(gameforge.guild_manage._210_say)

3
share/mark/.gitignore vendored
View File

@@ -1,2 +1,5 @@
* *
!default_mark.png
!default_mark.jpg
!default_mark.tga
!.gitignore !.gitignore

BIN
share/mark/default_mark.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB