Explorar o código

* Fixed bugreport:8090, Frost Driver damages with overpower level because skill_lv reduction mistake.
* Added item_id on @whodrops's result for each item (avoiding confusion if the result is more than 1 items).

Cahyadi Ramadhan Togihon %!s(int64=11) %!d(string=hai) anos
pai
achega
99ea656914

+ 1 - 1
conf/msg_conf/map_msg.conf

@@ -1208,7 +1208,7 @@
 
 // @whodrops
 1284: Please enter item name/ID (usage: @whodrops <item name/ID>).
-1285: Item: '%s'[%d]
+1285: Item: '%s'[%d] (ID:%d)
 1286:  - Item is not dropped by mobs.
 1287:  - Common mobs with highest drop chance (only max %d are listed):
 

+ 1 - 1
conf/msg_conf/map_msg_chn.conf

@@ -1187,7 +1187,7 @@
 
 // @whodrops
 1284: Please enter 物品名稱/ID (用法: @whodrops <物品名稱/ID>).
-1285: Item: '%s'[%d]
+1285: Item: '%s'[%d] (ID:%d)
 1286:  - Item is not dropped by mobs.
 1287:  - Common mobs with highest drop chance (only max %d are listed):
 

+ 1 - 1
conf/msg_conf/map_msg_frn.conf

@@ -1206,7 +1206,7 @@
 
 // @whodrops
 1284: Entrez un nom/ID d'Objet (usage: @whodrops <nom/ID_objet>).
-1285: Objet: '%s'[%d]
+1285: Objet: '%s'[%d] (ID:%d)
 1286:  - Cet Objet n'est lâché par aucun monstre.
 1287:  - Monstres communs avec la plus grande chance de drop (seuls %d max sont listés):
 

+ 1 - 1
conf/msg_conf/map_msg_idn.conf

@@ -1208,7 +1208,7 @@
 
 // @whodrops
 1284: Harap masukkan nama/ID item. (Penggunaan: @whodrops <nama/ID item>).
-1285: Item: '%s'[%d]
+1285: Item: '%s'[%d] (ID:%d)
 1286:  - Item ini tidak dijatuhkan dari monster.
 1287:  - Monster biasa dengan kemungkinan menjatuhkan barang tertinggi. (Maks. hanya %d yang ditampilkan):
 

+ 1 - 1
conf/msg_conf/map_msg_por.conf

@@ -1188,7 +1188,7 @@
 
 // @whodrops
 1284: Digite o nome/ID de um item (uso: @whodrops <nome do item/ID>).
-1285: Item: '%s'[%d]
+1285: Item: '%s'[%d] (ID:%d)
 1286:  - Item não derrubado por monstros.
 1287:  - Monstros comuns com maiores chances de drop (somente máx %d são listados):
 

+ 1 - 1
conf/msg_conf/map_msg_rus.conf

@@ -1206,7 +1206,7 @@
 
 // @whodrops
 1284: Введите ID/название предмета (Использование: @whodrops <ID/название предмета>).
-1285: Предмет: '%s'[%d]
+1285: Предмет: '%s'[%d] (ID:%d)
 1286:  - Предмет не падает с монстров.
 1287:  - Обычные монстры с высоким шансом выпадения (перечислено только %d):
 

+ 1 - 1
conf/msg_conf/map_msg_spn.conf

@@ -1193,7 +1193,7 @@
 
 // @whodrops
 1284: Introduce el nombre/ID de un objeto (Instrucciones: @whodrops <nombre/ID del objeto>). 
-1285: Objeto: '%s'[%d]
+1285: Objeto: '%s'[%d] (ID:%d)
 1286: - Ningún monstruo tiene ese objeto.
 1287: - Estos monstruos tienen ese objeto (sólo se muestran un máximo de %d):
 

+ 1 - 1
conf/msg_conf/map_msg_tha.conf

@@ -1200,7 +1200,7 @@
 
 // @whodrops
 1284: â»Ã´Ãкت×èÍ/ID item (ÇÔ¸Õãªé: @whodrops <ª×èÍ/ID item>).
-1285: Item: '%s'[%d]
+1285: Item: '%s'[%d] (ID:%d)
 1286:  - Item ¹ÕéäÁèÁÕµ¡¨Ò¡ monster.
 1287:  - Monster ·ÑèÇä»·ÕèÁÕâÍ¡Òʵ¡ÊÙ§ÊØ´ (áÊ´§à¾Õ§ %d ÃÒ¡ÒÃ):
 

+ 1 - 1
src/map/atcommand.c

@@ -7344,7 +7344,7 @@ ACMD_FUNC(whodrops)
 	}
 	for (i = 0; i < count; i++) {
 		item_data = item_array[i];
-		sprintf(atcmd_output, msg_txt(sd,1285), item_data->jname,item_data->slot); // Item: '%s'[%d]
+		sprintf(atcmd_output, msg_txt(sd,1285), item_data->jname, item_data->slot, item_data->nameid); // Item: '%s'[%d] (ID:%d)
 		clif_displaymessage(fd, atcmd_output);
 
 		if (item_data->mob[0].chance == 0) {

+ 5 - 3
src/map/battle.c

@@ -6123,9 +6123,11 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
 		int i = rnd()%100;
 		if (sc->data[SC_SPIRIT] && sc->data[SC_SPIRIT]->val2 == SL_SAGE)
 			i = 0; //Max chance, no skill_lv reduction. [Skotlex]
-		if (i >= 50) skill_lv -= 2;
-		else if (i >= 15) skill_lv--;
-		if (skill_lv < 1) skill_lv = 1;
+		//reduction only for skill_lv > 1
+		if (skill_lv > 1) {
+			if (i >= 50) skill_lv -= 2;
+			else if (i >= 15) skill_lv--;
+		}
 		sp = skill_get_sp(skill_id,skill_lv) * 2 / 3;
 
 		if (status_charge(src, 0, sp)) {