Skip to content

[pull] master from rathena:master #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Aug 4, 2026
Merged

[pull] master from rathena:master #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9a0aa3
Corrected the name of the yml field in doc and db folders (#10074)
Atemo Aug 4, 2026
2fe6ab3
Fixed message length calculations (#10073)
Lemongrass3110 Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion db/enchantgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
# Item Required item.
# Amount Amount of required item. (Default: 1)
# Set to 0 to remove an option.
# Price Amount of zeny required. (Default: 0)
# Zeny Amount of zeny required. (Default: 0)
# BreakingRate Chance of item breaking out of 0~10000. (Default: 0)
# DowngradeAmount Number of refine levels reduced on failure. (Default: 0)
###########################################################################
Expand Down
2 changes: 1 addition & 1 deletion db/homunculus_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# Homunculus Settings
#
###########################################################################
# - BaseClass Base class.
# - Class Base class.
# Name Name of homunculus.
# EvolutionClass Evolution class.
# Food Homunculus food item. (Default: Pet_Food)
Expand Down
2 changes: 1 addition & 1 deletion db/import-tmpl/enchantgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
# Item Required item.
# Amount Amount of required item. (Default: 1)
# Set to 0 to remove an option.
# Price Amount of zeny required. (Default: 0)
# Zeny Amount of zeny required. (Default: 0)
# BreakingRate Chance of item breaking out of 0~10000. (Default: 0)
# DowngradeAmount Number of refine levels reduced on failure. (Default: 0)
###########################################################################
Expand Down
2 changes: 1 addition & 1 deletion db/import-tmpl/homunculus_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# Homunculus Settings
#
###########################################################################
# - BaseClass Base class.
# - Class Base class.
# Name Name of homunculus.
# EvolutionClass Evolution class.
# Food Homunculus food item. (Default: Pet_Food)
Expand Down
2 changes: 1 addition & 1 deletion db/pre-re/homunculus_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# Homunculus Settings
#
###########################################################################
# - BaseClass Base class.
# - Class Base class.
# Name Name of homunculus.
# EvolutionClass Evolution class.
# Food Homunculus food item. (Default: Pet_Food)
Expand Down
2 changes: 1 addition & 1 deletion db/re/achievement_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1788,7 +1788,7 @@ Body:
Group: Chatting
Name: Who made the king
Rewards:
TitleID: 1046
TitleId: 1046
Score: 10
- Id: 170000
Group: Chatting
Expand Down
2 changes: 1 addition & 1 deletion db/re/enchantgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
# Item Required item.
# Amount Amount of required item. (Default: 1)
# Set to 0 to remove an option.
# Price Amount of zeny required. (Default: 0)
# Zeny Amount of zeny required. (Default: 0)
# BreakingRate Chance of item breaking out of 0~10000. (Default: 0)
# DowngradeAmount Number of refine levels reduced on failure. (Default: 0)
###########################################################################
Expand Down
2 changes: 1 addition & 1 deletion db/re/homunculus_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# Homunculus Settings
#
###########################################################################
# - BaseClass Base class.
# - Class Base class.
# Name Name of homunculus.
# EvolutionClass Evolution class.
# Food Homunculus food item. (Default: Pet_Food)
Expand Down
108 changes: 54 additions & 54 deletions db/re/item_combos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30958,8 +30958,8 @@ Body:
Script: |
bonus2 bResEff,Eff_Confusion,10000;
skill "AM_CP_HELM",5;
UnEquipScript: |
sc_end SC_CP_HELM;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_CP_HELM;
- Combos:
- Combo:
- ILL_Kraken_Card # 300151
Expand Down Expand Up @@ -33374,8 +33374,8 @@ Body:
bonus2 bSkillCooldown,"WL_TELEKINESIS_INTENSE",-120000;
bonus2 bSkillAtk,"WL_CRIMSONROCK",BaseLevel/3;
bonus2 bSkillAtk,"WL_SOULEXPANSION",BaseLevel/3;
UnEquipScript: |
sc_end SC_TELEKINESIS_INTENSE;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_TELEKINESIS_INTENSE;
- Combos:
- Combo:
- Noblesse_oblige # 490206
Expand Down Expand Up @@ -33405,8 +33405,8 @@ Body:
Script: |
skill "RA_UNLIMIT",5;
bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM_MELEE",BaseLevel/2;
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- CannonConverter_TW # 32259
Expand Down Expand Up @@ -34729,8 +34729,8 @@ Body:
.@r = getequiprefinerycnt(EQI_GARMENT);
if (eaclass()&EAJL_THIRD && BaseJob == Job_Hunter)
bonus2 bSkillCooldown,"RA_UNLIMIT",-18000;
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- aegis_29725 # 29725
Expand Down Expand Up @@ -35035,8 +35035,8 @@ Body:
.@r = getequiprefinerycnt(EQI_HEAD_TOP);
if (eaclass()&EAJL_THIRD && BaseJob == Job_Wizard)
bonus2 bSkillCooldown,"WL_TELEKINESIS_INTENSE",-8000*.@r;
UnEquipScript: |
sc_end SC_TELEKINESIS_INTENSE;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_TELEKINESIS_INTENSE;
- Combos:
- Combo:
- aegis_29725 # 29725
Expand Down Expand Up @@ -35070,8 +35070,8 @@ Body:
bonus bMatkRate,15;
bonus2 bSkillCooldown,"WL_TELEKINESIS_INTENSE",-75000;
}
UnEquipScript: |
sc_end SC_TELEKINESIS_INTENSE;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_TELEKINESIS_INTENSE;
- Combos:
- Combo:
- aegis_29725 # 29725
Expand Down Expand Up @@ -37919,8 +37919,8 @@ Body:
Script: |
bonus2 bAddEle,Ele_All,15;
bonus2 bSkillCooldown,"RA_UNLIMIT",-45000;
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- Water_Sprits_Armor # 2346
Expand Down Expand Up @@ -40081,8 +40081,8 @@ Body:
- aegis_311439 # 311439
Script: |
skill "RA_CAMOUFLAGE",5;
UnEquipScript: |
sc_end SC_CAMOUFLAGE;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_CAMOUFLAGE;
- Combos:
- Combo:
- Bone_Detale_Card # 300021
Expand Down Expand Up @@ -48243,17 +48243,17 @@ Body:
Script: |
bonus2 bSkillCooldown,"WL_CRIMSONROCK",-100;
bonus2 bSkillCooldown,"WL_TELEKINESIS_INTENSE",-185000;
UnEquipScript: |
sc_end SC_TELEKINESIS_INTENSE;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_TELEKINESIS_INTENSE;
- Combos:
- Combo:
- Hero # 29509
- aegis_312833 # 312833
Script: |
bonus2 bSkillCooldown,"RA_ARROWSTORM",-200;
bonus2 bSkillCooldown,"RA_UNLIMIT",-240000;
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- Hero # 29509
Expand Down Expand Up @@ -48309,8 +48309,8 @@ Body:
- aegis_312841 # 312841
Script: |
autobonus3 "{}",30,100,"SC_TRIANGLESHOT","{ sc_start SC_UNLIMIT,20000,5; }";
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- Hero # 29509
Expand Down Expand Up @@ -49453,8 +49453,8 @@ Body:
bonus2 bSkillUseSPrate,"WM_SEVERE_RAINSTORM",60;
bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-2000;
}
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- Old_Camo_RabbitHood # 18984
Expand Down Expand Up @@ -50592,8 +50592,8 @@ Body:
- aegis_313318 # 313318
Script: |
bonus2 bSkillCooldown,"WL_TELEKINESIS_INTENSE",-75000;
UnEquipScript: |
sc_end SC_TELEKINESIS_INTENSE;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_TELEKINESIS_INTENSE;
- Combos:
- Combo:
- Tendrilion_Card # 4463
Expand Down Expand Up @@ -50708,8 +50708,8 @@ Body:
Script: |
if ((eaclass()&EAJL_FOURTH) && (BaseJob == Job_Bard || BaseJob == Job_Dancer))
skill "RA_UNLIMIT",5;
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- Hero # 29509
Expand All @@ -50734,8 +50734,8 @@ Body:
- aegis_313301 # 313301
Script: |
bonus2 bSkillCooldown,"RA_UNLIMIT",-60000;
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- Hero # 29509
Expand Down Expand Up @@ -50787,8 +50787,8 @@ Body:
Script: |
if (eaclass()&EAJL_FOURTH && BaseJob == Job_Rogue)
skill "RA_UNLIMIT",5;
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- Release_Of_Magic # 29371
Expand Down Expand Up @@ -51724,8 +51724,8 @@ Body:
Script: |
autobonus3 "{}",50,100,"WH_HAWKBOOMERANG","{ sc_start SC_UNLIMIT,20000,5; }";
autobonus3 "{}",50,100,"WH_HAWKRUSH","{ sc_start SC_UNLIMIT,20000,5; }";
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- Release_Of_Magic # 29371
Expand Down Expand Up @@ -51980,8 +51980,8 @@ Body:
bonus bNoCastCancel;
bonus5 bAutoSpell,"NPC_WIDESLEEP",2,50,BF_MAGIC,1;
bonus5 bAutoSpell,"RA_UNLIMIT",3,50,BF_WEAPON,0;
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- Grand_Pere_Card # 27106
Expand Down Expand Up @@ -52446,53 +52446,53 @@ Body:
Script: |
bonus2 bAddSize,Size_All,25;
bonus2 bSkillCooldown,"RK_IGNITIONBREAK",-1000;
UnEquipScript: |
heal 0,-2000;
# UnEquipScript: | # TODO: field not supported
# heal 0,-2000;
- Combos:
- Combo:
- Real_Katrinn_Card # 4686
- RingOfThought_LT # 490596
Script: |
bonus2 bMagicAddSize,Size_All,25;
bonus2 bSkillCooldown,"WL_CRIMSONROCK",-1500;
UnEquipScript: |
heal 0,-2000;
# UnEquipScript: | # TODO: field not supported
# heal 0,-2000;
- Combos:
- Combo:
- Real_Magaleta_Card # 4685
- RingOfThought_LT # 490596
Script: |
bonus2 bMagicAddSize,Size_All,25;
bonus2 bSkillCooldown,"AB_ADORAMUS",-1000;
UnEquipScript: |
heal 0,-2000;
# UnEquipScript: | # TODO: field not supported
# heal 0,-2000;
- Combos:
- Combo:
- Real_Eremes_Card # 4684
- RingOfThought_LT # 490596
Script: |
bonus2 bAddSize,Size_All,25;
bonus2 bSkillCooldown,"GC_DARKCROW",-10000;
UnEquipScript: |
heal 0,-2000;
# UnEquipScript: | # TODO: field not supported
# heal 0,-2000;
- Combos:
- Combo:
- Real_Shecil_Card # 4687
- RingOfThought_LT # 490596
Script: |
bonus2 bAddSize,Size_All,25;
bonus2 bSkillCooldown,"RA_ARROWSTORM",-1500;
UnEquipScript: |
heal 0,-2000;
# UnEquipScript: | # TODO: field not supported
# heal 0,-2000;
- Combos:
- Combo:
- Real_Harword_Card # 4688
- RingOfThought_LT # 490596
Script: |
bonus2 bAddSize,Size_All,25;
bonus2 bSkillCooldown,"NC_AXETORNADO",-2000;
UnEquipScript: |
heal 0,-2000;
# UnEquipScript: | # TODO: field not supported
# heal 0,-2000;
- Combos:
- Combo:
- Raven_Of_Tomb # 410136
Expand Down Expand Up @@ -52556,8 +52556,8 @@ Body:
bonus2 bSubEle,Ele_All,30;
bonus2 bAddRace,RC_All,4*(.@r/2);
bonus2 bSkillAtk,"SC_TRIANGLESHOT",10*(.@r/2);
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- Old_Driver_Band_R # 18973
Expand Down Expand Up @@ -56090,8 +56090,8 @@ Body:
bonus bAspd,1;
bonus5 bAutoSpell,"RA_UNLIMIT",1,20,BF_LONG,0;
bonus2 bSkillAtk,"ASC_BREAKER",10*(getequiprefinerycnt(EQI_HAND_R)/3);
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- Mercenary_Ring_A # 28425
Expand Down Expand Up @@ -56695,8 +56695,8 @@ Body:
bonus bNoCastCancel;
bonus5 bAutoSpell,"NPC_WIDESLEEP",2,50,BF_MAGIC,1;
bonus5 bAutoSpell,"RA_UNLIMIT",3,50,BF_LONG,0;
UnEquipScript: |
sc_end SC_UNLIMIT;
# UnEquipScript: | # TODO: field not supported
# sc_end SC_UNLIMIT;
- Combos:
- Combo:
- Thanos_Dagger # 13093
Expand Down
Loading
Loading