diff options
56 files changed, 358 insertions, 28 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..1f6d396c8 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -76,6 +76,18 @@ map_list: ( "016-1", "016-6", "016-7", + "017-1", + "017-2-1", + "017-2", + "018-1-1", + "018-1", + "018-2-1", + "018-2", + "018-3-1", + "018-3", + "018-4-1", + "018-4-2", + "018-4", "boss", "botcheck", "sec_pri", diff --git a/db/map_index.txt b/db/map_index.txt index c5c76e3e0..22a82167d 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -73,10 +73,22 @@ 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 +017-1 76 +017-2-1 77 +017-2 78 +018-1-1 79 +018-1 80 +018-2-1 81 +018-2 82 +018-3-1 83 +018-3 84 +018-4-1 85 +018-4-2 86 +018-4 87 +boss 88 +botcheck 89 +sec_pri 90 +soren-2 91 +soren 92 +test 93 +testbg 94 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 0e93d7521..fc570deee 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -5817,13 +5817,13 @@ item_db: ( AegisName: "SaviorArmor" Name: "Savior Armor" Type: "IT_ARMOR" - Buy: 2 - Sell: 1 - Weight: 1 - Def: 1 + Buy: 6000000 + Sell: 1000000 + Weight: 2800 + Def: 420 Loc: "EQP_HEAD_MID" WeaponLv: 0 - EquipLv: 1 + EquipLv: 109 Refine: false ViewSprite: 1331 }, 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/017-1.mcache b/maps/re/017-1.mcache Binary files differnew file mode 100644 index 000000000..4b6aa7930 --- /dev/null +++ b/maps/re/017-1.mcache diff --git a/maps/re/017-2-1.mcache b/maps/re/017-2-1.mcache Binary files differnew file mode 100644 index 000000000..17216061a --- /dev/null +++ b/maps/re/017-2-1.mcache diff --git a/maps/re/017-2.mcache b/maps/re/017-2.mcache Binary files differnew file mode 100644 index 000000000..c07eb65e4 --- /dev/null +++ b/maps/re/017-2.mcache diff --git a/maps/re/018-1-1.mcache b/maps/re/018-1-1.mcache Binary files differnew file mode 100644 index 000000000..13d1cd74c --- /dev/null +++ b/maps/re/018-1-1.mcache diff --git a/maps/re/018-1.mcache b/maps/re/018-1.mcache Binary files differnew file mode 100644 index 000000000..bbc99e118 --- /dev/null +++ b/maps/re/018-1.mcache diff --git a/maps/re/018-2-1.mcache b/maps/re/018-2-1.mcache Binary files differnew file mode 100644 index 000000000..1e4c6e9bf --- /dev/null +++ b/maps/re/018-2-1.mcache diff --git a/maps/re/018-2.mcache b/maps/re/018-2.mcache Binary files differnew file mode 100644 index 000000000..2d34071c7 --- /dev/null +++ b/maps/re/018-2.mcache diff --git a/maps/re/018-3-1.mcache b/maps/re/018-3-1.mcache Binary files differnew file mode 100644 index 000000000..27c420ccb --- /dev/null +++ b/maps/re/018-3-1.mcache diff --git a/maps/re/018-3.mcache b/maps/re/018-3.mcache Binary files differnew file mode 100644 index 000000000..d17edc645 --- /dev/null +++ b/maps/re/018-3.mcache diff --git a/maps/re/018-4-1.mcache b/maps/re/018-4-1.mcache Binary files differnew file mode 100644 index 000000000..9616044e0 --- /dev/null +++ b/maps/re/018-4-1.mcache diff --git a/maps/re/018-4-2.mcache b/maps/re/018-4-2.mcache Binary files differnew file mode 100644 index 000000000..4dfc7d331 --- /dev/null +++ b/maps/re/018-4-2.mcache diff --git a/maps/re/018-4.mcache b/maps/re/018-4.mcache Binary files differnew file mode 100644 index 000000000..d13742f1d --- /dev/null +++ b/maps/re/018-4.mcache diff --git a/npc/012-1/_import.txt b/npc/012-1/_import.txt index 7df32f9db..d5aff042c 100644 --- a/npc/012-1/_import.txt +++ b/npc/012-1/_import.txt @@ -3,6 +3,7 @@ "npc/012-1/_mobs.txt", "npc/012-1/_warps.txt", "npc/012-1/andrei.txt", +"npc/012-1/bot.txt", "npc/012-1/dyrinthetraveler.txt", "npc/012-1/guards.txt", "npc/012-1/gwendolyn.txt", diff --git a/npc/012-1/bot.txt b/npc/012-1/bot.txt new file mode 100644 index 000000000..4a10bebf7 --- /dev/null +++ b/npc/012-1/bot.txt @@ -0,0 +1,87 @@ +// TMW2 Script +// Author: +// Jesusalva +// Description: +// Introduces the new area ingame + +012-1,82,59,0 script LOFBot NPC_PLAYER,{ + if (rand(1,5) % 2 == 1) { + mesn; + mesq l("Ah, @@ is sooo amazing!", $MOST_HEROIC$); + next; + } + mesn; + mesq l("Have you ever heard of the [@@https://landoffire.org/|Land Of Fire@@]? It is a really cool game which is being developed by Pyndragon and Pihro!"); + next; + mesn; + mesq l("They had a TMWA server, but the Monster King went hyperactive and... Well, it crashed here."); + +L_Menu: + mes ""; + menu + l("How can I reach the Land Of Fire?"), L_Where, + l("Tell me about the Land Of Fire."), L_Fire, + l("What are the Transcendence Gates?"), L_Gates, + l("Thanks for the help."), L_Close; + +L_Where: + mes ""; + /* + mesn; + mesq l("If you head west, you'll eventually reach Jesus Saves official residence."); + next; + */ + mesn; + mesq l("West of here, you'll find a small land path leading it it."); + next; + mesn; + mesq l("It is a really cool place. You must visit it someday!"); + next; + goto L_Menu; + +L_Fire: + mes ""; + mesn; + mesq l("The Land Of Fire Village was the result from the collapse of two worlds. It is a huge village."); + next; + mesq l("It have lots of lava caves, and some cool stuff, like the @@, can only be craft there.", getitemlink(SaviorArmor)); + next; + mesq l("Unique monsters can be found there, and people say about staffs which shoot raw death and doom from it!"); + next; + mesq l("It's self sufficient economically, and many fairies enjoy travelling there. In fact, rumors says the Fairy Kingdom is near it!"); + next; + goto L_Menu; + +L_Gates: + mes ""; + mesn; + mesq l("Ah, you'll find on the Land Of Fire Village four transcendence gates."); + next; + mesn; + mesq l("People from here always look dumbfolded when they walk past them and find themselves somewhere else."); + next; + mesn; + mesq l("There's usually not a lot of things to do past these gates, but some monsters which only lives on the Land of Fire can only be found there!"); + next; + goto L_Menu; + +L_Close: + closedialog; + npctalkonce l("Ah, @@ is so amazing!", $MOST_HEROIC$); + close; + +OnInit: + .@npcId = getnpcid(0, .name$); + setunitdata(.@npcId, UDT_HEADTOP, CenturionHelmet); + setunitdata(.@npcId, UDT_HEADMIDDLE, SaviorArmor); + setunitdata(.@npcId, UDT_HEADBOTTOM, TulimsharGuardBoots); + setunitdata(.@npcId, UDT_WEAPON, BromenalPants); + setunitdata(.@npcId, UDT_HAIRSTYLE, 1); + setunitdata(.@npcId, UDT_HAIRCOLOR, 1); + npcsit; + + .sex = G_OTHER; + .distance = 5; + end; +} + diff --git a/npc/017-1/_import.txt b/npc/017-1/_import.txt new file mode 100644 index 000000000..5720d3607 --- /dev/null +++ b/npc/017-1/_import.txt @@ -0,0 +1,3 @@ +// Map 017-1: Land Of Fire Village +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/017-1/_warps.txt", diff --git a/npc/017-1/_warps.txt b/npc/017-1/_warps.txt new file mode 100644 index 000000000..ad9e84da6 --- /dev/null +++ b/npc/017-1/_warps.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 017-1: Land Of Fire Village warps +017-1,176,197,0 warp #017-1_176_197 0,0,018-2,63,105 +017-1,185,197,0 warp #017-1_185_197 0,0,018-3,114,24 +017-1,179,197,0 warp #017-1_179_197 0,0,018-1,32,66 +017-1,182,197,0 warp #017-1_182_197 0,0,018-4,164,104 diff --git a/npc/017-2-1/_import.txt b/npc/017-2-1/_import.txt new file mode 100644 index 000000000..0a8172af5 --- /dev/null +++ b/npc/017-2-1/_import.txt @@ -0,0 +1,2 @@ +// Map 017-2-1: Jack's Basement +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/017-2/_import.txt b/npc/017-2/_import.txt new file mode 100644 index 000000000..9c2f5c724 --- /dev/null +++ b/npc/017-2/_import.txt @@ -0,0 +1,3 @@ +// Map 017-2: Jack's House +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/017-2/_warps.txt", diff --git a/npc/017-2/_warps.txt b/npc/017-2/_warps.txt new file mode 100644 index 000000000..97c07e729 --- /dev/null +++ b/npc/017-2/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 017-2: Jack's House warps +017-2,31,32,0 warp #017-2_31_32 0,0,017-1,0,0 diff --git a/npc/018-1-1/_import.txt b/npc/018-1-1/_import.txt new file mode 100644 index 000000000..29f69c5d4 --- /dev/null +++ b/npc/018-1-1/_import.txt @@ -0,0 +1,4 @@ +// Map 018-1-1: Sincerity Island Cave +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-1-1/_mobs.txt", +"npc/018-1-1/_warps.txt", diff --git a/npc/018-1-1/_mobs.txt b/npc/018-1-1/_mobs.txt new file mode 100644 index 000000000..35c00a8fb --- /dev/null +++ b/npc/018-1-1/_mobs.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-1-1: Sincerity Island Cave mobs +018-1-1,51,49,11,7 monster Silkworm 1034,10,30000,3000 +018-1-1,43,35,0,0 monster Evil Mushroom 1042,3,40000,5000 +018-1-1,27,31,0,0 monster Evil Mushroom 1042,3,40000,5000 +018-1-1,50,49,30,30 monster Bat 1039,10,60000,10000 diff --git a/npc/018-1-1/_warps.txt b/npc/018-1-1/_warps.txt new file mode 100644 index 000000000..c30c4fc11 --- /dev/null +++ b/npc/018-1-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-1-1: Sincerity Island Cave warps +018-1-1,33,78,0 warp #018-1-1_33_78 0,0,018-1,54,38 diff --git a/npc/018-1/_import.txt b/npc/018-1/_import.txt new file mode 100644 index 000000000..ad7c79468 --- /dev/null +++ b/npc/018-1/_import.txt @@ -0,0 +1,4 @@ +// Map 018-1: Sincerity +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-1/_mobs.txt", +"npc/018-1/_warps.txt", diff --git a/npc/018-1/_mobs.txt b/npc/018-1/_mobs.txt new file mode 100644 index 000000000..b3c21ab9f --- /dev/null +++ b/npc/018-1/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-1: Sincerity mobs +018-1,69,65,6,6 monster Evil Mushroom 1042,4,20000,60000 +018-1,32,33,6,6 monster Squirrel 1032,3,30000,60000 +018-1,46,48,2,0 monster Clover Patch 1028,1,10000,120000 +018-1,37,60,11,10 monster Poison Spiky Mushroom 1043,5,10000,30000 +018-1,54,36,8,9 monster Bat 1039,4,25000,30000 +018-1,59,51,6,4 monster Log Head 1066,2,25000,30000 diff --git a/npc/018-1/_warps.txt b/npc/018-1/_warps.txt new file mode 100644 index 000000000..d162146cc --- /dev/null +++ b/npc/018-1/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-1: Sincerity warps +018-1,54,37,0 warp #018-1_54_37 0,0,018-1-1,33,77 +018-1,32,67,0 warp #018-1_32_67 0,0,018-1,179,196 diff --git a/npc/018-2-1/_import.txt b/npc/018-2-1/_import.txt new file mode 100644 index 000000000..13f8970a0 --- /dev/null +++ b/npc/018-2-1/_import.txt @@ -0,0 +1,3 @@ +// Map 018-2-1: Heroes' Hold - Castle +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-2-1/_warps.txt", diff --git a/npc/018-2-1/_warps.txt b/npc/018-2-1/_warps.txt new file mode 100644 index 000000000..fddc866d2 --- /dev/null +++ b/npc/018-2-1/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-2-1: Heroes' Hold - Castle warps +018-2-1,26,33,0 warp #018-2-1_26_33 2,0,018-2,72,65 +018-2-1,26,27,0 warp #018-2-1_26_27 2,0,018-2,0,0 diff --git a/npc/018-2/_import.txt b/npc/018-2/_import.txt new file mode 100644 index 000000000..adb5e8745 --- /dev/null +++ b/npc/018-2/_import.txt @@ -0,0 +1,4 @@ +// Map 018-2: Heroes' Hold - Outside +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-2/_mobs.txt", +"npc/018-2/_warps.txt", diff --git a/npc/018-2/_mobs.txt b/npc/018-2/_mobs.txt new file mode 100644 index 000000000..18cbd2ada --- /dev/null +++ b/npc/018-2/_mobs.txt @@ -0,0 +1,7 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-2: Heroes' Hold - Outside mobs +018-2,92,39,29,10 monster Spawn Area 1 1002,2,120000,40000 +018-2,40,35,20,6 monster Spawn Area 2 1002,2,120000,40000 +018-2,20,45,0,0 monster Spawn Area 3 1002,2,120000,40000 +018-2,108,64,12,11 monster Spawn Area 4 1002,1,120000,40000 +018-2,92,90,36,12 monster Spawn Area 5 1002,2,120000,40000 diff --git a/npc/018-2/_warps.txt b/npc/018-2/_warps.txt new file mode 100644 index 000000000..3a4af7540 --- /dev/null +++ b/npc/018-2/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-2: Heroes' Hold - Outside warps +018-2,63,106,0 warp #018-2_63_106 0,0,017-1,176,196 +018-2,72,63,0 warp #018-2_72_63 3,0,018-2-1,26,32 diff --git a/npc/018-3-1/_import.txt b/npc/018-3-1/_import.txt new file mode 100644 index 000000000..0df895be4 --- /dev/null +++ b/npc/018-3-1/_import.txt @@ -0,0 +1,3 @@ +// Map 018-3-1: Skull Cave +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-3-1/_warps.txt", diff --git a/npc/018-3-1/_warps.txt b/npc/018-3-1/_warps.txt new file mode 100644 index 000000000..6cb1e0efd --- /dev/null +++ b/npc/018-3-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-3-1: Skull Cave warps +018-3-1,71,78,0 warp #018-3-1_71_78 1,0,018-3,0,0 diff --git a/npc/018-3/_import.txt b/npc/018-3/_import.txt new file mode 100644 index 000000000..97be42bc6 --- /dev/null +++ b/npc/018-3/_import.txt @@ -0,0 +1,4 @@ +// Map 018-3: Somber Cave +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-3/_mobs.txt", +"npc/018-3/_warps.txt", diff --git a/npc/018-3/_mobs.txt b/npc/018-3/_mobs.txt new file mode 100644 index 000000000..8915592de --- /dev/null +++ b/npc/018-3/_mobs.txt @@ -0,0 +1,16 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-3: Somber Cave mobs +018-3,81,91,1,1 monster Dark Lizard 1051,2,0,20000 +018-3,37,61,1,1 monster Dark Lizard 1051,2,0,20000 +018-3,45,114,1,1 monster Dark Lizard 1051,2,0,20000 +018-3,0,0,0,0 monster Lava Slime 1097,8,10000,0 +018-3,0,0,0,0 monster Fire Goblin 1067,30,20,0 +018-3,75,53,1,1 monster Black Scorpion 1074,1,0,10000 +018-3,115,116,2,2 monster Black Scorpion 1074,1,0,10000 +018-3,0,0,0,0 monster Evil Mushroom 1042,10,20,0 +018-3,39,57,21,38 monster Lava Slime 1097,12,10000,0 +018-3,96,46,34,27 monster Lava Slime 1097,10,10000,0 +018-3,88,84,26,10 monster Lava Slime 1097,5,10000,0 +018-3,123,100,7,26 monster Lava Slime 1097,4,10000,0 +018-3,66,111,48,15 monster Lava Slime 1097,11,10000,0 +018-3,74,72,56,53 monster Night Scorpion 1077,9,15000,0 diff --git a/npc/018-3/_warps.txt b/npc/018-3/_warps.txt new file mode 100644 index 000000000..ebb84bd5c --- /dev/null +++ b/npc/018-3/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-3: Somber Cave warps +018-3,114,23,0 warp #018-3_114_23 0,0,017-1,185,196 diff --git a/npc/018-4-1/_import.txt b/npc/018-4-1/_import.txt new file mode 100644 index 000000000..5c588d258 --- /dev/null +++ b/npc/018-4-1/_import.txt @@ -0,0 +1,4 @@ +// Map 018-4-1: sicave +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-4-1/_mobs.txt", +"npc/018-4-1/_warps.txt", diff --git a/npc/018-4-1/_mobs.txt b/npc/018-4-1/_mobs.txt new file mode 100644 index 000000000..4d37288f2 --- /dev/null +++ b/npc/018-4-1/_mobs.txt @@ -0,0 +1,7 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-4-1: Secret Island Cave mobs +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-4-1: sicave mobs +018-4-1,95,66,66,35 monster Cave Snake 1035,15,9000,3000 +018-4-1,95,84,66,18 monster Golden Scorpion 1078,7,10000,5000 +018-4-1,102,48,40,17 monster Giant Mutated Bat 1044,2,100000,50000 diff --git a/npc/018-4-1/_warps.txt b/npc/018-4-1/_warps.txt new file mode 100644 index 000000000..335f148c4 --- /dev/null +++ b/npc/018-4-1/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-4-1: Secret Island Cave warps +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-4-1: sicave warps +018-4-1,102,86,0 warp #018-4-1_102_86 0,0,018-4,94,90 diff --git a/npc/018-4-2/_import.txt b/npc/018-4-2/_import.txt new file mode 100644 index 000000000..fedb96431 --- /dev/null +++ b/npc/018-4-2/_import.txt @@ -0,0 +1,3 @@ +// Map 018-4-2: Secret_Island_Indoor +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-4-2/_warps.txt", diff --git a/npc/018-4-2/_warps.txt b/npc/018-4-2/_warps.txt new file mode 100644 index 000000000..02e21aacd --- /dev/null +++ b/npc/018-4-2/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-4-2: Secret Island House warps +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-4-2: Secret_Island_Indoor warps +018-4-2,33,36,0 warp #018-4-2_33_36 0,0,018-4,73,26 diff --git a/npc/018-4/_import.txt b/npc/018-4/_import.txt new file mode 100644 index 000000000..17bc5383e --- /dev/null +++ b/npc/018-4/_import.txt @@ -0,0 +1,4 @@ +// Map 018-4: Secret Island +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-4/_mobs.txt", +"npc/018-4/_warps.txt", diff --git a/npc/018-4/_mobs.txt b/npc/018-4/_mobs.txt new file mode 100644 index 000000000..101c5bba8 --- /dev/null +++ b/npc/018-4/_mobs.txt @@ -0,0 +1,9 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-4: Secret Island mobs +018-4,120,68,46,21 monster Golden Scorpion 1078,7,10000,5000 +018-4,98,47,46,32 monster Night Scorpion 1077,5,20000,10000 +018-4,98,47,46,32 monster BlackSlime 1002,10,15000,10000 +018-4,91,60,76,47 monster Red Slime 1092,12,12000,4000 +018-4,91,60,76,47 monster Yellow Slime 1091,15,30000,30000 +018-4,91,56,76,43 monster Clover Patch 1028,2,75000,35000 +018-4,91,60,76,47 monster Mouboo 1023,3,12000,4000 diff --git a/npc/018-4/_warps.txt b/npc/018-4/_warps.txt new file mode 100644 index 000000000..2c215adc5 --- /dev/null +++ b/npc/018-4/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-4: Secret Island warps +018-4,94,89,0 warp #018-4_94_89 0,0,018-4-1,102,84 +018-4,164,105,0 warp #018-4_164_105 0,0,017-1,182,196 +018-4,73,24,0 warp #018-4_73_24 0,0,018-4-2,33,34 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..acb231c6a 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -75,6 +75,18 @@ @include "npc/016-1/_import.txt" @include "npc/016-6/_import.txt" @include "npc/016-7/_import.txt" +@include "npc/017-1/_import.txt" +@include "npc/017-2-1/_import.txt" +@include "npc/017-2/_import.txt" +@include "npc/018-1-1/_import.txt" +@include "npc/018-1/_import.txt" +@include "npc/018-2-1/_import.txt" +@include "npc/018-2/_import.txt" +@include "npc/018-3-1/_import.txt" +@include "npc/018-3/_import.txt" +@include "npc/018-4-1/_import.txt" +@include "npc/018-4-2/_import.txt" +@include "npc/018-4/_import.txt" @include "npc/boss/_import.txt" @include "npc/botcheck/_import.txt" @include "npc/sec_pri/_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); } |