Skip to content

Commit

Permalink
Assembly and Script Loading Overhauled.
Browse files Browse the repository at this point in the history
  • Loading branch information
MapleWheels committed Sep 17, 2023
1 parent b8e8fbd commit 4c89ad9
Show file tree
Hide file tree
Showing 17 changed files with 2,697 additions and 475 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,8 @@ RegisterBarotrauma("Media.Video")

RegisterBarotrauma("SoundsFile")
RegisterBarotrauma("SoundPrefab")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.SoundPrefab]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.BackgroundMusic]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.GUISound]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.DamageSound]]")
RegisterBarotrauma("PrefabSelector`1[[Barotrauma.SoundPrefab]]")
RegisterBarotrauma("PrefabCollection`1")
RegisterBarotrauma("PrefabSelector`1")
RegisterBarotrauma("BackgroundMusic")
RegisterBarotrauma("GUISound")
RegisterBarotrauma("DamageSound")
Expand Down Expand Up @@ -57,7 +54,6 @@ RegisterBarotrauma("Particles.Particle")
RegisterBarotrauma("Particles.ParticleEmitterProperties")
RegisterBarotrauma("Particles.ParticleEmitter")
RegisterBarotrauma("Particles.ParticlePrefab")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.Particles.ParticlePrefab]]")

RegisterBarotrauma("Lights.LightManager")
RegisterBarotrauma("Lights.LightSource")
Expand Down Expand Up @@ -146,4 +142,4 @@ RegisterBarotrauma("UISprite")
RegisterBarotrauma("ParamsEditor")

RegisterBarotrauma("Inventory+SlotReference")
RegisterBarotrauma("VisualSlot")
RegisterBarotrauma("VisualSlot")
31 changes: 7 additions & 24 deletions Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Register("System.Exception")
Register("System.Console")
Register("System.Exception")

RegisterBarotrauma("Success`2[[Barotrauma.ContentPackage],[System.Exception]]")
RegisterBarotrauma("Failure`2[[Barotrauma.ContentPackage],[System.Exception]]")
RegisterBarotrauma("Success`2")
RegisterBarotrauma("Failure`2")

RegisterBarotrauma("LuaSByte")
RegisterBarotrauma("LuaByte")
Expand All @@ -24,8 +24,7 @@ RegisterBarotrauma("GameMain")
RegisterBarotrauma("Networking.BanList")
RegisterBarotrauma("Networking.BannedPlayer")

RegisterBarotrauma("Range`1[System.Single]")
RegisterBarotrauma("Range`1[System.Int32]")
RegisterBarotrauma("Range`1")

RegisterBarotrauma("RichString")
RegisterBarotrauma("Identifier")
Expand Down Expand Up @@ -399,27 +398,11 @@ end
RegisterBarotrauma("Camera")
RegisterBarotrauma("Key")

RegisterBarotrauma("PrefabCollection`1[[Barotrauma.ItemPrefab]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.JobPrefab]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.CharacterPrefab]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.AfflictionPrefab]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.TalentPrefab]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.TalentTree]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.OrderPrefab]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.LevelGenerationParams]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.OutpostGenerationParams]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.RuinGeneration.RuinGenerationParams]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.LevelGenerationParams]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.LocationType]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.EventPrefab]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.EventSet]]")
RegisterBarotrauma("PrefabCollection`1[[Barotrauma.EventManagerSettings]]")
RegisterBarotrauma("PrefabCollection`1")

RegisterBarotrauma("PrefabSelector`1[[Barotrauma.SkillSettings]]")
RegisterBarotrauma("PrefabSelector`1")

RegisterBarotrauma("Pair`2[[Barotrauma.JobPrefab],[System.Int32]]")

RegisterBarotrauma("Range`1[System.Single]")
RegisterBarotrauma("Pair`2")

RegisterBarotrauma("Items.Components.Signal")
RegisterBarotrauma("SubmarineInfo")
Expand Down Expand Up @@ -461,4 +444,4 @@ LuaUserData.RemoveMember(workshopItem, "AddFavorite")
LuaUserData.RemoveMember(workshopItem, "RemoveFavorite")
LuaUserData.RemoveMember(workshopItem, "Vote")
LuaUserData.RemoveMember(workshopItem, "GetUserVote")
LuaUserData.RemoveMember(workshopItem, "Edit")
LuaUserData.RemoveMember(workshopItem, "Edit")
50 changes: 0 additions & 50 deletions Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptBase.cs

This file was deleted.

Loading

0 comments on commit 4c89ad9

Please sign in to comment.