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

Corrected script for some item #26 (#8026)

Browse Source 
Thanks to @Pokye, @Atemo
This commit is contained in:
idk-whoami 2023-12-15 21:59:55 +07:00 committed by GitHub
parent 7ee7a25887
commit c8980072a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 9155 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1056
db/re/item_combos.yml
View File

File diff suppressed because it is too large Load Diff

6957
db/re/item_db_equip.yml
View File

File diff suppressed because it is too large Load Diff

1103
db/re/item_db_etc.yml
View File

File diff suppressed because it is too large Load Diff

9
db/re/item_db_usable.yml
View File

@ -66932,6 +66932,15 @@ Body:
Container: true
Script: |
getgroupitem(IG_Ponytail_Hair_Box);
- Id: 102605
AegisName: aegis_102605
Name: Costume Enchant Stone Box 33
Type: Usable
Weight: 10
Flags:
Container: true
Script: |
getgroupitem(IG_Enchant_Stone_Box33);
- Id: 200003
AegisName: LI_HD_Oridecon_Box2
Name: (Limited) HD Oridecon Box(Blacksmith)(30)

202
db/re/item_group_db.yml
View File

@ -73781,3 +73781,205 @@ Body:
- Index: 23
Item: C_Blackhand_Of_Fate
Rate: 1
- Group: ENCHANT_STONE_BOX33
SubGroups:
- SubGroup: 1
List:
- Index: 0
Item: Range_Stone_Robe_D
Rate: 10
- Index: 1
Item: Melee_Stone_Robe_D
Rate: 10
- Index: 2
Item: Magic_Stone_Robe_D
Rate: 10
- Index: 3
Item: SmatkStone_Robe
Rate: 10
- Index: 4
Item: M_PATKStone_Robe
Rate: 10
- Index: 5
Item: R_PATKStone_Robe
Rate: 10
- Index: 6
Item: ResistDefStone_Robe
Rate: 10
- Index: 7
Item: StaminaWISStone_Robe_D
Rate: 10
- Index: 8
Item: POWStone_Robe_D
Rate: 10
- Index: 9
Item: SplStone_Robe_D
Rate: 10
- Index: 10
Item: ConStone_Robe_D
Rate: 10
- Index: 11
Item: CrtStone_Robe_D
Rate: 10
- Index: 12
Item: MinorCastStone_Robe_D
Rate: 10
- Index: 13
Item: AbysschaserStone_Robe
Rate: 10
- Index: 14
Item: TRTRStone_Robe
Rate: 10
- Index: 15
Item: HNoviceStone_Robe
Rate: 10
- Index: 16
Item: ReloadStone_Robe_D
Rate: 10
- Index: 17
Item: CriticalStone_Robe_D
Rate: 10
- Index: 18
Item: DoubleAttack_Stone
Rate: 20
- Index: 19
Item: Critical_Stone_Robe
Rate: 20
- Index: 20
Item: CastStone_Robe_D
Rate: 40
- Index: 21
Item: SPdrainStone_Robe_D
Rate: 40
- Index: 22
Item: HPdrainStone_Robe_D
Rate: 80
- Index: 23
Item: ASPDStone_Robe_D
Rate: 80
- Index: 24
Item: CastStone_Robe
Rate: 80
- Index: 25
Item: ShadowchasStone_Top3
Rate: 80
- Index: 26
Item: ShadowchasStone_Middle3
Rate: 80
- Index: 27
Item: ShadowchasStone_Bottom3
Rate: 80
- Index: 28
Item: WanderMinsStone_Top3
Rate: 80
- Index: 29
Item: WanderMinsStone_Middle3
Rate: 80
- Index: 30
Item: WanderMinsStone_Bottom3
Rate: 80
- Index: 31
Item: SuNoviceStone_Top
Rate: 80
- Index: 32
Item: SuNoviceStone_Middle
Rate: 80
- Index: 33
Item: SuNoviceStone_Bottom
Rate: 80
- Index: 34
Item: Stone_Robe_Box
Rate: 170
- Index: 35
Item: aegis_102333
Rate: 170
- Index: 36
Item: Magic_Stone_Top
Rate: 200
- Index: 37
Item: Magic_Stone_Middle
Rate: 200
- Index: 38
Item: Magic_Stone_Bottom
Rate: 200
- Index: 39
Item: Range_Stone_Top
Rate: 200
- Index: 40
Item: Range_Stone
Rate: 200
- Index: 41
Item: Range_Stone_Bottom
Rate: 200
- Index: 42
Item: Melee_Stone_Top
Rate: 200
- Index: 43
Item: Melee_Stone_Middle
Rate: 200
- Index: 44
Item: Melee_Stone_Bottom
Rate: 200
- Index: 45
Item: DefenseStone_Top
Rate: 200
- Index: 46
Item: DefenseStone_Middle
Rate: 200
- Index: 47
Item: DefenseStone_Bottom
Rate: 200
- Index: 48
Item: ReloadStone_Top
Rate: 200
- Index: 49
Item: ReloadStone_Middle
Rate: 200
- Index: 50
Item: ReloadStone_Bottom
Rate: 200
- Index: 51
Item: EXPStone_Middle
Rate: 200
- Index: 52
Item: EXPStone_Bottom
Rate: 200
- Index: 53
Item: EXPStone_Top
Rate: 200
- Index: 54
Item: Stone_Top_Box
Rate: 400
- Index: 55
Item: Stone_Top2_Box
Rate: 400
- Index: 56
Item: Stone_Middle_Box
Rate: 400
- Index: 57
Item: Stone_Middle2_Box
Rate: 400
- Index: 58
Item: Stone_Bottom_Box
Rate: 400
- Index: 59
Item: Stone_Bottom2_Box
Rate: 400
- Index: 60
Item: CastingStone_Top
Rate: 400
- Index: 61
Item: CastingStone_Middle
Rate: 400
- Index: 62
Item: CastingStone_Bottom
Rate: 400
- Index: 63
Item: Critical_Stone
Rate: 400
- Index: 64
Item: Critical_Stone_Top
Rate: 400
- Index: 65
Item: Critical_Stone_Bottom
Rate: 400

