Merge branch 'rathena:master' into master

rathena · Mar 13, 2024 · 5ff0419 · 5ff0419
2 parents b7da245 + 872e31c
commit 5ff0419
Show file tree

Hide file tree

Showing 42 changed files with 15,417 additions and 9,345 deletions.
diff --git a/3rdparty/libconfig/scanner.c b/3rdparty/libconfig/scanner.c
@@ -2,6 +2,11 @@
 
 #line 4 "scanner.c"
 
+#ifdef _MSC_VER
+	#pragma warning( push )
+	#pragma warning( disable : 4267 )
+#endif
+
 #define  YY_INT_ALIGNED short int
 
 /* A lexical scanner generated by flex */
@@ -2365,3 +2370,7 @@ void libconfig_yyfree (void * ptr , yyscan_t yyscanner)
 #define YYTABLES_NAME "yytables"
 
 #line 192 "scanner.l"
+
+#ifdef _MSC_VER
+	#pragma warning( pop )
+#endif
diff --git a/db/re/item_combos.yml b/db/re/item_combos.yml
@@ -48623,3 +48623,80 @@ Body:
           - FuriousBoots   # 470265
     Script: |
       bonus bDelayrate,-10;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_DK   # 400628
+          - Slayer_Furious   # 600059
+    Script: |
+      bonus2 bSkillAtk,"DK_HACKANDSLASHER",15;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_DK   # 400628
+          - Trident_Furious   # 630045
+    Script: |
+      bonus2 bSkillAtk,"DK_MADNESS_CRUSHER",15;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_ABC   # 400629
+          - Demonius_Furious   # 510150
+    Script: |
+      bonus2 bSkillAtk,"ABC_DEFT_STAB",15;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_ABC   # 400629
+          - Demonsword_Furious   # 510151
+    Script: |
+      bonus2 bSkillAtk,"ABC_ABYSS_SQUARE",15;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_SH   # 400630
+          - Foxtail_Furious   # 550143
+    Script: |
+      bonus2 bSkillAtk,"SH_HOGOGONG_STRIKE",15;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_SH   # 400630
+          - Setaria_Furious   # 550144
+    Script: |
+      bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",15;
+  - Combos:
+      - Combo:
+          - Demonius_Furious   # 510150
+          - FuriousBoots   # 470265
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
+      bonus2 bSkillAtk,"ABC_DEFT_STAB",.@sum;
+  - Combos:
+      - Combo:
+          - Demonsword_Furious   # 510151
+          - FuriousBoots   # 470265
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
+      bonus2 bSkillAtk,"ABC_ABYSS_SQUARE",.@sum;
+  - Combos:
+      - Combo:
+          - Foxtail_Furious   # 550143
+          - FuriousBoots   # 470265
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
+      bonus2 bSkillAtk,"SH_HOGOGONG_STRIKE",.@sum;
+  - Combos:
+      - Combo:
+          - Setaria_Furious   # 550144
+          - FuriousBoots   # 470265
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
+      bonus2 bSkillAtk,"SH_HYUN_ROKS_BREEZE",.@sum;
+  - Combos:
+      - Combo:
+          - Slayer_Furious   # 600059
+          - FuriousBoots   # 470265
+    Script: |
+      bonus2 bSkillAtk,"DK_HACKANDSLASHER",15;
+  - Combos:
+      - Combo:
+          - Trident_Furious   # 630045
+          - FuriousBoots   # 470265
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
+      bonus2 bSkillAtk,"DK_MADNESS_CRUSHER",.@sum;