Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed some compiler warnings from recent commits. (credits: Lighta, Cydh)

Browse Source 
* Umbala Spirit doesn't have a slot. (bugreport:8039)

Signed-off-by: Euphy <euphy@rathena.org>
This commit is contained in:
Euphy 2013-08-31 13:18:10 -04:00
parent a4fdc72e6d
commit 397e1e5132
7 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/re/item_db.txt
View File

@ -8051,7 +8051,7 @@
18502,Cheer_Scarf10,Cheer Scarf10,5,0,,0,,0,,0,0xFFFFFFFF,63,2,1,,1,0,369,{ bonus2 bExpAddRace,RC_Boss,100; bonus2 bExpAddRace,RC_NonBoss,100; },{},{}
18503,Majestic_Devil,Small Devil Horns,5,20,,100,,2,,0,0xFFFFFFFF,63,2,512,,1,0,562,{ bonus bAtkRate,5; bonus bMatkRate,5; bonus bMaxHPrate,10; bonus bMaxSPrate,10; },{},{}
18504,Anubis_Helm_J,Anubis Helm J,5,20,,1000,,0,,0,0xFFFFFFFF,63,2,769,,70,0,485,{ bonus bMdefRate,-50; bonus bDefRate,-50; bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",2,10,BF_WEAPON|BF_MAGIC,0; },{},{}
18505,Umbala_Spirit,Umbala Spirit,5,0,,200,,1,,1,0xFFFFFFFF,63,2,1,,30,0,675,{ bonus bVit,1; bonus bMaxHPrate,1; bonus2 bAddMonsterDropItem,517,500; bonus2 bAddItemHealRate,517,25; },{},{}
18505,Umbala_Spirit,Umbala Spirit,5,0,,200,,1,,0,0xFFFFFFFF,63,2,1,,30,0,675,{ bonus bVit,1; bonus bMaxHPrate,1; bonus2 bAddMonsterDropItem,517,500; bonus2 bAddItemHealRate,517,25; },{},{}
18506,Hattah_Black,Hattah Black,5,12000,,4000,,2,,1,0xFFFFFFFF,63,2,769,,1,1,676,{},{},{}
18507,Elven_Ears_,Elven Ears,5,20,,100,,0,,1,0xFFFFFFFE,63,2,512,,70,0,73,{},{},{}
18508,Garuda_Hat,Garuda Hat,5,20,,100,,4,,1,0xFFFFFFFE,63,2,256,,30,1,677,{ bonus bLuk,5; bonus bMdef,3; bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Wind,5; bonus2 bSubEle,Ele_Earth,5; bonus2 bSubEle,Ele_Dark,5; bonus2 bSubEle,Ele_Holy,5; bonus2 bSubEle,Ele_Ghost,5; bonus bHit,10; bonus bDelayRate,-5; if(getrefine()>=7) bonus2 bAddMonsterDropItem,522,100*(getrefine()-6); },{},{}

4
npc/re/warps/dungeons/ecl_tdun.txt
View File

@ -1,5 +1,5 @@
//===== rAthena Script =======================================
//= Eclage Dungeon Warp Script
//= Bifrost Tower Warp Script
//===== By: ==================================================
//= Chilly
//===== Current Version: =====================================
@ -7,7 +7,7 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Warp Points for Eclage Dungeon
//= Warp Points for Bifrost Tower
//===== Additional Comments: =================================
//= 1.0 First Version.
//============================================================

2
sql-files/item_db_re.sql
View File

@ -8082,7 +8082,7 @@ REPLACE INTO `item_db_re` VALUES (18501,'Cheer_Scarf8','Cheer Scarf8',5,0,NULL,0
REPLACE INTO `item_db_re` VALUES (18502,'Cheer_Scarf10','Cheer Scarf10',5,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1,NULL,'1',0,369,'bonus2 bExpAddRace,RC_Boss,100; bonus2 bExpAddRace,RC_NonBoss,100;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18503,'Majestic_Devil','Small Devil Horns',5,20,NULL,100,NULL,2,NULL,0,0xFFFFFFFF,63,2,512,NULL,'1',0,562,'bonus bAtkRate,5; bonus bMatkRate,5; bonus bMaxHPrate,10; bonus bMaxSPrate,10;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18504,'Anubis_Helm_J','Anubis Helm J',5,20,NULL,1000,NULL,0,NULL,0,0xFFFFFFFF,63,2,769,NULL,'70',0,485,'bonus bMdefRate,-50; bonus bDefRate,-50; bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",2,10,BF_WEAPON|BF_MAGIC,0;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18505,'Umbala_Spirit','Umbala Spirit',5,0,NULL,200,NULL,1,NULL,1,0xFFFFFFFF,63,2,1,NULL,'30',0,675,'bonus bVit,1; bonus bMaxHPrate,1; bonus2 bAddMonsterDropItem,517,500; bonus2 bAddItemHealRate,517,25;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18505,'Umbala_Spirit','Umbala Spirit',5,0,NULL,200,NULL,1,NULL,0,0xFFFFFFFF,63,2,1,NULL,'30',0,675,'bonus bVit,1; bonus bMaxHPrate,1; bonus2 bAddMonsterDropItem,517,500; bonus2 bAddItemHealRate,517,25;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18506,'Hattah_Black','Hattah Black',5,12000,NULL,4000,NULL,2,NULL,1,0xFFFFFFFF,63,2,769,NULL,'1',1,676,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18507,'Elven_Ears_','Elven Ears',5,20,NULL,100,NULL,0,NULL,1,0xFFFFFFFE,63,2,512,NULL,'70',0,73,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (18508,'Garuda_Hat','Garuda Hat',5,20,NULL,100,NULL,4,NULL,1,0xFFFFFFFE,63,2,256,NULL,'30',1,677,'bonus bLuk,5; bonus bMdef,3; bonus2 bSubEle,Ele_Neutral,5; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Wind,5; bonus2 bSubEle,Ele_Earth,5; bonus2 bSubEle,Ele_Dark,5; bonus2 bSubEle,Ele_Holy,5; bonus2 bSubEle,Ele_Ghost,5; bonus bHit,10; bonus bDelayRate,-5; if(getrefine()>=7) bonus2 bAddMonsterDropItem,522,100*(getrefine()-6);',NULL,NULL);

12
src/custom/atcommand.inc
View File

@ -11,9 +11,9 @@
* }
**/
ACMD_FUNC(newcommand)
{
clif_displaymessage(fd, "It works!");
clif_specialeffect(&sd->bl, 343, AREA);
return 0;
}
//ACMD_FUNC(newcommand)
//{
// clif_displaymessage(fd, "It works!");
// clif_specialeffect(&sd->bl, 343, AREA);
// return 0;
//}

12
src/custom/script.inc
View File

@ -11,9 +11,9 @@
* }
**/
BUILDIN_FUNC(example)
{
ShowInfo("buildin_example: It works!\n");
script_pushint(st,1);
return 0;
}
//BUILDIN_FUNC(example)
//{
// ShowInfo("buildin_example: It works!\n");
// script_pushint(st,1);
// return 0;
//}

2
src/map/atcommand.c
View File

@ -9081,7 +9081,6 @@ ACMD_FUNC(langtype)
return -1;
}
#include "../custom/atcommand.inc"
/**
@ -9361,7 +9360,6 @@ void atcommand_basecommands(void) {
ACMD_DEF(channel),
ACMD_DEF(fontcolor),
ACMD_DEF(langtype),
};
AtCommandInfo* atcommand;
int i;

11
src/map/script.c
View File

@ -10781,12 +10781,11 @@ BUILDIN_FUNC(setmapflagnosave)
BUILDIN_FUNC(getmapflag)
{
int16 m,i,type=0;
int16 m,i;
const char *str;
str=script_getstr(st,2);
i=script_getnum(st,3);
FETCH(4,type);
m = map_mapname2mapid(str);
if(m >= 0) {
@ -10852,7 +10851,8 @@ BUILDIN_FUNC(getmapflag)
#ifdef ADJUST_SKILL_DAMAGE
case MF_SKILL_DAMAGE:
{
int ret_val = 0;
int ret_val=0, type=0;
FETCH(4,type);
switch (type) {
case 1: ret_val = map[m].adjust.damage.pc; break;
case 2: ret_val = map[m].adjust.damage.mob; break;
@ -10886,14 +10886,13 @@ static int script_mapflag_pvp_sub(struct block_list *bl,va_list ap) {
}
BUILDIN_FUNC(setmapflag)
{
int16 m,i,type=0;
int16 m,i;
const char *str;
int val=0;
str=script_getstr(st,2);
i=script_getnum(st,3);
FETCH(4,val);
FETCH(5,type);
m = map_mapname2mapid(str);
if(m >= 0) {
switch(i) {
@ -10974,6 +10973,8 @@ BUILDIN_FUNC(setmapflag)
#ifdef ADJUST_SKILL_DAMAGE
case MF_SKILL_DAMAGE:
{
int type=0;
FETCH(5,type);
switch (type) {
case 1: map[m].adjust.damage.pc = val; break;
case 2: map[m].adjust.damage.mob = val; break;