16
db/re/mob_db.yml
View File

@ -94088,6 +94088,8 @@ Body:
ChaseRange: 12
Size: Small
Race: Insect
RaceGroups:
Illusion_Luanda: true
Element: Earth
ElementLevel: 1
WalkSpeed: 200
@ -94135,6 +94137,8 @@ Body:
ChaseRange: 12
Size: Large
Race: Formless
RaceGroups:
Illusion_Luanda: true
Element: Neutral
ElementLevel: 4
WalkSpeed: 150
@ -94182,6 +94186,8 @@ Body:
ChaseRange: 12
Size: Large
Race: Formless
RaceGroups:
Illusion_Luanda: true
Element: Neutral
ElementLevel: 4
WalkSpeed: 200
@ -94227,6 +94233,8 @@ Body:
ChaseRange: 12
Size: Large
Race: Demon
RaceGroups:
Illusion_Luanda: true
Element: Neutral
ElementLevel: 3
WalkSpeed: 150
@ -94277,6 +94285,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Plant
RaceGroups:
Illusion_Luanda: true
Element: Fire
ElementLevel: 3
WalkSpeed: 175
@ -94324,6 +94334,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Demihuman
RaceGroups:
Illusion_Luanda: true
Element: Earth
ElementLevel: 2
WalkSpeed: 200
@ -94371,6 +94383,8 @@ Body:
ChaseRange: 12
Size: Medium
Race: Demihuman
RaceGroups:
Illusion_Luanda: true
Element: Fire
ElementLevel: 2
WalkSpeed: 200
@ -94418,6 +94432,8 @@ Body:
ChaseRange: 12
Size: Large
Race: Demihuman
RaceGroups:
Illusion_Luanda: true
Element: Fire
ElementLevel: 4
WalkSpeed: 150

4
doc/item_bonus.txt
View File

