From ce1a0a4654633962b7f60c09443df3540360eeed Mon Sep 17 00:00:00 2001 From: Reinier Vens Date: Wed, 27 Oct 2021 02:58:22 +0100 Subject: [PATCH] It Runs --- Asset Sources/lb-light-bulb.blend | 3 +++ Assets/Materials/UI/Map Gravity Lines.mat | 2 +- Assets/Scenes/ARPG.unity | 4 ++-- Assets/Scripts/Gameplay/ActionGameManager.cs | 5 +++-- Assets/Scripts/ServerShared/Galaxy.cs | 6 +++--- GameData/AetherDB.msgpack | 4 ++-- GameData/Faction/Finch Cybernetics.json | 2 +- GameData/Faction/Lucent Media.json | 2 +- GameData/GearData/MoveOnPro.json | 2 +- GameData/PlayerSettings.msgpack | 4 ++-- 10 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 Asset Sources/lb-light-bulb.blend diff --git a/Asset Sources/lb-light-bulb.blend b/Asset Sources/lb-light-bulb.blend new file mode 100644 index 000000000..907a9505c --- /dev/null +++ b/Asset Sources/lb-light-bulb.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bc704f7f236b0285d6944593fcf05a89ceb4214557eb67befe5bfeb5c19dd62 +size 4929776 diff --git a/Assets/Materials/UI/Map Gravity Lines.mat b/Assets/Materials/UI/Map Gravity Lines.mat index 8252c5c27..749d876be 100644 --- a/Assets/Materials/UI/Map Gravity Lines.mat +++ b/Assets/Materials/UI/Map Gravity Lines.mat @@ -86,7 +86,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Scale: 12.242577 + - _Scale: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity index 1bb1960a0..b5c9e2390 100644 --- a/Assets/Scenes/ARPG.unity +++ b/Assets/Scenes/ARPG.unity @@ -23751,7 +23751,7 @@ PrefabInstance: - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 55.675 objectReference: {fileID: 0} - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} @@ -24963,7 +24963,7 @@ PrefabInstance: - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 60.98 objectReference: {fileID: 0} - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 07cd74184..7d1cee9ab 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -86,8 +86,9 @@ public class ActionGameManager : MonoBehaviour _cultCache = new CultCache(); _cultCache.AddBackingStore(new MultiFileJsonBackingStore(GameDataDirectory.FullName)); - _cultCache.AddBackingStore( - new SingleFileMessagePackBackingStore(Path.Combine(GameDataDirectory.FullName, "AetherDB.msgpack"))); + // _cultCache.AddBackingStore( + // new SingleFileMessagePackBackingStore(Path.Combine(GameDataDirectory.FullName, "AetherDB.msgpack"))); + _cultCache.AddBackingStore(new MultiFileMessagePackBackingStore(GameDataDirectory.FullName), typeof(NameFile)); // _cultCache.AddBackingStore( // new MultiFileMessagePackBackingStore(GameDataDirectory.FullName), typeof(NameFile)); _cultCache.PullAllBackingStores(); diff --git a/Assets/Scripts/ServerShared/Galaxy.cs b/Assets/Scripts/ServerShared/Galaxy.cs index 2686b4009..f48ab9be2 100644 --- a/Assets/Scripts/ServerShared/Galaxy.cs +++ b/Assets/Scripts/ServerShared/Galaxy.cs @@ -224,9 +224,9 @@ public class Galaxy GenerateNames(cache, nameGeneratorSettings, ref random, progressCallback); - progressCallback?.Invoke("Weaving Narrative"); - var processor = new StoryProcessor(playerSettings, narrativeDirectory, this, ref random, Log); - processor.ProcessStories(); + // progressCallback?.Invoke("Weaving Narrative"); + // var processor = new StoryProcessor(playerSettings, narrativeDirectory, this, ref random, Log); + // processor.ProcessStories(); progressCallback?.Invoke("Done!"); if(progressCallback!=null) Thread.Sleep(500); // Inserting Delay to make it seem like it's doing more work lmao diff --git a/GameData/AetherDB.msgpack b/GameData/AetherDB.msgpack index 37fa74497..3f2ad601c 100644 --- a/GameData/AetherDB.msgpack +++ b/GameData/AetherDB.msgpack @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9de4289de506416b27d03a9d5d2f5a7e5fe92327eb9cc3ad47cfe892d9d08af5 -size 30765 +oid sha256:c3e23939cf2a7deebec53bc314c7711488e242558c6cc6f878a5c56f2760e253 +size 40363 diff --git a/GameData/Faction/Finch Cybernetics.json b/GameData/Faction/Finch Cybernetics.json index 2585b254b..16a5d410b 100644 --- a/GameData/Faction/Finch Cybernetics.json +++ b/GameData/Faction/Finch Cybernetics.json @@ -1 +1 @@ -{"name":"Finch Cybernetics","shortName":"Finch","description":"“The search for knowledge is the duty of all intelligent beings.”","logo":"Assets/Resources/Sprites/Icons/Logos/finch.png","personality":{"0e91c198-d6c6-4d28-a7e0-d5316db3b7d0":0.2,"2103d2d5-bf5c-4dd9-9381-c90f1e39496f":0.25,"3f608054-8e4a-43fb-926c-261da4cc92d9":0.9,"8e5a2064-9603-4205-baf7-4d037ebfda90":0.4,"d6506d2d-3699-4c8c-8e90-5e4b8f2f43b9":0.7},"primaryColor":[0.4552703,0.0,1.0],"secondaryColor":[1.0,0.0,0.0],"nameFile":"43872e8e-df2f-4e03-81bb-e1d71f39b696","bossHull":"00000000-0000-0000-0000-000000000000","influence":5,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.262,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":1.0,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.567,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.215,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.651,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.536,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":0.848,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.628,"a9672650-c335-484a-9555-71a35c841aa1":0.481,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.638,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.959,"d6466821-6776-4f40-9609-2342debf5c86":0.087},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"1dfaa629-6c63-42a7-91e1-f1ae90f92f09","$type":"Faction"} \ No newline at end of file +{"name":"Finch Cybernetics","shortName":"Finch","description":"“The search for knowledge is the duty of all intelligent beings.”","logo":"Assets/Resources/Sprites/Icons/Logos/finch.png","personality":{"0e91c198-d6c6-4d28-a7e0-d5316db3b7d0":0.2,"2103d2d5-bf5c-4dd9-9381-c90f1e39496f":0.25,"3f608054-8e4a-43fb-926c-261da4cc92d9":0.9},"primaryColor":[0.4552703,0.0,1.0],"secondaryColor":[1.0,0.0,0.0],"nameFile":"43872e8e-df2f-4e03-81bb-e1d71f39b696","bossHull":"00000000-0000-0000-0000-000000000000","influence":5,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.262,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":1.0,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.567,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.215,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.651,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.536,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":0.848,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.628,"a9672650-c335-484a-9555-71a35c841aa1":0.481,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.638,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.959,"d6466821-6776-4f40-9609-2342debf5c86":0.087},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"1dfaa629-6c63-42a7-91e1-f1ae90f92f09","$type":"Faction"} \ No newline at end of file diff --git a/GameData/Faction/Lucent Media.json b/GameData/Faction/Lucent Media.json index d2de55124..69a2c0216 100644 --- a/GameData/Faction/Lucent Media.json +++ b/GameData/Faction/Lucent Media.json @@ -1 +1 @@ -{"name":"Lucent Media","shortName":"Lucent","description":"“People will do anything for the adulation or loathing of their peers. We at Lucent have harnessed that heretofore destructive tendency for the benefit of all.”","logo":"Assets/Resources/Sprites/Icons/Logos/lucent.png","personality":{"0e91c198-d6c6-4d28-a7e0-d5316db3b7d0":0.7,"2103d2d5-bf5c-4dd9-9381-c90f1e39496f":0.9,"3f608054-8e4a-43fb-926c-261da4cc92d9":0.3,"8e5a2064-9603-4205-baf7-4d037ebfda90":0.6,"d6506d2d-3699-4c8c-8e90-5e4b8f2f43b9":0.2},"primaryColor":[0.8396226,0.04356533,0.3411568],"secondaryColor":[0.821494758,0.08962262,1.0],"nameFile":"35f90a4b-460c-416c-9a4e-f7e661850787","bossHull":"bb5d9f73-612f-4060-8fb4-f72d6b93b616","influence":6,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.252,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.679,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.305,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.914,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.831,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.808,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":1.0,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.714,"a9672650-c335-484a-9555-71a35c841aa1":0.329,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.333,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.583,"d6466821-6776-4f40-9609-2342debf5c86":0.53},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"a012e0f4-4b22-47b7-8b24-ff3e1439c949","$type":"Faction"} \ No newline at end of file +{"name":"Lucent Media","shortName":"Lucent","description":"“People will do anything for the adulation or loathing of their peers. We at Lucent have harnessed that heretofore destructive tendency for the benefit of all.”","logo":"Assets/Resources/Sprites/Icons/Logos/lucent.png","personality":{"0e91c198-d6c6-4d28-a7e0-d5316db3b7d0":0.7,"2103d2d5-bf5c-4dd9-9381-c90f1e39496f":0.9,"3f608054-8e4a-43fb-926c-261da4cc92d9":0.3},"primaryColor":[0.8396226,0.04356533,0.3411568],"secondaryColor":[0.821494758,0.08962262,1.0],"nameFile":"35f90a4b-460c-416c-9a4e-f7e661850787","bossHull":"bb5d9f73-612f-4060-8fb4-f72d6b93b616","influence":6,"allegiance":{"16bad4f9-7fb5-41c5-8da0-dc76709eb7d3":0.252,"1dfaa629-6c63-42a7-91e1-f1ae90f92f09":0.679,"2f74e6b4-d268-48a9-b2a8-24591c680e84":0.305,"73d368dd-58a8-4431-b9ba-2d44754d36a1":0.914,"8419f9bc-0167-46ec-86c3-3265d2905fbc":0.831,"8443f966-0d88-4ec7-a20e-8edf73fa62f6":0.808,"a012e0f4-4b22-47b7-8b24-ff3e1439c949":1.0,"a1f76631-d6d1-443a-9be1-c9b1267d6ca2":0.714,"a9672650-c335-484a-9555-71a35c841aa1":0.329,"adfb9b08-aabc-45c6-9586-915698a9c4b0":0.333,"bbd619ed-76c1-464c-829d-3f419cdc2525":0.583,"d6466821-6776-4f40-9609-2342debf5c86":0.53},"overworldMusic":0,"combatMusic":0,"bossMusic":0,"id":"a012e0f4-4b22-47b7-8b24-ff3e1439c949","$type":"Faction"} \ No newline at end of file diff --git a/GameData/GearData/MoveOnPro.json b/GameData/GearData/MoveOnPro.json index b0c0103a0..674ee927b 100644 --- a/GameData/GearData/MoveOnPro.json +++ b/GameData/GearData/MoveOnPro.json @@ -1 +1 @@ -{"hardpointType":5,"schematic":"","behaviors":[{"charge":{"min":25.0,"max":125.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"efficiency":{"min":0.015,"max":0.1,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"overload":{"min":0.00025,"max":0.005,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.125,"qualityExponent":2.5},"underload":{"min":2.5,"max":20.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":2.25},"group":0,"$type":"ReactorData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":200.0,"maxTemp":500.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":5.0,"actionIcon":"","soundBank":2204642885,"audioStats":[],"name":"MoveOnPro","description":"The only muon catalyst fusion reactor on the market! Always gets a great reaction.","creator":"73d368dd-58a8-4431-b9ba-2d44754d36a1","mass":300.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":2.5,"conductivity":1.0,"price":900000,"id":"372d23cc-5ef0-42b5-9d96-807f2e412b0d","$type":"GearData"} \ No newline at end of file +{"hardpointType":5,"schematic":"","behaviors":[{"charge":{"min":25.0,"max":125.0,"heatExponentMultiplier":0.125,"durabilityExponentMultiplier":0.25,"qualityExponent":1.5},"efficiency":{"min":0.015,"max":0.1,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.125,"qualityExponent":2.0},"overload":{"min":0.00025,"max":0.005,"heatExponentMultiplier":0.0625,"durabilityExponentMultiplier":0.125,"qualityExponent":2.5},"underload":{"min":2.5,"max":20.0,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.25,"qualityExponent":2.25},"group":0,"$type":"ReactorData"},{"stat":{"behavior":"CapacitorData","stat":"Capacity"},"modifier":{"min":1.1,"max":1.25,"heatExponentMultiplier":0.0,"durabilityExponentMultiplier":0.0,"qualityExponent":1.0},"type":1,"requireBehavior":null,"group":0,"$type":"StatModifierData"},{"perSecond":true,"group":0,"$type":"WearData"}],"durability":100.0,"minTemp":200.0,"maxTemp":500.0,"heatCurve":{"keys":[[0.0,0.0,8.389394,8.389394],[0.357228935,0.8660065,-2.46956825,-2.46956825],[1.0,0.0,-0.6179685,-0.6179685]]},"resilience":5.0,"actionIcon":"","soundBank":2204642885,"audioStats":[],"name":"MoveOnPro","description":"The only muon catalyst fusion reactor on the market! Always gets a great reaction.","creator":"73d368dd-58a8-4431-b9ba-2d44754d36a1","mass":300.0,"shape":{"name":[[true,true],[true,true]]},"specificHeat":2.5,"conductivity":1.0,"price":900000,"id":"372d23cc-5ef0-42b5-9d96-807f2e412b0d","$type":"GearData"} \ No newline at end of file diff --git a/GameData/PlayerSettings.msgpack b/GameData/PlayerSettings.msgpack index 4a928cd16..9e30e2f53 100644 --- a/GameData/PlayerSettings.msgpack +++ b/GameData/PlayerSettings.msgpack @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c20f21772ea7ff1422048212eebe3b3dfddb441a83902e35f8623f9c9c1a739 -size 156286 +oid sha256:aaa76a06923681820d73bc0ad70852506bc95b5706c031feb2a8a6a43ed74f88 +size 23260