Explorar o código

Hat Effect Update (#7569)

idk-whoami %!s(int64=2) %!d(string=hai) anos
pai
achega
96f0f77d42
Modificáronse 2 ficheiros con 28 adicións e 4 borrados
  1. 13 2
      src/map/script.hpp
  2. 15 2
      src/map/script_constants.hpp

+ 13 - 2
src/map/script.hpp

@@ -1958,8 +1958,8 @@ enum e_hat_effects : int16{
 	HAT_EF_QSCARABA,
 	HAT_EF_FSTONE,
 	HAT_EF_MAGICCIRCLE,
-	HAT_EF_GODCLASS,
-	HAT_EF_GODCLASS2,
+	HAT_EF_BRYSINGGAMEN,
+	HAT_EF_MAGINGIORDE,
 	HAT_EF_LEVEL99_RED,
 	HAT_EF_LEVEL99_ULTRAMARINE,
 	HAT_EF_LEVEL99_CYAN,
@@ -2066,10 +2066,21 @@ enum e_hat_effects : int16{
 	HAT_EF_C_SAMBA_CARNIVAL,
 	HAT_EF_POISON_MASTER,
 	HAT_EF_C_SWIRLING_FLAME,
+	HAT_EF_C_2021RTC_HEADSET_1_TW,
+	HAT_EF_C_2021RTC_HEADSET_2_TW,
+	HAT_EF_C_2021RTC_HEADSET_3_TW,
+	HAT_EF_SUBJECT_AURA_WHITE_ALPHA,
+	HAT_EF_GC_DARKCROW,
+	HAT_EF_DIABOLUS_RING,
+	HAT_EF_MAGICCIRCLE_BLUE_TW,
+	HAT_EF_C_DISAPEAR_TIME_TW_2,
 	HAT_EF_C_MELODY_WING,
 	HAT_EF_C_SPOT_LIGHT,
 	HAT_EF_C_ASTRA_BLESSING,
 	HAT_EF_EFST_C_20TH_ANNIVERSARY_HAT,
+	HAT_EF_SUBJECT_AURA_NAVY,
+	HAT_EF_20TH_SCARF_J,
+	HAT_EF_GHOST_FIRE,
 	HAT_EF_MAX
 };
 

+ 15 - 2
src/map/script_constants.hpp

@@ -9222,8 +9222,10 @@
 	export_constant(HAT_EF_QSCARABA);
 	export_constant(HAT_EF_FSTONE);
 	export_constant(HAT_EF_MAGICCIRCLE);
-	export_constant(HAT_EF_GODCLASS);
-	export_constant(HAT_EF_GODCLASS2);
+	export_deprecated_constant2("HAT_EF_GODCLASS",HAT_EF_BRYSINGGAMEN);
+	export_deprecated_constant2("HAT_EF_GODCLASS2",HAT_EF_MAGINGIORDE);
+	export_constant(HAT_EF_BRYSINGGAMEN);
+	export_constant(HAT_EF_MAGINGIORDE);
 	export_constant(HAT_EF_LEVEL99_RED);
 	export_constant(HAT_EF_LEVEL99_ULTRAMARINE);
 	export_constant(HAT_EF_LEVEL99_CYAN);
@@ -9330,10 +9332,21 @@
 	export_constant(HAT_EF_C_SAMBA_CARNIVAL);
 	export_constant(HAT_EF_POISON_MASTER);
 	export_constant(HAT_EF_C_SWIRLING_FLAME);
+	export_constant(HAT_EF_C_2021RTC_HEADSET_1_TW);
+	export_constant(HAT_EF_C_2021RTC_HEADSET_2_TW);
+	export_constant(HAT_EF_C_2021RTC_HEADSET_3_TW);
+	export_constant(HAT_EF_SUBJECT_AURA_WHITE_ALPHA);
+	export_constant(HAT_EF_GC_DARKCROW);
+	export_constant(HAT_EF_DIABOLUS_RING);
+	export_constant(HAT_EF_MAGICCIRCLE_BLUE_TW);
+	export_constant(HAT_EF_C_DISAPEAR_TIME_TW_2);
 	export_constant(HAT_EF_C_MELODY_WING);
 	export_constant(HAT_EF_C_SPOT_LIGHT);
 	export_constant(HAT_EF_C_ASTRA_BLESSING);
 	export_constant(HAT_EF_EFST_C_20TH_ANNIVERSARY_HAT);
+	export_constant(HAT_EF_SUBJECT_AURA_NAVY);
+	export_constant(HAT_EF_20TH_SCARF_J);
+	export_constant(HAT_EF_GHOST_FIRE);
 
 	/* pet catch */
 	export_constant(PET_CATCH_UNIVERSAL);