diff options
44 files changed, 222 insertions, 23 deletions
diff --git a/conf/groups.conf b/conf/groups.conf index 717b6b83a..39f733ac5 100644 --- a/conf/groups.conf +++ b/conf/groups.conf @@ -158,6 +158,8 @@ groups: ( skillid: true skilltree: true monsterignore: true + broadcast: true + localbroadcast: true } log_commands: true permissions: { @@ -191,8 +193,6 @@ groups: ( inherit: ( "Support" ) level: 4 commands: { - broadcast: true - localbroadcast: true monster: true monstersmall: true monsterbig: true @@ -254,8 +254,6 @@ groups: ( inherit: ( "Support", "Script Manager" ) level: 5 commands: { - broadcast: true - localbroadcast: true hide: true follow: true warp: true @@ -293,10 +291,10 @@ groups: ( } }, { - id: 7 - name: "Officer" - inherit: ( "Support", "Patrol" ) /* Officer is not used in TMW2 and may be removed later */ - level: 5 + id: 8 + name: "Herc Game Master" + inherit: ( "Event Coordinator", "Support", "Patrol" ) /* Herc Game Master is not used in TMW2 and may be removed later */ + level: 6 commands: { heal: [true, true] alive: [true, true] @@ -309,9 +307,15 @@ groups: ( cartlist: [true, true] itemlist: [true, true] stats: [true, true] + fakename: true + recallall: true + raisemap: [true, true] + raise: [true, true] + dropall: true } log_commands: true permissions: { + any_warp: true join_chat: true kick_chat: true hide_session: true @@ -320,20 +324,51 @@ groups: ( } }, { - id: 8 - name: "Herc Game Master" - inherit: ( "Event Coordinator", "Officer" ) /* Herc Game Master is not used in TMW2 and may be removed later */ - level: 6 + id: 60 + name: "Officer" + level: 60 + inherit: ( "Support" ) commands: { - fakename: true - recallall: true + storagelist: [true, true] + cartlist: [true, true] + itemlist: [true, true] + stats: [true, true] + recall: true raisemap: [true, true] - raise: [true, true] - dropall: true + kick: true + jailfor: true + unjail: true + unban: true + monster: true + monstersmall: true + monsterbig: true + killmonster2: true + cleanarea: true + cleanmap: true + heal: [true, true] + alive: [true, true] + sound: true + storage: true + clone: [true, true] + slaveclone: [true, true] + evilclone: [true, true] + jump: [true, true] + npctalk: true + mute: true + unmute: true + speed: true } log_commands: true permissions: { + who_display_aid: true + view_hpmeter: true any_warp: true + join_chat: true + kick_chat: true + hide_session: true + hack_info: true + send_gm: true + can_trade_bound: false } }, { diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 2432f8fb5..bd503b0cb 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -76,9 +76,20 @@ map_list: ( "016-1", "016-6", "016-7", + "029-1", + "029-2", "boss", "botcheck", + "hh-castle", + "hh-outside", + "jacks-basement", + "jacks-indoor", "sec_pri", + "si-cave", + "si-house", + "si-outside", + "skull-cave", + "somber-cave", "soren-2", "soren", "test", diff --git a/db/map_index.txt b/db/map_index.txt index c5c76e3e0..58650fa80 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -73,10 +73,21 @@ 016-1 73 016-6 74 016-7 75 -boss 76 -botcheck 77 -sec_pri 78 -soren-2 79 -soren 80 -test 81 -testbg 82 +029-1 76 +029-2 77 +boss 78 +botcheck 79 +hh-castle 80 +hh-outside 81 +jacks-basement 82 +jacks-indoor 83 +sec_pri 84 +si-cave 85 +si-house 86 +si-outside 87 +skull-cave 88 +somber-cave 89 +soren-2 90 +soren 91 +test 92 +testbg 93 diff --git a/maps/re/003-10.mcache b/maps/re/003-10.mcache Binary files differindex 3425ad52f..3e9d06512 100644 --- a/maps/re/003-10.mcache +++ b/maps/re/003-10.mcache diff --git a/maps/re/029-1.mcache b/maps/re/029-1.mcache Binary files differnew file mode 100644 index 000000000..bbc99e118 --- /dev/null +++ b/maps/re/029-1.mcache diff --git a/maps/re/029-2.mcache b/maps/re/029-2.mcache Binary files differnew file mode 100644 index 000000000..13d1cd74c --- /dev/null +++ b/maps/re/029-2.mcache diff --git a/maps/re/hh-castle.mcache b/maps/re/hh-castle.mcache Binary files differnew file mode 100644 index 000000000..1e4c6e9bf --- /dev/null +++ b/maps/re/hh-castle.mcache diff --git a/maps/re/hh-outside.mcache b/maps/re/hh-outside.mcache Binary files differnew file mode 100644 index 000000000..2d34071c7 --- /dev/null +++ b/maps/re/hh-outside.mcache diff --git a/maps/re/jacks-basement.mcache b/maps/re/jacks-basement.mcache Binary files differnew file mode 100644 index 000000000..17216061a --- /dev/null +++ b/maps/re/jacks-basement.mcache diff --git a/maps/re/jacks-indoor.mcache b/maps/re/jacks-indoor.mcache Binary files differnew file mode 100644 index 000000000..c07eb65e4 --- /dev/null +++ b/maps/re/jacks-indoor.mcache diff --git a/maps/re/si-cave.mcache b/maps/re/si-cave.mcache Binary files differnew file mode 100644 index 000000000..9616044e0 --- /dev/null +++ b/maps/re/si-cave.mcache diff --git a/maps/re/si-house.mcache b/maps/re/si-house.mcache Binary files differnew file mode 100644 index 000000000..4dfc7d331 --- /dev/null +++ b/maps/re/si-house.mcache diff --git a/maps/re/si-outside.mcache b/maps/re/si-outside.mcache Binary files differnew file mode 100644 index 000000000..d13742f1d --- /dev/null +++ b/maps/re/si-outside.mcache diff --git a/maps/re/skull-cave.mcache b/maps/re/skull-cave.mcache Binary files differnew file mode 100644 index 000000000..27c420ccb --- /dev/null +++ b/maps/re/skull-cave.mcache diff --git a/maps/re/somber-cave.mcache b/maps/re/somber-cave.mcache Binary files differnew file mode 100644 index 000000000..d17edc645 --- /dev/null +++ b/maps/re/somber-cave.mcache diff --git a/npc/017-1/_import.txt b/npc/017-1/_import.txt new file mode 100644 index 000000000..8c471e380 --- /dev/null +++ b/npc/017-1/_import.txt @@ -0,0 +1,2 @@ +// Map 017-1: Land Of Fire Village +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/029-1/_import.txt b/npc/029-1/_import.txt new file mode 100644 index 000000000..45e41a1be --- /dev/null +++ b/npc/029-1/_import.txt @@ -0,0 +1,4 @@ +// Map 029-1: Sincerity +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/029-1/_mobs.txt", +"npc/029-1/_warps.txt", diff --git a/npc/029-1/_mobs.txt b/npc/029-1/_mobs.txt new file mode 100644 index 000000000..c3add9e14 --- /dev/null +++ b/npc/029-1/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 029-1: Sincerity mobs +029-1,69,65,6,6 monster Evil Mushroom 1042,4,20000,60000 +029-1,32,33,6,6 monster Squirrel 1032,3,30000,60000 +029-1,46,48,2,0 monster Clover Patch 1028,1,10000,120000 +029-1,37,60,11,10 monster Poison Spiky Mushroom 1043,5,10000,30000 +029-1,54,36,8,9 monster Bat 1039,4,25000,30000 +029-1,59,51,6,4 monster Log Head 1066,2,25000,30000 diff --git a/npc/029-1/_warps.txt b/npc/029-1/_warps.txt new file mode 100644 index 000000000..4aae3b291 --- /dev/null +++ b/npc/029-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 029-1: Sincerity warps +029-1,54,37,0 warp #029-1_54_37 0,0,029-2,33,77 diff --git a/npc/029-2/_import.txt b/npc/029-2/_import.txt new file mode 100644 index 000000000..9d9718335 --- /dev/null +++ b/npc/029-2/_import.txt @@ -0,0 +1,4 @@ +// Map 029-2: Easter Island Cave +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/029-2/_mobs.txt", +"npc/029-2/_warps.txt", diff --git a/npc/029-2/_mobs.txt b/npc/029-2/_mobs.txt new file mode 100644 index 000000000..c5aea76fc --- /dev/null +++ b/npc/029-2/_mobs.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 029-2: Easter Island Cave mobs +029-2,51,49,11,7 monster Silkworm 1034,10,30000,3000 +029-2,43,35,0,0 monster Evil Mushroom 1042,3,40000,5000 +029-2,27,31,0,0 monster Evil Mushroom 1042,3,40000,5000 +029-2,50,49,30,30 monster Bat 1039,10,60000,10000 diff --git a/npc/029-2/_warps.txt b/npc/029-2/_warps.txt new file mode 100644 index 000000000..ca5a9c573 --- /dev/null +++ b/npc/029-2/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 029-2: Easter Island Cave warps +029-2,33,78,0 warp #029-2_33_78 0,0,029-1,54,38 diff --git a/npc/_import.txt b/npc/_import.txt index a95cc10b9..9cc591305 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -75,9 +75,20 @@ @include "npc/016-1/_import.txt" @include "npc/016-6/_import.txt" @include "npc/016-7/_import.txt" +@include "npc/029-1/_import.txt" +@include "npc/029-2/_import.txt" @include "npc/boss/_import.txt" @include "npc/botcheck/_import.txt" +@include "npc/hh-castle/_import.txt" +@include "npc/hh-outside/_import.txt" +@include "npc/jacks-basement/_import.txt" +@include "npc/jacks-indoor/_import.txt" @include "npc/sec_pri/_import.txt" +@include "npc/si-cave/_import.txt" +@include "npc/si-house/_import.txt" +@include "npc/si-outside/_import.txt" +@include "npc/skull-cave/_import.txt" +@include "npc/somber-cave/_import.txt" @include "npc/soren-2/_import.txt" @include "npc/soren/_import.txt" @include "npc/test/_import.txt" diff --git a/npc/functions/permissions.txt b/npc/functions/permissions.txt index 99094bb43..eaedcce92 100644 --- a/npc/functions/permissions.txt +++ b/npc/functions/permissions.txt @@ -5,6 +5,10 @@ // Checks player GM levels function script is_gm { + return (getgmlevel() >= 60); +} + +function script is_master { return (getgmlevel() >= 80); } diff --git a/npc/hh-castle/_import.txt b/npc/hh-castle/_import.txt new file mode 100644 index 000000000..990a6cb3e --- /dev/null +++ b/npc/hh-castle/_import.txt @@ -0,0 +1,3 @@ +// Map hh-castle: Heroes' Hold - Castle +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/hh-castle/_warps.txt", diff --git a/npc/hh-castle/_warps.txt b/npc/hh-castle/_warps.txt new file mode 100644 index 000000000..452139599 --- /dev/null +++ b/npc/hh-castle/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map hh-castle: Heroes' Hold - Castle warps +hh-castle,26,33,0 warp #hh-castle_26_33 2,0,hh-outside,72,65 +hh-castle,26,33,0 warp #hh-castle_26_33 2,0,hh-maincave,0,0 diff --git a/npc/hh-outside/_import.txt b/npc/hh-outside/_import.txt new file mode 100644 index 000000000..eef69a13f --- /dev/null +++ b/npc/hh-outside/_import.txt @@ -0,0 +1,4 @@ +// Map hh-outside: Heroes' Hold - Outside +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/hh-outside/_mobs.txt", +"npc/hh-outside/_warps.txt", diff --git a/npc/hh-outside/_mobs.txt b/npc/hh-outside/_mobs.txt new file mode 100644 index 000000000..55af54ae0 --- /dev/null +++ b/npc/hh-outside/_mobs.txt @@ -0,0 +1,7 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map hh-outside: Heroes' Hold - Outside mobs +hh-outside,92,39,29,10 monster Spawn Area 1 1002,2,120000,40000 +hh-outside,40,35,20,6 monster Spawn Area 2 1002,2,120000,40000 +hh-outside,20,45,0,0 monster Spawn Area 3 1002,2,120000,40000 +hh-outside,108,64,12,11 monster Spawn Area 4 1002,1,120000,40000 +hh-outside,92,90,36,12 monster Spawn Area 5 1002,2,120000,40000 diff --git a/npc/hh-outside/_warps.txt b/npc/hh-outside/_warps.txt new file mode 100644 index 000000000..c734c1046 --- /dev/null +++ b/npc/hh-outside/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map hh-outside: Heroes' Hold - Outside warps +hh-outside,63,106,0 warp #hh-outside_63_106 0,0,026-1,63,17 +hh-outside,72,63,0 warp #hh-outside_72_63 3,0,hh-castle,26,32 diff --git a/npc/jacks-basement/_import.txt b/npc/jacks-basement/_import.txt new file mode 100644 index 000000000..fb05e8704 --- /dev/null +++ b/npc/jacks-basement/_import.txt @@ -0,0 +1,2 @@ +// Map jacks-basement: Jack's Basement +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/jacks-indoor/_import.txt b/npc/jacks-indoor/_import.txt new file mode 100644 index 000000000..034399e37 --- /dev/null +++ b/npc/jacks-indoor/_import.txt @@ -0,0 +1,3 @@ +// Map jacks-indoor: Jack's House +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/jacks-indoor/_warps.txt", diff --git a/npc/jacks-indoor/_warps.txt b/npc/jacks-indoor/_warps.txt new file mode 100644 index 000000000..5ee64a7e6 --- /dev/null +++ b/npc/jacks-indoor/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map jacks-indoor: Jack's House warps +jacks-indoor,31,32,0 warp #jacks-indoor_31_32 0,0,009-1,42,45 diff --git a/npc/si-cave/_import.txt b/npc/si-cave/_import.txt new file mode 100644 index 000000000..241809635 --- /dev/null +++ b/npc/si-cave/_import.txt @@ -0,0 +1,4 @@ +// Map si-cave: sicave +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/si-cave/_mobs.txt", +"npc/si-cave/_warps.txt", diff --git a/npc/si-cave/_mobs.txt b/npc/si-cave/_mobs.txt new file mode 100644 index 000000000..fb4a6accf --- /dev/null +++ b/npc/si-cave/_mobs.txt @@ -0,0 +1,7 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map si-cave: Secret Island Cave mobs +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map si-cave: sicave mobs +si-cave,95,66,66,35 monster Cave Snake 1035,15,9000,3000 +si-cave,95,84,66,18 monster Golden Scorpion 1078,7,10000,5000 +si-cave,102,48,40,17 monster Giant Mutated Bat 1044,2,100000,50000 diff --git a/npc/si-cave/_warps.txt b/npc/si-cave/_warps.txt new file mode 100644 index 000000000..916c408c4 --- /dev/null +++ b/npc/si-cave/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map si-cave: Secret Island Cave warps +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map si-cave: sicave warps +si-cave,102,86,0 warp #si-cave_102_86 0,0,si-outside,94,90 diff --git a/npc/si-house/_import.txt b/npc/si-house/_import.txt new file mode 100644 index 000000000..c8441503f --- /dev/null +++ b/npc/si-house/_import.txt @@ -0,0 +1,3 @@ +// Map si-house: Secret_Island_Indoor +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/si-house/_warps.txt", diff --git a/npc/si-house/_warps.txt b/npc/si-house/_warps.txt new file mode 100644 index 000000000..a068fb265 --- /dev/null +++ b/npc/si-house/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map si-house: Secret Island House warps +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map si-house: Secret_Island_Indoor warps +si-house,33,36,0 warp #si-house_33_36 0,0,si-outside,73,26 diff --git a/npc/si-outside/_import.txt b/npc/si-outside/_import.txt new file mode 100644 index 000000000..d3dd72c13 --- /dev/null +++ b/npc/si-outside/_import.txt @@ -0,0 +1,4 @@ +// Map si-outside: Secret Island +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/si-outside/_mobs.txt", +"npc/si-outside/_warps.txt", diff --git a/npc/si-outside/_mobs.txt b/npc/si-outside/_mobs.txt new file mode 100644 index 000000000..a37debb8d --- /dev/null +++ b/npc/si-outside/_mobs.txt @@ -0,0 +1,9 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map si-outside: Secret Island mobs +si-outside,120,68,46,21 monster Golden Scorpion 1078,7,10000,5000 +si-outside,98,47,46,32 monster Night Scorpion 1077,5,20000,10000 +si-outside,98,47,46,32 monster BlackSlime 1119,10,15000,10000 +si-outside,91,60,76,47 monster Red Slime 1092,12,12000,4000 +si-outside,91,60,76,47 monster Yellow Slime 1091,15,30000,30000 +si-outside,91,56,76,43 monster Clover Patch 1028,2,75000,35000 +si-outside,91,60,76,47 monster Mouboo 1023,3,12000,4000 diff --git a/npc/si-outside/_warps.txt b/npc/si-outside/_warps.txt new file mode 100644 index 000000000..3fd5e21cd --- /dev/null +++ b/npc/si-outside/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map si-outside: Secret Island warps +si-outside,94,89,0 warp #si-outside_94_89 0,0,si-cave,102,84 +si-outside,164,105,0 warp #si-outside_164_105 0,0,018-1,166,49 +si-outside,73,24,0 warp #si-outside_73_24 0,0,si-house,33,34 diff --git a/npc/skull-cave/_import.txt b/npc/skull-cave/_import.txt new file mode 100644 index 000000000..184682937 --- /dev/null +++ b/npc/skull-cave/_import.txt @@ -0,0 +1,2 @@ +// Map skull-cave: Skull Cave +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/somber-cave/_import.txt b/npc/somber-cave/_import.txt new file mode 100644 index 000000000..d6e039942 --- /dev/null +++ b/npc/somber-cave/_import.txt @@ -0,0 +1,4 @@ +// Map somber-cave: Somber Cave +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/somber-cave/_mobs.txt", +"npc/somber-cave/_warps.txt", diff --git a/npc/somber-cave/_mobs.txt b/npc/somber-cave/_mobs.txt new file mode 100644 index 000000000..cd742609d --- /dev/null +++ b/npc/somber-cave/_mobs.txt @@ -0,0 +1,16 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map somber-cave: Somber Cave mobs +somber-cave,81,91,1,1 monster Dark Lizard 1051,2,0,20000 +somber-cave,37,61,1,1 monster Dark Lizard 1051,2,0,20000 +somber-cave,45,114,1,1 monster Dark Lizard 1051,2,0,20000 +somber-cave,0,0,0,0 monster Lava Slime 1097,8,10000,0 +somber-cave,0,0,0,0 monster Fire Goblin 1067,30,20,0 +somber-cave,75,53,1,1 monster Black Scorpion 1074,1,0,10000 +somber-cave,115,116,2,2 monster Black Scorpion 1074,1,0,10000 +somber-cave,0,0,0,0 monster Evil Mushroom 1042,10,20,0 +somber-cave,39,57,21,38 monster Lava Slime 1097,12,10000,0 +somber-cave,96,46,34,27 monster Lava Slime 1097,10,10000,0 +somber-cave,88,84,26,10 monster Lava Slime 1097,5,10000,0 +somber-cave,123,100,7,26 monster Lava Slime 1097,4,10000,0 +somber-cave,66,111,48,15 monster Lava Slime 1097,11,10000,0 +somber-cave,74,72,56,53 monster Night Scorpion 1077,9,15000,0 diff --git a/npc/somber-cave/_warps.txt b/npc/somber-cave/_warps.txt new file mode 100644 index 000000000..3595731a5 --- /dev/null +++ b/npc/somber-cave/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map somber-cave: Somber Cave warps +somber-cave,114,23,0 warp #somber-cave_114_23 0,0,009-1,1,1 |