From b8ac7c7b4b86b0debd229ad29cec48e945b7a098 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 9 Apr 2021 15:59:50 -0300 Subject: Rebuild, disable broken stuff --- char-server | Bin 2044416 -> 2044416 bytes db/craft_db.conf | 13 +- db/pre-re/item_group.conf | 47 ---- db/pre-re/mob_db.conf | 2 +- db/pre-re/mob_skill_db.conf | 665 -------------------------------------------- login-server | Bin 1104736 -> 1104736 bytes map-server | Bin 12529736 -> 12529736 bytes plugins/libevol_char.so | Bin 174584 -> 174592 bytes plugins/libevol_login.so | Bin 231552 -> 231568 bytes plugins/libevol_map.so | Bin 5120136 -> 5120728 bytes 10 files changed, 12 insertions(+), 715 deletions(-) diff --git a/char-server b/char-server index 9a519c2f..63a70f68 100755 Binary files a/char-server and b/char-server differ diff --git a/db/craft_db.conf b/db/craft_db.conf index 806e0bf6..538e699a 100644 --- a/db/craft_db.conf +++ b/db/craft_db.conf @@ -76,6 +76,7 @@ Boots: 700 --> 799 **** Reserved range for : 000 --> 099 **** Valid parameters: CRAFT_COOKING *******************************************************************************/ +/* { Id: 0 Name: "CraftCarpSandwich" @@ -404,6 +405,7 @@ Boots: 700 --> 799 **** Valid parameters: CRAFT_SMITHERY, CRAFT_TAILORING *******************************************************************************/ +/* { Id: 100 Name: "CraftCreasedShirt" @@ -1004,6 +1006,7 @@ Boots: 700 --> 799 } Priority: 82 }, +*/ /************************* LEG ARMOR (PANTS) *********************************** ******************************************************************************** @@ -1011,6 +1014,7 @@ Boots: 700 --> 799 **** Valid parameters: CRAFT_SMITHERY, CRAFT_TAILORING *******************************************************************************/ +/* { Id: 200 Name: "CraftCreasedShorts" @@ -1286,6 +1290,7 @@ Boots: 700 --> 799 } Priority: 71 }, +*/ /****************************** GLOVES ***************************************** ******************************************************************************** @@ -1293,6 +1298,7 @@ Boots: 700 --> 799 **** Valid parameters: CRAFT_SMITHERY, CRAFT_TAILORING *******************************************************************************/ +/* { Id: 300 Name: "CraftShortGloves" @@ -1322,13 +1328,13 @@ Boots: 700 --> 799 Id: 301 Name: "CraftArmbands" Flag: "CRAFT_TAILORING" - /* TODO: maybe add a WOODWORKING category? */ + // TODO: maybe add a WOODWORKING category? ReturnCode: "Armbands" SourceItems: ( { RawLog: 20 - /* May need to be changed at a later date to Hardwood/Softwood/RefinedWood */ + // May need to be changed at a later date to Hardwood/Softwood/RefinedWood LeatherPatch: 10 Coal: 15 Knife: 1 @@ -1545,6 +1551,7 @@ Boots: 700 --> 799 } Priority: 71 }, +*/ /************************** WEAPONS & TOOLS ************************************ ******************************************************************************** @@ -1570,6 +1577,7 @@ Boots: 700 --> 799 **** Valid parameters: CRAFT_SMITHERY, CRAFT_TAILORING *******************************************************************************/ +/* { Id: 700 Name: "CraftLousyMoccasins" @@ -1845,4 +1853,5 @@ Boots: 700 --> 799 } Priority: 71 }, +*/ ) diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf index ea58364c..1266d345 100644 --- a/db/pre-re/item_group.conf +++ b/db/pre-re/item_group.conf @@ -19,56 +19,15 @@ */ BasicSilkDyes: ( - "PitchBlackSilkDye", - "ChocolateSilkDye", - "CrimsonSilkDye", ) ExtendedSilkDyes: ( - "PitchBlackSilkDye", - "ChocolateSilkDye", - "CrimsonSilkDye", - "TomatoSilkDye", - "GoldenrodSilkDye", - "SunflowerSilkDye", - "OliveSilkDye", - "SeaGreenSilkDye", - "MintSilkDye", - "MidnightBlueSilkDye", - "SlatBlueSilkDye", - "OrchidSilkDye", - "PinkiePinkSilkDye", ) BasicCottonDyes: ( - "BlackCottonDye", - "SilverCottonDye", - "CamelCottonDye", - "BrownCottonDye", - "OrangeCottonDye", - "DarkRedCottonDye", - "RedCottonDye", - "FuschiaCottonDye", - "PinkCottonDye", - "MauveCottonDye", - "PurpleCottonDye", - "NavyBlueCottonDye", - "BlueGrayCottonDye", - "BlueCottonDye", - "TealCottonDye", - "GreenCottonDye", - "LimeCottonDye", - "KhakiCottonDye", - "YellowCottonDye", ) CrudeGems: ( - "CrudeDiamond", - "CrudeRuby", - "CrudeEmerald", - "CrudeSapphire", - "CrudeTopaz", - "CrudeAmethyst", ) Gems: ( @@ -81,10 +40,4 @@ Gems: ( ) Runestones: ( - "RunestoneUruz", - "RunestoneRaido", - "RunestoneThurisaz", - "RunestoneKaunaz", - "RunestoneDagaz", - "RunestonePeorth", ) diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf index b31f7854..776a5828 100644 --- a/db/pre-re/mob_db.conf +++ b/db/pre-re/mob_db.conf @@ -4476,7 +4476,7 @@ mob_db: ( }, { Id: 1069 - SpriteName: "Scythe" + SpriteName: "ScytheMob" Name: "The Scythe" Lv: 80 Hp: 3000 diff --git a/db/pre-re/mob_skill_db.conf b/db/pre-re/mob_skill_db.conf index c89d90c7..b8a4921c 100644 --- a/db/pre-re/mob_skill_db.conf +++ b/db/pre-re/mob_skill_db.conf @@ -171,671 +171,6 @@ SKILL_COND2 = { } **************************************************************************/ - Ratto: { - NPC_POISON: { - SkillState: "MSS_BERSERK" - SkillLevel: 20 - Rate: 500 - Delay: 500 - Cancelable: true - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - } - - /**********************************************************************/ - Blub: { - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANY" - SkillLevel: 4 - Rate: 10000 - CastTime: 700 - Delay: 60000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SPAWN" - val0: 1007 - } - } - - /**********************************************************************/ - Crocotree: { - NPC_REBIRTH: { - SkillState: "MSS_DEAD" - SkillLevel: 2 - Rate: 10000 - Cancelable: true - SkillTarget: "MST_SELF" - CastCondition: "MSC_ALWAYS" - } - NPC_TRANSFORMATION: { - SkillState: "MSS_ANY" - SkillLevel: 1 - Rate: 10000 - CastTime: 700 - Delay: 60000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_AFTERSKILL" - ConditionData: 208 - val0: 1014 - } - } - - /**********************************************************************/ - Frostiana: { - NPC_POISON: { - SkillState: "MSS_BERSERK" - SkillLevel: 5 - Rate: 1000 - Delay: 2000 - Cancelable: true - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - } - - /**********************************************************************/ - Pikpik: { - NPC_SELFDESTRUCTION: { - SkillState: "MSS_BERSERK" - SkillLevel: 1 - Rate: 10000 - CastTime: 1000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_ALWAYS" - } - NPC_SELFDESTRUCTION: { - SkillState: "MSS_RUSH" - SkillLevel: 1 - Rate: 2000 - CastTime: 1000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_ALWAYS" - } - } - - /**********************************************************************/ - CroconutMob: { - NPC_SUICIDE: { - SkillState: "MSS_ANY" - SkillLevel: 1 - Rate: 10000 - CastTime: 1000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_ALWAYS" - } - } - - /**********************************************************************/ - Tipiu: { - NPC_SUMMONSLAVE: { - SkillState: "MSS_IDLE" - SkillLevel: 6 - Rate: 10000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SPAWN" - val0: 1003 - } - NPC_SUMMONSLAVE: { - SkillState: "MSS_BERSERK" - SkillLevel: 2 - Rate: 2000 - CastTime: 700 - Delay: 10000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SLAVELE" - ConditionData: 5 - val0: 1003 - } - NPC_SUMMONSLAVE: { - SkillState: "MSS_IDLE" - SkillLevel: 2 - Rate: 7000 - CastTime: 700 - Delay: 10000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SLAVELE" - ConditionData: 5 - val0: 1003 - } - } - - /**********************************************************************/ - Tipiou: { - NPC_SUMMONSLAVE: { - SkillState: "MSS_IDLE" - SkillLevel: 5 - Rate: 10000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SPAWN" - val0: 1002 - } - NPC_SUMMONSLAVE: { - SkillState: "MSS_BERSERK" - SkillLevel: 2 - Rate: 2000 - CastTime: 700 - Delay: 10000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SLAVELE" - ConditionData: 4 - val0: 1002 - } - NPC_SUMMONSLAVE: { - SkillState: "MSS_IDLE" - SkillLevel: 2 - Rate: 7000 - CastTime: 700 - Delay: 10000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SLAVELE" - ConditionData: 4 - val0: 1002 - } - } - - /**********************************************************************/ - Slime: { - NPC_SUMMONMONSTER: { - SkillState: "MSS_DEAD" - SkillLevel: 2 - Rate: 10000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_ALWAYS" - val0: 1025 - } - } - - /**********************************************************************/ - Beehive: { - NPC_SUMMONMONSTER: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 1 - Rate: 10000 - CastTime: 100 - Delay: 6500 - Cancelable: false - SkillTarget: "MST_SELF" - CastCondition: "MSC_MYHPLTMAXRATE" - ConditionData: 90 - val0: 1058 - } - NPC_SUMMONMONSTER: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 2 - Rate: 10000 - CastTime: 100 - Delay: 6500 - Cancelable: false - SkillTarget: "MST_SELF" - CastCondition: "MSC_MYHPLTMAXRATE" - ConditionData: 50 - val0: 1058 - } - NPC_SUMMONMONSTER: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 3 - Rate: 10000 - CastTime: 100 - Delay: 6500 - Cancelable: false - SkillTarget: "MST_SELF" - CastCondition: "MSC_MYHPLTMAXRATE" - ConditionData: 20 - val0: 1058 - } - NPC_SUMMONMONSTER: { - SkillState: "MSS_DEAD" - SkillLevel: 1 - Rate: 10000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_ALWAYS" - val0: 1058 - } - } - - /**********************************************************************/ - PoisonSkull: { - NPC_POISON: { - SkillState: "MSS_BERSERK" - SkillLevel: 20 - Rate: 2500 - Delay: 100 - Cancelable: true - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - } - - /**********************************************************************/ - BanditLord: { - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 1 - Rate: 10000 - CastTime: 300 - Delay: 270000 - Cancelable: false - SkillTarget: "MST_SELF" - CastCondition: "MSC_MYHPLTMAXRATE" - ConditionData: 70 - val0: 1063 - } - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 2 - Rate: 10000 - CastTime: 300 - Delay: 270000 - Cancelable: false - SkillTarget: "MST_SELF" - CastCondition: "MSC_MYHPLTMAXRATE" - ConditionData: 50 - val0: 1064 - } - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 2 - Rate: 10000 - CastTime: 1000 - Delay: 90000 - Cancelable: false - SkillTarget: "MST_SELF" - CastCondition: "MSC_LONGRANGEATTACKED" - val0: 1064 - } - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 3 - Rate: 10000 - CastTime: 1000 - Delay: 270000 - Cancelable: false - SkillTarget: "MST_SELF" - CastCondition: "MSC_MYHPLTMAXRATE" - ConditionData: 25 - val0: 1063 - } - NPC_POISON: { - SkillState: "MSS_BERSERK" - SkillLevel: 20 - Rate: 7500 - Delay: 20000 - Cancelable: true - SkillTarget: "MST_TARGET" - CastCondition: "MSC_MYHPLTMAXRATE" - ConditionData: 7 - } - /**********************************************************************/ - } - SpiderQueen: { - NPC_POISON: { - SkillState: "MSS_ALL" - SkillLevel: 20 - Rate: 5000 - Delay: 100 - Cancelable: true - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANY" - SkillLevel: 5 - Rate: 10000 - CastTime: 700 - Delay: 60000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SPAWN" - val0: 1044 - } - } - /**********************************************************************/ - FireDummy: { - MG_FIREWALL: { - SkillState: "MSS_BERSERK" - SkillLevel: 1 - Rate: 9000 - CastTime: 1800 - Delay: 120000 - Cancelable: true - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - } - /**********************************************************************/ - PinkFlower: { - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANY" - SkillLevel: 1 - Rate: 10000 - CastTime: 1000 - Delay: 20000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SLAVELE" - ConditionData: 3 - val0: 1029 - } - } - /**********************************************************************/ - YellowTulip: { - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANY" - SkillLevel: 1 - Rate: 10000 - CastTime: 500 - Delay: 10000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SLAVELE" - ConditionData: 1 - val0: 1029 - } - } - /**********************************************************************/ - YellowRose: { - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANY" - SkillLevel: 1 - Rate: 10000 - CastTime: 200 - Delay: 5000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SLAVELE" - ConditionData: 2 - val0: 1029 - } - } - /**********************************************************************/ - BlueRose: { - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANY" - SkillLevel: 2 - Rate: 10000 - CastTime: 100 - Delay: 3000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SLAVELE" - ConditionData: 2 - val0: 1029 - } - } - /**********************************************************************/ - RedRose: { - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANY" - SkillLevel: 1 - Rate: 10000 - CastTime: 1000 - Delay: 20000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SLAVELE" - ConditionData: 2 - val0: 1029 - } - } - /**********************************************************************/ - GoldenScorpion: { - SM_BASH: { - SkillState: "MSS_BERSERK" - SkillLevel: 6 - Rate: 1800 - Delay: 20000 - Cancelable: true - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ATTACKPCGE" - ConditionData: 2 - } - NPC_SILENCEATTACK: { - SkillState: "MSS_BERSERK" - SkillLevel: 2 - Rate: 9800 - Delay: 40000 - CastTime: 700 - Cancelable: true - SkillTarget: "MST_TARGET" - CastCondition: "MSC_LONGRANGEATTACKED" - } - } - - /**********************************************************************/ - GreenSlimeProgenitor: { - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANY" - SkillLevel: 4 - Rate: 10000 - CastTime: 700 - Delay: 20000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SLAVELE" - ConditionData: 2 - val0: 1024 - } - } - - /**********************************************************************/ - YellowSlimeProgenitor: { - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANY" - SkillLevel: 8 - Rate: 10000 - CastTime: 700 - Delay: 40000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SLAVELE" - ConditionData: 6 - val0: 1073 - } - } - - /**********************************************************************/ - MudSlimeProgenitor: { - NPC_SUMMONSLAVE: { - SkillState: "MSS_ANY" - SkillLevel: 8 - Rate: 10000 - CastTime: 400 - Delay: 30000 - SkillTarget: "MST_SELF" - CastCondition: "MSC_SLAVELE" - ConditionData: 6 - val0: 1096 - } - AL_DECAGI: { - SkillState: "MSS_BERSERK" - SkillLevel: 1 - Rate: 6000 - Delay: 180000 - Cancelable: true - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - } - -/**********************************************************************/ - GeneralKrukan: { - ASC_METEORASSAULT: { - SkillState: "MSS_BERSERK" - SkillLevel: 2 - Rate: 6000 - CastTime: 800 - Delay: 20000 - Cancelable: false - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - NPC_CURSEATTACK: { - SkillState: "MSS_BERSERK" - SkillLevel: 1 - Rate: 4000 - CastTime: 2000 - Delay: 20000 - Cancelable: false - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - // Mana Ghost - NPC_SUMMONMONSTER: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 4 - Rate: 7000 - CastTime: 500 - Delay: 60000 - Cancelable: true - SkillTarget: "MST_SELF" - CastCondition: "MSC_MYHPLTMAXRATE" - ConditionData: 50 - val0: 1101 - } - // Black Scorpion - NPC_SUMMONMONSTER: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 1 - Rate: 6000 - CastTime: 700 - Delay: 60000 - Cancelable: true - SkillTarget: "MST_SELF" - CastCondition: "MSC_ALWAYS" - val0: 1104 - } - SM_BASH: { - SkillState: "MSS_BERSERK" - SkillLevel: 5 - Rate: 2800 - Delay: 20000 - Cancelable: true - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - } - - /**********************************************************************/ - GeneralRazha: { - ASC_METEORASSAULT: { - SkillState: "MSS_BERSERK" - SkillLevel: 3 - Rate: 6000 - CastTime: 800 - Delay: 20000 - Cancelable: false - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - NPC_CURSEATTACK: { - SkillState: "MSS_BERSERK" - SkillLevel: 2 - Rate: 4000 - CastTime: 2000 - Delay: 20000 - Cancelable: false - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - // Skeleton - NPC_SUMMONMONSTER: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 4 - Rate: 7000 - CastTime: 500 - Delay: 60000 - Cancelable: true - SkillTarget: "MST_SELF" - CastCondition: "MSC_MYHPLTMAXRATE" - ConditionData: 50 - val0: 1084 - } - // Black Slime - NPC_SUMMONMONSTER: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 3 - Rate: 6000 - CastTime: 700 - Delay: 60000 - Cancelable: true - SkillTarget: "MST_SELF" - CastCondition: "MSC_ALWAYS" - val0: 1079 - } - SM_BASH: { - SkillState: "MSS_BERSERK" - SkillLevel: 6 - Rate: 2800 - Delay: 20000 - Cancelable: true - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - } - - /**********************************************************************/ - GeneralTerogan: { - ASC_METEORASSAULT: { - SkillState: "MSS_BERSERK" - SkillLevel: 4 - Rate: 6000 - CastTime: 800 - Delay: 20000 - Cancelable: false - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - NPC_CURSEATTACK: { - SkillState: "MSS_BERSERK" - SkillLevel: 3 - Rate: 4000 - CastTime: 2000 - Delay: 20000 - Cancelable: false - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - // Golem - NPC_SUMMONMONSTER: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 2 - Rate: 7000 - CastTime: 500 - Delay: 60000 - Cancelable: true - SkillTarget: "MST_SELF" - CastCondition: "MSC_MYHPLTMAXRATE" - ConditionData: 50 - val0: 1121 - } - // Terranite - NPC_SUMMONMONSTER: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 5 - Rate: 6000 - CastTime: 700 - Delay: 60000 - Cancelable: true - SkillTarget: "MST_SELF" - CastCondition: "MSC_ALWAYS" - val0: 1113 - } - SM_BASH: { - SkillState: "MSS_BERSERK" - SkillLevel: 7 - Rate: 2800 - Delay: 20000 - Cancelable: true - SkillTarget: "MST_TARGET" - CastCondition: "MSC_ALWAYS" - } - } - - /**********************************************************************/ - MisterPrickel: { - SN_SHARPSHOOTING: { - SkillState: "MSS_ANYTARGET" - SkillLevel: 2 - Rate: 10000 - CastTime: 1000 - Delay: 5000 - Cancelable: false - SkillTarget: "MST_TARGET" - CastCondition: "MSC_LONGRANGEATTACKED" - } - } } ) diff --git a/login-server b/login-server index 8699830c..2dfd50fc 100755 Binary files a/login-server and b/login-server differ diff --git a/map-server b/map-server index b28f008e..b82e5505 100755 Binary files a/map-server and b/map-server differ diff --git a/plugins/libevol_char.so b/plugins/libevol_char.so index b6651b05..e03d10d5 100644 Binary files a/plugins/libevol_char.so and b/plugins/libevol_char.so differ diff --git a/plugins/libevol_login.so b/plugins/libevol_login.so index 4dcc6fd1..8552e557 100644 Binary files a/plugins/libevol_login.so and b/plugins/libevol_login.so differ diff --git a/plugins/libevol_map.so b/plugins/libevol_map.so index 0e7ada89..85baa1b2 100644 Binary files a/plugins/libevol_map.so and b/plugins/libevol_map.so differ -- cgit v1.2.3-60-g2f50