diff options
| -rw-r--r-- | Changelog.txt | 3 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | conf-tmpl/mapflag/nomemo.txt | 1 | ||||
| -rw-r--r-- | db/Changelog.txt | 4 | ||||
| -rw-r--r-- | db/item_db.txt | 2 | ||||
| -rw-r--r-- | src/map/map.h | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 4 |
7 files changed, 12 insertions, 6 deletions
diff --git a/Changelog.txt b/Changelog.txt index accf32895..8f8394b29 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,6 +1,9 @@ Date Added 01/26 + * Removed my changes to /stable/Makefile that i've accidentally commited, sorry + ^^; [celest] + * Removed an unnecessary "cloneskill_lv" from map_session_data [celest] * Removed WATER.TXT (this file wasn't used at all. There's no such mapflag as WATER even). [Lupus] * Added Water Height of New Yuno Fileds 9 and 11. Now Water Ball works there as should. Wizards could levelup on sleepers, too. [Lupus] @@ -5,7 +5,7 @@ CC = gcc -pipe # CC = gcc -pipe -DDMALLOC -DDMALLOC_FUNC_CHECK # CC = /usr/local/bin/gcc -fbounds-checking -pipe -DBCHECK -# GCLIB = -L/usr/local/lib -lgc +# GCLIB = -lgc GCLIB = # GCLIB = -ldmalloc diff --git a/conf-tmpl/mapflag/nomemo.txt b/conf-tmpl/mapflag/nomemo.txt index e28d7aa69..0566ec0e2 100644 --- a/conf-tmpl/mapflag/nomemo.txt +++ b/conf-tmpl/mapflag/nomemo.txt @@ -9,6 +9,7 @@ // Towns ==================== ayo_in01.gat mapflag nomemo ayo_in02.gat mapflag nomemo +ayo_fild02.gat mapflag nomemo alb2trea.gat mapflag nomemo alb_ship.gat mapflag nomemo alberta_in.gat mapflag nomemo diff --git a/db/Changelog.txt b/db/Changelog.txt index e3384763b..e6f60e31a 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -5,6 +5,10 @@ Ayathoya items == Added but no effect ( all are "ect" itens) Skill databases == celest working on them i believe. +01/26 + * Updated Counter dagger's attack, thanks to Poki#3 + * Added ayo_fild02 to nomemo mapflag list + 01/13 * Fixed drops of Taoist Hermit, added drops rates to JOKER (all rates were 0%) Removed 0.01% Chances of all Apple drops plugs diff --git a/db/item_db.txt b/db/item_db.txt index 4c3bcecdf..d7440724e 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -538,7 +538,7 @@ 1239,Poison_Knife,Poison Knife,4,20,0,800,64,,1,0,2055918,2,2,3,65,1,{},{ bonus bAtkEle,5; bonus2 bAddEff,Eff_Poison,3000; } 1240,Princess_Knife,Princess Knife,4,20,0,400,84,,1,0,2055918,2,2,4,1,1,{},{ bonus bAllStats,1; } 1241,Cursed_Dagger,Cursed Dagger,4,20,0,400,55,,1,0,66052,2,2,4,85,1,{},{ bonus2 bAddEff,Eff_Curse,500; } -1242,Counter_Dagger,Counter Dagger,4,20,0,550,75,,1,0,66052,2,2,4,55,1,{},{ bonus bCritical,90; bonus3 bAutoSpell,61,1,25; } +1242,Counter_Dagger,Counter Dagger,4,20,0,550,140,,1,0,66052,2,2,4,55,1,{},{ bonus bCritical,90; bonus3 bAutoSpell,61,1,25; } 1243,Main_Gauche_For_Novice,Novice Main Gauche,4,20,0,1,45,,1,0,8388609,2,2,1,1,1,{},{} // Katars 1250,Jur,Jur,4,19500,0,800,125,,1,2,4096,2,34,2,18,16,{},{} diff --git a/src/map/map.h b/src/map/map.h index d4f673d6a..ed66e5669 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -217,7 +217,7 @@ struct map_session_data { struct skill_unit_group_tickset skillunittick[MAX_SKILLUNITGROUPTICKSET]; struct skill_timerskill skilltimerskill[MAX_SKILLTIMERSKILL]; unsigned short timerskill_count; // [celest] - int cloneskill_id,cloneskill_lv; + int cloneskill_id; int potion_hp,potion_sp,potion_per_hp,potion_per_sp; int invincible_timer; diff --git a/src/map/skill.c b/src/map/skill.c index 55d3ce175..b42d3d898 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1804,13 +1804,11 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds && !(skillid > NPC_PIERCINGATT && skillid < NPC_SUMMONMONSTER) && !(skillid > NPC_SELFDESTRUCTION2 && skillid < NPC_UNDEADATTACK)){ //?に?んでいるスキルがあれば該?スキルを消す - if (tsd->cloneskill_id && tsd->cloneskill_lv && tsd->status.skill[tsd->cloneskill_id].flag==13){ + if (tsd->cloneskill_id && tsd->status.skill[tsd->cloneskill_id].flag==13){ tsd->status.skill[tsd->cloneskill_id].id=0; - tsd->status.skill[tsd->cloneskill_id].lv=0; tsd->status.skill[tsd->cloneskill_id].flag=0; } tsd->cloneskill_id=skillid; - tsd->cloneskill_lv=skilllv; tsd->status.skill[skillid].id=skillid; tsd->status.skill[skillid].lv=(pc_checkskill(tsd,RG_PLAGIARISM) > skill_get_max(skillid))? skill_get_max(skillid):pc_checkskill(tsd,RG_PLAGIARISM); |