Cydh

src/map/skill.c | 1 +  1 file changed, 1 insertion(+)   diff --git a/src/map/skill.c b/src/map/skill.c index ad08fb3..23db870 100755 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -15595,6 +15595,7 @@ void skill_weaponrefine (struct map_session_data *sd, int idx)   pc_unequipitem(sd,idx,3);   }   clif_delitem(sd,idx,1,3); + clif_additem(sd,idx,1,0);   clif_upgrademessage(sd->fd, 0, item->nameid);   clif_inventorylist(sd);   clif_refine(sd->fd,0,idx,item->refine);  

vending_nowho-rA-svn17340.patch

cannot find the string ?
 
edit: typo,
so change this config in application.php
'NoResetPassGroupLevel' => AccountLevel::LOWGM, // Minimum group level of account to prevent password reset using control panel.  

yes, fixed here https://github.com/rathena/FluxCP/commit/e0fa6a8347db17de99b3fe0926dc87c0769262fc

a new ID too? I guess because your NPC id is out of range based on this check. https://github.com/rathena/rathena/commit/f42c2ff21171ac48fec329d6ff0dfdbbd2f0ea59#diff-301256667588bcb9a1bbf9b2ab500229R1094 try change the ID (<-- better this) or add/edit the range urself
// Old NPC range #define MAX_NPC_CLASS NPC_RANGE2_END // New NPC range #define MAX_NPC_CLASS2_START NPC_RANGE3_START #define MAX_NPC_CLASS2_END NPC_RANGE3_END //Checks if a given id is a valid npc id. [Skotlex] //Since new npcs are added all the time, the max valid value is the one before the first mob (Scorpion = 1001) #define npcdb_checkid(id) ( ( (id) > NPC_RANGE1_START && (id) < NPC_RANGE1_END ) || (id) == JT_HIDDEN_WARP_NPC || ( (id) > NPC_RANGE2_START && (id) < NPC_RANGE2_END ) || (id) == JT_INVISIBLE || ( id > NPC_RANGE3_START && id < NPC_RANGE3_END ) )  
or can u paste here what's u write on const.txt and in ur script definition?

Maybe you can try this diff.
There is new config, you just need set it to "no".
// Always drop item from quest_db even the kill objective is complete? (Note 1) quest_drop: yes  

try this maybe
src/map/skill.c | 10 ++++++++++ src/map/skill.h | 1 + 2 files changed, 11 insertions(+) diff --git a/src/map/skill.c b/src/map/skill.c index db8cc49..23c3a4c 100755 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -13500,6 +13500,7 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, uns sg->limit=DIFF_TICK(tick,sg->tick)+1500; //Target will be stopped for 3 seconds sc_start(ss,bl,SC_STOP,100,0,skill_get_time2(sg->skill_id,sg->skill_lv)); + skill_someoneStepOnMyTrap(ss, bl); } break; @@ -21184,6 +21185,15 @@ static void skill_db_destroy(void) { skill_db = NULL; } +void skill_someoneStepOnMyTrap(struct block_list *src, struct block_list *bl) { + if (!bl || !src) + return; + if (src == bl || src->type != BL_PC || src->m != bl->m) + return; + /* clif_viewpoint need id, and it's bad! */ + clif_viewpoint(BL_CAST(BL_PC, src), src->id, 0, bl->x, bl-> y, rnd()%255, 0xFF0000); +} + /*=============================== * DB reading. * skill_db.txt diff --git a/src/map/skill.h b/src/map/skill.h index a5df73b..df669d8 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -2135,6 +2135,7 @@ void skill_combo_toogle_inf(struct block_list* bl, uint16 skill_id, int inf); void skill_combo(struct block_list* src,struct block_list *dsrc, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int tick); void skill_reveal_trap_inarea(struct block_list *src, int range, int x, int y); +void skill_someoneStepOnMyTrap(struct block_list *src, struct block_list *bl); #ifdef ADJUST_SKILL_DAMAGE /// Skill Damage target  

It's mean, conflicts in ur file after merger. It's common when u have modified file.
You can read also
Resolving a merge conflict from the command line Resolving Conflicts How to resolve merge conflicts in Git?  
But from me, I'll explain a little. The conflicted lines always have these information like this
<<<<<<< cb279a724341d27700e09b92eee766df77de0ede // These are codes below are from rAthena/rAthena@cb279a72 /* random option attributes */ export_constant(ROA_ID); export_constant(ROA_VALUE); export_constant(ROA_PARAM); export_constant(CARD0_FORGE); export_constant(CARD0_CREATE); export_constant(CARD0_PET); export_constant(STOR_MODE_NONE); export_constant(STOR_MODE_GET); export_constant(STOR_MODE_PUT); ======= // This code below are from my 'current' source, I added this line script_set_constant("bNoEleStone",SP_NO_ELESTONE,false); >>>>>>> 17718a6e36db0ef3dfcf5247bc5fe2a88e045b85 So, if I want to conflict that lines above, become
/* random option attributes */ export_constant(ROA_ID); export_constant(ROA_VALUE); export_constant(ROA_PARAM); export_constant(CARD0_FORGE); export_constant(CARD0_CREATE); export_constant(CARD0_PET); export_constant(STOR_MODE_NONE); export_constant(STOR_MODE_GET); export_constant(STOR_MODE_PUT); script_set_constant("bNoEleStone",SP_NO_ELESTONE,false);  
Idk what the hell were you doing, maybe you 'cut' some lines so the conflicted lines look so terrible.

those 2 bonus will never displayed at that stat window. try hit mobs

