From d9a0aa3bafc03d323f56898a4917731fa4870f49 Mon Sep 17 00:00:00 2001 From: Atemo Date: Tue, 4 Aug 2026 17:09:57 +0200 Subject: [PATCH 1/2] Corrected the name of the yml field in doc and db folders (#10074) --- db/enchantgrade.yml | 2 +- db/homunculus_db.yml | 2 +- db/import-tmpl/enchantgrade.yml | 2 +- db/import-tmpl/homunculus_db.yml | 2 +- db/pre-re/homunculus_db.yml | 2 +- db/re/achievement_db.yml | 2 +- db/re/enchantgrade.yml | 2 +- db/re/homunculus_db.yml | 2 +- db/re/item_combos.yml | 108 +++++++++++++++---------------- db/re/item_db_equip.yml | 8 +-- db/re/stylist.yml | 8 +-- doc/yaml/db/castle_db.yml | 7 ++ doc/yaml/db/enchantgrade.yml | 2 +- doc/yaml/db/homunculus_db.yml | 2 +- 14 files changed, 79 insertions(+), 72 deletions(-) diff --git a/db/enchantgrade.yml b/db/enchantgrade.yml index c97c4e4651b..936aee302ab 100644 --- a/db/enchantgrade.yml +++ b/db/enchantgrade.yml @@ -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) ########################################################################### diff --git a/db/homunculus_db.yml b/db/homunculus_db.yml index 5646cd94623..4d48a4ae296 100644 --- a/db/homunculus_db.yml +++ b/db/homunculus_db.yml @@ -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) diff --git a/db/import-tmpl/enchantgrade.yml b/db/import-tmpl/enchantgrade.yml index 64ccd4cad5f..dea701097a7 100644 --- a/db/import-tmpl/enchantgrade.yml +++ b/db/import-tmpl/enchantgrade.yml @@ -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) ########################################################################### diff --git a/db/import-tmpl/homunculus_db.yml b/db/import-tmpl/homunculus_db.yml index ac4f14b302a..64cee1ab7b1 100644 --- a/db/import-tmpl/homunculus_db.yml +++ b/db/import-tmpl/homunculus_db.yml @@ -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) diff --git a/db/pre-re/homunculus_db.yml b/db/pre-re/homunculus_db.yml index b5060a36d5b..9526c6100bf 100644 --- a/db/pre-re/homunculus_db.yml +++ b/db/pre-re/homunculus_db.yml @@ -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) diff --git a/db/re/achievement_db.yml b/db/re/achievement_db.yml index 2a825cb4d28..8992b513f14 100644 --- a/db/re/achievement_db.yml +++ b/db/re/achievement_db.yml @@ -1788,7 +1788,7 @@ Body: Group: Chatting Name: Who made the king Rewards: - TitleID: 1046 + TitleId: 1046 Score: 10 - Id: 170000 Group: Chatting diff --git a/db/re/enchantgrade.yml b/db/re/enchantgrade.yml index abf116b4524..b3f35d70ec6 100644 --- a/db/re/enchantgrade.yml +++ b/db/re/enchantgrade.yml @@ -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) ########################################################################### diff --git a/db/re/homunculus_db.yml b/db/re/homunculus_db.yml index f29b0a1c792..975a6059dea 100644 --- a/db/re/homunculus_db.yml +++ b/db/re/homunculus_db.yml @@ -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) diff --git a/db/re/item_combos.yml b/db/re/item_combos.yml index 14f0a66e15c..a0bebb04d11 100644 --- a/db/re/item_combos.yml +++ b/db/re/item_combos.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -48243,8 +48243,8 @@ 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 @@ -48252,8 +48252,8 @@ Body: 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -52446,8 +52446,8 @@ 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 @@ -52455,8 +52455,8 @@ Body: 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 @@ -52464,8 +52464,8 @@ Body: 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 @@ -52473,8 +52473,8 @@ Body: 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 @@ -52482,8 +52482,8 @@ Body: 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 @@ -52491,8 +52491,8 @@ Body: 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 @@ -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 @@ -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 @@ -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 diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml index b719007c0ff..dbac991a7ab 100644 --- a/db/re/item_db_equip.yml +++ b/db/re/item_db_equip.yml @@ -173438,7 +173438,7 @@ Body: Weight: 300 Defense: 20 Slots: 1 - Job: + Jobs: Crusader: true Knight: true Swordman: true @@ -173471,7 +173471,7 @@ Body: Weight: 300 Defense: 20 Slots: 1 - Job: + Jobs: Crusader: true Knight: true Swordman: true @@ -185083,7 +185083,7 @@ Body: Type: Armor Locations: Costume_Head_Mid: true - Trage: + Trade: NoMail: true NoAuction: true NoGuildStorage: true @@ -185139,7 +185139,7 @@ Body: Type: Armor Locations: Costume_Head_Mid: true - Trage: + Trade: NoDrop: true NoSell: true NoMail: true diff --git a/db/re/stylist.yml b/db/re/stylist.yml index 5ca2c9009cf..e413788c983 100644 --- a/db/re/stylist.yml +++ b/db/re/stylist.yml @@ -139,28 +139,28 @@ Body: Value: 7 CostsHuman: Price: 100000 - CostDoram: + CostsDoram: RequiredItem: J_Shop_Coupon2 RequiredItemBox: J_Shop_Coupon2 - Index: 8 Value: 8 CostsHuman: Price: 100000 - CostDoram: + CostsDoram: RequiredItem: J_Shop_Coupon2 RequiredItemBox: J_Shop_Coupon2 - Index: 9 Value: 9 CostsHuman: Price: 100000 - CostDoram: + CostsDoram: RequiredItem: J_Shop_Coupon2 RequiredItemBox: J_Shop_Coupon2 - Index: 10 Value: 10 CostsHuman: Price: 100000 - CostDoram: + CostsDoram: RequiredItem: J_Shop_Coupon2 RequiredItemBox: J_Shop_Coupon2 - Index: 11 diff --git a/doc/yaml/db/castle_db.yml b/doc/yaml/db/castle_db.yml index 0c30e258f85..cabc42f6037 100644 --- a/doc/yaml/db/castle_db.yml +++ b/doc/yaml/db/castle_db.yml @@ -9,4 +9,11 @@ # Map Map name to be considered as the castle map. # Name Name of the castle (used by scripts and guardian name tags). # Npc NPC unique name to invoke ::OnGuildBreak on, when a occupied castle is abandoned during guild break. +# Type The WoE type this castle belongs to. (Default: First_Edition) +# ClientId Client side ID of the castle. (Default: 0) +# WarpEnabled If the warp to the castle is enabled. (Default: false) +# WarpX X coordinate to warp to. (Default: 0) +# WarpY Y coordinate to warp to. (Default: 0) +# WarpCost Zeny cost to use the warp. (Default: 100) +# WarpCostSiege Zeny cost to use the warp during WoE. (Default: 100000) ########################################################################### diff --git a/doc/yaml/db/enchantgrade.yml b/doc/yaml/db/enchantgrade.yml index a1fd2ef5fed..cbd02f67c8f 100644 --- a/doc/yaml/db/enchantgrade.yml +++ b/doc/yaml/db/enchantgrade.yml @@ -28,7 +28,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) ########################################################################### diff --git a/doc/yaml/db/homunculus_db.yml b/doc/yaml/db/homunculus_db.yml index 2624f56df75..ded85b9c833 100644 --- a/doc/yaml/db/homunculus_db.yml +++ b/doc/yaml/db/homunculus_db.yml @@ -5,7 +5,7 @@ # Homunculus Settings # ########################################################################### -# - BaseClass Base class. +# - Class Base class. # Name Name of homunculus. # EvolutionClass Evolution class. # Food Homunculus food item. (Default: Pet_Food) From 2fe6ab3dc4d830b11d93fb44c3b48436571890bd Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Tue, 4 Aug 2026 19:50:04 +0200 Subject: [PATCH 2/2] Fixed message length calculations (#10073) Added missing parenthesis (the full packet header should be subtracted) Fixes #10072 Thanks to @jtonl --- src/map/intif.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/map/intif.cpp b/src/map/intif.cpp index fb15ac34ae0..931a56e8f3e 100644 --- a/src/map/intif.cpp +++ b/src/map/intif.cpp @@ -1308,7 +1308,7 @@ int32 intif_parse_WisMessage(int32 fd) return 0; } //Success to send whisper. - clif_wis_message(sd, wisp_source, RFIFOCP(fd,12+2*NAME_LENGTH),RFIFOW(fd,2)-12+2*NAME_LENGTH, gmlvl); + clif_wis_message(sd, wisp_source, RFIFOCP(fd,12+2*NAME_LENGTH),RFIFOW(fd,2)-(12+2*NAME_LENGTH), gmlvl); intif_wis_reply(id,0); // success return 1; } @@ -1371,7 +1371,7 @@ int32 mapif_parse_WisToGM(int32 fd) char Wisp_name[NAME_LENGTH]; char *message; - mes_len = RFIFOW(fd,2) - 8+NAME_LENGTH; + mes_len = RFIFOW(fd,2) - (8+NAME_LENGTH); message = (char *) aMalloc(mes_len+1); safestrncpy(Wisp_name, RFIFOCP(fd,4), NAME_LENGTH);