Skip to content

Commit 0686f8a

Browse files
RegynateRegynate
committed
Fix Effects.cs
1 parent cced5d3 commit 0686f8a

File tree

3 files changed

+32
-27
lines changed

3 files changed

+32
-27
lines changed

‎ChaosMod/Effects/db/Player/PlayerLazerEyes.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static void OnStart()
100100
// clang-format off
101101
REGISTER_EFFECT(OnStart, nullptr, OnTick,
102102
{
103-
.Name = "Lazer Eyes",
103+
.Name = "Laser Eyes",
104104
.Id = "player_laser_eyes",
105105
.IsTimed = true
106106
}

‎ChaosMod/Main.cpp‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@ static void Init()
188188

189189
INIT_COMPONENT("Workshop", "workshop", Workshop);
190190

191-
if (g_OptionsManager.GetConfigValue({ "EffectSoundUseMCI" }, OPTION_DEFAULT_EFFECT_SOUND_USE_MCI) || FORCE_LEGACY_SOUND_MANAGER)
191+
if (g_OptionsManager.GetConfigValue({ "EffectSoundUseMCI" }, OPTION_DEFAULT_EFFECT_SOUND_USE_MCI)
192+
|| FORCE_LEGACY_SOUND_MANAGER)
192193
{
193194
INIT_COMPONENT_BASE("EffectSoundManager", "effect sound system (legacy MCI)", EffectSoundManager,
194195
EffectSoundMCI);
@@ -224,6 +225,13 @@ static void Init()
224225

225226
INIT_COMPONENT("EntityTracking", "Entity Tracking", EntityTracking);
226227

228+
for (auto &&[effectId, effectMetadata] : g_RegisteredEffectsMetadata)
229+
{
230+
LOG("{ \"" << effectId << "\", new EffectInfo(\"" << effectMetadata.Name << "\", EffectCategory."
231+
<< (effectMetadata.IsTimed ? ", true" : "") << (effectMetadata.IsShortDuration ? ", true" : "")
232+
<< ") },");
233+
}
234+
227235
#ifdef WITH_DEBUG_PANEL_SUPPORT
228236
if (DoesFeatureFlagExist("enabledebugsocket"))
229237
INIT_COMPONENT("DebugSocket", "Debug Websocket", DebugSocket);

‎ConfigApp/Effects.cs‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ public enum EffectTimedType
102102
{ "vehs_green", new EffectInfo("Green Traffic", EffectCategory.Vehicle, true) },
103103
{ "vehs_chrome", new EffectInfo("Chrome Traffic", EffectCategory.Vehicle, true) },
104104
{ "vehs_pink", new EffectInfo("Hot Traffic", EffectCategory.Vehicle, true) },
105-
{ "vehs_rainbow", new EffectInfo("Rainbow Traffic", EffectCategory.Vehicle, true) },
106105
{ "vehs_slippery", new EffectInfo("Slippery Vehicles", EffectCategory.Vehicle, true) },
107106
{ "vehs_nogravity", new EffectInfo("Vehicles Have No Gravity", EffectCategory.Vehicle, true, true) },
108107
{ "player_invincible", new EffectInfo("Invincibility", EffectCategory.Player, true) },
@@ -317,7 +316,7 @@ public enum EffectTimedType
317316
{ "player_spin_camera", new EffectInfo("Spinning Camera", EffectCategory.Screen, true, true) },
318317
{ "misc_lowpitch", new EffectInfo("Low Pitch", EffectCategory.Misc, true) },
319318
{ "peds_roasting", new EffectInfo("Get Roasted", EffectCategory.Peds, true, true) },
320-
{ "player_binoculars", new EffectInfo("Binoculars", EffectCategory.Screen, true) },
319+
{ "player_binoculars", new EffectInfo("Binoculars", EffectCategory.Screen, true, true) },
321320
{ "peds_slippery_peds", new EffectInfo("Can't Tie My Shoes", EffectCategory.Peds, true, true) },
322321
{ "vehs_cruise_control", new EffectInfo("Cruise Control", EffectCategory.Vehicle, true, true) },
323322
{ "peds_hands_up", new EffectInfo("Hands Up!", EffectCategory.Peds) },
@@ -344,7 +343,7 @@ public enum EffectTimedType
344343
{ "misc_stuffguns", new EffectInfo("Improvised Weaponry", EffectCategory.Misc, true, true) },
345344
{ "misc_random_waypoint", new EffectInfo("Set Random Waypoint", EffectCategory.Misc) },
346345
{ "peds_eternal_screams", new EffectInfo("Eternal Screams", EffectCategory.Peds, true, true) },
347-
{ "spawn_angry_chimp", new EffectInfo("Spawn Angry Chimp", EffectCategory.Peds, true) },
346+
{ "spawn_angry_chimp", new EffectInfo("Spawn Angry Chimp", EffectCategory.Peds) },
348347
{ "misc_uturn", new EffectInfo("U-Turn", EffectCategory.Misc) },
349348
{ "peds_spawn_quarreling_couple", new EffectInfo("Spawn Quarreling Couple", EffectCategory.Peds) },
350349
{ "misc_get_towed", new EffectInfo("Get Towed", EffectCategory.Misc) },
@@ -379,8 +378,8 @@ public enum EffectTimedType
379378
{ "screen_rgbland", new EffectInfo("RGB Land", EffectCategory.Screen, true) },
380379
{ "peds_give_props", new EffectInfo("Give Everyone A Random Prop", EffectCategory.Peds) },
381380
{ "screen_textureless", new EffectInfo("Textureless", EffectCategory.Screen, true) },
382-
{ "screen_mirrored", new EffectInfo("Mirrored Screen", EffectCategory.Screen, true) },
383-
{ "screen_foldedscreen", new EffectInfo("Folded Screen", EffectCategory.Screen, true) },
381+
{ "screen_mirrored", new EffectInfo("Mirrored Screen", EffectCategory.Screen, true, true) },
382+
{ "screen_foldedscreen", new EffectInfo("Folded Screen", EffectCategory.Screen, true, true) },
384383
{ "screen_swappedcolors", new EffectInfo("Swapped Colors", EffectCategory.Screen, true) },
385384
{ "screen_screenfreakout", new EffectInfo("Screen Freakout", EffectCategory.Screen, true, true) },
386385
{ "screen_screenpotato", new EffectInfo("Potato", EffectCategory.Screen, true, true) },
@@ -429,12 +428,11 @@ public enum EffectTimedType
429428
{ "screen_leaned_camera", new EffectInfo("Leaned Camera", EffectCategory.Screen, true, true) },
430429
{ "vehs_disappear_on_impact", new EffectInfo("Vehicles Disappear On Impact", EffectCategory.Vehicle, true) },
431430
{ "misc_fake_spawn", new EffectInfo("Fake Spawn", EffectCategory.Misc) },
432-
{ "peds_upsidedown", new EffectInfo("Upside Down Peds", EffectCategory.Peds, true)},
433431
{ "peds_blanks", new EffectInfo("Blanks", EffectCategory.Peds, true, true) },
434432
{ "player_magnetgravity", new EffectInfo("Pulsating Gravity Field", EffectCategory.Player, true, true) },
435433
{ "peds_aliens", new EffectInfo("Alien Invasion", EffectCategory.Peds, true) },
436434
{ "misc_fake_nochaos", new EffectInfo("Fake No Chaos", EffectCategory.Misc) },
437-
{ "screen_rainbow_ui", new EffectInfo("Rainbow Chaos UI", EffectCategory.Screen) },
435+
{ "screen_rainbow_ui", new EffectInfo("Rainbow Chaos UI", EffectCategory.Screen, true) },
438436
{ "screen_ingame_chat", new EffectInfo("In-Game Chat", EffectCategory.Screen, true) },
439437
{ "meta_bonus_random_effect", new EffectInfo("Bonus Random Effect", EffectCategory.Meta, true) },
440438
{ "meta_broken_record", new EffectInfo("Broken Record", EffectCategory.Meta, true) },
@@ -443,11 +441,10 @@ public enum EffectTimedType
443441
{ "misc_boom_gate", new EffectInfo("Boom Gate", EffectCategory.Misc) },
444442
{ "misc_bouncy_props", new EffectInfo("Bouncy Props", EffectCategory.Misc, true) },
445443
{ "misc_cinematic_killz", new EffectInfo("Cinematic Killz", EffectCategory.Misc, true) },
446-
{ "misc_feet_cam", new EffectInfo("Feet Cam", EffectCategory.Misc, true) },
447444
{ "misc_help_my_s_key_is_stuck", new EffectInfo("Help My S Key Is Stuck", EffectCategory.Misc, true, true) },
448445
{ "misc_molotov_bullets", new EffectInfo("Molotov Bullets", EffectCategory.Misc, true) },
449446
{ "misc_no_headshots", new EffectInfo("No Headshots", EffectCategory.Misc, true) },
450-
{ "misc_orbit_camera_v2", new EffectInfo("Orbit Camera V2", EffectCategory.Misc, true) },
447+
{ "misc_orbit_camera_v2", new EffectInfo("Orbit Camera V2", EffectCategory.Misc, true, true) },
451448
{ "misc_please_let_this_be_a_normal_field_trip", new EffectInfo("Please Let This Be A Normal Field Trip", EffectCategory.Misc, true) },
452449
{ "misc_random_hospital", new EffectInfo("Random Hospital", EffectCategory.Misc, true) },
453450
{ "misc_repeat_last_effect", new EffectInfo("Repeat Last Effect", EffectCategory.Misc) },
@@ -461,13 +458,11 @@ public enum EffectTimedType
461458
{ "peds_bullet_men", new EffectInfo("Bullet Men", EffectCategory.Peds, true) },
462459
{ "peds_chopception", new EffectInfo("Chopception", EffectCategory.Peds, true) },
463460
{ "peds_give_me_7_dollars", new EffectInfo("Give Me $7", EffectCategory.Peds) },
464-
{ "player_personality_disorder", new EffectInfo("Personality Disorder", EffectCategory.Player, true) },
465-
{ "peds_pikmin", new EffectInfo("Pikmin", EffectCategory.Peds, true) },
461+
{ "player_personality_disorder", new EffectInfo("Personality Disorder", EffectCategory.Player, true, true) },
466462
{ "peds_pokemon", new EffectInfo("Pokemon", EffectCategory.Peds, true) },
467-
{ "peds_ragdoll_impact", new EffectInfo("Ragdoll Impact", EffectCategory.Peds, true) },
463+
{ "peds_ragdoll_impact", new EffectInfo("Launch Peds On Death", EffectCategory.Peds, true) },
468464
{ "peds_recruit_anyone", new EffectInfo("Recruit Anyone", EffectCategory.Peds, true) },
469465
{ "peds_shot_enemies_friendly", new EffectInfo("Shot Enemies Become Friendly", EffectCategory.Peds, true) },
470-
{ "peds_the_lost_and_damned", new EffectInfo("The Lost and Damned", EffectCategory.Peds) },
471466
{ "peds_enemies_are_fish", new EffectInfo("Enemies Are Fish", EffectCategory.Peds) },
472467
{ "peds_were_getting_the_band_back_together", new EffectInfo("We're Getting the Band Back Together", EffectCategory.Peds) },
473468
{ "peds_womanizer", new EffectInfo("Womanizer", EffectCategory.Peds) },
@@ -477,8 +472,6 @@ public enum EffectTimedType
477472
{ "player_becomes_land_animal", new EffectInfo("Player Becomes Land Animal", EffectCategory.Player, true, true) },
478473
{ "player_becomes_water_animal", new EffectInfo("Player Becomes Water Animal In Nearest Water", EffectCategory.Player, true, true) },
479474
{ "player_blood_sacrifice", new EffectInfo("Blood Sacrifice", EffectCategory.Player, true) },
480-
{ "player_ghost_rider", new EffectInfo("Ghost Rider", EffectCategory.Player, true) },
481-
{ "player_give_paleto_score_armour", new EffectInfo("Give Paleto Score Armour", EffectCategory.Player) },
482475
{ "player_hunting_time", new EffectInfo("Hunting Time", EffectCategory.Player, true, true) },
483476
{ "player_laser_eyes", new EffectInfo("Laser Eyes", EffectCategory.Player, true) },
484477
{ "player_one_in_the_chamber", new EffectInfo("One In The Chamber", EffectCategory.Player, true) },
@@ -488,20 +481,24 @@ public enum EffectTimedType
488481
{ "player_walking_speed_100x", new EffectInfo("Slide Walk", EffectCategory.Player, true) },
489482
{ "player_what_if_i_was_the_hitman_all_along", new EffectInfo("What If I Was The Hitman All Along?", EffectCategory.Player) },
490483
{ "vehs_lost_and_damned", new EffectInfo("Lost And The Damned", EffectCategory.Vehicle) },
491-
{ "misc_mystery_effect", new EffectInfo("Mystery Effect", EffectCategory.Misc) },
492-
{ "veh_try_again", new EffectInfo("Try again", EffectCategory.Vehicle) },
493-
{ "ped_peds_think_you_are_a_cop", new EffectInfo("Peds Think You Are A Cop", EffectCategory.Peds) },
494-
{ "player_use_any_weapons_while_in_vehicle", new EffectInfo("Use Any Weapons while in Vehicles", EffectCategory.Player) },
484+
{ "veh_try_again", new EffectInfo("Try Again", EffectCategory.Vehicle) },
485+
{ "player_use_any_weapons_while_in_vehicle", new EffectInfo("Use Any Weapons While In Vehicles", EffectCategory.Player, true) },
495486
{ "player_forced_switch", new EffectInfo("Switch To Different Character", EffectCategory.Player) },
496-
{ "vehs_jump_and_boost", new EffectInfo("Jump And Boost", EffectCategory.Vehicle) },
497-
{ "player_kid_friendly", new EffectInfo("Kid Friendly", EffectCategory.Player) },
498-
{ "peds_men_in_black", new EffectInfo("Men In Black", EffectCategory.Peds) },
499-
{ "player_explosive_trail", new EffectInfo("Explosive Trail", EffectCategory.Player) },
487+
{ "vehs_jump_and_boost", new EffectInfo("Jump And Boost", EffectCategory.Vehicle, true) },
488+
{ "player_kid_friendly", new EffectInfo("Kid Friendly", EffectCategory.Player, true) },
489+
{ "peds_men_in_black", new EffectInfo("Men In Black", EffectCategory.Peds, true, true) },
490+
{ "player_explosive_trail", new EffectInfo("Explosive Trail", EffectCategory.Player, true) },
500491
{ "vehs_vehicles_equal_peds", new EffectInfo("Vehicles = Peds", EffectCategory.Vehicle) },
501-
{ "player_run_towards_nearest_enemy", new EffectInfo("Run Towards Nearest Enemy", EffectCategory.Player) },
492+
{ "player_run_towards_nearest_enemy", new EffectInfo("Run Towards Nearest Enemy", EffectCategory.Player, true, true) },
502493
{ "vehs_attach_ramp_to_current_vehicle", new EffectInfo("Attach Ramp to Current Vehicle", EffectCategory.Vehicle) },
503-
{ "player_stylish_outfit", new EffectInfo("Stylish Outfit", EffectCategory.Player) },
504494
{ "peds_spawn_evil_trio", new EffectInfo("Spawn Evil Trio", EffectCategory.Peds) },
495+
{ "misc_active_timers_refill", new EffectInfo("Refill Active Effect Timers", EffectCategory.Misc) },
496+
{ "misc_clear_active_effects", new EffectInfo("Clear Active Effects", EffectCategory.Misc) },
497+
{ "misc_high_bulletspread", new EffectInfo("High Bulletspread", EffectCategory.Peds, true) },
498+
{ "misc_infinite_weapon_range", new EffectInfo("Infinite Weapon Range", EffectCategory.Peds, true) },
499+
{ "misc_pole_drivefast", new EffectInfo("Spawn A Pole Next Time You Drive Fast", EffectCategory.Misc) },
500+
{ "misc_pole_fly", new EffectInfo("Spawn A Pole Next Time You Fly A Plane", EffectCategory.Misc) },
501+
{ "player_jumping_explosions", new EffectInfo("Jumping Explosions", EffectCategory.Player, true) },
505502
};
506503
}
507504
}

0 commit comments

Comments
 (0)