Parcourir la source

Implemented 4 missing status change (#8838)

SC_CONTENTS_26
SC_CONTENTS_27
SC_CONTENTS_28
SC_CONTENTS_29
Atemo il y a 5 mois
Parent
commit
ea10b81ad3
4 fichiers modifiés avec 94 ajouts et 5 suppressions
  1. 17 0
      db/re/item_db_usable.yml
  2. 53 0
      db/re/status.yml
  3. 11 0
      src/map/script_constants.hpp
  4. 13 5
      src/map/status.hpp

+ 17 - 0
db/re/item_db_usable.yml

@@ -79860,6 +79860,10 @@ Body:
       NoGuildStorage: true
       NoMail: true
       NoAuction: true
+    Script: |
+      specialeffect2 EF_POTION_BERSERK;
+      specialeffect2 EF_PROVIDENCE;
+      sc_start2 SC_CONTENTS_26,900000,30,10;
   - Id: 103429
     AegisName: 24_A_Ev_Rice
     Name: Academic Festival Rice Crackers    # !todo check english name
@@ -79873,6 +79877,9 @@ Body:
       NoGuildStorage: true
       NoMail: true
       NoAuction: true
+    Script: |
+      specialeffect2 EF_SPELLBREAKER;
+      sc_start2 SC_CONTENTS_27,900000,15,10;
   - Id: 103430
     AegisName: 24_A_Ev_Butter
     Name: Academic Festival Butter Crackers    # !todo check english name
@@ -79886,6 +79893,9 @@ Body:
       NoGuildStorage: true
       NoMail: true
       NoAuction: true
+    Script: |
+      specialeffect2 EF_HASTEUP;
+      sc_start2 SC_CONTENTS_28,900000,15,12;
   - Id: 103431
     AegisName: 24_A_Ev_Coffee
     Name: Academic Festival Coffee Sticks    # !todo check english name
@@ -79899,11 +79909,17 @@ Body:
       NoGuildStorage: true
       NoMail: true
       NoAuction: true
+    Script: |
+      specialeffect2 EF_STEAL;
+      sc_start2 SC_CONTENTS_29,900000,15,-10;
   - Id: 103432
     AegisName: 24_A_Ev_Cookie
     Name: Academic Festival Commemorative Cookies    # !todo check english name
     Type: Usable
     Weight: 50
+    Delay:
+      Duration: 3000
+      Status: Reuse_Limit_H
     Trade:
       NoDrop: true
       NoTrade: true
@@ -79913,6 +79929,7 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
+      specialeffect2 EF_POTION4;
       percentheal 100,100;
   - Id: 103437
     AegisName: Rt_Ep18_Armor_A

+ 53 - 0
db/re/status.yml

@@ -9338,3 +9338,56 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
+  - Status: Contents_26
+    Icon: EFST_CONTENTS_26
+    Flags:
+      NoClearbuff: true
+      NoDispell: true
+      NoBanishingBuster: true
+      NoClearance: true
+    Script: |
+      .@val1 = getstatus(SC_CONTENTS_26, 1);
+      .@val2 = getstatus(SC_CONTENTS_26, 2);
+      bonus bHit, .@val1;
+      bonus2 bAddEle,Ele_All, .@val2;
+      bonus2 bMagicAddEle,Ele_All, .@val2;
+  - Status: Contents_27
+    Icon: EFST_CONTENTS_27
+    Flags:
+      NoClearbuff: true
+      NoDispell: true
+      NoBanishingBuster: true
+      NoClearance: true
+    Script: |
+      .@val1 = getstatus(SC_CONTENTS_27, 1);
+      .@val2 = getstatus(SC_CONTENTS_27, 2);
+      bonus bCritical, .@val1;
+      bonus2 bAddSize,Size_All, .@val2;
+      bonus2 bMagicAddSize,Size_All, .@val2;
+  - Status: Contents_28
+    Icon: EFST_CONTENTS_28
+    Flags:
+      NoClearbuff: true
+      NoDispell: true
+      NoBanishingBuster: true
+      NoClearance: true
+    Script: |
+      .@val1 = getstatus(SC_CONTENTS_28, 1);
+      .@val2 = getstatus(SC_CONTENTS_28, 2);
+      bonus bFlee, .@val1;
+      bonus bShortAtkRate, .@val2;
+      bonus bLongAtkRate, .@val2;
+      bonus2 bMagicAtkEle,Ele_All, .@val2;
+  - Status: Contents_29
+    Icon: EFST_CONTENTS_29
+    Flags:
+      NoClearbuff: true
+      NoDispell: true
+      NoBanishingBuster: true
+      NoClearance: true
+    Script: |
+      .@val1 = getstatus(SC_CONTENTS_29, 1);
+      .@val2 = getstatus(SC_CONTENTS_29, 2);
+      bonus bAtkRate, .@val1;
+      bonus bMatkRate, .@val1;
+      bonus bVariableCastrate, .@val2;

+ 11 - 0
src/map/script_constants.hpp

@@ -1914,6 +1914,10 @@
 	export_constant(SC_CONTENTS_9);
 	export_constant(SC_CONTENTS_10);
 	export_constant(SC_MYSTERY_POWDER);
+	export_constant(SC_CONTENTS_26);
+	export_constant(SC_CONTENTS_27);
+	export_constant(SC_CONTENTS_28);
+	export_constant(SC_CONTENTS_29);
 
 /// Do not modify code below this, until the end of the API hook, since it will be automatically generated again
 /// @APIHOOK_START(EFST_CONST)
@@ -3352,14 +3356,21 @@
 	export_constant(EFST_CONTENTS_23);
 	export_constant(EFST_CONTENTS_24);
 	export_constant(EFST_CONTENTS_25);
+	export_constant(EFST_CONTENTS_26);
+	export_constant(EFST_CONTENTS_27);
+	export_constant(EFST_CONTENTS_28);
+	export_constant(EFST_CONTENTS_29);
+	export_constant(EFST_CONTENTS_30);
 	export_constant(EFST_C_BUFF_1);
 	export_constant(EFST_C_BUFF_2);
 	export_constant(EFST_CHASING);
 	export_constant(EFST_MYSTERY_POWDER);
+	export_constant(EFST_WILD_WALK);
 	export_constant(EFST_FIRE_CHARM_POWER);
 	export_constant(EFST_WATER_CHARM_POWER);
 	export_constant(EFST_WIND_CHARM_POWER);
 	export_constant(EFST_GROUND_CHARM_POWER);
+	export_constant(EFST_OVERCOMING_CRISIS);
 /// @APIHOOK_END
 /// Do not modify code above this, since it will be automatically generated by the API again
 	export_constant(EFST_MAX);

+ 13 - 5
src/map/status.hpp

@@ -1328,9 +1328,11 @@ enum sc_type : int16 {
 	SC_CONTENTS_8,
 	SC_CONTENTS_9,
 	SC_CONTENTS_10,
-
-	// Level 275 New Skills
 	SC_MYSTERY_POWDER,
+	SC_CONTENTS_26,
+	SC_CONTENTS_27,
+	SC_CONTENTS_28,
+	SC_CONTENTS_29,
 
 	SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
 };
@@ -2787,7 +2789,12 @@ enum efst_type : short{
 	EFST_CONTENTS_22,
 	EFST_CONTENTS_23,
 	EFST_CONTENTS_24,
-	EFST_CONTENTS_25,	//1483
+	EFST_CONTENTS_25,
+	EFST_CONTENTS_26,
+	EFST_CONTENTS_27,
+	EFST_CONTENTS_28,
+	EFST_CONTENTS_29,
+	EFST_CONTENTS_30,	//1488
 
 	EFST_C_BUFF_1 = 1509,
 	EFST_C_BUFF_2,
@@ -2795,11 +2802,12 @@ enum efst_type : short{
 	EFST_CHASING = 1560,
 
 	EFST_MYSTERY_POWDER = 1665,
-
-	EFST_FIRE_CHARM_POWER = 1667,
+	EFST_WILD_WALK,
+	EFST_FIRE_CHARM_POWER,
 	EFST_WATER_CHARM_POWER,
 	EFST_WIND_CHARM_POWER,
 	EFST_GROUND_CHARM_POWER,
+	EFST_OVERCOMING_CRISIS,	//1671
 /// @APIHOOK_END
 /// Do not modify code above this, since it will be automatically generated by the API again
 	EFST_MAX,