Advertisement
Guest User

Untitled

a guest
May 24th, 2016
96
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.70 KB | None | 0 0
  1.  db/pre-re/skill_cast_db.txt    | 4 ++++
  2.  db/pre-re/skill_db.txt         | 5 ++++-
  3.  db/pre-re/skill_require_db.txt | 5 ++++-
  4.  db/pre-re/skill_tree.conf      | 2 ++
  5.  src/map/skill.c                | 2 ++
  6.  src/map/skill.h                | 4 ++++
  7.  src/map/status.c               | 6 ++++++
  8.  7 files changed, 26 insertions(+), 2 deletions(-)
  9.  
  10. diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt
  11. index 181ce83..9127bcb 100644
  12. --- a/db/pre-re/skill_cast_db.txt
  13. +++ b/db/pre-re/skill_cast_db.txt
  14. @@ -1944,3 +1944,7 @@
  15.  2826,0,0,0,40000:55000:70000:85000:100000,0,0
  16.  //-- SI_RECALL
  17.  2827,1000,0,0,0,0,0
  18. +//-- SL_JEDI
  19. +2828,1000,500,0,150000:200000:250000:300000:350000,0,0
  20. +//-- SL_SITH
  21. +2829,1000,500,0,150000:200000:250000:300000:350000,0,0
  22. \ No newline at end of file
  23. diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt
  24. index 1cf19d5..2285df5 100644
  25. --- a/db/pre-re/skill_db.txt
  26. +++ b/db/pre-re/skill_db.txt
  27. @@ -1290,4 +1290,7 @@
  28.  2824,9,0,2,6,0,0,5,20,yes,0,0,0,none,0,        SI_STO, Force_Storm
  29.  2825,0,0,4,0,0,0,5,0,no,0,0,0,none,0,      SI_COLDSKIN, Cold_Skin
  30.  2826,0,0,4,0,0,0,5,0,no,0,0,0,none,0,      SI_SABERTHRUST, Saber Thrust
  31. -2827,9,6,1,0,0x1,0,5,0,no,0,0,0,none,0,        SI_RECALL, Force Drain
  32. \ No newline at end of file
  33. +2827,9,6,1,0,0x1,0,5,0,no,0,0,0,none,0,        SI_RECALL, Force Drain
  34. +
  35. +2828,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0, SL_JEDI,Spirit of the Jedi
  36. +2829,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0, SL_SITH,Spirit of the Sith
  37. \ No newline at end of file
  38. diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt
  39. index 5b70532..4097a7f 100644
  40. --- a/db/pre-re/skill_require_db.txt
  41. +++ b/db/pre-re/skill_require_db.txt
  42. @@ -1047,4 +1047,7 @@
  43.  2824,0,0,115:130:145:160:175,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0   //SI_STO#Force_Storm#
  44.  2825,0,0,100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0   //SI_COLDSKIN#Cold_Skin#
  45.  2826,0,0,100,0,0,0,2,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0    //SI_SABERTHRUST#Saber Thrust#
  46. -2827,0,0,50:75:100:125:150,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SI_RECALL#Force Drain#
  47. \ No newline at end of file
  48. +2827,0,0,50:75:100:125:150,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SI_RECALL#Force Drain#
  49. +
  50. +2828,0,0,460:360:260:160:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0    //SL_JEDI
  51. +2829,0,0,460:360:260:160:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0    //SL_SITH
  52. \ No newline at end of file
  53. diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
  54. index 3215068..2aae6fb 100644
  55. --- a/db/pre-re/skill_tree.conf
  56. +++ b/db/pre-re/skill_tree.conf
  57. @@ -2143,6 +2143,8 @@ Soul_Linker: {
  58.     inherit: ( "Taekwon" );
  59.  
  60.     skills: {
  61. +       SL_JEDI: 5
  62. +       SL_SITH: 5
  63.         SL_ALCHEMIST: 5
  64.         SL_MONK: 5
  65.         SL_STAR: 5
  66. diff --git a/src/map/skill.c b/src/map/skill.c
  67. index ca89ac2..00e096d 100644
  68. --- a/src/map/skill.c
  69. +++ b/src/map/skill.c
  70. @@ -8077,6 +8077,8 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
  71.         case SL_STAR:
  72.         case SL_SUPERNOVICE:
  73.         case SL_WIZARD:
  74. +       case SL_JEDI:
  75. +       case SL_SITH:
  76.             //NOTE: here, 'type' has the value of the associated MAPID, not of the SC_SOULLINK constant.
  77.             if (sd && !(dstsd && (dstsd->class_&MAPID_UPPERMASK) == type)) {
  78.                 clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
  79. diff --git a/src/map/skill.h b/src/map/skill.h
  80. index 5abd55d..116f345 100644
  81. --- a/src/map/skill.h
  82. +++ b/src/map/skill.h
  83. @@ -1355,6 +1355,10 @@ enum e_skill {
  84.     SI_COLDSKIN,
  85.     SI_SABERTHRUST,
  86.     SI_RECALL,
  87. +  
  88. +   // New Link
  89. +   SL_JEDI,
  90. +   SL_SITH,
  91.  
  92.     KO_YAMIKUMO = 3001,
  93.     KO_RIGHT,
  94. diff --git a/src/map/status.c b/src/map/status.c
  95. index 52d9715..330dae7 100644
  96. --- a/src/map/status.c
  97. +++ b/src/map/status.c
  98. @@ -803,6 +803,8 @@ void initChangeTables(void) {
  99.     status->dbs->Skill2SCTable[SL_BLACKSMITH]  = (sc_type)MAPID_BLACKSMITH,
  100.     status->dbs->Skill2SCTable[SL_HUNTER]      = (sc_type)MAPID_HUNTER,
  101.     status->dbs->Skill2SCTable[SL_SOULLINKER]  = (sc_type)MAPID_SOUL_LINKER,
  102. +   status->dbs->Skill2SCTable[SL_JEDI]        = (sc_type)MAPID_JEDI,
  103. +   status->dbs->Skill2SCTable[SL_SITH]        = (sc_type)MAPID_SITH,
  104.  
  105.     // Status that don't have a skill associated.
  106.     status->dbs->IconChangeTable[SC_WEIGHTOVER50] = SI_WEIGHTOVER50;
  107. @@ -4609,6 +4611,10 @@ unsigned short status_calc_vit(struct block_list *bl, struct status_change *sc,
  108.         vit += status->get_status_data(bl)->int_ / 5;
  109.     if ( sc->data[SC_JE_SACRI] )
  110.         vit -= vit;
  111. +   if (sc->data[SC_SOULLINK] && sc->data[SC_SOULLINK]->val2 == SL_JEDI)
  112. +       vit += 35;
  113. +   if (sc->data[SC_SOULLINK] && sc->data[SC_SOULLINK]->val2 == SL_SITH)
  114. +       vit += 35;
  115.  
  116.     return (unsigned short)cap_value(vit,0,USHRT_MAX);
  117.  }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement