diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..35dd676 --- /dev/null +++ b/.gitignore @@ -0,0 +1,484 @@ +# Created by https://www.toptal.com/developers/gitignore/api/visualstudio,rider +# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudio,rider + +### Rider ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### VisualStudio ### +## 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/main/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/ +[Ww][Ii][Nn]32/ +[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/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# 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 +*.tlog +*.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 + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# 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 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files + +# 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/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# 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/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml + +### VisualStudio Patch ### +# Additional files built by Visual Studio + +# End of https://www.toptal.com/developers/gitignore/api/visualstudio,rider \ No newline at end of file diff --git a/.idea/.idea.VisiblePants/.idea/.gitignore b/.idea/.idea.VisiblePants/.idea/.gitignore new file mode 100644 index 0000000..f3c155c --- /dev/null +++ b/.idea/.idea.VisiblePants/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/contentModel.xml +/projectSettingsUpdater.xml +/.idea.VisiblePants.iml +/modules.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.idea.VisiblePants/.idea/encodings.xml b/.idea/.idea.VisiblePants/.idea/encodings.xml new file mode 100644 index 0000000..df87cf9 --- /dev/null +++ b/.idea/.idea.VisiblePants/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.VisiblePants/.idea/indexLayout.xml b/.idea/.idea.VisiblePants/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/.idea/.idea.VisiblePants/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.VisiblePants/.idea/vcs.xml b/.idea/.idea.VisiblePants/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/.idea.VisiblePants/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/1.0/Assemblies/0Harmony.dll b/1.0/Assemblies/0Harmony.dll deleted file mode 100644 index 6c0dd94..0000000 Binary files a/1.0/Assemblies/0Harmony.dll and /dev/null differ diff --git a/1.0/Assemblies/VisiblePants.dll b/1.0/Assemblies/VisiblePants.dll deleted file mode 100644 index 5d98f8c..0000000 Binary files a/1.0/Assemblies/VisiblePants.dll and /dev/null differ diff --git a/About/About.xml b/About/About.xml index b034d58..78eef8b 100644 --- a/About/About.xml +++ b/About/About.xml @@ -5,10 +5,14 @@ XeoNovaDan.VisiblePants https://steamcommunity.com/sharedfiles/filedetails/?id=926698084 -
  • 1.0
  • 1.1
    • +
  • 1.2
    • +
  • 1.3
    • +
  • 1.4
    • +
  • 1.5
    • +
  • 1.6
    •  - Current version: v2.3.0.3 (2nd March 2020)\n\nA mod that allows you to see everybody's trousers, for that complete feel! + A mod that allows you to see everybody's trousers, for that complete feel!
  • brrainz.harmony diff --git a/About/Manifest.xml b/About/Manifest.xml index f220779..4c72034 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,6 +1,6 @@ VisiblePants - https://cdn.jsdelivr.net/gh/XeoNovaDan/VisiblePants/About/Manifest.xml - https://github.com/XeoNovaDan/VisiblePants/releases - 2.3 + https://raw.githubusercontent.com/JonathanTroyer/VisiblePants/master/About/Manifest.xml + https://github.com/JonathanTroyer/VisiblePants/releases + 2.6 \ No newline at end of file diff --git a/About/PublishedFileId.txt b/About/PublishedFileId.txt index d765a22..5a4600c 100644 --- a/About/PublishedFileId.txt +++ b/About/PublishedFileId.txt @@ -1 +1 @@ -926698084 \ No newline at end of file +2264108215 \ No newline at end of file diff --git a/Languages/English/Keyed/Keys.xml b/Common/Languages/English/Keyed/Keys.xml similarity index 100% rename from Languages/English/Keyed/Keys.xml rename to Common/Languages/English/Keyed/Keys.xml diff --git a/Languages/Japanese/Keyed/Keys.xml b/Common/Languages/Japanese/Keyed/Keys.xml similarity index 100% rename from Languages/Japanese/Keyed/Keys.xml rename to Common/Languages/Japanese/Keyed/Keys.xml diff --git a/Patches/Core/ThingDefs_Misc/Apparel_Various.xml b/Common/Patches/Core/ThingDefs_Misc/Apparel_Various.xml similarity index 100% rename from Patches/Core/ThingDefs_Misc/Apparel_Various.xml rename to Common/Patches/Core/ThingDefs_Misc/Apparel_Various.xml diff --git a/Common/Patches/MechainoidsAddOn/ThingDefs_Misc/MechanoidsAddOn.xml b/Common/Patches/MechainoidsAddOn/ThingDefs_Misc/MechanoidsAddOn.xml new file mode 100644 index 0000000..f310f23 --- /dev/null +++ b/Common/Patches/MechainoidsAddOn/ThingDefs_Misc/MechanoidsAddOn.xml @@ -0,0 +1,34 @@ + + + +
  • Vanilla Factions Expanded - Mechanoids
    • + + + +
  • + Always + +
  • + /Defs/ThingDef[defName="VFE_MechanitePants"]/apparel/wornGraphicPath +
    • +
  • + /Defs/ThingDef[defName="VFE_MechanitePants"]/apparel/wornGraphicPath +
    • +     + +
  • + /Defs/ThingDef[defName="VFE_MechanitePants"] + +
  • + +
    • +
  • + /Defs/ThingDef[defName="VFE_MechanitePants"]/apparel + + MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants + +
    • + +     + + diff --git a/Patches/VanillaApparelExpanded/ThingDefs_Misc/Apparel_Industrial.xml b/Common/Patches/VanillaApparelExpanded/ThingDefs_Misc/Apparel_Industrial.xml similarity index 100% rename from Patches/VanillaApparelExpanded/ThingDefs_Misc/Apparel_Industrial.xml rename to Common/Patches/VanillaApparelExpanded/ThingDefs_Misc/Apparel_Industrial.xml diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Fat_east.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Fat_east.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Fat_east.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Fat_east.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Fat_north.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Fat_north.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Fat_north.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Fat_north.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Fat_south.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Fat_south.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Fat_south.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Fat_south.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Female_east.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Female_east.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Female_east.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Female_east.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Female_north.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Female_north.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Female_north.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Female_north.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Female_south.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Female_south.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Female_south.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Female_south.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Hulk_east.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Hulk_east.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Hulk_east.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Hulk_east.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Hulk_north.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Hulk_north.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Hulk_north.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Hulk_north.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Hulk_south.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Hulk_south.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Hulk_south.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Hulk_south.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Male_east.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Male_east.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Male_east.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Male_east.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Male_north.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Male_north.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Male_north.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Male_north.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Male_south.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Male_south.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Male_south.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Male_south.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Thin_east.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Thin_east.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Thin_east.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Thin_east.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Thin_north.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Thin_north.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Thin_north.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Thin_north.png diff --git a/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Thin_south.png b/Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Thin_south.png similarity index 100% rename from Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Thin_south.png rename to Common/Textures/Core/Things/Pawn/Humanlike/Apparel/Pants/Pants_Thin_south.png diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Fat_east.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Fat_east.png new file mode 100644 index 0000000..3540822 Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Fat_east.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Fat_north.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Fat_north.png new file mode 100644 index 0000000..a87a55d Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Fat_north.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Fat_south.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Fat_south.png new file mode 100644 index 0000000..d3c893e Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Fat_south.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Female_east.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Female_east.png new file mode 100644 index 0000000..3f3abc9 Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Female_east.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Female_north.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Female_north.png new file mode 100644 index 0000000..c771e35 Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Female_north.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Female_south.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Female_south.png new file mode 100644 index 0000000..8aa2e9b Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Female_south.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Hulk_east.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Hulk_east.png new file mode 100644 index 0000000..52a16e5 Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Hulk_east.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Hulk_north.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Hulk_north.png new file mode 100644 index 0000000..925fbaa Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Hulk_north.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Hulk_south.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Hulk_south.png new file mode 100644 index 0000000..955453b Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Hulk_south.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Male_east.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Male_east.png new file mode 100644 index 0000000..462789b Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Male_east.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Male_north.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Male_north.png new file mode 100644 index 0000000..37d0a04 Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Male_north.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Male_south.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Male_south.png new file mode 100644 index 0000000..453e20d Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Male_south.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Thin_east.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Thin_east.png new file mode 100644 index 0000000..16993b0 Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Thin_east.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Thin_north.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Thin_north.png new file mode 100644 index 0000000..a5c6d71 Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Thin_north.png differ diff --git a/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Thin_south.png b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Thin_south.png new file mode 100644 index 0000000..15b3bff Binary files /dev/null and b/Common/Textures/MechanoidsAddOn/Things/Pawn/Humanlike/Apparel/MechanitePants/MechanitePants_Thin_south.png differ diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Fat_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Fat_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Fat_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Fat_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Fat_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Fat_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Fat_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Fat_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Fat_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Fat_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Fat_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Fat_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Female_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Female_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Female_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Female_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Female_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Female_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Female_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Female_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Female_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Female_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Female_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Female_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Hulk_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Hulk_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Hulk_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Hulk_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Hulk_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Hulk_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Hulk_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Hulk_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Hulk_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Hulk_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Hulk_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Hulk_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Male_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Male_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Male_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Male_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Male_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Male_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Male_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Male_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Male_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Male_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Male_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Male_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Thin_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Thin_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Thin_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Thin_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Thin_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Thin_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Thin_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Thin_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Thin_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Thin_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Thin_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Jeans/Jeans_Thin_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Fat_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Fat_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Fat_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Fat_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Fat_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Fat_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Fat_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Fat_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Fat_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Fat_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Fat_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Fat_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Female_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Female_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Female_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Female_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Female_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Female_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Female_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Female_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Female_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Female_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Female_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Female_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Hulk_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Hulk_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Hulk_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Hulk_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Hulk_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Hulk_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Hulk_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Hulk_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Hulk_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Hulk_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Hulk_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Hulk_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Male_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Male_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Male_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Male_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Male_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Male_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Male_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Male_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Male_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Male_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Male_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Male_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Thin_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Thin_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Thin_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Thin_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Thin_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Thin_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Thin_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Thin_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Thin_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Thin_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Thin_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Shorts/Shorts_Thin_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Fat_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Fat_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Fat_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Fat_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Fat_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Fat_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Fat_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Fat_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Fat_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Fat_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Fat_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Fat_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Female_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Female_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Female_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Female_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Female_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Female_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Female_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Female_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Female_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Female_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Female_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Female_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Hulk_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Hulk_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Hulk_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Hulk_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Hulk_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Hulk_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Hulk_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Hulk_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Hulk_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Hulk_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Hulk_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Hulk_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Male_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Male_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Male_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Male_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Male_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Male_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Male_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Male_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Male_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Male_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Male_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Male_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Thin_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Thin_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Thin_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Thin_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Thin_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Thin_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Thin_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Thin_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Thin_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Thin_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Thin_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Skirt/Skirt_Thin_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Fat_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Fat_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Fat_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Fat_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Fat_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Fat_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Fat_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Fat_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Fat_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Fat_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Fat_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Fat_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Female_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Female_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Female_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Female_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Female_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Female_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Female_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Female_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Female_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Female_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Female_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Female_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Hulk_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Hulk_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Hulk_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Hulk_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Hulk_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Hulk_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Hulk_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Hulk_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Hulk_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Hulk_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Hulk_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Hulk_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Male_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Male_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Male_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Male_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Male_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Male_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Male_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Male_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Male_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Male_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Male_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Male_south.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Thin_east.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Thin_east.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Thin_east.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Thin_east.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Thin_north.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Thin_north.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Thin_north.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Thin_north.png diff --git a/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Thin_south.png b/Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Thin_south.png similarity index 100% rename from Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Thin_south.png rename to Common/Textures/VanillaApparelExpanded/Things/Pawn/Humanlike/Apparel/Trousers/Trousers_Thin_south.png diff --git a/Install.bat b/Install.bat new file mode 100644 index 0000000..b7eb3a0 --- /dev/null +++ b/Install.bat @@ -0,0 +1,123 @@ +REM ################ Mod build and install script (c) Andreas Pardeike 2020 ################ +REM +REM Call this script from Visual Studio's Build Events post-build event command line box: +REM "$(ProjectDir)Install.bat" $(ConfigurationName) "$(ProjectDir)" "$(ProjectName)" "About Assemblies Languages Textures v1.1" "LoadFolders.xml" +REM +REM The project structure should look like this: +REM +REM Modname +REM +- .git +REM +- .vs +REM +- About +REM | +- About.xml +REM | +- Preview.png +REM | +- PublishedFileId.txt +REM +- Assemblies <----- this is for RW1.0 + Harmony 1 +REM | +- 0Harmony.dll +REM | +- 0Harmony.dll.mbd +REM | +- 0Harmony.pdb +REM | +- Modname.dll +REM | +- Modname.dll.mbd +REM | +- Modname.pdb +REM +- Languages +REM +- packages +REM | +- Lib.Harmony.2.x.x +REM +- Source +REM | +- .vs +REM | +- obj +REM | +- Debug +REM | +- Release +REM | +- Properties +REM | +- Modname.csproj +REM | +- Modname.csproj.user +REM | +- packages.config +REM | +- Install.bat <----- this script +REM +- Textures +REM +- v1.1 +REM | +- Assemblies <----- this is for RW1.1 + Harmony 2 +REM | +- 0Harmony.dll +REM | +- 0Harmony.dll.mbd +REM | +- 0Harmony.pdb +REM | +- Modname.dll +REM | +- Modname.dll.mbd +REM | +- Modname.pdb +REM +- .gitattributes +REM +- .gitignore +REM +- LICENSE +REM +- LoadFolders.xml +REM +- README.md +REM +- Modname.sln +REM +REM Also needed are the following environment variables in the system settings (example values): +REM +REM MONO_EXE = C:\Program Files\Mono\bin\mono.exe +REM PDB2MDB_PATH = C:\Program Files\Mono\lib\mono\4.5\pdb2mdb.exe +REM RIMWORLD_DIR_STEAM = C:\Program Files (x86)\Steam\steamapps\common\RimWorld\ +REM RIMWORLD_DIR_STANDALONE = %USERPROFILE%\RimWorld1-0-2408Win64 +REM RIMWORLD_MOD_DEBUG = --debugger-agent=transport=dt_socket,address=127.0.0.1:56000,server=y +REM +REM Finally, configure Visual Studio's Debug configuration with the rimworld exe as an external +REM program and set the working directory to the directory containing the exe. +REM +REM To debug, build the project (this script will install the mod), then run "Debug" (F5) which +REM will start RimWorld in paused state. Finally, choose "Debug -> Attach Unity Debugger" and +REM press "Input IP" and accept the default 127.0.0.1 : 56000 + +@ECHO ON +SETLOCAL ENABLEDELAYEDEXPANSION + +SET RIMWORLD_DIR_STEAM=C:\Program Files (x86)\Steam\steamapps\common\RimWorld + +SET SOLUTION_DIR=%~2 +SET TARGET_DIR=%RIMWORLD_DIR_STEAM%\Mods\%~3 +SET TARGET_DEBUG_DIR=%RIMWORLD_DIR_STANDALONE%\Mods\%~3 +SET ZIP_EXE="C:\Program Files\7-Zip\7z.exe" + +SET HARMONY_PATH=%SOLUTION_DIR%Assemblies\0Harmony.dll +SET MOD_DLL_PATH=%SOLUTION_DIR%Assemblies\%~3.dll + +echo "%RIMWORLD_DIR_STEAM%" +IF %1==Debug ( + IF EXIST "%HARMONY_PATH:~0,-4%.pdb" ( + ECHO "Creating mdb at %HARMONY_PATH%" + "%MONO_EXE%" "%PDB2MDB_PATH%" "%HARMONY_PATH%" 1>NUL + ) + IF EXIST "%MOD_DLL_PATH:~0,-4%.pdb" ( + ECHO "Creating mdb at %MOD_DLL_PATH%" + "%MONO_EXE%" "%PDB2MDB_PATH%" "%MOD_DLL_PATH%" 1>NUL + ) +) + +IF %1==Release ( + IF EXIST "%HARMONY_PATH%.mdb" ( + ECHO "Deleting %HARMONY_PATH%.mdb" + DEL "%HARMONY_PATH%.mdb" 1>NUL + ) + IF EXIST "%MOD_DLL_PATH%.mdb" ( + ECHO "Deleting %MOD_DLL_PATH%.mdb" + DEL "%MOD_DLL_PATH%.mdb" 1>NUL + ) +) + +IF EXIST "%RIMWORLD_DIR_STANDALONE%" ( + ECHO "Copying to %TARGET_DEBUG_DIR%" + IF NOT EXIST "%TARGET_DEBUG_DIR%" MKDIR "%TARGET_DEBUG_DIR%" 1>NUL + FOR %%D IN (%~4) DO ( + XCOPY /I /Y /E "%SOLUTION_DIR%%%D" "%TARGET_DEBUG_DIR%\%%D" 1>NUL + ) + FOR %%D IN (%~5) DO ( + XCOPY /Y "%SOLUTION_DIR%%%D" "%TARGET_DEBUG_DIR%\*" 1>NUL + ) +) + +IF EXIST "%RIMWORLD_DIR_STEAM%" ( + ECHO "Copying to %TARGET_DIR%" + IF NOT EXIST "%TARGET_DIR%" MKDIR "%TARGET_DIR%" + FOR %%D IN (%~4) DO ( + XCOPY /I /Y /E "%SOLUTION_DIR%%%D" "%TARGET_DIR%\%%D" 1>NUL + ) + FOR %%D IN (%~5) DO ( + XCOPY /Y "%SOLUTION_DIR%%%D" "%TARGET_DIR%\*" 1>NUL + ) + %ZIP_EXE% a "%TARGET_DIR%.zip" "%TARGET_DIR%" 1>NUL +) \ No newline at end of file diff --git a/LoadFolders.xml b/LoadFolders.xml new file mode 100644 index 0000000..76affb7 --- /dev/null +++ b/LoadFolders.xml @@ -0,0 +1,27 @@ + + + +
  • Common
    • +
  • v1.1
    • +     + +
  • Common
    • +
  • v1.2
    • +     + +
  • Common
    • +
  • v1.3
    • +     + +
  • Common
    • +
  • v1.4
    • +     + +
  • Common
    • +
  • v1.5
    • +     + +
  • Common
    • +
  • v1.6
    • +     +     \ No newline at end of file diff --git a/Source/Preview.xcf b/Source/Preview.xcf deleted file mode 100644 index ef409c4..0000000 Binary files a/Source/Preview.xcf and /dev/null differ diff --git a/Source/VisiblePants/.vs/VisiblePants/v16/.suo b/Source/VisiblePants/.vs/VisiblePants/v16/.suo deleted file mode 100644 index 8b42049..0000000 Binary files a/Source/VisiblePants/.vs/VisiblePants/v16/.suo and /dev/null differ diff --git a/Source/VisiblePants/.vs/VisiblePants/v16/Server/sqlite3/db.lock b/Source/VisiblePants/.vs/VisiblePants/v16/Server/sqlite3/db.lock deleted file mode 100644 index e69de29..0000000 diff --git a/Source/VisiblePants/.vs/VisiblePants/v16/Server/sqlite3/storage.ide b/Source/VisiblePants/.vs/VisiblePants/v16/Server/sqlite3/storage.ide deleted file mode 100644 index 7705921..0000000 Binary files a/Source/VisiblePants/.vs/VisiblePants/v16/Server/sqlite3/storage.ide and /dev/null differ diff --git a/Source/VisiblePants/HarmonyPatches/HarmonyPatches.cs b/Source/VisiblePants/HarmonyPatches/HarmonyPatches.cs deleted file mode 100644 index 82e0292..0000000 --- a/Source/VisiblePants/HarmonyPatches/HarmonyPatches.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; -using System.Runtime.CompilerServices; -using System.Text; -using UnityEngine; -using Verse; -using RimWorld; -using HarmonyLib; - -namespace VisiblePants -{ - [StaticConstructorOnStartup] - public static class HarmonyPatches - { - - static HarmonyPatches() - { - VisiblePants.harmonyInstance.PatchAll(); - } - - } -} diff --git a/Source/VisiblePants/HarmonyPatches/Patch_Pawn.cs b/Source/VisiblePants/HarmonyPatches/Patch_Pawn.cs deleted file mode 100644 index 48b1dbf..0000000 --- a/Source/VisiblePants/HarmonyPatches/Patch_Pawn.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; -using System.Runtime.CompilerServices; -using System.Text; -using UnityEngine; -using Verse; -using RimWorld; -using HarmonyLib; - -namespace VisiblePants -{ - - public static class Patch_Pawn - { - - [HarmonyPatch(typeof(Pawn))] - [HarmonyPatch(nameof(Pawn.Tick))] - public static class Patch_Tick - { - - public static void Postfix(Pawn __instance) - { - // Redraw pawn apparel if settings have changed - if (__instance.apparel != null && VisiblePantsUtility.cachedDrawPantsOver != VisiblePantsSettings.drawPantsOver) - { - if (VisiblePantsUtility.ticksToCacheChange == 0) - { - VisiblePantsUtility.ticksToCacheChange = GenTicks.TicksPerRealSecond; - VisiblePantsUtility.cachedDrawPantsOver = VisiblePantsSettings.drawPantsOver; - } - else - VisiblePantsUtility.ticksToCacheChange--; - __instance.apparel.Notify_ApparelAdded(null); - } - } - - } - - } -} diff --git a/Source/VisiblePants/Properties/AssemblyInfo.cs b/Source/VisiblePants/Properties/AssemblyInfo.cs deleted file mode 100644 index 53c6989..0000000 --- a/Source/VisiblePants/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("VisiblePants")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("VisiblePants")] -[assembly: AssemblyCopyright("Copyright © XeoNovaDan 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("e774ea52-14e4-4b87-b610-be7fb0eb1f01")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.3.0.3")] -[assembly: AssemblyFileVersion("2.3.0.3")] diff --git a/Source/VisiblePants/Reflection/ReflectedMethods.cs b/Source/VisiblePants/Reflection/ReflectedMethods.cs deleted file mode 100644 index 72ce8d9..0000000 --- a/Source/VisiblePants/Reflection/ReflectedMethods.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; -using Verse; -using RimWorld; -using System.Reflection; - -namespace VisiblePants -{ - - [StaticConstructorOnStartup] - public static class ReflectedMethods - { - - static ReflectedMethods() - { - SortWornApparelIntoDrawOrder = (OpenDelegate)Delegate.CreateDelegate(typeof(OpenDelegate), null, - typeof(Pawn_ApparelTracker).GetMethod("SortWornApparelIntoDrawOrder", BindingFlags.NonPublic | BindingFlags.Instance)); - } - - public static OpenDelegate SortWornApparelIntoDrawOrder; - - public delegate void OpenDelegate(T instance); - - } - -} diff --git a/Source/VisiblePants/ThingDefExtension.cs b/Source/VisiblePants/ThingDefExtension.cs deleted file mode 100644 index 65c0904..0000000 --- a/Source/VisiblePants/ThingDefExtension.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; -using Verse; -using RimWorld; - -namespace VisiblePants -{ - - public class ThingDefExtension : DefModExtension - { - } - -} diff --git a/Source/VisiblePants/VisiblePants.csproj b/Source/VisiblePants/VisiblePants.csproj deleted file mode 100644 index 670c8fa..0000000 --- a/Source/VisiblePants/VisiblePants.csproj +++ /dev/null @@ -1,76 +0,0 @@ - - - - - Debug - AnyCPU - {E774EA52-14E4-4B87-B610-BE7FB0EB1F01} - Library - Properties - VisiblePants - VisiblePants - v4.7.2 - 512 - - - - false - none - false - ..\..\1.1\Assemblies\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\..\..\..\..\Program Files (x86)\Steam\steamapps\workshop\content\294100\2009463077\Assemblies\0Harmony.dll - False - - - ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll - False - - - - - - - - - - ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll - False - - - ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll - False - - - ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.TextRenderingModule.dll - False - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/VisiblePants/VisiblePantsSettings.cs b/Source/VisiblePants/VisiblePantsSettings.cs deleted file mode 100644 index c600f69..0000000 --- a/Source/VisiblePants/VisiblePantsSettings.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; -using Verse; -using RimWorld; - -namespace VisiblePants -{ - - public class VisiblePantsSettings : ModSettings - { - - public static bool drawPantsOver = true; - - public void DoWindowContents(Rect wrect) - { - var options = new Listing_Standard(); - var defaultColor = GUI.color; - options.Begin(wrect); - GUI.color = defaultColor; - Text.Font = GameFont.Small; - Text.Anchor = TextAnchor.UpperLeft; - - // Draw pants over shirts - options.Gap(); - options.CheckboxLabeled("VisiblePants.DrawPantsOver".Translate(), ref drawPantsOver, "VisiblePants.DrawPantsOver_Tooltip".Translate()); - - // Finish - options.End(); - Mod.GetSettings().Write(); - - } - - public override void ExposeData() - { - Scribe_Values.Look(ref drawPantsOver, "drawPantsOver", drawPantsOver); - - if (Scribe.mode == LoadSaveMode.PostLoadInit) - VisiblePantsUtility.cachedDrawPantsOver = drawPantsOver; - } - - } - -} diff --git a/Source/VisiblePants/VisiblePantsUtility.cs b/Source/VisiblePants/VisiblePantsUtility.cs deleted file mode 100644 index 1e9205a..0000000 --- a/Source/VisiblePants/VisiblePantsUtility.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; -using Verse; -using RimWorld; - -namespace VisiblePants -{ - - public static class VisiblePantsUtility - { - - public static bool cachedDrawPantsOver; - public static int ticksToCacheChange = GenTicks.TicksPerRealSecond; - - } - -} diff --git a/Source/VisiblePants/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Source/VisiblePants/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 1303027..0000000 Binary files a/Source/VisiblePants/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/Source/VisiblePants/obj/Debug/VisiblePants.csproj.FileListAbsolute.txt b/Source/VisiblePants/obj/Debug/VisiblePants.csproj.FileListAbsolute.txt deleted file mode 100644 index f6ccb53..0000000 --- a/Source/VisiblePants/obj/Debug/VisiblePants.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,3 +0,0 @@ -D:\Documents\GitHub\VisiblePants\1.1\Assemblies\VisiblePants.dll -D:\Documents\GitHub\VisiblePants\Source\VisiblePants\obj\Debug\VisiblePants.csprojAssemblyReference.cache -D:\Documents\GitHub\VisiblePants\Source\VisiblePants\obj\Debug\VisiblePants.dll diff --git a/Source/VisiblePants/obj/Debug/VisiblePants.csprojAssemblyReference.cache b/Source/VisiblePants/obj/Debug/VisiblePants.csprojAssemblyReference.cache deleted file mode 100644 index 1ec8651..0000000 Binary files a/Source/VisiblePants/obj/Debug/VisiblePants.csprojAssemblyReference.cache and /dev/null differ diff --git a/Source/VisiblePants/obj/Debug/VisiblePants.dll b/Source/VisiblePants/obj/Debug/VisiblePants.dll deleted file mode 100644 index db400a5..0000000 Binary files a/Source/VisiblePants/obj/Debug/VisiblePants.dll and /dev/null differ diff --git a/Source/visible-pants.code-workspace b/Source/visible-pants.code-workspace deleted file mode 100644 index 35ce0da..0000000 --- a/Source/visible-pants.code-workspace +++ /dev/null @@ -1,13 +0,0 @@ -{ - "folders": [ - { - "name": "VisiblePants", - "path": "D:\\Documents\\GitHub\\VisiblePants" - }, - { - "name": "Data", - "path": "D:\\Program Files (x86)\\Steam\\steamapps\\common\\RimWorld\\Data" - } - ], - "settings": {} -} \ No newline at end of file diff --git a/VisiblePants.csproj b/VisiblePants.csproj new file mode 100644 index 0000000..245b2dd --- /dev/null +++ b/VisiblePants.csproj @@ -0,0 +1,199 @@ + + + + + Debug + AnyCPU + {E774EA52-14E4-4B87-B610-BE7FB0EB1F01} + Library + Properties + VisiblePants + VisiblePants + v4.7.2 + 512 + + + + false + none + false + v1.6\Assemblies\ + DEBUG;TRACE + prompt + 4 + false + + + none + true + v1.6\Assemblies\ + TRACE + prompt + 4 + false + + + + packages\Lib.Harmony.2.3.3\lib\net472\0Harmony.dll + False + + + ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll + False + + + + + + + + + + ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.dll + False + + + ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll + False + + + ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll + False + + + ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.TextRenderingModule.dll + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(ProjectDir)Install.bat $(ConfigurationName) "$(ProjectDir)" "$(ProjectName)" "About Common v1.1 v1.2 v1.3 v1.4 v1.5 v1.6" "LoadFolders.xml" + + \ No newline at end of file diff --git a/Source/VisiblePants/VisiblePants.sln b/VisiblePants.sln similarity index 100% rename from Source/VisiblePants/VisiblePants.sln rename to VisiblePants.sln diff --git a/packages.config b/packages.config new file mode 100644 index 0000000..75a6411 --- /dev/null +++ b/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/HarmonyPatches/HarmonyPatches.cs b/src/HarmonyPatches/HarmonyPatches.cs new file mode 100644 index 0000000..6d09eba --- /dev/null +++ b/src/HarmonyPatches/HarmonyPatches.cs @@ -0,0 +1,16 @@ +using HarmonyLib; +using System.Reflection; +using Verse; + +namespace VisiblePants +{ + [StaticConstructorOnStartup] + public static class HarmonyPatches + { + static HarmonyPatches() + { + var harmony = new Harmony("XeoNovaDan.VisiblePants"); + harmony.PatchAll(Assembly.GetExecutingAssembly()); + } + } +} diff --git a/src/HarmonyPatches/Patch_Pawn.cs b/src/HarmonyPatches/Patch_Pawn.cs new file mode 100644 index 0000000..21443af --- /dev/null +++ b/src/HarmonyPatches/Patch_Pawn.cs @@ -0,0 +1,35 @@ +using System.Reflection; +using Verse; +using HarmonyLib; + +namespace VisiblePants +{ + public static class Patch_Pawn + { + [HarmonyPatch(typeof(Pawn))] + [HarmonyPatch(nameof(Pawn.TickRare))] + public static class Patch_TickRare + { + // Redraw pawn apparel if settings have changed + public static void Postfix(Pawn __instance) + { + //Don't try to update anything that doesn't have apparel + if (__instance.apparel == null) return; + + //Have to check that we have a valid key + if (__instance.Name == null) return; + + var redrawFound = VisiblePantsUtility.NeedsRedraw.TryGetValue(__instance.Name, out var needsRedraw); + if (needsRedraw || !redrawFound) + { + var sortWornApparelIntoDrawOrder = __instance.apparel.GetType().GetMethod("SortWornApparelIntoDrawOrder", BindingFlags.NonPublic | BindingFlags.Instance); + sortWornApparelIntoDrawOrder.Invoke(__instance.apparel, new object[] { }); + + __instance.apparel.Notify_ApparelChanged(); + + VisiblePantsUtility.NeedsRedraw[__instance.Name] = false; + } + } + } + } +} diff --git a/Source/VisiblePants/HarmonyPatches/Patch_Pawn_ApparelTracker.cs b/src/HarmonyPatches/Patch_Pawn_ApparelTracker.cs similarity index 84% rename from Source/VisiblePants/HarmonyPatches/Patch_Pawn_ApparelTracker.cs rename to src/HarmonyPatches/Patch_Pawn_ApparelTracker.cs index b658b94..b493f2f 100644 --- a/Source/VisiblePants/HarmonyPatches/Patch_Pawn_ApparelTracker.cs +++ b/src/HarmonyPatches/Patch_Pawn_ApparelTracker.cs @@ -1,12 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; -using System.Runtime.CompilerServices; -using System.Text; -using UnityEngine; -using Verse; +using Verse; using RimWorld; using HarmonyLib; diff --git a/src/ThingDefExtension.cs b/src/ThingDefExtension.cs new file mode 100644 index 0000000..59137db --- /dev/null +++ b/src/ThingDefExtension.cs @@ -0,0 +1,10 @@ +using Verse; + +namespace VisiblePants +{ + + public class ThingDefExtension : DefModExtension + { + } + +} diff --git a/Source/VisiblePants/VisiblePants.cs b/src/VisiblePants.cs similarity index 51% rename from Source/VisiblePants/VisiblePants.cs rename to src/VisiblePants.cs index 533f3cd..643b9e7 100644 --- a/Source/VisiblePants/VisiblePants.cs +++ b/src/VisiblePants.cs @@ -1,34 +1,22 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; +using UnityEngine; using Verse; -using RimWorld; -using HarmonyLib; namespace VisiblePants { - public class VisiblePants : Mod { - public VisiblePantsSettings settings; - public static Harmony harmonyInstance; - public VisiblePants(ModContentPack content) : base(content) { settings = GetSettings(); - harmonyInstance = new Harmony("XeoNovaDan.VisiblePants"); } public override string SettingsCategory() => "VisiblePants.SettingsCategory".Translate(); - public override void DoSettingsWindowContents(Rect inRect) + public override void DoSettingsWindowContents(Rect rect) { - settings.DoWindowContents(inRect); + settings.DoWindowContents(rect); + base.DoSettingsWindowContents(rect); } - } - } diff --git a/src/VisiblePantsSettings.cs b/src/VisiblePantsSettings.cs new file mode 100644 index 0000000..260ff3e --- /dev/null +++ b/src/VisiblePantsSettings.cs @@ -0,0 +1,37 @@ +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using Verse; + +namespace VisiblePants +{ + public class VisiblePantsSettings : ModSettings + { + public static bool drawPantsOver = true; + + public VisiblePantsSettings() : base() { } + + public void DoWindowContents(Rect rect) + { + var ls = new Listing_Standard(); + ls.Begin(rect); + + // Draw pants over shirts + ls.Gap(); + ls.CheckboxLabeled("VisiblePants.DrawPantsOver".Translate(), ref drawPantsOver, "VisiblePants.DrawPantsOver_Tooltip".Translate()); + + ls.End(); + } + + public override void ExposeData() + { + Scribe_Values.Look(ref drawPantsOver, "drawPantsOver", true); + base.ExposeData(); + + foreach (var key in VisiblePantsUtility.NeedsRedraw.Keys.ToList()) + { + VisiblePantsUtility.NeedsRedraw[key] = true; + } + } + } +} diff --git a/src/VisiblePantsUtility.cs b/src/VisiblePantsUtility.cs new file mode 100644 index 0000000..e287fd8 --- /dev/null +++ b/src/VisiblePantsUtility.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using Verse; + +namespace VisiblePants +{ + + public static class VisiblePantsUtility + { + public static Dictionary NeedsRedraw = new Dictionary(); + } + +} diff --git a/1.1/Assemblies/VisiblePants.dll b/v1.1/Assemblies/VisiblePants.dll similarity index 100% rename from 1.1/Assemblies/VisiblePants.dll rename to v1.1/Assemblies/VisiblePants.dll diff --git a/v1.2/Assemblies/VisiblePants.dll b/v1.2/Assemblies/VisiblePants.dll new file mode 100644 index 0000000..a912d78 Binary files /dev/null and b/v1.2/Assemblies/VisiblePants.dll differ diff --git a/v1.3/Assemblies/VisiblePants.dll b/v1.3/Assemblies/VisiblePants.dll new file mode 100644 index 0000000..a334812 Binary files /dev/null and b/v1.3/Assemblies/VisiblePants.dll differ diff --git a/v1.4/Assemblies/VisiblePants.dll b/v1.4/Assemblies/VisiblePants.dll new file mode 100644 index 0000000..db20564 Binary files /dev/null and b/v1.4/Assemblies/VisiblePants.dll differ diff --git a/v1.5/Assemblies/VisiblePants.dll b/v1.5/Assemblies/VisiblePants.dll new file mode 100644 index 0000000..3017042 Binary files /dev/null and b/v1.5/Assemblies/VisiblePants.dll differ