diff options
| -rw-r--r-- | conf-tmpl/mapflag/nomemo.txt | 14 | ||||
| -rw-r--r-- | db/Changelog.txt | 3 | ||||
| -rw-r--r-- | db/item_db.txt | 2 | ||||
| -rw-r--r-- | npc/Changelog.txt | 5 | ||||
| -rw-r--r-- | npc/merchants/shops.txt | 24 | ||||
| -rw-r--r-- | npc/mobs/fields/niflheim.txt | 2 |
6 files changed, 38 insertions, 12 deletions
diff --git a/conf-tmpl/mapflag/nomemo.txt b/conf-tmpl/mapflag/nomemo.txt index 4bd5e9c36..ada95176b 100644 --- a/conf-tmpl/mapflag/nomemo.txt +++ b/conf-tmpl/mapflag/nomemo.txt @@ -6,6 +6,7 @@ // Towns ==================>\\ +alb2trea.gat mapflag nomemo alb_ship.gat mapflag nomemo alberta_in.gat mapflag nomemo aldeba_in.gat mapflag nomemo @@ -13,6 +14,9 @@ ama_in01.gat mapflag nomemo ama_in02.gat mapflag nomemo cmd_in01.gat mapflag nomemo cmd_in02.gat mapflag nomemo +gef_fild06.gat mapflag nomemo +gef_fild08.gat mapflag nomemo +gef_fild12.gat mapflag nomemo gef_tower.gat mapflag nomemo geffen_in.gat mapflag nomemo gon_test.gat mapflag nomemo @@ -24,22 +28,32 @@ lou_in01.gat mapflag nomemo lou_in02.gat mapflag nomemo moc_castle.gat mapflag nomemo morocc_in.gat mapflag nomemo +mjolnir_01.gat mapflag nomemo +mjolnir_07.gat mapflag nomemo +mjolnir_10.gat mapflag nomemo +niflheim.gat mapflag nomemo nif_in.gat mapflag nomemo new_1-1.gat mapflag nomemo new_1-2.gat mapflag nomemo new_1-3.gat mapflag nomemo new_1-4.gat mapflag nomemo +pay_fild05.gat mapflag nomemo payon_in01.gat mapflag nomemo payon_in02.gat mapflag nomemo prt_castle.gat mapflag nomemo prt_church.gat mapflag nomemo prt_in.gat mapflag nomemo um_in.gat mapflag nomemo +um_fild01.gat mapflag nomemo +um_fild02.gat mapflag nomemo +um_fild03.gat mapflag nomemo xmas_in.gat mapflag nomemo +yuno_fild02.gat mapflag nomemo yuno_in01.gat mapflag nomemo yuno_in02.gat mapflag nomemo yuno_in03.gat mapflag nomemo + // Job quests =================== sword_1-1.gat mapflag nomemo sword_2-1.gat mapflag nomemo diff --git a/db/Changelog.txt b/db/Changelog.txt index e564a8c87..e9d7ccd56 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -5,6 +5,9 @@ Ayathoya items == Added but no effect ( all are "ect" itens) Skill databases == celest working on them i believe. +12/8 + * Capitalised horn_Card in item_db [celest] + 12/7 * Fixed some item names (and swpped names of Alarm Mask and Expressionless Mask) [Lupus] * Added effect for Bow Thimble, Archer Skeleton Card and Tribal Solidarity [celest] diff --git a/db/item_db.txt b/db/item_db.txt index 0a9592a8c..1e5dc588d 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -1044,7 +1044,7 @@ 4042,Steel_Chonchon_Card,Steel Chonchon Card,6,20,0,10,,,,,,,16,,,,{},{ bonus2 bSubEle,4,10; bonus bDef,2; } 4043,Andre_Card,Andre Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bBaseAtk,20; } 4044,Smokie_Card,Smokie Card,6,20,0,10,,,,,,,136,,,,{},{ skill 51,1; } -4045,horn_Card,horn Card,6,20,0,10,,,,,,,32,,,,{},{ bonus bLongAtkDef,35; } +4045,Horn_Card,Horn Card,6,20,0,10,,,,,,,32,,,,{},{ bonus bLongAtkDef,35; } 4046,Martin_Card,Martin Card,6,20,0,10,,,,,,,769,,,,{},{ bonus2 bResEff,Eff_Blind,2000; bonus bDef,1; } 4047,Ghostring_Card,Ghostring Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bDefEle,8; bonus bHPrecovRate,-25; } 4048,Poison_Spore_Card,Poison Spore Card,6,20,0,10,,,,,,,136,,,,{},{ skill 52,3; } diff --git a/npc/Changelog.txt b/npc/Changelog.txt index a45bbcb8e..324c2270b 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -32,6 +32,11 @@ Date Added ====== 12/08 * Added translated shop names for the Extended Shop, I'unno who made it. o.O; [Mass Zero] + * Changed Lord of Death spawn intervals to 90 minutes based on jRO [celest] + * Added nomemo flags for Niflheim and some maps [celest] + * Corrected Niflheim shops and Morroc jewel merchant - should sell Ruby + instead of Pearl [celest] + 12/07 * Added npc/other/mc_cameri/heal.txt, a heal npc that is as simple as one click healing [MC Cameri] * Fixed Al De Baran to Mjolnir warp in Al De Baran [MC Cameri] diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 5ce421b31..4080b83b1 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena Dev Team //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -16,6 +16,7 @@ //= Moved shops in Umbala.txt here. Commented out the duplicate ones.[kobra_k88] //= 1.6 Removed GRAPE ID 514 from shops (caused exploits) //= 1.7 Removed juices from custom amatsu shops (it's a quest item + levelup exploit) +//= 1.8 Corrected Niflheim Shops and Morroc Jewel Merchant [celest] //============================================================ @@ -121,7 +122,7 @@ morocc.gat,145,44,1 shop Jewel Seller 99,730:-1,2613:-1 morocc.gat,147,102,5 shop Tool Dealer 93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,645:-1,656:-1,657:-1 morocc.gat,151,243,1 shop Tool Dealer 99,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,2242:-1,645:-1,656:-1,657:-1 morocc.gat,157,72,6 shop Butcher 49,517:-1 -morocc.gat,166,51,1 shop Jewel Seller 102,721:-1,722:-1,726:-1,728:-1,729:-1 +morocc.gat,166,51,1 shop Jewel Seller 102,721:-1,723:-1,726:-1,728:-1,729:-1 morocc.gat,170,101,3 shop Tool Dealer 85,909:-1,528:-1,919:-1,925:-1 morocc.gat,206,250,1 shop Tool Dealer 85,909:-1,528:-1,919:-1,925:-1 morocc.gat,244,134,1 shop Trader 93,2612:-1 @@ -133,13 +134,16 @@ morocc.gat,269,167,4 shop Pet Merchant 125,537:-1,643:-1,10013:-1,10014:-1 //======================================================= //NIFLHEIM //======================================================= -nif_in.gat,35,91,3 shop Armor Dealer 796,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 -nif_in.gat,35,84,3 shop Weapon Dealer 795,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1 -nif_in.gat,154,21,3 shop Tool Dealer 798,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,2239:-1,645:-1,656:-1,657:-1 -niflheim.gat,201,209,3 shop Milk Merchant 794,519:-1 -niflheim.gat,224,185,3 shop Fruit Merchant 795,512:-1,513:-1 -niflheim.gat,209,161,3 shop Butcher 794,517:-1,528:-1 -niflheim.gat,205,152,3 shop Gift Merchant 795,734:-1,735:-1,736:-1,737:-1,746:-1 +nif_in.gat,35,84,3 shop Weapon Dealer 795,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1 +nif_in.gat,35,91,3 shop Armor Dealer 796,2501:-1,2501:-1,2503:-1,2503:-1,2505:-1,2505:-1 +nif_in.gat,154,21,3 shop Tool Dealer 798,535:-1,1062:-1,902:-1,7106:-1,537:-1,7154:-1,1052:-1,934:-1 +//nif_in.gat,35,84,3 shop Weapon Dealer 795,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1 +//nif_in.gat,35,91,3 shop Armor Dealer 796,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1 +//nif_in.gat,154,21,3 shop Tool Dealer 798,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,2239:-1,645:-1,656:-1,657:-1 +//niflheim.gat,201,209,3 shop Milk Merchant 794,519:-1 +//niflheim.gat,224,185,3 shop Fruit Merchant 795,512:-1,513:-1 +//niflheim.gat,209,161,3 shop Butcher 794,517:-1,528:-1 +//niflheim.gat,205,152,3 shop Gift Merchant 795,734:-1,735:-1,736:-1,737:-1,746:-1 //======================================================= //PAYON @@ -198,7 +202,7 @@ um_in.gat,151,125,4 shop Armor Merchant 49,2103:-1,2105:-1,2403:-1,2405:-1,2503: //======================================================= yuno.gat,65,122,4 shop Fruit Merchant 93,512:-1,513:-1,515:-1,516:-1 yuno.gat,217,97,4 shop Tool Dealer 83,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,505:-1,506:-1,645:-1,656:-1,601:-1,602:-1 -yuno.gat,226,106,5 shop Trader 97, 909:-1, 911:-1, 910:-1, 912:-1 +yuno.gat,226,106,5 shop Trader 97, 911:-1, 910:-1, 912:-1 yuno.gat,197,115,4 shop Pet Merchant 124, 537:-1, 643:-1, 10013:-1, 10014:-1 yuno.gat,205,104,4 shop Equip Dealer 84, 2340:-1, 2341:-1, 2411:-1, 2222:-1, 2230:-1; 1721:-1 yuno.gat,163,187,5 shop Magic Dealer 90,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1 diff --git a/npc/mobs/fields/niflheim.txt b/npc/mobs/fields/niflheim.txt index ba220b9eb..457fb75ec 100644 --- a/npc/mobs/fields/niflheim.txt +++ b/npc/mobs/fields/niflheim.txt @@ -11,7 +11,7 @@ //============================================================ //niflheim -niflheim.gat,0,0,0,0 monster Lord Of Death 5373,1,15600000,78000000,1 +niflheim.gat,0,0,0,0 monster Lord Of Death 5373,1,5400000,2700000,1 niflheim.gat,0,0,0,0 monster Gibbet 1503,10,2400000,1200000,0 niflheim.gat,0,0,0,0 monster Dullahan 1504,5,3600000,1800000,0 niflheim.gat,0,0,0,0 monster Quve 1508,20,60000,30000,0 |