If you can't equip it, just check the job and class for those items see Corrected job for Crimson Weapons, Infinity Weapons, and a Spoon!
if u don't know how to set the option for the weapon, try read this maybe: Crimson Weapon and Item Random Options

I believe it's not Poring Hat because it's Eleanor's Head.
maybe http://www.divine-pride.net/database/item/31062/

UPDATE `inventory` SET `card0` = 0 WHERE `card0` BETWEEN 4700 AND 4900; repeat it for cart_inventory, storage, guild_storage, mail, auction
repeat it for card1, card2, and card3

u just need more effort to learn from doc/item_group.txt
 
 
db/import/item_db.txt
32000,WOE_Super_Box,Woe Super Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_WOE_Super_Box); },{},{}  
db/const.txt (make sure no duplicate name)
IG_WOE_Super_Box 1000  
db/import/item_package.txt
// GroupID,ItemID,Rate{,Amount,Random,isAnnounced,Duration,GUID,isBound,isNamed} // Always obtained IG_WOE_Super_Box,7135,1,50,0 // 50x Fire_Bottle IG_WOE_Super_Box,7136,1,50,0 // 50x Acid_Bottle // Random group 1 IG_WOE_Super_Box,11500,400,10,1 // 10x Light_Yellow_Pot IG_WOE_Super_Box,11501,300,10,1 // 10x Light_White_Pot IG_WOE_Super_Box,11502,200,10,1 // 10x Light_Blue_Pot IG_WOE_Super_Box,11503,150,5,1 // 5x Siege_White_Potion IG_WOE_Super_Box,11504,150,5,1 // 5x Siege_Blue_Potion // Random group 2 with rental IG_WOE_Super_Box,658,80,1,2 // 10x Union_Of_Tribe IG_WOE_Super_Box,1293,10,1,2,120 // 10x Velum_Jamadhar IG_WOE_Super_Box,1294,10,1,2,120 // 10x Velum_Scare

From this http://php.net/manual/en/timezones.asia.php#113195
I've tested "Asia/Calcutta" as well as "Asia/Kolkata" on PHP 5.4.7 and both returns accurate results.    But I would suggest you to use "Asia/Kolkata" as "Calcutta" is now renamed to "Kolkata".    <?php      date_default_timezone_set("Asia/Kolkata");      echo date('d-m-Y H:i:s'); //Returns IST  ?> [spoiler=Just for knowledge for others who read]
https://en.wikipedia.org/wiki/Kolkata
https://en.wikipedia.org/wiki/List_of_renamed_Indian_cities_and_states#West_Bengal

maybe will give u hint https://gist.github.com/cydh/3f3f3290b298fe7b12b22b193edcc717

ROA_PARAM is currently (officially) unused.
But of course u can use it. Simply say, it's just 'another' value.
If u read current item_randomopt_db.txt, the bonuses there aren't using bonus with 'another values'.

Example
RDMOPT_ATTR_TOLERACE_GROUND,{ bonus2 bSubEle,Ele_Earth,getrandomoptinfo(ROA_VALUE); } You also can change the 'Ele_Earth' as ROA_VALUE then the ROA_PARAM is the tolerance value, such
RDMOPT_ATTR_TOLERACE_GROUND,{ bonus2 bSubEle,getrandomoptinfo(ROA_VALUE),getrandomoptinfo(ROA_PARAM); } But, u have to do setrandomoption correctly. And need to edit the lua on client.

"manual" apply this diff https://github.com/rathena/rathena/commit/0647b159a8c6e96024deb72e63b1ce9e9a23320a.diff
 
This the file
diff --git a/src/map/clif.c b/src/map/clif.c  
the changes are around that line,
if you can't found the exact line, try find the codes inside this function.
 
- lines mean "line removed" + lines mean "line added"

it was fixed in very latest

u don't understand at all.
 
1. Stores all current 4-slots (possible) items IDs in variables by using
.@slot1= getequipcardid(<equipment slot>,0); .@slot2= getequipcardid(<equipment slot>,1); .@slot3= getequipcardid(<equipment slot>,2); .@slot4= getequipcardid(<equipment slot>,3);  
2. Change the deserved slots (leave the slots that u don't want to change).
.@slot1= <item_id>; .@slot2= <item_id>; .@slot3= <item_id>; .@slot4= <item_id>;  
3. Give it to player
getitem2 <item id>,<amount>,<identify>,<refine>,<attribute>,.@slot1,.@slot2,.@slot3,.@slot4;

the fastest way by editing on `battle.c::battle_calc_damage`, find
if( (sce = sc->data[SC_AUTOGUARD]) && flag&BF_WEAPON && !(skill_get_nk(skill_id)&NK_NO_CARDFIX_ATK) && rnd()%100 < sce->val2 ) {  
remove the `rnd()%100 < sce->val2` part, to
if( (sce = sc->data[SC_AUTOGUARD]) && flag&BF_WEAPON && !(skill_get_nk(skill_id)&NK_NO_CARDFIX_ATK) ) {

check your src/map/instance.c (or .h?) find #define MAX_INSTANCE_DB I think (forgot, since that limit was removed by me)

u can try to rip it from 730311e009c8078ecc21f679c425de944b293faf

those are MSVS version. 9 for 2009, 10 for 2010, 12 for 2012, 13 for 2013

hmm.
that what I made was something like this, not a mapflag @_@
partylock-rA.diff

... ... int eff_id = -1; ... if (config_setting_lookup_string(npcef, "Effect", &var)) script_get_constant(var, &eff_id); if (eff_id == -1) { ShowWarning("npceffect_conf: Effect '%s' unknown.\n", var); continue; } else ShowInfo("npceffect_conf: Effect '%d'\n", eff_id); ... ...