Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into update/skills_Spirit_Handler

Browse Source
This commit is contained in:
Atemo 2024-01-23 15:07:47 +01:00
commit dd540bddb2
10 changed files with 1190 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
db/pre-re/statpoint.yml
View File

@ -532,3 +532,23 @@ Body:
Points: 4545
- Level: 250
Points: 4545
- Level: 251
Points: 4545
- Level: 252
Points: 4545
- Level: 253
Points: 4545
- Level: 254
Points: 4545
- Level: 255
Points: 4545
- Level: 256
Points: 4545
- Level: 257
Points: 4545
- Level: 258
Points: 4545
- Level: 259
Points: 4545
- Level: 260
Points: 4545

800
db/re/job_basepoints.yml
View File

File diff suppressed because it is too large Load Diff

76
db/re/job_exp.yml
View File

@ -2870,7 +2870,7 @@ Body:
- Jobs:
Super_Novice_E: true
Super_Baby_E: true
MaxJobLevel: 50
MaxJobLevel: 70
JobExp:
- Level: 1
Exp: 12800
@ -2971,6 +2971,46 @@ Body:
- Level: 49
Exp: 81209043
- Level: 50
Exp: 91847428
- Level: 51
Exp: 103879441
- Level: 52
Exp: 117487647
- Level: 53
Exp: 132878529
- Level: 54
Exp: 150285617
- Level: 55
Exp: 169973033
- Level: 56
Exp: 192239500
- Level: 57
Exp: 217422874
- Level: 58
Exp: 245905271
- Level: 59
Exp: 278118862
- Level: 60
Exp: 319836691
- Level: 61
Exp: 367812195
- Level: 62
Exp: 422984024
- Level: 63
Exp: 486431628
- Level: 64
Exp: 559396372
- Level: 65
Exp: 632361116
- Level: 66
Exp: 705325860
- Level: 67
Exp: 778290604
- Level: 68
Exp: 851255348
- Level: 69
Exp: 924220092
- Level: 70
Exp: 999999999
- Jobs:
Super_Novice: true
@ -3325,7 +3365,7 @@ Body:
Night_Watch: true
Hyper_Novice: true
Spirit_Handler: true
MaxBaseLevel: 250
MaxBaseLevel: 260
BaseExp:
- Level: 1
Exp: 658
@ -3826,6 +3866,26 @@ Body:
- Level: 249
Exp: 35221511928
- Level: 250
Exp: 43181573623
- Level: 251
Exp: 52940609261
- Level: 252
Exp: 64905186953
- Level: 253
Exp: 79573759204
- Level: 254
Exp: 97557428784
- Level: 255
Exp: 119605407689
- Level: 256
Exp: 146636229826
- Level: 257
Exp: 179776017766
- Level: 258
Exp: 220405397781
- Level: 259
Exp: 270217017679
- Level: 260
Exp: 999999999999
- Jobs:
Dragon_Knight: true
@ -3852,7 +3912,7 @@ Body:
Night_Watch: true
Hyper_Novice: true
Spirit_Handler: true
MaxJobLevel: 50
MaxJobLevel: 55
JobExp:
- Level: 1
Exp: 4700000
@ -3953,4 +4013,14 @@ Body:
- Level: 49
Exp: 4073145058
- Level: 50
Exp: 4480459564
- Level: 51
Exp: 4928505520
- Level: 52
Exp: 5421356072
- Level: 53
Exp: 5963491679
- Level: 54
Exp: 6559840847
- Level: 55
Exp: 9999999999

184
db/re/job_stats.yml
View File