@ -15,7 +15,7 @@ This list contains all available constants referenced in the 'bonus' commands.
* Status effect (eff)
Eff_Bleeding, Eff_Blind, Eff_Burning, Eff_Confusion, Eff_Crystalize, Eff_Curse, Eff_DPoison,
Eff_Fear, Eff_Freeze, Eff_Poison, Eff_Silence, Eff_Sleep, Eff_Stone, Eff_Stun, Eff_Freezing,
Eff_Heat, Eff_Deepsleep, Eff_WhiteImprison
Eff_Heat, Eff_Deepsleep, Eff_WhiteImprison, Eff_Hallucination
* Element (e)
Ele_Dark, Ele_Earth, Ele_Fire, Ele_Ghost, Ele_Holy, Ele_Neutral, Ele_Poison,
@ -31,7 +31,7 @@ This list contains all available constants referenced in the 'bonus' commands.
RC2_Bio5_Swordman_Thief, RC2_Bio5_Acolyte_Merchant, RC2_Bio5_Mage_Archer, RC2_Bio5_MVP,
RC2_Clocktower, RC2_Thanatos, RC2_Faceworm, RC2_Hearthunter, RC2_Rockridge, RC2_Werner_Lab,
RC2_Temple_Demon, RC2_Illusion_Vampire, RC2_Malangdo, RC2_EP172ALPHA, RC2_EP172BETA, RC2_EP172BATH,
RC2_Illusion_Turtle, RC2_Rachel_Sanctuary
RC2_Illusion_Turtle, RC2_Rachel_Sanctuary, RC2_Illusion_Luanda
* Class (c)
Class_Normal, Class_Boss, Class_Guardian, Class_All

1
sql-files/mob_db.sql
View File

