Patch 1544

・マップ帰還系スキルの追加（skill.c）・ランダムオプションで前方記載が優位にエンチャントされる問題を修正（mob.c） Thanks Dallen さん
auriga · Apr 29, 2024 · 4433995 · 4433995
1 parent 4e69ceb
commit 4433995
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3  1,17 @@
 ----------------------------------------
 //1544 [2024/04/29] by refis
 
 ・マップ帰還系スキルの追加（skill.c）
 
 ・ランダムオプションで前方記載が優位にエンチャントされる問題を修正（mob.c）
 	Thanks Dallen さん
 
 ----------------------------------------
 //1543 [2024/04/29] by refis
 
 ・mob_dbを修正（mob_db.txt, mob_skill_db.txt）
 	Thanks Dallen さん、フリージア さん
 
 ----------------------------------------
 //1542 [2024/04/21] by refis
 

diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
@@ -815,11  815,11 @@
 3034,0,0,0,5000,0,0	//ECL_SEQUOIADUST#���E���̂ق���#
 3035,0,3000,0,300000,0,0	//ECLAGE_RECALL#�G�N���[�W���ւ̋A��#
 
-3041,0,2000,0,300000,0,0	//ALL_NIFLHEIM_RECALL#�j�u���w�C���ւ̋A��#
-3042,0,2000,0,300000,0,0	//ALL_PRONTERA_RECALL#�v�����e���ւ̋A��#
-3043,0,2000,0,300000,0,0	//ALL_GLASTHEIM_RECALL#�O���X�g�w�C���ւ̋A��#
-3044,0,2000,0,300000,0,0	//ALL_THANATOS_RECALL#�^�i�g�X�^���[�ւ̋A��#
-3045,0,2000,0,300000,0,0	//ALL_LIGHTHALZEN_RECALL#���q�^���[���ւ̋A��#
 3041,0,1000,0,300000,0,0	//ALL_NIFLHEIM_RECALL#�j�u���w�C���ւ̋A��#
 3042,0,1000,0,1800000:950000,0,0	//ALL_PRONTERA_RECALL#�v�����e���ւ̋A��#
 3043,0,1000,0,300000,0,0	//ALL_GLASTHEIM_RECALL#�O���X�g�w�C���ւ̋A��#
 3044,0,1000,0,300000,0,0	//ALL_THANATOS_RECALL#�^�i�g�X�^���[�ւ̋A��#
 3045,0,1000,0,300000,0,0	//ALL_LIGHTHALZEN_RECALL#���q�^���[���ւ̋A��#
 
 5001,0,0,0,60000,5000,0	//GC_DARKCROW#�_�[�N�N���[#
 5002,0,1000,500,300000,60000,0	//RA_UNLIMIT#�A�����~�b�g#

diff --git a/db/skill_db.txt b/db/skill_db.txt
@@ -1192,7  1192,7 @@
 3039,0,6,1,0,1,1,1,no,0,0,0,none,0,GM_FORCE_TRANSFER,
 3040,0,6,1,0,1,1,1,no,0,0,0,none,0,GM_WIDE_RESURRECTION,
 3041,0,6,4,0,1,1,1,no,0,0,0,none,0,ALL_NIFLHEIM_RECALL,�j�u���w�C���ւ̋A��
-3042,0,6,4,0,1,1,1,no,0,0,0,none,0,ALL_PRONTERA_RECALL,�v�����e���ւ̋A��
 3042,0,6,4,0,1,2,1,no,0,0,0,none,0,ALL_PRONTERA_RECALL,�v�����e���ւ̋A��
 3043,0,6,4,0,1,1,1,no,0,0,0,none,0,ALL_GLASTHEIM_RECALL,�O���X�g�w�C���ւ̋A��
 3044,0,6,4,0,1,1,1,no,0,0,0,none,0,ALL_THANATOS_RECALL,�^�i�g�X�^���[�ւ̋A��
 3045,0,6,4,0,1,1,1,no,0,0,0,none,0,ALL_LIGHTHALZEN_RECALL,���q�^���[���ւ̋A��

diff --git a/src/map/mob.c b/src/map/mob.c
@@ -1603,14  1603,17 @@ static int mob_delay_item_drop(int tid,unsigned int tick,int id,void *data)
 		if(ro.nameid) {
 			int i, slot = 0;
 			int rate = 0;
 			int rnd = atn_rand()%10000;
 			for(i = 0; i < sizeof(ro.opt) / sizeof(ro.opt[0]); i  ) {
-				if(ro.opt[i].slot != slot)
 				if(ro.opt[i].slot != slot) {
 					rate = 0;
 					rnd = atn_rand()%10000;
 				}
 				slot = ro.opt[i].slot;
 				if(temp_item.opt[slot].id > 0)
 					continue;
 				rate  = ro.opt[i].rate;
-				if(rate >= atn_rand()%10000) {
 				if(rate >= rnd) {
 					temp_item.opt[slot].id = ro.opt[i].optid;
 					if(ro.opt[i].optval_plus)
 						temp_item.opt[slot].val = ro.opt[i].optval_min   (atn_rand() % ((ro.opt[i].optval_max - ro.opt[i].optval_min) / ro.opt[i].optval_plus   1)) * ro.opt[i].optval_plus;

diff --git a/src/map/skill.c b/src/map/skill.c
@@ -8407,8  8407,11 @@ int skill_castend_nodamage_id( struct block_list *src, struct block_list *bl,int
 	case RETURN_TO_ELDICASTES:		/* �G���f�B�J�X�e�B�X�ւ̋A�� */
 	case ALL_GUARDIAN_RECALL:		/* ���[���ւ̋A�� */
 	case ECLAGE_RECALL:		/* �G�N���[�W���ւ̋A�� */
 	case ALL_NIFLHEIM_RECALL:		/* �j�u���w�C���ւ̋A�� */
 	case ALL_PRONTERA_RECALL:		/* �v�����e���ւ̋A�� */
 	case ALL_GLASTHEIM_RECALL:		/* �O���X�g�w�C���ւ̋A�� */
 	case ALL_THANATOS_RECALL:		/* �^�i�g�X�^���[�ւ̋A�� */
 	case ALL_LIGHTHALZEN_RECALL:	/* ���q�^���[���ւ̋A�� */
 		if(sd) {
 			int x, y;
 			const char *mapname;
@@ -8425,14  8428,26 @@ int skill_castend_nodamage_id( struct block_list *src, struct block_list *bl,int
 				x = 44;
 				y = 151;
 				mapname = "mora.gat";
 			} else if(skillid == ALL_NIFLHEIM_RECALL) {
 				x = 193;
 				y = 186;
 				mapname = "niflheim.gat";
 			} else if(skillid == ALL_PRONTERA_RECALL) {
-				x = 115;
-				y = 72;
 				x = (skilllv==1)? 115: 159;
 				y = (skilllv==1)? 72: 192;
 				mapname = "prontera.gat";
 			} else if(skillid == ALL_GLASTHEIM_RECALL) {
 				x = 200;
 				y = 268;
 				mapname = "glast_01.gat";
 			} else if(skillid == ALL_THANATOS_RECALL) {
 				x = 139;
 				y = 156;
 				mapname = "hu_fild01.gat";
 			} else if(skillid == ALL_LIGHTHALZEN_RECALL) {
 				x = 307;
 				y = 307;
 				mapname = "lighthalzen.gat";
 			} else {
 				x = 47;
 				y = 31;