Skip to content

Commit

Permalink
Remote command translators and Server-wide EP boosters (#503)
Browse files Browse the repository at this point in the history
  • Loading branch information
Sellafield authored Dec 22, 2024
1 parent 7ade31a commit ee6cc7e
Show file tree
Hide file tree
Showing 54 changed files with 1,182 additions and 291 deletions.
11 changes: 11 additions & 0 deletions src/Perpetuum.Bootstrapper/Modules/EntitiesModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using Perpetuum.Modules;
using Perpetuum.Modules.AdaptiveAlloy;
using Perpetuum.Modules.EffectModules;
using Perpetuum.Modules.RemoteControl;
using Perpetuum.Modules.Terraforming;
using Perpetuum.Modules.Weapons;
using Perpetuum.Players;
Expand Down Expand Up @@ -176,9 +177,11 @@ protected override void Load(ContainerBuilder builder)
RegisterEntity<Ice>(builder);
RegisterEntity<RespecToken>(builder);
RegisterEntity<SparkTeleportDevice>(builder);
RegisterEntity<ServerWideEpBooster>(builder);
RegisterEntity<Ammo>(builder);
RegisterEntity<WeaponAmmo>(builder);
RegisterEntity<RemoteControlledUnit>(builder);
RegisterEntity<RemoteCommand>(builder);
RegisterEntity<MiningAmmo>(builder);
RegisterEntity<TileScannerAmmo>(builder);
RegisterEntity<OneTileScannerAmmo>(builder);
Expand Down Expand Up @@ -248,6 +251,8 @@ protected override void Load(ContainerBuilder builder)
RegisterEffectModule<DreadnoughtModule>(builder);
RegisterEffectModule<ExcavatorModule>(builder);

RegisterEffectModule<RemoteCommandTranslatorModule>(builder);

RegisterEntity<SystemContainer>(builder);
RegisterEntity<PunchBagDeployer>(builder);

Expand Down Expand Up @@ -381,6 +386,7 @@ void ByNamePatternAndFlag<T>(string substr, CategoryFlags cf, params Parameter[]
ByCategoryFlags<RemoteControlledUnit>(CategoryFlags.cf_attack_drones_units);
ByCategoryFlags<RemoteControlledUnit>(CategoryFlags.cf_industrial_drones_units);
ByCategoryFlags<RemoteControlledUnit>(CategoryFlags.cf_support_drones_units);
ByCategoryFlags<RemoteCommand>(CategoryFlags.cf_remote_commands);
ByCategoryFlags<TileScannerAmmo>(CategoryFlags.cf_mining_probe_ammo_tile);
ByCategoryFlags<OneTileScannerAmmo>(CategoryFlags.cf_mining_probe_ammo_one_tile);
ByCategoryFlags<ArtifactScannerAmmo>(CategoryFlags.cf_mining_probe_ammo_artifact);
Expand Down Expand Up @@ -525,6 +531,10 @@ void ByNamePatternAndFlag<T>(string substr, CategoryFlags cf, params Parameter[]
ByCategoryFlags<DreadnoughtModule>(CategoryFlags.cf_dreadnought_modules);
ByCategoryFlags<ExcavatorModule>(CategoryFlags.cf_excavator_modules);

ByCategoryFlags<RemoteCommandTranslatorModule>(
CategoryFlags.cf_remote_command_translators,
new NamedParameter("ammoCategoryFlags", CategoryFlags.cf_remote_commands));

ByCategoryFlags<SystemContainer>(CategoryFlags.cf_logical_storage);
ByCategoryFlags<Item>(CategoryFlags.cf_mission_items);
ByCategoryFlags<Item>(CategoryFlags.cf_robotshards);
Expand Down Expand Up @@ -562,6 +572,7 @@ void ByNamePatternAndFlag<T>(string substr, CategoryFlags cf, params Parameter[]
ByCategoryFlags<Item>(CategoryFlags.cf_datashards); // OPP datashards
ByCategoryFlags<RespecToken>(CategoryFlags.cf_respec_tokens); // OPP respec tokens
ByCategoryFlags<SparkTeleportDevice>(CategoryFlags.cf_spark_teleport_devices);
ByCategoryFlags<ServerWideEpBooster>(CategoryFlags.cf_server_wide_ep_boosters);

// OPP new Blinder module
ByNamePatternAndFlag<TargetBlinderModule>(DefinitionNames.STANDARD_BLINDER_MODULE, CategoryFlags.cf_target_painter);
Expand Down
14 changes: 14 additions & 0 deletions src/Perpetuum.ExportedTypes/AggregateField.cs
Original file line number Diff line number Diff line change
Expand Up @@ -499,5 +499,19 @@ public enum AggregateField
effect_excavator_enhancer_mining_amount_modifier = 739,
effect_excavator_stealth_strength_modifier = 740,
effect_excavator_enhancer_stealth_strength_modifier = 741,
drone_remote_command_translation_damage_modifier = 742,
drone_remote_command_translation_damage_modifier_modifier = 743,
drone_remote_command_translation_armor_max_modifier = 744,
drone_remote_command_translation_armor_max_modifier_modifier = 745,
drone_remote_command_translation_mining_amount_modifier = 746,
drone_remote_command_translation_mining_amount_modifier_modifier = 747,
drone_remote_command_translation_harvesting_amount_modifier = 748,
drone_remote_command_translation_harvesting_amount_modifier_modifier = 749,
drone_remote_command_translation_remote_repair_amount_modifier = 750,
drone_remote_command_translation_remote_repair_amount_modifier_modifier = 751,
drone_remote_command_translation_retreat = 752,
drone_remote_command_translation_retreat_confirmation = 753,
server_wide_ep_bonus = 754,
server_wide_ep_bonus_duration = 755,
}
}
6 changes: 6 additions & 0 deletions src/Perpetuum.ExportedTypes/CategoryFlags.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ public enum CategoryFlags : long
cf_industrial_drones_units = 0x000000000005120A,
cf_support_drones_units = 0x000000000006120A,

cf_remote_commands = 0x000000000007120A,

cf_robot_equipment = 0x000000000000000F,
cf_armor_equipment = 0x000000000000010F,
cf_armor_plates = 0x000000000001010F,
Expand Down Expand Up @@ -204,6 +206,9 @@ public enum CategoryFlags : long
cf_assault_remote_controllers = 0x00000000020C040F,
cf_industrial_remote_controllers = 0x00000000030C040F,
cf_support_remote_controllers = 0x00000000040C040F,

cf_remote_command_translators = 0x00000000050C040F,

cf_electronic_warfare_equipment = 0x000000000000050F,
cf_webber = 0x000000000001050F,
cf_shortrange_webber = 0x000000000101050F,
Expand Down Expand Up @@ -746,5 +751,6 @@ public enum CategoryFlags : long
cf_ct_capsules_misc = 0x000000000403049B,
cf_respec_tokens = 0x000000000004049B,
cf_spark_teleport_devices = 0x000000000005049B,
cf_server_wide_ep_boosters = 0x000000000006049B,
}
}
3 changes: 2 additions & 1 deletion src/Perpetuum.ExportedTypes/EffectCategory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public enum EffectCategory : long
effcat_zone_effects = 0x0000100000000000, // OPP: New Zone effects
effcat_environmental_effects = 0x0000200000000000, // OPP: New Zone effects
effcat_mine_detection = 0x0000400000000000, // OPP: Mine detection
effcat_drones_amplification = 0x0002000000000000, // OPP: Drone amplification
effcat_drones_amplification = 0x0000800000000000, // OPP: Drone amplification
effcat_drone_remote_command_translation = 0x0001000000000000, // OPP: Remote command translation
}
}
3 changes: 2 additions & 1 deletion src/Perpetuum.ExportedTypes/EffectType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ public enum EffectType
effect_overheat_buildup_medium = 131,
effect_overheat_buildup_high = 132,
effect_overheat_buildup_critical = 133,
effect_excavator = 135,
effect_excavator = 134,
remote_command_translation = 135,
}
}
Loading

0 comments on commit ee6cc7e

Please sign in to comment.