@ -8884,6 +8884,15 @@ Body:
- Level: 50
Vit: 1
Pow: 1
- Level: 51
Crt: 1
- Level: 52
Pow: 1
- Level: 54
Pow: 1
Crt: 1
- Level: 55
Sta: 1
- Jobs:
Meister: true
Meister2: true
@ -9017,6 +9026,15 @@ Body:
- Level: 50
Pow: 1
Wis: 1
- Level: 51
Pow: 1
- Level: 52
Con: 1
- Level: 53
Sta: 1
Wis: 1
- Level: 55
Pow: 1
- Jobs:
Shadow_Cross: true
MaxWeight: 32000
@ -9149,6 +9167,15 @@ Body:
- Level: 50
Pow: 1
Crt: 1
- Level: 51
Pow: 1
- Level: 53
Con: 1
- Level: 54
Sta: 1
Crt: 1
- Level: 55
Crt: 1
- Jobs:
Arch_Mage: true
MaxWeight: 30000
@ -9281,6 +9308,15 @@ Body:
- Level: 50
Sta: 1
Wis: 1
- Level: 52
Spl: 1
- Level: 53
Con: 1
- Level: 54
Sta: 1
Wis: 1
- Level: 55
Spl: 1
- Jobs:
Cardinal: true
MaxWeight: 30000
@ -9413,6 +9449,16 @@ Body:
- Level: 50
Spl: 1
Crt: 1
- Level: 51
Spl: 1
- Level: 52
Pow: 1
- Level: 53
Sta: 1
- Level: 54
Wis: 1
- Level: 55
Crt: 1
- Jobs:
Windhawk: true
Windhawk2: true
@ -9546,6 +9592,15 @@ Body:
- Level: 50
Dex: 1
Con: 1
- Level: 51
Con: 1
- Level: 52
Pow: 1
Con: 1
- Level: 53
Sta: 1
- Level: 55
Pow: 1
- Jobs:
Imperial_Guard: true
Imperial_Guard2: true
@ -9680,6 +9735,15 @@ Body:
- Level: 50
Pow: 1
Sta: 1
- Level: 51
Pow: 1
- Level: 52
Sta: 1
- Level: 53
Sta: 1
- Level: 55
Wis: 1
Con: 1
- Jobs:
Biolo: true
MaxWeight: 32000
@ -9812,6 +9876,15 @@ Body:
- Level: 50
Str: 1
Crt: 1
- Level: 51
Crt: 1
- Level: 52
Sta: 1
- Level: 53
Pow: 1
Crt: 1
- Level: 55
Con: 1
- Jobs:
Abyss_Chaser: true
MaxWeight: 28000
@ -9944,6 +10017,15 @@ Body:
- Level: 50
Pow: 1
Spl: 1
- Level: 51
Pow: 1
- Level: 52
Crt: 1
- Level: 54
Sta: 1
- Level: 55
Sta: 1
Con: 1
- Jobs:
Elemental_Master: true
MaxWeight: 30000
@ -10076,6 +10158,16 @@ Body:
- Level: 50
Wis: 1
Spl: 1
- Level: 51
Spl: 1
- Level: 52
Sta: 1
- Level: 53
Sta: 1
- Level: 54
Wis: 1
- Level: 55
Spl: 1
- Jobs:
Inquisitor: true
MaxWeight: 30000
@ -10208,6 +10300,15 @@ Body:
- Level: 50
Pow: 1
Wis: 1
- Level: 51
Pow: 1
- Level: 52
Sta: 1
- Level: 53
Sta: 1
- Level: 55
Pow: 1
Wis: 1
- Jobs:
Troubadour: true
MaxWeight: 32000
@ -10340,6 +10441,15 @@ Body:
Con: 1
- Level: 50
Dex: 1
- Level: 51
Con: 1
- Level: 52
Spl: 1
- Level: 53
Sta: 1
- Level: 55
Pow: 1
Con: 1
- Jobs:
Trouvere: true
MaxWeight: 32000
@ -10473,6 +10583,15 @@ Body:
Con: 1
- Level: 50
Agi: 1
- Level: 51
Con: 1
- Level: 52
Sta: 1
- Level: 53
Spl: 1
- Level: 55
Pow: 1
Con: 1
- Jobs:
Sky_Emperor: true
MaxWeight: 42000
@ -10607,6 +10726,14 @@ Body:
- Level: 50
Pow: 1
Crt: 1
- Level: 51
Sta: 1
Con: 1
- Level: 53
Sta: 1
- Level: 55
Pow: 1
Con: 1
- Jobs:
Soul_Ascetic: true
MaxWeight: 42000
@ -10730,6 +10857,16 @@ Body:
- Level: 50
Wis: 1
Spl: 1
- Level: 51
Spl: 1
- Level: 52
Con: 1
- Level: 53
Wis: 1
- Level: 54
Sta: 1
- Level: 55
Spl: 1
- Jobs:
Shinkiro: true
MaxWeight: 45000
@ -10863,6 +11000,16 @@ Body:
- Level: 50
Pow: 1
Crt: 1
- Level: 51
Crt: 1
- Level: 52
Con: 1
- Level: 53
Wis: 1
- Level: 54
Sta: 1
- Level: 55
Sta: 1
- Jobs:
Shiranui: true
MaxWeight: 45000
@ -10985,6 +11132,15 @@ Body:
- Level: 50
Wis: 1
Spl: 1
- Level: 51
Pow: 1
- Level: 52
Spl: 1
- Level: 54
Spl: 1
- Level: 55
Spl: 1
Con: 1
- Jobs:
Night_Watch: true
MaxWeight: 48000
@ -11112,6 +11268,15 @@ Body:
Con: 1
- Level: 50
Pow: 1
- Level: 51
Con: 1
- Level: 53
Pow: 1
Con: 1
- Level: 54
Wis: 1
- Level: 55
Pow: 1
- Jobs:
Hyper_Novice: true
MaxWeight: 40000
@ -11248,6 +11413,15 @@ Body:
- Level: 50
Agi: 1
Dex: 1
- Level: 51
Con: 1
- Level: 52
Pow: 1
Con: 1
- Level: 53
Sta: 1
- Level: 55
Spl: 1
- Jobs:
Spirit_Handler: true
MaxWeight: 42000
@ -11379,3 +11553,13 @@ Body:
Crt: 1
- Level: 50
Pow: 1
- Level: 51
Con: 1
- Level: 52
Pow: 1
- Level: 53
Spl: 1
- Level: 54
Wis: 1
- Level: 55
Sta: 1

