From 6b307bc0581d67112c2a46ac2d9783d5d755996e Mon Sep 17 00:00:00 2001 From: Playtester Date: Mon, 15 May 2006 23:17:16 +0000 Subject: More Amon Ra related changes - Dark Blessing and Blood Sucker now have a range of 9 tiles - Small fixes on his skills again - G_Khalitzburg is a bit slower now Changes to skill.conf: -mobs now can stack ground skills by default -mobs can place unlimited ground skills -format for land_skill_limit changed git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6614 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 3 +++ conf-tmpl/battle/skill.conf | 9 +++------ db/Changelog.txt | 4 ++++ db/mob_db.txt | 2 +- db/mob_skill_db.txt | 12 ++++++------ db/skill_db.txt | 4 ++-- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 86e168f5a..e66a1a1da 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2006/05/15 + * Small changes to the skill.conf + - Monsters now can place ground skills on top of each other by default + - Land_Skill_Limit format changed and set to "Only Players" by default * When reading mapflags, when a map is set to be pvp or gvg, the other will be turned off (disables pvp mapflags in gvg maps for pk-servers) [Skotlex] * Firepillar's damage per hit is now 100% MATK (rather than 20%) when the diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf index 3f766ab27..8182fb52f 100644 --- a/conf-tmpl/battle/skill.conf +++ b/conf-tmpl/battle/skill.conf @@ -110,7 +110,7 @@ auto_counter_type: 15 // Can ground skills be placed on top of each other? (Note 4) // If set, only skills with UF_NOREITERATION set will be affected (skill_unit_db) -skill_reiteration: 0 +skill_reiteration: 2 // Can ground skills NOT be placed underneath/near players/monsters? (Note 4) // If set, only skills with UF_NOFOOTSET set will be affected (skill_unit_db) @@ -142,11 +142,8 @@ player_cloak_check_type: 1 // When a monster is cloaking, Whether the wall is checked or not. (Note 1) monster_cloak_check_type: no -// Will Player Skills Stay Within Land Limit or not? (Note 1) -player_land_skill_limit: yes - -// Will Monster Skills Stay Within Land Limit or not? (Note 1) -monster_land_skill_limit: yes +// Can't place unlimited land skills at the same time (Note 4) +land_skill_limit: 1 // If skill fails by delay, should it display or not. (Note 1) display_delay_skill_fail: no diff --git a/db/Changelog.txt b/db/Changelog.txt index ec531f014..08490d670 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -27,6 +27,10 @@ ========================= 05/15 + * More Amon Ra related changes [Playtester] + - Dark Blessing and Blood Sucker now have a range of 9 tiles + - Small fixes on his skills again + - G_Khalitzburg is a bit slower now * Fixed implementation of MVP Meteor Storm [Playtester] - Dark Lord and Amon Ra use it - Meteors drop in an area of 31x31 tiles diff --git a/db/mob_db.txt b/db/mob_db.txt index 5baedc13a..74ca90feb 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -439,7 +439,7 @@ 1435,G_EVIL_DRUID,Evil Druid,Evil Druid,58,16506,0,0,0,1,420,670,5,60,1,29,58,80,68,30,10,12,2,1,89,2693,300,2276,576,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1436,G_JAKK,Jakk,Jakk,38,3581,0,0,0,1,315,382,5,30,1,38,38,43,75,45,10,12,1,0,43,2181,200,1180,480,648,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1437,G_JOKER,Joker,Joker,57,12450,0,0,0,1,621,738,10,35,1,143,47,75,98,175,10,12,2,7,84,2181,100,1364,864,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1438,G_KHALITZBURG,Khalitzburg,Khalitzburg,63,19276,0,0,0,1,875,1025,45,10,1,65,48,5,73,40,10,12,2,1,29,2693,100,528,1000,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1438,G_KHALITZBURG,Khalitzburg,Khalitzburg,63,19276,0,0,0,1,875,1025,45,10,1,65,48,5,73,40,10,12,2,1,29,2693,200,528,1000,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1439,G_HIGH_ORC,High Orc,High Orc,52,6890,0,0,0,1,428,533,15,5,1,46,55,35,82,40,10,12,2,7,43,2181,150,1500,500,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1440,G_STEM_WORM,Stem Worm,Stem Worm,40,6136,0,0,0,2,290,375,5,10,1,30,26,15,79,35,10,12,1,3,24,2181,200,1500,500,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1441,G_PENOMENA,Penomena,Penomena,57,7256,0,0,0,7,415,565,5,50,1,5,35,15,136,30,10,12,1,5,25,2181,400,832,500,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt index a6ff6caac..bfb5b6d02 100644 --- a/db/mob_skill_db.txt +++ b/db/mob_skill_db.txt @@ -2444,12 +2444,12 @@ 1511,Amon Ra@NPC_BLOODDRAIN,any,199,1,2000,0,5000,yes,target,always,0,,,,,,29 1511,Amon Ra@NPC_BLOODDRAIN,any,199,1,2000,0,5000,yes,target,always,0,,,,,,29 1511,Amon Ra@NPC_DARKBLESSING,any,203,1,5000,0,2000,no,target,always,0,,,,,, -1511,Amon Ra@NPC_SUMMONMONSTER,any,209,6,5000,0,10000,no,self,casttargeted,0,1474,1477,1438,,,9 -1511,Amon Ra@NPC_SUMMONMONSTER,any,209,6,5000,0,10000,no,self,longrangeattacked,0,1474,1477,1438,,,9 -1511,Amon Ra@WZ_FIREPILLAR,idle,80,30,10000,0,2000,yes,around2,always,0,,,,,, -1511,Amon Ra@WZ_FIREPILLAR,idle,80,30,10000,0,2000,yes,around2,always,0,,,,,, -1511,Amon Ra@WZ_METEOR,any,83,30,10000,0,0,yes,self,casttargeted,,,,,,, -1511,Amon Ra@WZ_METEOR,any,83,30,10000,0,0,yes,self,longrangeattacked,,,,,,, +1511,Amon Ra@NPC_SUMMONMONSTER,any,209,5,5000,0,10000,no,self,casttargeted,0,1474,1477,1438,,,9 +1511,Amon Ra@NPC_SUMMONMONSTER,any,209,5,5000,0,10000,no,self,longrangeattacked,0,1474,1477,1438,,,9 +1511,Amon Ra@WZ_FIREPILLAR,idle,80,30,10000,0,1000,yes,around2,always,0,,,,,, +1511,Amon Ra@WZ_FIREPILLAR,angry,80,30,10000,0,1000,yes,around2,always,0,,,,,, +1511,Amon Ra@WZ_METEOR,any,83,30,10000,0,10000,yes,self,casttargeted,,,,,,, +1511,Amon Ra@WZ_METEOR,any,83,30,10000,0,10000,yes,self,longrangeattacked,,,,,,, 1512,Hyegun@AS_SONICBLOW,attack,136,5,500,1000,30000,no,target,always,0,,,,,, 1512,Hyegun@MO_BODYRELOCATION,chase,264,1,2000,500,5000,no,target,always,0,,,,,, 1512,Hyegun@NPC_CRITICALSLASH,attack,170,1,500,0,5000,yes,target,always,0,,,,,, diff --git a/db/skill_db.txt b/db/skill_db.txt index 795ed22b9..71d0c7edf 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -218,11 +218,11 @@ 196,0,0,4,0,1,0,10,1,no,0,2,0,magic,0 //NPC_SUMMONSLAVE#Follower Summons# 197,0,0,4,0,1,0,10,1,no,0,2,0,none,0 //NPC_EMOTION#Emotion# 198,0,0,4,0,1,0,10,1,no,0,2,0,magic,0 //NPC_TRANSFORMATION#Transformation# -199,-1,6,1,-1,0,0,10,1,no,0,2,0,weapon,0 //NPC_BLOODDRAIN#Sucking Blood# +199,9,6,1,-1,0,0,10,1,no,0,2,0,weapon,0 //NPC_BLOODDRAIN#Sucking Blood# 200,9,6,1,7,0,0,10,1,no,0,2,0,magic,0 //NPC_ENERGYDRAIN#Energy Drain# 201,0,0,4,0,1,0,10,1,no,0,2,0,weapon,0 //NPC_KEEPING#Keeping# 202,2,6,1,7,0,0,5,1,no,0,2,0,misc,0 //NPC_DARKBREATH#Dark Breath# -203,1,6,1,7,1,0,10,1,no,0,2,0,magic,0 //NPC_DARKBLESSING#Dark Blessing# +203,9,6,1,7,1,0,10,1,no,0,2,0,magic,0 //NPC_DARKBLESSING#Dark Blessing# 204,0,0,4,0,1,0,10,1,no,0,2,0,magic,0 //NPC_BARRIER#Barrier# 205,0,0,4,0,1,0,10,1,no,0,2,0,weapon,0 //NPC_DEFENDER#Defender# 206,1,6,1,-1,1,0,10,1,no,0,2,0,weapon,0 //NPC_LICK#Lick# -- cgit v1.2.3-70-g09d2