Skip to content

Commit

Permalink
Fixxed wrong gameforge. calls.
Browse files Browse the repository at this point in the history
  • Loading branch information
Lead0b110010100 authored and Lead0b110010100 committed Dec 6, 2020
1 parent 8036a48 commit bd85b07
Show file tree
Hide file tree
Showing 32 changed files with 911 additions and 905 deletions.
8 changes: 4 additions & 4 deletions main/srv1/share/locale/germany/quest/LIB/GameForge_QuestLib.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@ end

function get_time_remaining(seconds)
if seconds <= 60 then
return string.format(gameforge.locale.time.seconds, seconds)
return string.format(gameforge[get_language()].locale.time.seconds, seconds)
else
local minutes = math.floor(seconds / 60)
seconds = math.mod(seconds, 60)
if minutes <= 60 then
return string.format(gameforge.locale.time.minutes_and_seconds, minutes, seconds)
return string.format(gameforge[get_language()].locale.time.minutes_and_seconds, minutes, seconds)
else
local hours = math.floor(minutes / 60)
minutes = math.mod(minutes, 60)
if hours <= 24 then
return string.format(gameforge.locale.time.hours_and_minutes, hours, minutes)
return string.format(gameforge[get_language()].locale.time.hours_and_minutes, hours, minutes)
else
local days = math.floor(hours / 24)
hours = math.mod(hours, 24)
return string.format(gameforge.locale.time.days_and_hours, days, hours)
return string.format(gameforge[get_language()].locale.time.days_and_hours, days, hours)
end
end
end
Expand Down
Binary file modified main/srv1/share/locale/germany/quest/qc
View file
Binary file not shown.
84 changes: 42 additions & 42 deletions main/srv1/share/locale/germany/quest/quest_dungeon/devilcatacomb_zone.quest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,13 @@ quest devilcatacomb_zone begin
d.set_warp_location (0, 0, 0)

if level == 2 then
say(gameforge.devilcatacomb_zone._10_say)
say(string.format(gameforge.devilcatacomb_zone._20_say, 60))
say(gameforge[get_language()].devilcatacomb_zone._10_say)
say(string.format(gameforge[get_language()].devilcatacomb_zone._20_say, 60))
elseif level == pc.getqf ("level") then
-- say ("�������� �ʱ� ���� ������ �շ��Ͻʽÿ�.")
say(gameforge.devilcatacomb_zone._30_say)
say(gameforge[get_language()].devilcatacomb_zone._30_say)
else
say(gameforge.devilcatacomb_zone._40_say)
say(gameforge[get_language()].devilcatacomb_zone._40_say)
-- say ("����� �����Ǿ����ϴ�. ����� ���� ���� ��� �� ���� ������ �̵��մϴ�.")
timer ("devilcatacomb_ban_timer", 5)
end
Expand All @@ -116,13 +116,13 @@ quest devilcatacomb_zone begin
then
-- �Ʊ͵��� �Ա���
-- if not is_test_server() then
say(gameforge.devilcatacomb_zone._40_say)
say(gameforge[get_language()].devilcatacomb_zone._40_say)
timer ("devilcatacomb_ban_timer", 5)
-- end
else
-- �Ʊ͵��� �Ա���
-- pc.set_warp_location(65, 5914, 992)
say(gameforge.devilcatacomb_zone._50_say)
say(gameforge[get_language()].devilcatacomb_zone._50_say)
end
end
end
Expand All @@ -142,28 +142,28 @@ quest devilcatacomb_zone begin
when warp_timer.timer begin
local level = d.getf("level")
local level_switch = {
[3] = gameforge.devilcatacomb_zone._60_say,
[4] = gameforge.devilcatacomb_zone._70_say,
[5] = gameforge.devilcatacomb_zone._80_say,
[6] = gameforge.devilcatacomb_zone._90_say,
[3] = gameforge[get_language()].devilcatacomb_zone._60_say,
[4] = gameforge[get_language()].devilcatacomb_zone._70_say,
[5] = gameforge[get_language()].devilcatacomb_zone._80_say,
[6] = gameforge[get_language()].devilcatacomb_zone._90_say,
}
local t = 3600 -(get_global_time() - d.getf("enter_time"))
local t_r = math.mod (t, 60)
local t_m = (t - t_r) / 60
d.notice ( level_switch[level] )
d.notice(string.format(gameforge.devilcatacomb_zone._20_say, t_m))
d.notice(string.format(gameforge[get_language()].devilcatacomb_zone._20_say, t_m))
d.set_warp_location (0, 0, 0)
end

