diff --git a/db/re/item_db.txt b/db/re/item_db.txt index 74da3d6d14..1612e6f211 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -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); },{},{} diff --git a/npc/re/warps/dungeons/ecl_tdun.txt b/npc/re/warps/dungeons/ecl_tdun.txt index 6d6bb321af..5c5f4117e8 100644 --- a/npc/re/warps/dungeons/ecl_tdun.txt +++ b/npc/re/warps/dungeons/ecl_tdun.txt @@ -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. //============================================================ diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index 932e2e5e49..3e67388b6b 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -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); diff --git a/src/custom/atcommand.inc b/src/custom/atcommand.inc index d26d6fb5ae..afb74b2b24 100644 --- a/src/custom/atcommand.inc +++ b/src/custom/atcommand.inc @@ -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; +//} diff --git a/src/custom/script.inc b/src/custom/script.inc index adfd6cd6a1..1e01c886c0 100644 --- a/src/custom/script.inc +++ b/src/custom/script.inc @@ -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; +//} diff --git a/src/map/atcommand.c b/src/map/atcommand.c index a96e8aeab6..9fc4ca40b8 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -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; diff --git a/src/map/script.c b/src/map/script.c index bc31326d3a..0d63181b86 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -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;