48
db/re/skill_db.yml
View File

@ -41892,7 +41892,7 @@ Body:
DamageFlags:
Splash: true
SplashArea: 4
Knockback: 2
Knockback: 1
CastCancel: true
CastTime: 300
AfterCastActDelay: 1000
@ -41937,7 +41937,7 @@ Body:
GiveAp: 2
Element: Weapon
AfterCastActDelay: 500
Cooldown: 300
Cooldown: 350
Duration2: 5000
Requires:
SpCost:
@ -41978,7 +41978,7 @@ Body:
CastCancel: true
CastTime: 1200
AfterCastActDelay: 500
Cooldown: 300
Cooldown: 350
FixedCastTime: 300
Duration1: 5000
Duration2: 1200
@ -42020,7 +42020,7 @@ Body:
CastCancel: true
CastTime: 1000
AfterCastActDelay: 500
Cooldown: 300
Cooldown: 350
FixedCastTime: 300
Duration2: 2000
Requires:
@ -42428,25 +42428,25 @@ Body:
Requires:
SpCost:
- Level: 1
Amount: 71
Amount: 88
- Level: 2
Amount: 74
Amount: 91
- Level: 3
Amount: 77
Amount: 94
- Level: 4
Amount: 80
Amount: 97
- Level: 5
Amount: 83
Amount: 100
- Level: 6
Amount: 86
Amount: 103
- Level: 7
Amount: 89
Amount: 106
- Level: 8
Amount: 92
Amount: 109
- Level: 9
Amount: 95
Amount: 112
- Level: 10
Amount: 98
Amount: 115
- Id: 5459
Name: HN_GROUND_GRAVITATION
Description: Ground Gravitation
@ -42531,25 +42531,25 @@ Body:
Requires:
SpCost:
- Level: 1
Amount: 55
Amount: 93
- Level: 2
Amount: 60
Amount: 96
- Level: 3
Amount: 65
Amount: 99
- Level: 4
Amount: 70
Amount: 102
- Level: 5
Amount: 75
Amount: 105
- Level: 6
Amount: 80
Amount: 108
- Level: 7
Amount: 85
Amount: 111
- Level: 8
Amount: 90
Amount: 114
- Level: 9
Amount: 95
Amount: 117
- Level: 10
Amount: 100
Amount: 120
Unit:
Id: GROUND_GRAVITATION
Range:

30
db/re/statpoint.yml
View File

@ -582,3 +582,33 @@ Body:
- Level: 250
Points: 4099
TraitPoints: 190
- Level: 251
Points: 4099
TraitPoints: 193
- Level: 252
Points: 4099
TraitPoints: 196
- Level: 253
Points: 4099
TraitPoints: 199
- Level: 254
Points: 4099
TraitPoints: 202
- Level: 255
Points: 4099
TraitPoints: 209
- Level: 256
Points: 4099
TraitPoints: 212
- Level: 257
Points: 4099
TraitPoints: 215
- Level: 258
Points: 4099
TraitPoints: 218
- Level: 259
Points: 4099
TraitPoints: 221
- Level: 260
Points: 4099
TraitPoints: 228

14
npc/re/merchants/barters/enchan_illusion_dungeons.yml
View File

@ -412,6 +412,20 @@ Body:
- Index: 3
Item: IllusionStone
Amount: 120
- Name: resonance_stone_barter
Items:
- Index: 0
Item: ILL_Piece_A
RequiredItems:
- Index: 0
Item: IllusionStone
Amount: 10
- Index: 1
Item: ILL_Piece_B
RequiredItems:
- Index: 0
Item: IllusionStone
Amount: 10
- Name: barter_ill_moonlight
Items:
- Index: 0

38
npc/re/merchants/enchan_illusion_dungeons.txt
View File