when devilcatacomb_man.chat.gameforge.devilcatacomb_zone._100_npcChat with not devilcatacomb_zone.is_closed() begin
when devilcatacomb_man.chat.gameforge[get_language()].devilcatacomb_zone._100_npcChat with not devilcatacomb_zone.is_closed() begin
local setting = devilcatacomb_zone.setting()
if pc.get_level() < 75 then
say(gameforge.devilcatacomb_zone._110_say)
say(gameforge[get_language()].devilcatacomb_zone._110_say)
elseif ((get_global_time() - pc.getf("devilcatacomb_zone","last_exit_time")) < 1800) then
say(gameforge.devilcatacomb_zone._130_say)
say(gameforge[get_language()].devilcatacomb_zone._130_say)
else
say(gameforge.devilcatacomb_zone._140_say)
local s = select(gameforge.devilcatacomb_zone._150_select, gameforge.devilcatacomb_zone._160_select)
say(gameforge[get_language()].devilcatacomb_zone._140_say)
local s = select(gameforge[get_language()].devilcatacomb_zone._150_select, gameforge[get_language()].devilcatacomb_zone._160_select)
if s == 1 then
pc.warp ((setting.floor1_entry.x + setting.base.x )* 100, (setting.floor1_entry.y + setting.base.y) * 100)
end
Expand Down Expand Up @@ -205,17 +205,17 @@ quest devilcatacomb_zone begin

if item.vnum == setting.rag then
if not party.is_party() then
say(gameforge.devilcatacomb_zone._170_say)
say(gameforge[get_language()].devilcatacomb_zone._170_say)
return
elseif party.is_in_dungeon() then
say(gameforge.devilcatacomb_zone._180_say)
say(gameforge[get_language()].devilcatacomb_zone._180_say)
return
end

item.remove()
say(gameforge.devilcatacomb_zone._190_say)
say(gameforge[get_language()].devilcatacomb_zone._190_say)
wait()
say(gameforge.devilcatacomb_zone._200_say)
say(gameforge[get_language()].devilcatacomb_zone._200_say)
wait()
d.new_jump_party (setting.map_idx, setting.floor2_entry.x + setting.base.x , setting.floor2_entry.y + setting.base.y )
d.setqf2("devilcatacomb_zone","level", 2)
Expand All @@ -233,42 +233,42 @@ quest devilcatacomb_zone begin

when devilcatacomb_45m_left_timer.server_timer begin
if d.select(get_server_timer_arg()) then
d.notice(string.format(gameforge.devilcatacomb_zone._20_say, 45))
d.notice(string.format(gameforge[get_language()].devilcatacomb_zone._20_say, 45))
server_timer('devilcatacomb_30m_left_timer', 60 * 15, get_server_timer_arg())
end
end

when devilcatacomb_30m_left_timer.server_timer begin
if d.select(get_server_timer_arg()) then
d.notice(string.format(gameforge.devilcatacomb_zone._20_say, 30))
d.notice(string.format(gameforge[get_language()].devilcatacomb_zone._20_say, 30))
server_timer('devilcatacomb_15m_left_timer', 60 * 15, get_server_timer_arg())
end
end

when devilcatacomb_15m_left_timer.server_timer begin
if d.select(get_server_timer_arg()) then
d.notice(string.format(gameforge.devilcatacomb_zone._20_say, 15))
d.notice(string.format(gameforge[get_language()].devilcatacomb_zone._20_say, 15))
server_timer('devilcatacomb_5m_left_timer', 60 * 10, get_server_timer_arg())
end
end

