Skip to content

Commit

Permalink
== Small updates ==
Browse files Browse the repository at this point in the history 
=General
*Merged missing changes from 3ceam rev. 267 - 273

=Database
*Updated ItemDB
-changed Ebon Armor to fit pre-RE system. Also added natural drops.

=Skills
*Fixed GC_WEAPONCRUSH behavior.
  • Loading branch information
@15peaces
15peaces committed Aug 5, 2015
1 parent 45fdf67 commit 2ce010c
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 8 deletions.
7 changes: 7 additions & 0 deletions Changelog-15-3athena.txt
View file
Expand Up @@ -4,6 +4,13 @@
// * Modifications.
// - Details.
//========================================
08/05/2015
r73 [15peaces]
*Merged missing changes from 3ceam rev. 267 - 273
*Updated ItemDB
-changed Ebon Armor to fit pre-RE system. Also added natural drops.
*Fixed GC_WEAPONCRUSH behavior.

08/02/2015
r72 [15peaces]
*Merged missing changes from 3ceam rev. 263 - 266
Expand Down
2 changes: 1 addition & 1 deletion db/item_db.txt
View file
Expand Up @@ -6615,7 +6615,7 @@
15011,Para_Team_Uniform3,Eden Team Uniform III,5,0,,0,,58,,0,0xFFFFFFFF,7,2,16,,40,0,0,{ bonus bMaxHP,300; bonus bMaxSP,30; bonus bMdef,5; },{},{}
15012,Puente_Robe,Puente Robe,5,12000,,400,,42,,1,0xFFFFFFFF,7,2,16,,22,1,0,{ /* bonus bFixedCastRate,-30; */ },{},{}
15013,Claire_Suits,Claire Suits,5,28000,,2800,,58,,1,0xFFFFFFFE,2,2,16,,22,1,0,{},{},{}
15014,Ebone_Armor,Ebon Armor,5,40000,,4500,,93,,1,0x00000000,7,2,16,,100,1,0,{},{},{}
15014,Ebone_Armor,Ebon Armor,5,40000,,4500,,10,,1,0x00000000,7,2,16,,100,1,0,{},{},{}
15015,Upg_Adv_Suit,Upg Adv Suit,5,20,,150,,25,,1,0xFFFFFFFF,7,2,16,,1,1,0,{},{},{}
15016,Upg_Coat,Upg Coat,5,20,,600,,47,,1,0xFFFFFFFE,7,2,16,,1,1,0,{},{},{}
15017,Upg_Saint_Robe,Upg Saint Robe,5,20,,300,,55,,1,0x00048530,7,2,16,,1,1,0,{ bonus bMdef,5; },{},{}
Expand Down
6 changes: 3 additions & 3 deletions db/mob_db.txt
View file
Expand Up @@ -135,7 +135,7 @@
1129,HORONG,Horong,Horong,34,1939,0,786,479,1,275,327,99,50,1,34,10,0,50,0,10,12,0,0,83,0x308D,400,1888,1152,828,0,0,0,0,0,0,0,0,953,6500,912,500,2279,5,1752,10000,757,118,633,20,970,50,0,0,0,0,4103,1
1130,JAKK,Jakk,Jakk,38,3581,0,1408,880,1,315,382,5,30,1,38,38,43,75,45,10,12,1,0,43,0x3695,200,1180,480,648,0,0,0,0,0,0,0,0,1062,9000,912,900,985,31,2331,5,1008,5,535,1000,0,0,0,0,0,0,4109,1
1131,JOKER,Joker,Joker,57,12450,0,3706,2362,1,621,738,10,35,1,143,47,75,98,175,10,12,2,7,84,0x3695,100,1364,864,432,0,0,0,0,0,0,0,0,912,2000,616,2,641,20,508,1000,1259,1,984,100,695,100,0,0,0,0,4139,1
1132,KHALITZBURG,Khalitzburg,Khalitzburg,63,19276,0,4378,2750,1,875,1025,45,10,58,65,48,5,73,40,10,12,2,1,29,0x3695,350,528,1000,396,0,0,0,0,0,0,0,0,932,8000,985,191,5017,1,2108,2,1004,10,509,2000,1127,2,0,0,0,0,4136,1
1132,KHALITZBURG,Khalitzburg,Khalitzburg,63,19276,0,4378,2750,1,875,1025,45,10,58,65,48,5,73,40,10,12,2,1,29,0x3695,350,528,1000,396,0,0,0,0,0,0,0,0,932,8000,985,191,5017,1,2108,2,1004,10,509,2000,1127,2,15014,2,0,0,4136,1
1133,KOBOLD_1,Kobold,Kobold,36,3893,0,988,625,1,265,318,15,10,1,90,36,30,52,20,10,12,1,7,44,0x308D,150,1028,528,360,0,0,0,0,0,0,0,0,999,100,1034,5335,912,700,757,25,1220,2,2104,5,0,0,0,0,0,0,4091,1
1134,KOBOLD_2,Kobold,Kobold,31,2179,0,806,407,1,262,324,15,10,1,31,31,20,46,20,10,12,1,7,45,0x308D,200,1528,528,360,0,0,0,0,0,0,0,0,999,100,1034,5335,912,200,2104,3,508,100,2101,100,0,0,0,0,0,0,4091,1
1135,KOBOLD_3,Kobold,Kobold,31,2179,0,644,407,1,186,216,15,10,1,31,31,20,88,20,10,12,1,7,43,0x308D,300,1228,528,360,0,0,0,0,0,0,0,0,990,35,999,100,1034,5335,912,200,1355,5,2104,3,508,100,0,0,0,0,4091,1
Expand Down Expand Up @@ -220,7 +220,7 @@
1214,CHOCO,Choco,Choco,43,4278,0,1265,1265,1,315,402,5,5,65,68,55,45,65,25,10,12,0,2,23,0x3095,200,1500,500,1000,0,0,0,0,0,0,0,0,7011,5335,942,7000,985,53,513,5000,634,20,532,1000,607,25,0,0,0,0,4285,1
1215,STEM_WORM,Stem Worm,Stem Worm,40,6136,0,1452,939,2,290,375,5,10,1,30,26,15,79,35,10,12,1,3,24,0x3095,200,1500,500,1000,0,0,0,0,0,0,0,0,7012,5335,509,1800,1968,10,756,115,997,5,1454,20,608,45,0,0,0,0,4224,1
1216,PENOMENA,Penomena,Penomena,57,7256,0,2870,2200,7,415,565,5,50,1,5,35,15,136,30,10,12,1,5,25,0x3695,400,832,500,600,0,0,0,0,0,0,0,0,7013,4850,962,8000,938,7000,525,200,719,15,1258,1,716,550,0,0,0,0,4314,1
1219,KNIGHT_OF_ABYSS,Knight of Abyss,Abysmal Knight,79,36140,0,8469,6268,1,1600,2150,55,50,66,68,64,25,135,50,10,12,2,7,87,0x3695,300,1500,500,1000,0,0,0,0,0,0,0,0,1064,5335,7023,5,2318,1,1421,25,1162,1,985,369,984,259,0,0,0,0,4140,1
1219,KNIGHT_OF_ABYSS,Knight of Abyss,Abysmal Knight,79,36140,0,8469,6268,1,1600,2150,55,50,66,68,64,25,135,50,10,12,2,7,87,0x3695,300,1500,500,1000,0,0,0,0,0,0,0,0,1064,5335,7023,5,2318,1,1421,25,1162,1,985,369,984,259,15014,10,0,0,4140,1
1220,M_DESERT_WOLF,Desert Wolf,Desert Wolf,27,1716,0,388,242,1,169,208,0,10,1,27,45,15,56,10,10,12,1,2,23,0x3695,200,1120,420,288,0,0,0,0,0,0,0,0,1253,5,7030,5500,2311,1,517,1200,920,2000,756,53,0,0,0,0,0,0,4082,1
1221,M_SAVAGE,Savage,Savage,26,2092,0,357,226,1,146,177,10,5,1,26,54,10,37,10,10,12,2,2,42,0x3695,150,1960,960,384,0,0,0,0,0,0,0,0,1028,6000,514,150,702,3,2276,2,605,15,757,70,0,0,0,0,0,0,4078,1
//1222,L_HIGH_ORC,High Orc,High Orc,52,6890,0,2128,1490,1,428,533,15,5,1,46,55,35,82,40,10,12,2,7,43,0x3695,200,1500,500,1000,0,0,0,0,0,0,0,0,7002,2500,1304,10,999,120,931,8000,912,1600,756,196,508,1100,0,0,0,0,4066,1
Expand Down Expand Up @@ -269,7 +269,7 @@
1265,COOKIE,Cookie,Cookie,25,950,0,310,188,1,130,145,0,25,1,35,20,53,37,90,10,12,0,7,60,0x1089,200,1036,936,240,0,0,0,0,0,0,0,0,538,1000,530,150,979,1,11002,50,2402,30,12001,100,529,320,0,0,0,0,4293,1
1266,ASTER,Aster,Aster,18,1372,0,122,78,1,56,64,0,10,1,19,15,0,34,5,10,12,0,5,22,0x91,400,1264,864,216,0,0,0,0,0,0,0,0,938,500,7013,40,1052,1200,508,200,912,60,512,100,0,0,0,0,0,0,4247,1
1267,CARAT,Carat,Carat,51,5200,0,1926,1353,1,330,417,0,25,1,41,45,5,85,155,10,12,1,6,44,0x3795,200,1078,768,384,0,0,0,0,0,0,0,0,7054,3200,536,1000,2409,5,5003,1,0,0,0,0,509,1450,0,0,0,0,4288,1
1268,BLOODY_KNIGHT,Bloody Knight,Bloody Knight,82,57870,0,10120,6820,3,2150,3030,60,50,88,75,70,77,125,55,10,12,2,0,87,0x3695,250,828,528,192,0,0,0,0,0,0,0,0,7054,4850,2229,45,2317,5,2125,62,1170,1,1417,2,985,433,0,0,0,0,4320,1
1268,BLOODY_KNIGHT,Bloody Knight,Bloody Knight,82,57870,0,10120,6820,3,2150,3030,60,50,88,75,70,77,125,55,10,12,2,0,87,0x3695,250,828,528,192,0,0,0,0,0,0,0,0,7054,4850,2229,45,2317,5,2125,62,1170,1,1417,2,985,433,15014,5,0,0,4320,1
1269,CLOCK,Clock,Clock,60,11050,0,3410,2904,1,720,909,15,10,1,70,50,25,90,50,10,12,1,0,42,0x91,200,1092,792,480,0,0,0,0,0,0,0,0,1095,5335,1019,800,509,1900,568,320,7026,30,7027,30,985,163,0,0,0,0,4299,1
1270,C_TOWER_MANAGER,Clock Tower Manager,Clock Tower Manager,63,18600,0,4378,2850,3,880,1180,35,30,1,75,20,64,75,60,10,12,2,0,80,0x91,200,1072,672,384,0,0,0,0,0,0,0,0,1095,5335,7054,5335,999,500,520,850,2109,1,7026,2000,7027,2000,0,0,0,0,4229,1
1271,ALLIGATOR,Alligator,Alligator,42,6962,0,1379,866,1,315,360,2,5,1,45,50,10,69,65,10,12,1,2,21,0x91,200,1100,900,480,0,0,0,0,0,0,0,0,912,1000,1099,600,7003,2000,608,50,0,0,0,0,756,129,0,0,0,0,4252,1
Expand Down
2 changes: 1 addition & 1 deletion src/map/battle.c
View file
Expand Up @@ -380,7 +380,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag
{
clif_skill_nodamage(bl,src,GC_WEAPONBLOCKING,1,1);
d->dmg_lv = ATK_NONE;
sc_start(bl,SC_COMBO,100,GC_WEAPONBLOCKING,2000);
sc_start2(bl,SC_COMBO,100,GC_WEAPONBLOCKING,src->id,2000);
return 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/map/map.h
View file
Expand Up @@ -39,7 +39,7 @@ struct item_data;
#define NATURAL_HEAL_INTERVAL 500
#define MIN_FLOORITEM 2
#define MAX_FLOORITEM START_ACCOUNT_NUM
#define MAX_LEVEL 1000
#define MAX_LEVEL 150
#define MAX_DROP_PER_MAP 48
#define MAX_IGNORE_LIST 20 // official is 14
#define MAX_VENDING 12
Expand Down
13 changes: 11 additions & 2 deletions src/map/skill.c
View file
Expand Up @@ -1006,6 +1006,9 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
case RK_DRAGONBREATH:
sc_start(bl,SC_BURNING,5 + 5 * skilllv,skilllv,skill_get_time(skillid,skilllv));
break;
case GC_WEAPONCRUSH:// Rate is handled later.
skill_castend_nodamage_id(src,bl,skillid,skilllv,tick,BCT_ENEMY);
break;
case AB_ADORAMUS:
sc_start(bl, SC_BLIND, 100, skilllv, skill_get_time(skillid, skilllv));
sc_start(bl, SC_DECREASEAGI, 100, skilllv, skill_get_time(skillid, skilllv));
Expand Down Expand Up @@ -3493,7 +3496,13 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
break;

case GC_WEAPONCRUSH:
skill_castend_nodamage_id(src,bl,skillid,skilllv,tick,flag);
{
if( sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == GC_WEAPONBLOCKING ){
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
status_change_end(src,SC_COMBO,-1);
}else if( sd )
clif_skill_fail(sd,skillid,USESKILL_FAIL_GC_WEAPONBLOCKING,0,0);
}
break;

case GC_CROSSRIPPERSLASHER:
Expand Down Expand Up @@ -5298,7 +5307,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
}

//Attempts to strip at rate i and duration d
if( (i = skill_strip_equip(bl, location, i, skilllv, d)) || skillid != ST_FULLSTRIP )
if( (i = skill_strip_equip(bl, location, i, skilllv, d)) || skillid != ST_FULLSTRIP || skillid != GC_WEAPONCRUSH)
clif_skill_nodamage(src,bl,skillid,skilllv,i);

//Nothing stripped.
Expand Down
11 changes: 11 additions & 0 deletions src/map/unit.c
View file
Expand Up @@ -1105,6 +1105,17 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
return 0;
}
break;
case GC_WEAPONCRUSH:
if( sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == GC_WEAPONBLOCKING ){
if ((target=map_id2bl(sc->data[SC_COMBO]->val2)) == NULL){
clif_skill_fail(sd,skill_num,USESKILL_FAIL_GC_WEAPONBLOCKING,0,0);
return 0;
}
}else{
clif_skill_fail(sd,skill_num,USESKILL_FAIL_GC_WEAPONBLOCKING,0,0);
return 0;
}
break;
}
if (target)
target_id = target->id;
Expand Down

0 comments on commit 2ce010c

Please sign in to comment.