@ -14,6 +14,7 @@
//= 1.5 Added Illusion of Luanda enchanter [Capuche]
//= 1.6 Added Illusion of Underwater exchange [Capuche]
//= 1.7 Added Illusion of Twins enchanter [Capuche]
//= 1.8 Added Illusion Merchant [Haydrich]
//============================================================
//============================================================
@ -846,3 +847,40 @@ OnInit:
setunitdata .@npc_id, UNPC_HAIRCOLOR, 6;
end;
}
//============================================================
//= Illusion Merchant
//============================================================
- marketshop market_resonance_stone -1,100003:2000000:99999,100004:2000000:99999
prontera,88,113,5 script Illusion Merchant#0829 HIDDEN_NPC,{
mes "[Illusion Merchant]";
mes "I'm selling two random optional weapon grant scrolls that I made myself. You can choose the payment method you like.";
next;
switch( select( "Purchase with Zeny.", "Purchase with Illusion Stones" )) {
case 1:
mes "[Illusion Merchant]";
mes "I hope you like it.";
close2;
callshop "market_resonance_stone";
end;
case 2:
mes "[Illusion Merchant]";
mes "I hope you like it.";
close2;
callshop "resonance_stone_barter";
end;
}
OnInit:
.@npc_id = getnpcid(0);
setunitdata .@npc_id,UNPC_CLASS, JOB_MAGE_HIGH;
setunitdata .@npc_id,UNPC_SEX,SEX_FEMALE;
setunitdata .@npc_id,UNPC_HEADTOP,142;
setunitdata .@npc_id,UNPC_HEADMIDDLE,92;
setunitdata .@npc_id,UNPC_HAIRSTYLE,2;
setunitdata .@npc_id,UNPC_HAIRCOLOR,2;
// Restock
npcshopupdate "market_resonance_stone",100003,2000000,99999;
npcshopupdate "market_resonance_stone",100004,2000000,99999;
end;
}

12
src/map/battle.cpp
View File

@ -1846,11 +1846,11 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
switch (skill_id) {
case HN_SHIELD_CHAIN_RUSH:
case HN_DOUBLEBOWLINGBASH:
damage += damage / 2;
damage += damage * 70 / 100;
break;
case HN_MEGA_SONIC_BLOW:
case HN_SPIRAL_PIERCE_MAX:
damage += damage * 70 / 100;
damage *= 2;
break;
}
}
@ -5841,7 +5841,7 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list *
skillratio += -100 + 50000;
break;
case HN_SPIRAL_PIERCE_MAX:
skillratio += -100 + 550 + 350 * skill_lv;
skillratio += -100 + 700 + 800 * skill_lv;
skillratio += pc_checkskill(sd, HN_SELFSTUDY_TATICS) * 3 * skill_lv;
skillratio += 5 * sstatus->pow;
switch (status_get_size(target)){
@ -5858,13 +5858,13 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list *
RE_LVL_DMOD(100);
break;
case HN_SHIELD_CHAIN_RUSH:
skillratio += -100 + 600 + 450 * skill_lv;
skillratio += -100 + 700 + 500 * skill_lv;
skillratio += pc_checkskill(sd, HN_SELFSTUDY_TATICS) * 3 * skill_lv;
skillratio += 5 * sstatus->pow;
RE_LVL_DMOD(100);
break;
case HN_MEGA_SONIC_BLOW:
skillratio += -100 + 900 + 450 * skill_lv;
skillratio += -100 + 900 + 750 * skill_lv;
skillratio += pc_checkskill(sd, HN_SELFSTUDY_TATICS) * 5 * skill_lv;
skillratio += 5 * sstatus->pow;
if (status_get_hp(target) < status_get_max_hp(target) / 2)
@ -5872,7 +5872,7 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list *
RE_LVL_DMOD(100);
break;
case HN_DOUBLEBOWLINGBASH:
skillratio += -100 + 150 + 250 * skill_lv;
skillratio += -100 + 200 + 300 * skill_lv;
skillratio += pc_checkskill(sd, HN_SELFSTUDY_TATICS) * 3 * skill_lv;
skillratio += 5 * sstatus->pow;
RE_LVL_DMOD(100);

2
src/map/map.hpp
View File

@ -66,7 +66,7 @@ void map_msg_reload(void);
#define NATURAL_HEAL_INTERVAL 500
#define MIN_FLOORITEM 2
#define MAX_FLOORITEM START_ACCOUNT_NUM
#define MAX_LEVEL 250
#define MAX_LEVEL 260
#define MAX_DROP_PER_MAP 48
#define MAX_IGNORE_LIST 20 // official is 14
#define MAX_VENDING 12