when devilcatacomb_5m_left_timer.server_timer begin
if d.select(get_server_timer_arg()) then
d.notice(string.format(gameforge.devilcatacomb_zone._20_say, 5))
d.notice(string.format(gameforge[get_language()].devilcatacomb_zone._20_say, 5))
server_timer('devilcatacomb_1m_left_timer', 60 * 4, get_server_timer_arg())
end
end

when devilcatacomb_1m_left_timer.server_timer begin
if d.select(get_server_timer_arg()) then
d.notice(string.format(gameforge.devilcatacomb_zone._20_say, 1))
d.notice(string.format(gameforge[get_language()].devilcatacomb_zone._20_say, 1))
server_timer ("devilcatacomb_0m_left_timer", 60 * 1, get_server_timer_arg())
end
end

when devilcatacomb_0m_left_timer.server_timer begin
if d.select(get_server_timer_arg()) then
d.notice (gameforge.devilcatacomb_zone._210_dNotice)
d.notice (gameforge[get_language()].devilcatacomb_zone._210_dNotice)
d.set_warp_location (65, 5914, 992)
server_timer('devilcatacomb_exit_timer', 7, get_server_timer_arg())
end
Expand Down Expand Up @@ -305,26 +305,26 @@ quest devilcatacomb_zone begin

if d.getf("devilcatacomb_floor2_stone_clicked") == 0 then
if not devilcatacomb_zone.is_dc2_doors_clear () then
say(gameforge.devilcatacomb_zone._220_say)
say(gameforge[get_language()].devilcatacomb_zone._220_say)
wait ()
return
end
say(gameforge.devilcatacomb_zone._230_say)
say(gameforge[get_language()].devilcatacomb_zone._230_say)
wait()
say(gameforge.devilcatacomb_zone._240_say)
say(gameforge[get_language()].devilcatacomb_zone._240_say)
wait()
local s = select(gameforge.devilcatacomb_zone._150_select, gameforge.devilcatacomb_zone._160_select)
local s = select(gameforge[get_language()].devilcatacomb_zone._150_select, gameforge[get_language()].devilcatacomb_zone._160_select)
if s == 1 then
if d.getf("devilcatacomb_floor2_stone_clicked") == 0 then
d.setf("devilcatacomb_floor2_stone_clicked", 1)
d.setqf2("devilcatacomb_zone","last_exit_time", get_global_time())
d.set_item_group ("reapers_credit", 3, setting.reapers_credit3, 1, setting.reapers_credit2, 1, setting.reapers_credit1, 1)
d.say_diff_by_item_group("reapers_credit", gameforge.devilcatacomb_zone._250_say, gameforge.devilcatacomb_zone._260_say)
d.say_diff_by_item_group("reapers_credit", gameforge[get_language()].devilcatacomb_zone._250_say, gameforge[get_language()].devilcatacomb_zone._260_say)
timer ("devilcatacomb_floor3_enter_timer", 7)
end
end
else
say(gameforge.devilcatacomb_zone._270_say)
say(gameforge[get_language()].devilcatacomb_zone._270_say)
end
end

Expand Down Expand Up @@ -364,13 +364,13 @@ quest devilcatacomb_zone begin
-- ���� �ı��Ǹ� ��¥�� �׾����� Ȯ���غ���.
-- ��¥�� �׾����� 4������ �̵��Ѵ�.
if d.is_unique_dead("real") then
d.notice(gameforge.devilcatacomb_zone._280_dNotice)
d.notice(gameforge[get_language()].devilcatacomb_zone._280_dNotice)

d.setf ("level",4)
d.setqf2("devilcatacomb_zone","level", 4)
timer ("devilcatacomb_floor4_enter_timer", 3)
else
d.notice(gameforge.devilcatacomb_zone._290_dNotice)
d.notice(gameforge[get_language()].devilcatacomb_zone._290_dNotice)
end
end

