Fixed merge and some errors

2023-10-19 12:53:49 -03:00
parent ea1111cd6e
commit a65d99021c
10 changed files with 63 additions and 19 deletions
@@ -36,7 +36,6 @@ defaultLib["ClientPacketHeader"] = CreateEnum("Barotrauma.Networking.ClientPacke
 defaultLib["ServerPacketHeader"] = CreateEnum("Barotrauma.Networking.ServerPacketHeader")
 defaultLib["RandSync"] = CreateEnum("Barotrauma.Rand+RandSync")
 defaultLib["DisconnectReason"] = CreateEnum("Barotrauma.Networking.DisconnectReason")
-defaultLib["TraitorMessageType"] = CreateEnum("Barotrauma.Networking.TraitorMessageType")
 defaultLib["CombatMode"] = CreateEnum("Barotrauma.AIObjectiveCombat+CombatMode")
 defaultLib["CauseOfDeathType"] = CreateEnum("Barotrauma.CauseOfDeathType")
 defaultLib["CharacterTeamType"] = CreateEnum("Barotrauma.CharacterTeamType")
@@ -108,7 +107,6 @@ defaultLib["NetEntityEvent"] = CreateStatic("Barotrauma.Networking.NetEntityEven
 defaultLib["Screen"] = CreateStatic("Barotrauma.Screen")
 defaultLib["AttackResult"] = CreateStatic("Barotrauma.AttackResult", true)
 defaultLib["TempClient"] = CreateStatic("Barotrauma.Networking.TempClient", true)
-defaultLib["TraitorMissionResult"] = CreateStatic("Barotrauma.TraitorMissionResult", true)
 defaultLib["DecalManager"] = CreateStatic("Barotrauma.DecalManager", true)
 defaultLib["AutoItemPlacer"] = CreateStatic("Barotrauma.AutoItemPlacer")
 defaultLib["PropertyConditional"] = CreateStatic("Barotrauma.PropertyConditional", true)
@@ -123,6 +123,10 @@ RegisterBarotrauma("VideoPlayer")
 RegisterBarotrauma("CreditsPlayer")
 RegisterBarotrauma("SlideshowPlayer")
 RegisterBarotrauma("SerializableEntityEditor")
+RegisterBarotrauma("CircuitBoxWireRenderer")
+RegisterBarotrauma("CircuitBoxLabel")
+RegisterBarotrauma("CircuitBoxMouseDragSnapshotHandler")
+RegisterBarotrauma("CircuitBoxUI")

 RegisterBarotrauma("SettingsMenu")
 RegisterBarotrauma("TabMenu")
@@ -18,6 +18,3 @@ RegisterBarotrauma("Networking.GameServer")

 RegisterBarotrauma("Networking.ServerPeer")
 RegisterBarotrauma("Networking.ServerPeer+PendingClient")
-
-RegisterBarotrauma("Traitor")
-RegisterBarotrauma("Traitor+TraitorMission")
@@ -216,7 +216,6 @@ RegisterBarotrauma("SubmarineFile")
 RegisterBarotrauma("TalentsFile")
 RegisterBarotrauma("TalentTreesFile")
 RegisterBarotrauma("TextFile")
-RegisterBarotrauma("TraitorMissionsFile")
 RegisterBarotrauma("TutorialsFile")
 RegisterBarotrauma("UIStyleFile")
 RegisterBarotrauma("UpgradeModulesFile")
@@ -240,8 +239,15 @@ RegisterBarotrauma("ItemInventory")
 RegisterBarotrauma("Inventory+ItemSlot")
 RegisterBarotrauma("FireSource")
 RegisterBarotrauma("AutoItemPlacer")
+RegisterBarotrauma("CircuitBoxConnection")
+RegisterBarotrauma("CircuitBoxComponent")
+RegisterBarotrauma("CircuitBoxNode")
+RegisterBarotrauma("CircuitBoxWire")
+RegisterBarotrauma("CircuitBoxInputOutputNode")
+RegisterBarotrauma("CircuitBoxSelectable")
+RegisterBarotrauma("CircuitBoxSizes")

-local componentsToRegister = { "DockingPort", "Door", "GeneticMaterial", "Growable", "Holdable", "LevelResource", "ItemComponent", "ItemLabel", "LightComponent", "Controller", "Deconstructor", "Engine", "Fabricator", "OutpostTerminal", "Pump", "Reactor", "Steering", "PowerContainer", "Projectile", "Repairable", "Rope", "Scanner", "ButtonTerminal", "ConnectionPanel", "CustomInterface", "MemoryComponent", "Terminal", "WifiComponent", "Wire", "TriggerComponent", "ElectricalDischarger", "EntitySpawnerComponent", "ProducedItem", "VineTile", "GrowthSideExtension", "IdCard", "MeleeWeapon", "Pickable", "AbilityItemPickingTime", "Propulsion", "RangedWeapon", "AbilityRangedWeapon", "RepairTool", "Sprayer", "Throwable", "ItemContainer", "AbilityItemContainer", "Ladder", "LimbPos", "AbilityDeconstructedItem", "AbilityItemCreationMultiplier", "AbilityItemDeconstructedInventory", "MiniMap", "OxygenGenerator", "Sonar", "SonarTransducer", "Vent", "NameTag", "Planter", "Powered", "PowerTransfer", "Quality", "RemoteController", "AdderComponent", "AndComponent", "ArithmeticComponent", "ColorComponent", "ConcatComponent", "Connection", "DelayComponent", "DivideComponent", "EqualsComponent", "ExponentiationComponent", "FunctionComponent", "GreaterComponent", "ModuloComponent", "MotionSensor", "MultiplyComponent", "NotComponent", "OrComponent", "OscillatorComponent", "OxygenDetector", "RegExFindComponent", "RelayComponent", "SignalCheckComponent", "SmokeDetector", "StringComponent", "SubtractComponent", "TrigonometricFunctionComponent", "WaterDetector", "XorComponent", "StatusHUD", "Turret", "Wearable",
+local componentsToRegister = { "DockingPort", "Door", "GeneticMaterial", "Growable", "Holdable", "LevelResource", "ItemComponent", "ItemLabel", "LightComponent", "Controller", "Deconstructor", "Engine", "Fabricator", "OutpostTerminal", "Pump", "Reactor", "Steering", "PowerContainer", "Projectile", "Repairable", "Rope", "Scanner", "ButtonTerminal", "ConnectionPanel", "CustomInterface", "MemoryComponent", "Terminal", "WifiComponent", "Wire", "TriggerComponent", "ElectricalDischarger", "EntitySpawnerComponent", "ProducedItem", "VineTile", "GrowthSideExtension", "IdCard", "MeleeWeapon", "Pickable", "AbilityItemPickingTime", "Propulsion", "RangedWeapon", "AbilityRangedWeapon", "RepairTool", "Sprayer", "Throwable", "ItemContainer", "AbilityItemContainer", "Ladder", "LimbPos", "AbilityDeconstructedItem", "AbilityItemCreationMultiplier", "AbilityItemDeconstructedInventory", "MiniMap", "OxygenGenerator", "Sonar", "SonarTransducer", "Vent", "NameTag", "Planter", "Powered", "PowerTransfer", "Quality", "RemoteController", "AdderComponent", "AndComponent", "ArithmeticComponent", "ColorComponent", "ConcatComponent", "Connection", "CircuitBox", "DelayComponent", "DivideComponent", "EqualsComponent", "ExponentiationComponent", "FunctionComponent", "GreaterComponent", "ModuloComponent", "MotionSensor", "MultiplyComponent", "NotComponent", "OrComponent", "OscillatorComponent", "OxygenDetector", "RegExFindComponent", "RelayComponent", "SignalCheckComponent", "SmokeDetector", "StringComponent", "SubtractComponent", "TrigonometricFunctionComponent", "WaterDetector", "XorComponent", "StatusHUD", "Turret", "Wearable",
 "GridInfo", "PowerSourceGroup"
 }

@@ -381,8 +387,7 @@ RegisterBarotrauma("Skill")
 RegisterBarotrauma("SkillPrefab")
 RegisterBarotrauma("SkillSettings")

-RegisterBarotrauma("TraitorMissionPrefab")
-RegisterBarotrauma("TraitorMissionResult")
+RegisterBarotrauma("TraitorManager")

 Register("FarseerPhysics.Dynamics.Body")
 Register("FarseerPhysics.Dynamics.World")