summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/battle/battleground.conf88
-rw-r--r--db/item_db.txt2
-rw-r--r--npc/merchants/socket_enchant.txt19
3 files changed, 56 insertions, 53 deletions
diff --git a/conf/battle/battleground.conf b/conf/battle/battleground.conf
index a91e1ddd6..80bb0477a 100644
--- a/conf/battle/battleground.conf
+++ b/conf/battle/battleground.conf
@@ -1,44 +1,44 @@
-// ______ __ __
-// /\ _ \/\ \__/\ \
-// __\ \ \L\ \ \ ,_\ \ \___ __ ___ __
-// /'__`\ \ __ \ \ \/\ \ _ `\ /'__`\/' _ `\ /'__`\
-///\ __/\ \ \/\ \ \ \_\ \ \ \ \/\ __//\ \/\ \/\ \L\.\_
-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
-// _ _ _ _ _ _ _ _ _ _ _ _ _
-// / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \
-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
-// \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/
-//
-//--------------------------------------------------------------
-// eAthena Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-// assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-//--------------------------------------------------------------
-
-// Melee damage adjustments (non skills) for Battleground maps (Note 2)
-bg_short_attack_damage_rate: 80
-
-// Ranged damage adjustments (non skills) for Battleground maps (Note 2)
-bg_long_attack_damage_rate: 80
-
-// Weapon skills damage adjustments for Battleground maps (Note 2)
-bg_weapon_attack_damage_rate: 60
-
-// Magic skills damage adjustments for Battleground maps (Note 2)
-bg_magic_attack_damage_rate: 60
-
-// Misc skills damage adjustments for Battleground maps (Note 2)
-bg_misc_attack_damage_rate: 60
-
-// Flee penalty on BG grounds.
-// NOTE: It's %, not absolute, so 20 is -20% of your total flee
-bg_flee_penalty: 20
-
-// Interval before updating the bg-member map mini-dots (milliseconds)
-bg_update_interval: 1000
+// ______ __ __
+// /\ _ \/\ \__/\ \
+// __\ \ \L\ \ \ ,_\ \ \___ __ ___ __
+// /'__`\ \ __ \ \ \/\ \ _ `\ /'__`\/' _ `\ /'__`\
+///\ __/\ \ \/\ \ \ \_\ \ \ \ \/\ __//\ \/\ \/\ \L\.\_
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+// _ _ _ _ _ _ _ _ _ _ _ _ _
+// / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+// Note 1: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+// assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//--------------------------------------------------------------
+
+// Melee damage adjustments (non skills) for Battleground maps (Note 2)
+bg_short_attack_damage_rate: 80
+
+// Ranged damage adjustments (non skills) for Battleground maps (Note 2)
+bg_long_attack_damage_rate: 80
+
+// Weapon skills damage adjustments for Battleground maps (Note 2)
+bg_weapon_attack_damage_rate: 60
+
+// Magic skills damage adjustments for Battleground maps (Note 2)
+bg_magic_attack_damage_rate: 60
+
+// Misc skills damage adjustments for Battleground maps (Note 2)
+bg_misc_attack_damage_rate: 60
+
+// Flee penalty on BG grounds.
+// NOTE: It's %, not absolute, so 20 is -20% of your total flee
+bg_flee_penalty: 20
+
+// Interval before updating the bg-member map mini-dots (milliseconds)
+bg_update_interval: 1000
diff --git a/db/item_db.txt b/db/item_db.txt
index ce16de6a6..b5dd7f8eb 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -4013,7 +4013,7 @@
13034,Twilight_Desert,Desert Twilight,4,20,,600,130,,1,2,0x00001000,2,2,2,2,70,1,1,{ if (isequipped(13035)) { bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddSize,2,30; autobonus "{ bonus bAspdRate,100; }",1,7000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; } },{},{}
13035,Sandstorm,Sandstorm,4,20,,600,50,,1,4,0x00001000,2,2,2,2,70,1,1,{},{},{}
13036,Brave_Assassin's_Damascus,Brave Assassin's Damascus,4,0,,0,120,,1,0,0x028F5EEF,7,2,2,3,80,1,1,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if (Class == Job_Ninja || Class == Job_Rogue || Class == Job_Stalker) bonus bMatkRate,15; },{},{}
-13037,Valorous_Assassin's_Damascus,Valorous Assassin's Damascus,4,0,,0,120,,1,0,0x029E7CEB,7,2,2,3,80,1,1,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; autobonus "{ bonus bDefRatioAtkRace,RC_NonBoss,1; }",50,6000; if (Class == Job_Ninja || Class == Job_Rogue || Class == Job_Stalker) bonus bMatkRate,15; },{},{}
+13037,Valorous_Assassin's_Damascus,Valorous Assassin's Damascus,4,0,,0,120,,1,0,0x029E7CEB,7,2,2,3,80,1,1,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; autobonus "{ bonus bDefRatioAtkRace,RC_NonBoss; }",50,6000; if (Class == Job_Ninja || Class == Job_Rogue || Class == Job_Stalker) bonus bMatkRate,15; },{},{}
//13038#Trackers_Dagger#
//13039#Ivory_Knife#
13040,Novice_Cutter,Novice Cutter,4,1,,0,50,,1,0,0xFE9F7EEF,7,2,2,1,1,0,1,{},{},{}
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 46392e0ef..cd2f6a501 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -23,6 +23,7 @@
//= 1.5 Removed Ontouch trigger area from NPCs. [L0ne_W0lf]
//= 1.6 Replaced effect numerics with constants. [Samuray22]
//= 1.7 Adjusted prices on some armor and weapons. [L0ne_W0lf]
+//= 1.8 Added missing Gae Bolg and Dragon Slayer. [Kisuka]
//============================================================
payon,140,151,5 script Seiyablem 84,{
@@ -92,7 +93,7 @@ payon,140,151,5 script Seiyablem 84,{
mes "This is some high risk territory!";
mes "Alright, which weapon would you like me to try adding a Slot?";
next;
- switch( select( "Hunter Bow","Survivor's Rod(INT)","Zweihander","Flamberge","Infiltrator","Ballista","Stunner","Berserk","Claymore","Dragon Killer","Katar of Frozen Icicle","Katar of Quaking","Katar of Raging Blaze","Katar of Piercing Wind","Golden Mace","Oriental Lute","Queen's Whip","Phantom Spear","Schweizersabel" ) )
+ switch( select( "Hunter Bow","Survivor's Rod(INT)","Zweihander","Flamberge","Infiltrator","Ballista","Stunner","Berserk","Claymore","Dragon Killer","Katar of Frozen Icicle","Katar of Quaking","Katar of Raging Blaze","Katar of Piercing Wind","Golden Mace","Oriental Lute","Queen's Whip","Phantom Spear","Gae Bolg","Schweizersabel" ) )
{
case 1: callfunc "Func_Socket",2,1718,1726,40,61,500,984,2,999,10; break;
case 2: callfunc "Func_Socket",2,1619,1620,40,61,500,984,5,999,10; break;
@@ -112,7 +113,8 @@ payon,140,151,5 script Seiyablem 84,{
case 16: callfunc "Func_Socket",1,1918,1922,40,61,500,984,2; break;
case 17: callfunc "Func_Socket",1,1970,1976,40,61,500,984,2; break;
case 18: callfunc "Func_Socket",1,1477,1479,40,61,500,984,2; break;
- case 19: callfunc "Func_Socket",1,1167,1178,40,61,500,984,2; break;
+ case 19: callfunc "Func_Socket",1,1474,1480,40,61,500,984,2; break;
+ case 20: callfunc "Func_Socket",1,1167,1178,40,61,500,984,2; break;
}
break;
@@ -123,7 +125,7 @@ payon,140,151,5 script Seiyablem 84,{
mes "It'd be a near miracle if I can actually pull this off.";
mes "Okay... Which weapon shall we try adding a Slot to?";
next;
- switch( select( "Gungnir","Poison Knife","Ice Pick","Sucsamad","Ginnungagap","Cutlas","Crescent Scythe","Survivor's Rod(DEX)","Zephyrus","Mailbreaker","Swordbreaker","Assassin Dagger","Grand Cross","Executioner" ) )
+ switch( select( "Gungnir","Poison Knife","Ice Pick","Sucsamad","Ginnungagap","Cutlas","Crescent Scythe","Survivor's Rod(DEX)","Zephyrus","Mailbreaker","Dragon Slayer","Swordbreaker","Assassin Dagger","Grand Cross","Executioner" ) )
{
case 1: callfunc "Func_Socket",2,1413,1418,40,51,1000,984,5,999,10; break;
case 2: callfunc "Func_Socket",2,1239,13016,40,51,1000,984,5,999,10; break;
@@ -135,10 +137,11 @@ payon,140,151,5 script Seiyablem 84,{
case 8: callfunc "Func_Socket",2,1617,1618,40,51,2000,984,5,999,10; break;
case 9: callfunc "Func_Socket",2,1468,1481,40,51,1000,984,5,999,10; break;
case 10: callfunc "Func_Socket",2,1225,13032,40,51,1000,984,5,999,10; break;
- case 11: callfunc "Func_Socket",2,1224,13031,40,51,1000,984,5,999,10; break;
- case 12: callfunc "Func_Socket",2,1232,13033,40,51,1000,984,5,999,10; break;
- case 13: callfunc "Func_Socket",2,1528,1540,40,51,1000,984,5,999,10; break;
- case 14: callfunc "Func_Socket",2,1169,1179,40,51,1000,984,5,999,10; break;
+ case 11: callfunc "Func_Socket",2,1166,1180,40,51,1000,984,5,999,10; break;
+ case 12: callfunc "Func_Socket",2,1224,13031,40,51,1000,984,5,999,10; break;
+ case 13: callfunc "Func_Socket",2,1232,13033,40,51,1000,984,5,999,10; break;
+ case 14: callfunc "Func_Socket",2,1528,1540,40,51,1000,984,5,999,10; break;
+ case 15: callfunc "Func_Socket",2,1169,1179,40,51,1000,984,5,999,10; break;
}
break;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 16:58:11 +0000