p34.2 (#506)

OpenPerpetuum · Jan 12, 2025 · 6282113 · 6282113
1 parent 422585f
commit 6282113
Show file tree

Hide file tree

Showing 22 changed files with 509 additions and 413 deletions.
diff --git a/src/Perpetuum.Bootstrapper/Modules/EffectsModule.cs b/src/Perpetuum.Bootstrapper/Modules/EffectsModule.cs
@@ -104,6 +104,8 @@ protected override void Load(ContainerBuilder builder)
             _ = builder.RegisterType<AuraEffect>().Keyed<Effect>(EffectType.effect_alpha_bonus);
             _ = builder.RegisterType<AuraEffect>().Keyed<Effect>(EffectType.effect_alpha2_bonus);
 
+            _ = builder.RegisterType<AuraEffect>().Keyed<Effect>(EffectType.effect_field_stealth);
+
             _ = builder.Register<EffectFactory>(x =>
             {
                 IComponentContext ctx = x.Resolve<IComponentContext>();

diff --git a/src/Perpetuum.Bootstrapper/Modules/EntitiesModule.cs b/src/Perpetuum.Bootstrapper/Modules/EntitiesModule.cs
@@ -37,6 +37,7 @@
 using Perpetuum.Zones;
 using Perpetuum.Zones.Blobs.BlobEmitters;
 using Perpetuum.Zones.Eggs;
+using Perpetuum.Zones.FieldEffectGenerators;
 using Perpetuum.Zones.Gates;
 using Perpetuum.Zones.Intrusion;
 using Perpetuum.Zones.LandMines;
@@ -173,6 +174,8 @@ protected override void Load(ContainerBuilder builder)
             RegisterUnit<MobileTeleport>(builder);
             RegisterUnit<NpcEgg>(builder);
 
+            RegisterUnit<FieldEffectGenerator>(builder);
+
             RegisterEntity<FieldContainerCapsule>(builder);
             RegisterEntity<Ice>(builder);
             RegisterEntity<RespecToken>(builder);
@@ -201,6 +204,8 @@ protected override void Load(ContainerBuilder builder)
             RegisterEntity<RiftActivator>(builder);
             RegisterEntity<MineralScanResultItem>(builder);
 
+            RegisterEntity<FieldEffectGeneratorDeployer>(builder);
+
             RegisterModule<DrillerModule>(builder);
             RegisterModule<LargeDrillerModule>(builder);
             RegisterModule<RemoteControlledDrillerModule>(builder);
@@ -577,6 +582,9 @@ void ByNamePatternAndFlag<T>(string substr, CategoryFlags cf, params Parameter[]
                 ByCategoryFlags<SparkTeleportDevice>(CategoryFlags.cf_spark_teleport_devices);
                 ByCategoryFlags<ServerWideEpBooster>(CategoryFlags.cf_server_wide_ep_boosters);
 
+                ByCategoryFlags<FieldEffectGeneratorDeployer>(CategoryFlags.cf_mobile_field_masker_capsule);
+                ByCategoryFlags<FieldEffectGenerator>(CategoryFlags.cf_mobile_field_masker, new NamedParameter("effectType", EffectType.effect_field_stealth));
+
                 // OPP new Blinder module
                 ByNamePatternAndFlag<TargetBlinderModule>(DefinitionNames.STANDARD_BLINDER_MODULE, CategoryFlags.cf_target_painter);
 

diff --git a/src/Perpetuum.ExportedTypes/CategoryFlags.cs b/src/Perpetuum.ExportedTypes/CategoryFlags.cs
@@ -511,6 +511,7 @@ public enum CategoryFlags : long
         cf_mobile_arena_teleport = 0x0000000003060278,
         cf_teleport_back_home = 0x0000000004060278,
         cf_training_exit_teleport = 0x0000000000070278,
+        cf_mobile_field_masker = 0x0000000000080278,
 
         cf_groups = 0x0000000000000082,
         cf_corporation = 0x0000000000000182,
@@ -663,6 +664,7 @@ public enum CategoryFlags : long
         cf_wall_healer_capsule = 0x0000000000000A98,
         cf_terraform_buoy_capsule = 0x0000000000000C98,
         cf_landmine_deployer = 0x0000000000000D98,
+        cf_mobile_field_masker_capsule = 0x0000000000000E98,
 
         cf_dynamic_cprg = 0x0000000000000099,
 

diff --git a/src/Perpetuum.ExportedTypes/EffectType.cs b/src/Perpetuum.ExportedTypes/EffectType.cs
@@ -136,5 +136,6 @@ public enum EffectType
         effect_overheat_buildup_critical = 133,
         effect_excavator = 134,
         remote_command_translation = 135,
+        effect_field_stealth = 136,
     }
 }