Expand All @@ -392,7 +392,7 @@ quest devilcatacomb_zone begin
when devilcatacomb_floor4_stone.click begin
local setting = devilcatacomb_zone.setting()
local n = number (1,5)
say(gameforge.devilcatacomb_zone._300_say)
say(gameforge[get_language()].devilcatacomb_zone._300_say)
wait()
if (is_test_server()) then
-- devil_king pos
Expand Down Expand Up @@ -420,7 +420,7 @@ quest devilcatacomb_zone begin
local setting = devilcatacomb_zone.setting()
if item.vnum == setting.unlock_stone then
item.remove ()
d.notice(gameforge.devilcatacomb_zone._310_dNotice)
d.notice(gameforge[get_language()].devilcatacomb_zone._310_dNotice)
-- 6������ �̵�
d.clear_regen()
d.purge()
Expand Down Expand Up @@ -452,7 +452,7 @@ quest devilcatacomb_zone begin
when floor6_eli_check_timer_1.server_timer begin
if d.select(get_server_timer_arg()) then
if d.count_monster() == 0 then
say_in_map (get_server_timer_arg(), gameforge.devilcatacomb_zone._320_say)
say_in_map (get_server_timer_arg(), gameforge[get_language()].devilcatacomb_zone._320_say)
server_timer ("devilcatacomb_floor7_timer", 3, get_server_timer_arg())
else
server_timer ("floor6_eli_check_timer_2", 5, get_server_timer_arg())
Expand All @@ -463,7 +463,7 @@ quest devilcatacomb_zone begin
when floor6_eli_check_timer_2.server_timer begin
if d.select(get_server_timer_arg()) then
if d.count_monster() == 0 then
say_in_map (get_server_timer_arg(), gameforge.devilcatacomb_zone._320_say)
say_in_map (get_server_timer_arg(), gameforge[get_language()].devilcatacomb_zone._320_say)
server_timer("devilcatacomb_floor7_timer", 3, get_server_timer_arg())
else
server_timer ("floor6_eli_check_timer_1", 5, get_server_timer_arg())
Expand All @@ -490,8 +490,8 @@ quest devilcatacomb_zone begin
local t = 3600 -(get_global_time() - d.getf("enter_time"))
local t_r = math.mod (t, 60)
local t_m = (t - t_r) / 60
d.notice(gameforge.devilcatacomb_zone._330_dNotice)
d.notice(string.format(gameforge.devilcatacomb_zone._20_say, t_m))
d.notice(gameforge[get_language()].devilcatacomb_zone._330_dNotice)
d.notice(string.format(gameforge[get_language()].devilcatacomb_zone._20_say, t_m))
d.set_warp_location (0, 0, 0)
end
end
Expand All @@ -510,7 +510,7 @@ quest devilcatacomb_zone begin
if d.count_monster() == 0 then
d.set_warp_location (65, 5914, 992)
d.setqf2("devilcatacomb_zone","done", 1)
say_in_map (get_server_timer_arg(), gameforge.devilcatacomb_zone._340_say)
say_in_map (get_server_timer_arg(), gameforge[get_language()].devilcatacomb_zone._340_say)
clear_server_timer ("devilcatacomb_0m_left_timer", get_server_timer_arg())
server_timer("devilcatacomb_exit_timer", 60, get_server_timer_arg())
else
Expand All @@ -524,7 +524,7 @@ quest devilcatacomb_zone begin
if d.count_monster() == 0 then
d.set_warp_location (65, 5914, 992)
d.setqf2("devilcatacomb_zone","done", 1)
say_in_map (get_server_timer_arg(), gameforge.devilcatacomb_zone._340_say)
say_in_map (get_server_timer_arg(), gameforge[get_language()].devilcatacomb_zone._340_say)
clear_server_timer ("devilcatacomb_0m_left_timer", get_server_timer_arg())
server_timer("devilcatacomb_exit_timer", 60, get_server_timer_arg())
else
Expand Down
Loading

0 comments on commit bd85b07

Please sign in to comment.