- Updated BD_INTOABYSS's unit flag to not affect mobs.

- Changed setting for skill_nocast flag 16. It is no longer a "pk-mode map" setting, it's now a clone-forbidden skill. That is, skills with the flag 16 will never be copied by clones. If you use a PK-mode server, use flag 2 now to forbid skills from common maps.
- Default skills from not being cloned are Magnus Exorcism and Turn Undead.
- The map search free cell will now use the size of the map # of tries before giving up when the spawn area is the whole map. Added a check to inmediately give up when the number of spawn retries has reached the max specified (no_spawn_onplayer = 100).
- Cleaned up a bit the clone code to account for the unit flags UF_NOPC/UF_NOMOB when the skill is not ground-based (accounts for self skill that causes a ground-tile to be placed, like Dances).


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7315 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 9 insertions, 4 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 0c63781c7..38948ca4c 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -25,6 +25,7 @@
 

 =========================

 06/23

+	* Updated BD_INTOABYSS's unit flag to not affect mobs. [Skotlex]

 	* Rogue Card Combo now removes Intimidate autospell [Playtester]

 	* Sorted in the new cards and fixed some equips [Playtester]

 06/22

diff --git a/db/skill_nocast_db.txt b/db/skill_nocast_db.txt
index fa2a0b4de..afcc62b91 100644
--- a/db/skill_nocast_db.txt
+++ b/db/skill_nocast_db.txt
@@ -5,10 +5,10 @@
 //

 // Legend for 'Flag' field (bitmask):

 //  1 = Cannot be used in normal maps

-//  2 = Cannot be used in PvP maps

+//  2 = Cannot be used in PvP maps (use this instead of 1 for PK-mode servers)

 //  4 = Cannot be used in GvG maps

 //  8 = Cannot be used when WoE is on

-//  16 = Cannot be used in PK Mode maps

+//  16 = Cannot be cloned (clones will not copy this skill)

 //  Restricted zones - they're configured by 'restricted <number>' mapflag

 //  32 = Cannot be used in zone 1 maps

 //  64 = Cannot be used in zone 2 maps

@@ -32,7 +32,11 @@
 491,4	//CR_CULTIVATION

 

 //mixed

-488,19	//CG_HERMODE

+488,3	//CG_HERMODE

+

+//Clone Forbidden/pointless skills

+77,16	//PR_TURNUNDEAD

+79,16 //PR_MAGNUS

 

 //Zone 1 - Aldebaran Turbo Track

 219,32 //Snatch

diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index 712a3784b..ed7b774c0 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -61,7 +61,7 @@
 309,0xa1,    ,  4, 0,  -1,party, 0x300	//BD_DRUMBATTLEFIELD#戦太鼓の響き

 310,0xa2,    ,  4, 0,  -1,party, 0x300	//BD_RINGNIBELUNGEN#ニーベルングの指輪

 311,0xa3,    ,  4, 0,  -1,all,   0x300	//BD_ROKISWEIL#ロキの叫び

-312,0xa4,    ,  4, 0,  -1,party, 0x300	//BD_INTOABYSS#深淵の中に

+312,0xa4,    ,  4, 0,  -1,party, 0x320	//BD_INTOABYSS#深淵の中に

 313,0xa5,    ,  4, 0,  -1,party, 0x300	//BD_SIEGFRIED#不死身のジークフリード

 317,0xa6,    ,  3, 0,3000,enemy, 0x100	//BA_DISSONANCE#不協和音

 319,0xa7,    ,  3, 0,  -1,all,   0x120	//BA_WHISTLE#口笛