diff --git a/.gitignore b/.gitignore index 7c69db2fa..0dc583f78 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,402 @@ -KolonyTools/KolonyTools.v12.suo -KolonyTools/KolonyTools/bin -KolonyTools/KolonyTools/obj ~$MKS_Worksheet.xlsx -Source/KolonyTools/obj/ -Source/KolonyTools/KolonyTools/obj/ -Source/KolonyTools/bin/ -Source/KolonyTools/KolonyTools/bin/ Models/Kerbitrail_Tube/Temp/UnityLockfile -*.DotSettings -*.user *.force -*.cache *.db -*.cache *.zip -Source/KolonyTools/KolonyTools.v12.suo + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# ========================= +# Operating System Files +# ========================= + +# OSX +# ========================= + +.DS_Store +.AppleDouble +.LSOverride + +# Icon must ends with two \r. +Icon + + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + + +#OS junk files +[Tt]humbs.db +*.DS_Store + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ \ No newline at end of file diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll index f102e111d..1fdb97867 100644 Binary files a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll.mdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll.mdb index 9839412f4..143088692 100644 Binary files a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll.mdb and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll.mdb differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.pdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.pdb index 0f9db0bdb..058b961ee 100644 Binary files a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.pdb and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.pdb differ diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg index 0d5d99418..8d9a485bf 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg @@ -279,7 +279,7 @@ PART UseSpecialistBonus = true ExperienceEffect = DrillSkill } - MODULE + MODULE:NEEDS[Karbonite] { name = USI_HarvesterSwapOption ConverterName = Karbonite @@ -291,7 +291,7 @@ PART UseSpecialistBonus = true ExperienceEffect = DrillSkill } - MODULE + MODULE:NEEDS[Karbonite] { name = USI_HarvesterSwapOption ConverterName = Karborundum diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg index 86d73d030..354f0d45f 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg @@ -253,7 +253,7 @@ PART Efficiency = 0.8 ResourceName = Ore } - MODULE + MODULE:NEEDS[Karbonite] { name = USI_HarvesterSwapOption ConverterName = Karbonite @@ -263,7 +263,7 @@ PART Efficiency = 0.8 ResourceName = Karbonite } - MODULE + MODULE:NEEDS[Karbonite] { name = USI_HarvesterSwapOption ConverterName = Karborundum diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg index 123b49059..421329efd 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg @@ -155,18 +155,6 @@ PART moduleIndex = 0 } MODULE - { - name = USI_SwappableBay - bayName = Bay 2 - moduleIndex = 1 - } - MODULE - { - name = USI_SwappableBay - bayName = Bay 3 - moduleIndex = 2 - } - MODULE { name = USI_Harvester @@ -202,76 +190,6 @@ PART } } MODULE - { - name = USI_Harvester - - HarvesterType = 0 - ImpactTransform = ImpactTransform - ImpactRange = 5 - AutoShutdown = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - EfficiencyBonus = 1 - GeneratesHeat = true - - TemperatureModifier - { - key = 0 20000 - key = 250 10000 - key = 500 5000 - key = 750 500 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 20 - } - } - MODULE - { - name = USI_Harvester - - HarvesterType = 0 - ImpactTransform = ImpactTransform - ImpactRange = 5 - AutoShutdown = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - EfficiencyBonus = 1 - GeneratesHeat = true - - TemperatureModifier - { - key = 0 20000 - key = 250 10000 - key = 500 5000 - key = 750 500 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 20 - } - } - MODULE { name = USI_HarvesterSwapOption ConverterName = Dirt @@ -427,7 +345,7 @@ PART UseSpecialistBonus = true ExperienceEffect = DrillSkill } - MODULE + MODULE:NEEDS[Karbonite] { name = USI_HarvesterSwapOption ConverterName = Karbonite @@ -439,7 +357,7 @@ PART UseSpecialistBonus = true ExperienceEffect = DrillSkill } - MODULE + MODULE:NEEDS[Karbonite] { name = USI_HarvesterSwapOption ConverterName = Karborundum diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg index 7a9e4211f..941c5b5ef 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg @@ -153,84 +153,6 @@ PART name = USI_SwappableBay bayName = Bay 1 moduleIndex = 0 - } - MODULE - { - name = USI_SwappableBay - bayName = Bay 2 - moduleIndex = 1 - } - MODULE - { - name = USI_SwappableBay - bayName = Bay 3 - moduleIndex = 2 - } - MODULE - { - name = USI_Harvester - - HarvesterType = 0 - ImpactTransform = ImpactTransform - ImpactRange = 5 - AutoShutdown = true - UseSpecialistBonus = false - EfficiencyBonus = 1 - GeneratesHeat = true - TemperatureModifier - { - key = 0 20000 - key = 250 10000 - key = 500 5000 - key = 750 500 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 13.1 - } - } - MODULE - { - name = USI_Harvester - - HarvesterType = 0 - ImpactTransform = ImpactTransform - ImpactRange = 5 - AutoShutdown = true - UseSpecialistBonus = false - EfficiencyBonus = 1 - GeneratesHeat = true - TemperatureModifier - { - key = 0 20000 - key = 250 10000 - key = 500 5000 - key = 750 500 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 13.1 - } } MODULE { @@ -395,7 +317,7 @@ PART Efficiency = 1.31 ResourceName = Ore } - MODULE + MODULE:NEEDS[Karbonite] { name = USI_HarvesterSwapOption ConverterName = Karbonite @@ -405,7 +327,7 @@ PART Efficiency = 1.31 ResourceName = Karbonite } - MODULE + MODULE:NEEDS[Karbonite] { name = USI_HarvesterSwapOption ConverterName = Karborundum diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03.cfg index 38c7b6578..f517db60c 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03.cfg @@ -155,170 +155,6 @@ PART moduleIndex = 0 } MODULE - { - name = USI_SwappableBay - bayName = Bay 2 - moduleIndex = 1 - } - MODULE - { - name = USI_SwappableBay - bayName = Bay 3 - moduleIndex = 2 - } - MODULE - { - name = USI_SwappableBay - bayName = Bay 4 - moduleIndex = 3 - } - MODULE - { - name = USI_SwappableBay - bayName = Bay 5 - moduleIndex = 4 - } - MODULE - { - name = USI_Harvester - - HarvesterType = 0 - ImpactTransform = ImpactTransform - ImpactRange = 15 - AutoShutdown = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - EfficiencyBonus = 1 - GeneratesHeat = true - - TemperatureModifier - { - key = 0 40000 - key = 250 20000 - key = 500 10000 - key = 750 1000 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 60 - } - } - MODULE - { - name = USI_Harvester - - HarvesterType = 0 - ImpactTransform = ImpactTransform - ImpactRange = 15 - AutoShutdown = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - EfficiencyBonus = 1 - GeneratesHeat = true - - TemperatureModifier - { - key = 0 40000 - key = 250 20000 - key = 500 10000 - key = 750 1000 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 60 - } - } - MODULE - { - name = USI_Harvester - - HarvesterType = 0 - ImpactTransform = ImpactTransform - ImpactRange = 15 - AutoShutdown = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - EfficiencyBonus = 1 - GeneratesHeat = true - - TemperatureModifier - { - key = 0 40000 - key = 250 20000 - key = 500 10000 - key = 750 1000 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 60 - } - } - MODULE - { - name = USI_Harvester - - HarvesterType = 0 - ImpactTransform = ImpactTransform - ImpactRange = 15 - AutoShutdown = true - SpecialistEfficiencyFactor = 0.2 - SpecialistBonusBase = 0.05 - EfficiencyBonus = 1 - GeneratesHeat = true - - TemperatureModifier - { - key = 0 40000 - key = 250 20000 - key = 500 10000 - key = 750 1000 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 60 - } - } - MODULE { name = USI_Harvester @@ -509,7 +345,7 @@ PART UseSpecialistBonus = true ExperienceEffect = DrillSkill } - MODULE + MODULE:NEEDS[Karbonite] { name = USI_HarvesterSwapOption ConverterName = Karbonite @@ -521,7 +357,7 @@ PART UseSpecialistBonus = true ExperienceEffect = DrillSkill } - MODULE + MODULE:NEEDS[Karbonite] { name = USI_HarvesterSwapOption ConverterName = Karborundum diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03A.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03A.cfg index 89f46f090..d555e4be7 100644 --- a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03A.cfg +++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_03A.cfg @@ -153,162 +153,6 @@ PART name = USI_SwappableBay bayName = Bay 1 moduleIndex = 0 - } - MODULE - { - name = USI_SwappableBay - bayName = Bay 2 - moduleIndex = 1 - } - MODULE - { - name = USI_SwappableBay - bayName = Bay 3 - moduleIndex = 2 - } - MODULE - { - name = USI_SwappableBay - bayName = Bay 4 - moduleIndex = 3 - } - MODULE - { - name = USI_SwappableBay - bayName = Bay 5 - moduleIndex = 4 - } - MODULE - { - name = USI_Harvester - - HarvesterType = 0 - ImpactTransform = ImpactTransform - ImpactRange = 15 - AutoShutdown = true - UseSpecialistBonus = false - EfficiencyBonus = 1 - GeneratesHeat = true - TemperatureModifier - { - key = 0 40000 - key = 250 20000 - key = 500 10000 - key = 750 1000 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 52.4 - } - } - MODULE - { - name = USI_Harvester - - HarvesterType = 0 - ImpactTransform = ImpactTransform - ImpactRange = 15 - AutoShutdown = true - UseSpecialistBonus = false - EfficiencyBonus = 1 - GeneratesHeat = true - TemperatureModifier - { - key = 0 40000 - key = 250 20000 - key = 500 10000 - key = 750 1000 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 52.4 - } - } - MODULE - { - name = USI_Harvester - - HarvesterType = 0 - ImpactTransform = ImpactTransform - ImpactRange = 15 - AutoShutdown = true - UseSpecialistBonus = false - EfficiencyBonus = 1 - GeneratesHeat = true - TemperatureModifier - { - key = 0 40000 - key = 250 20000 - key = 500 10000 - key = 750 1000 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 52.4 - } - } - MODULE - { - name = USI_Harvester - - HarvesterType = 0 - ImpactTransform = ImpactTransform - ImpactRange = 15 - AutoShutdown = true - UseSpecialistBonus = false - EfficiencyBonus = 1 - GeneratesHeat = true - TemperatureModifier - { - key = 0 40000 - key = 250 20000 - key = 500 10000 - key = 750 1000 - key = 1000 0 - } - ThermalEfficiency - { - key = 0 0.1 - key = 250 .1 - key = 500 1 - key = 750 .1 - key = 1000 0 - } - INPUT_RESOURCE - { - ResourceName = ElectricCharge - Ratio = 52.4 - } } MODULE { @@ -473,7 +317,7 @@ PART Efficiency = 5.24 ResourceName = Ore } - MODULE + MODULE:NEEDS[Karbonite] { name = USI_HarvesterSwapOption ConverterName = Karbonite @@ -483,7 +327,7 @@ PART Efficiency = 5.24 ResourceName = Karbonite } - MODULE + MODULE:NEEDS[Karbonite] { name = USI_HarvesterSwapOption ConverterName = Karborundum diff --git a/Source/KolonyTools/.vs/KolonyTools/v15/.suo b/Source/KolonyTools/.vs/KolonyTools/v15/.suo deleted file mode 100644 index 61003a835..000000000 Binary files a/Source/KolonyTools/.vs/KolonyTools/v15/.suo and /dev/null differ diff --git a/Source/KolonyTools/.vs/KolonyTools/v15/Server/sqlite3/storage.ide b/Source/KolonyTools/.vs/KolonyTools/v15/Server/sqlite3/storage.ide deleted file mode 100644 index 529bdc6f3..000000000 Binary files a/Source/KolonyTools/.vs/KolonyTools/v15/Server/sqlite3/storage.ide and /dev/null differ diff --git a/Source/KolonyTools/KolonyTools/KolonyOptions/KolonyACOptions.cs b/Source/KolonyTools/KolonyTools/KolonyOptions/KolonyACOptions.cs index a9a4c2dac..05d4afd67 100644 --- a/Source/KolonyTools/KolonyTools/KolonyOptions/KolonyACOptions.cs +++ b/Source/KolonyTools/KolonyTools/KolonyOptions/KolonyACOptions.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace KolonyTools -{ +namespace KolonyTools +{ public class KolonyACOptions : GameParameters.CustomParameterNode { [GameParameters.CustomParameterUI("Customized Kerbonauts", toolTip = "If enabled, allows the customization of new Kerbonauts.", autoPersistance = true)] @@ -29,7 +24,7 @@ public class KolonyACOptions : GameParameters.CustomParameterNode public bool AlternateKolonistCost = true; [GameParameters.CustomIntParameterUI("Kolonist Cost", toolTip = "Base cost for secondary professions", autoPersistance = true, minValue = 0, maxValue = 1000000, stepSize = 1000)] - public int KolonistCost = 1000; + public int KolonistCost = 25000; [GameParameters.CustomParameterUI("Enable Hiring Cost Cap", toolTip = "If enabled, puts a hard cap on the cost of a new hire", autoPersistance = true)] public bool CostCap = true; diff --git a/Source/KolonyTools/KolonyTools/KolonyTools.csproj b/Source/KolonyTools/KolonyTools/KolonyTools.csproj index 38590ba43..5592e574a 100644 --- a/Source/KolonyTools/KolonyTools/KolonyTools.csproj +++ b/Source/KolonyTools/KolonyTools/KolonyTools.csproj @@ -9,7 +9,7 @@ Properties KolonyTools KolonyTools - v3.5 + v4.0 512 @@ -45,10 +45,42 @@ ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.dll False + + ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.AnimationModule.dll + False + + + ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.CoreModule.dll + False + + + ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.ImageConversionModule.dll + False + + + ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.IMGUIModule.dll + False + + + ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.InputLegacyModule.dll + False + + + ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.PhysicsModule.dll + False + + + ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.TextRenderingModule.dll + False + ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.UI.dll False + + ..\..\..\..\..\KSP_DEV\KSP_x64_Data\Managed\UnityEngine.UIModule.dll + False + ..\..\..\..\..\KSP_DEV\GameData\000_USITools\USITools.dll False @@ -115,7 +147,7 @@ "D:\Games\pdb2mdb\pdb2mdb.exe" "$(TargetFileName)" - + D:\Games\pdb2mdb\pdb2mdb.exe $(TargetFileName)