@ -62,6 +62,7 @@ CREATE TABLE `mob_db` (
`racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
`racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
`racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
`racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL,
`element` varchar(24) DEFAULT NULL,
`element_level` tinyint(4) unsigned DEFAULT NULL,
`walk_speed` smallint(6) unsigned DEFAULT NULL,

1
sql-files/mob_db2.sql
View File

@ -62,6 +62,7 @@ CREATE TABLE `mob_db2` (
`racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
`racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
`racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
`racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL,
`element` varchar(24) DEFAULT NULL,
`element_level` tinyint(4) unsigned DEFAULT NULL,
`walk_speed` smallint(6) unsigned DEFAULT NULL,

1
sql-files/mob_db2_re.sql
View File

@ -64,6 +64,7 @@ CREATE TABLE `mob_db2_re` (
`racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
`racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
`racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
`racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL,
`element` varchar(24) DEFAULT NULL,
`element_level` tinyint(4) unsigned DEFAULT NULL,
`walk_speed` smallint(6) unsigned DEFAULT NULL,

1
sql-files/mob_db_re.sql
View File

@ -64,6 +64,7 @@ CREATE TABLE `mob_db_re` (
`racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
`racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
`racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
`racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL,
`element` varchar(24) DEFAULT NULL,
`element_level` tinyint(4) unsigned DEFAULT NULL,
`walk_speed` smallint(6) unsigned DEFAULT NULL,

12
sql-files/upgrades/upgrade_20231201.sql Normal file
View File

@ -0,0 +1,12 @@
ALTER TABLE `mob_db`
ADD COLUMN `racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL
;
ALTER TABLE `mob_db2`
ADD COLUMN `racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL
;
ALTER TABLE `mob_db_re`
ADD COLUMN `racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL
;
ALTER TABLE `mob_db2_re`
ADD COLUMN `racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL
;

1
src/map/itemdb.hpp
View File

@ -2029,6 +2029,7 @@ enum e_random_item_group {
IG_DUN_VOUCHER_BOX1,
IG_DUN_VOUCHER_BOX2,
IG_BLUEBOXOFQUESTIONS,
IG_ENCHANT_STONE_BOX33,
IG_MAX,
};

1
src/map/map.hpp
View File

@ -365,6 +365,7 @@ enum e_race2 : uint8{
RC2_EP172BATH,
RC2_ILLUSION_TURTLE,
RC2_RACHEL_SANCTUARY,
RC2_ILLUSION_LUANDA,
RC2_MAX
};

2
src/map/mob.cpp
View File

@ -5194,7 +5194,7 @@ static int mob_read_sqldb(void)
for( uint8 fi = 0; fi < ARRAYLENGTH(mob_db_name); ++fi ) {
// retrieve all rows from the mob database
if( SQL_ERROR == Sql_Query(mmysql_handle, "SELECT `id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`sp`,`base_exp`,`job_exp`,`mvp_exp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,"
"`racegroup_goblin`,`racegroup_kobold`,`racegroup_orc`,`racegroup_golem`,`racegroup_guardian`,`racegroup_ninja`,`racegroup_gvg`,`racegroup_battlefield`,`racegroup_treasure`,`racegroup_biolab`,`racegroup_manuk`,`racegroup_splendide`,`racegroup_scaraba`,`racegroup_ogh_atk_def`,`racegroup_ogh_hidden`,`racegroup_bio5_swordman_thief`,`racegroup_bio5_acolyte_merchant`,`racegroup_bio5_mage_archer`,`racegroup_bio5_mvp`,`racegroup_clocktower`,`racegroup_thanatos`,`racegroup_faceworm`,`racegroup_hearthunter`,`racegroup_rockridge`,`racegroup_werner_lab`,`racegroup_temple_demon`,`racegroup_illusion_vampire`,`racegroup_malangdo`,`racegroup_ep172alpha`,`racegroup_ep172beta`,`racegroup_ep172bath`,`racegroup_illusion_turtle`,`racegroup_rachel_sanctuary`,"
"`racegroup_goblin`,`racegroup_kobold`,`racegroup_orc`,`racegroup_golem`,`racegroup_guardian`,`racegroup_ninja`,`racegroup_gvg`,`racegroup_battlefield`,`racegroup_treasure`,`racegroup_biolab`,`racegroup_manuk`,`racegroup_splendide`,`racegroup_scaraba`,`racegroup_ogh_atk_def`,`racegroup_ogh_hidden`,`racegroup_bio5_swordman_thief`,`racegroup_bio5_acolyte_merchant`,`racegroup_bio5_mage_archer`,`racegroup_bio5_mvp`,`racegroup_clocktower`,`racegroup_thanatos`,`racegroup_faceworm`,`racegroup_hearthunter`,`racegroup_rockridge`,`racegroup_werner_lab`,`racegroup_temple_demon`,`racegroup_illusion_vampire`,`racegroup_malangdo`,`racegroup_ep172alpha`,`racegroup_ep172beta`,`racegroup_ep172bath`,`racegroup_illusion_turtle`,`racegroup_rachel_sanctuary`,`racegroup_illusion_luanda`,"
"`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`damage_taken`,`ai`,`class`,"
"`mode_canmove`,`mode_looter`,`mode_aggressive`,`mode_assist`,`mode_castsensoridle`,`mode_norandomwalk`,`mode_nocast`,`mode_canattack`,`mode_castsensorchase`,`mode_changechase`,`mode_angry`,`mode_changetargetmelee`,`mode_changetargetchase`,`mode_targetweak`,`mode_randomtarget`,`mode_ignoremelee`,`mode_ignoremagic`,`mode_ignoreranged`,`mode_mvp`,`mode_ignoremisc`,`mode_knockbackimmune`,`mode_teleportblock`,`mode_fixeditemdrop`,`mode_detector`,`mode_statusimmune`,`mode_skillimmune`,"
"`mvpdrop1_item`,`mvpdrop1_rate`,`mvpdrop1_option`,`mvpdrop1_index`,`mvpdrop2_item`,`mvpdrop2_rate`,`mvpdrop2_option`,`mvpdrop2_index`,`mvpdrop3_item`,`mvpdrop3_rate`,`mvpdrop3_option`,`mvpdrop3_index`,"

34
src/map/script.hpp
View File

@ -2088,6 +2088,40 @@ enum e_hat_effects : int16{
HAT_EF_ALICE_TEA,
HAT_EF_C_DARK_LORD_CLOAK,
HAT_EF_C_SAKURA_FUBUKI,
HAT_EF_C_DARK_LORD_MANTEAU,
HAT_EF_DECORATION_OF_MUSIC,
HAT_EF_2023RTC_S_ROBE1,
HAT_EF_2023RTC_S_ROBE2,
HAT_EF_2023RTC_S_ROBE3,
HAT_EF_C_CONSECRATE_F_AUREOLA,
HAT_EF_C_BULB_WREATH,
HAT_EF_MD_HOL_BARRIER1,
HAT_EF_MD_HOL_BARRIER2,
HAT_EF_MD_HOL_BARRIER3,
HAT_EF_MD_HOL_BARRIER4,
HAT_EF_MD_HOL_BARRIER5,
HAT_EF_MD_HOL_BARRIER6,
HAT_EF_MD_HOL_BARRIER7,
HAT_EF_MD_HOL_BARRIER8,
HAT_EF_MD_HOL_BARRIER9,
HAT_EF_MD_HOL_BARRIER10,
HAT_EF_MD_HOL_BARRIER11,
HAT_EF_MD_HOL_BARRIER12,
HAT_EF_MD_HOL_BARRIER13,
HAT_EF_MD_HOL_BARRIER14,
HAT_EF_MD_HOL_BARRIER15,
HAT_EF_MD_HOL_BARRIER16,
HAT_EF_MD_HOL_BARRIER17,
HAT_EF_MD_HOL_BARRIER18,
HAT_EF_MD_HOL_BARRIER19,
HAT_EF_MD_HOL_BARRIER20,
HAT_EF_C_FLUTTERING_HAZE,
HAT_EF_EFST_CINNAMON,
HAT_EF_AUTUMN_FULL_MOON,
HAT_EF_NIFLHEIM_NIGHT_SKY,
HAT_EF_C_ROS2023_CAPE_1,
HAT_EF_C_ROS2023_CAPE_2,
HAT_EF_C_15TH_NOV_HELMET,
HAT_EF_MAX
};

37
src/map/script_constants.hpp
View File

@ -964,6 +964,7 @@
export_constant2("Eff_Heat",SC_BURNT);
export_constant2("Eff_Deepsleep",SC_DEEPSLEEP);
export_constant2("Eff_WhiteImprison",SC_WHITEIMPRISON);
export_constant2("Eff_Hallucination",SC_HALLUCINATION);
export_constant2("SC_ALL",SC_NONE);
@ -4223,6 +4224,7 @@
export_constant(RC2_EP172BATH);
export_constant(RC2_ILLUSION_TURTLE);
export_constant(RC2_RACHEL_SANCTUARY);
export_constant(RC2_ILLUSION_LUANDA);
export_constant(RC2_MAX);
/* monster ai */
@ -6973,6 +6975,7 @@
export_constant(IG_DUN_VOUCHER_BOX1);
export_constant(IG_DUN_VOUCHER_BOX2);
export_constant(IG_BLUEBOXOFQUESTIONS);
export_constant(IG_ENCHANT_STONE_BOX33);
/* unit stop walking */
export_constant(USW_NONE);
@ -9581,6 +9584,40 @@
export_constant(HAT_EF_ALICE_TEA);
export_constant(HAT_EF_C_DARK_LORD_CLOAK);
export_constant(HAT_EF_C_SAKURA_FUBUKI);
export_constant(HAT_EF_C_DARK_LORD_MANTEAU);
export_constant(HAT_EF_DECORATION_OF_MUSIC);
export_constant(HAT_EF_2023RTC_S_ROBE1);
export_constant(HAT_EF_2023RTC_S_ROBE2);
export_constant(HAT_EF_2023RTC_S_ROBE3);
export_constant(HAT_EF_C_CONSECRATE_F_AUREOLA);
export_constant(HAT_EF_C_BULB_WREATH);
export_constant(HAT_EF_MD_HOL_BARRIER1);
export_constant(HAT_EF_MD_HOL_BARRIER2);
export_constant(HAT_EF_MD_HOL_BARRIER3);
export_constant(HAT_EF_MD_HOL_BARRIER4);
export_constant(HAT_EF_MD_HOL_BARRIER5);
export_constant(HAT_EF_MD_HOL_BARRIER6);
export_constant(HAT_EF_MD_HOL_BARRIER7);
export_constant(HAT_EF_MD_HOL_BARRIER8);
export_constant(HAT_EF_MD_HOL_BARRIER9);
export_constant(HAT_EF_MD_HOL_BARRIER10);
export_constant(HAT_EF_MD_HOL_BARRIER11);
export_constant(HAT_EF_MD_HOL_BARRIER12);
export_constant(HAT_EF_MD_HOL_BARRIER13);
export_constant(HAT_EF_MD_HOL_BARRIER14);
export_constant(HAT_EF_MD_HOL_BARRIER15);
export_constant(HAT_EF_MD_HOL_BARRIER16);
export_constant(HAT_EF_MD_HOL_BARRIER17);
export_constant(HAT_EF_MD_HOL_BARRIER18);
export_constant(HAT_EF_MD_HOL_BARRIER19);
export_constant(HAT_EF_MD_HOL_BARRIER20);
export_constant(HAT_EF_C_FLUTTERING_HAZE);
export_constant(HAT_EF_EFST_CINNAMON);
export_constant(HAT_EF_AUTUMN_FULL_MOON);
export_constant(HAT_EF_NIFLHEIM_NIGHT_SKY);
export_constant(HAT_EF_C_ROS2023_CAPE_1);
export_constant(HAT_EF_C_ROS2023_CAPE_2);
export_constant(HAT_EF_C_15TH_NOV_HELMET);
/* pet catch */
export_constant(PET_CATCH_UNIVERSAL);