diff --git a/1.5/Assemblies/RimJobWorldWhoring.dll b/1.5/Assemblies/RimJobWorldWhoring.dll index 1a6a18c..6436cc6 100644 Binary files a/1.5/Assemblies/RimJobWorldWhoring.dll and b/1.5/Assemblies/RimJobWorldWhoring.dll differ diff --git a/1.5/Languages/ChineseSimplified/DefInjected/JobDef/Jobs_Whoring.xml b/1.5/Languages/ChineseSimplified/DefInjected/JobDef/Jobs_Whoring.xml deleted file mode 100644 index 575f63f..0000000 --- a/1.5/Languages/ChineseSimplified/DefInjected/JobDef/Jobs_Whoring.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 服务访客 - 尝试拉客 - \ No newline at end of file diff --git a/1.5/Languages/ChineseSimplified/DefInjected/PawnColumnDef/PawnColumns.xml b/1.5/Languages/ChineseSimplified/DefInjected/PawnColumnDef/PawnColumns.xml deleted file mode 100644 index 3f5e335..0000000 --- a/1.5/Languages/ChineseSimplified/DefInjected/PawnColumnDef/PawnColumns.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 经验 - 卖淫经验 - - 妓女价格范围 - 价格 - - 赚取的总金额 - 赚取 - - 服务的客户数量 - 客户 - - 平均赚取的金额 - 平均 - - 小人的心情 - 心情 - - 用性交易换取利益 - 支付类型 - \ No newline at end of file diff --git a/1.5/Languages/ChineseSimplified/DefInjected/PawnTableDef/PawnTableDefs.xml b/1.5/Languages/ChineseSimplified/DefInjected/PawnTableDef/PawnTableDefs.xml deleted file mode 100644 index 4868bab..0000000 --- a/1.5/Languages/ChineseSimplified/DefInjected/PawnTableDef/PawnTableDefs.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 妓院 - \ No newline at end of file diff --git a/1.5/Languages/ChineseSimplified/DefInjected/RecordDef/Records.xml b/1.5/Languages/ChineseSimplified/DefInjected/RecordDef/Records.xml deleted file mode 100644 index e41848a..0000000 --- a/1.5/Languages/ChineseSimplified/DefInjected/RecordDef/Records.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - 卖淫次数 - 我卖淫的次数。 - 作为妓女赚取的白银 - 我作为妓女赚取的白银总数。 - \ No newline at end of file diff --git a/1.5/Languages/ChineseSimplified/DefInjected/RoomRoleDef/RoomRoles.xml b/1.5/Languages/ChineseSimplified/DefInjected/RoomRoleDef/RoomRoles.xml deleted file mode 100644 index c727271..0000000 --- a/1.5/Languages/ChineseSimplified/DefInjected/RoomRoleDef/RoomRoles.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 妓院 - \ No newline at end of file diff --git a/1.5/Languages/ChineseSimplified/DefInjected/ThoughtDef/Thoughts_Whore.xml b/1.5/Languages/ChineseSimplified/DefInjected/ThoughtDef/Thoughts_Whore.xml deleted file mode 100644 index 6f28f1a..0000000 --- a/1.5/Languages/ChineseSimplified/DefInjected/ThoughtDef/Thoughts_Whore.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 愤怒的妓女 - 愤怒的妓女 - 妓女 - 嗯，至少报酬不错... - 妓女 - 这份工作还算不错呢！ - - 被迫的妓女 - 他们逼迫我作为性玩具服侍！ - 不情愿的妓女 - 我可不是个公交车！ - 习惯的妓女 - 只要不要打我就好。 - 完全的妓女 - 如果不是这些束缚，我能有更多客户！ - - - 试图招揽我 - - 打扰了我 - - 打扰了我 - - 睡在妓院 - 呸，床单全是黏乎乎的。 - 睡在妓院! - 我就是喜欢这个地方，它的味道，它的声音…… - \ No newline at end of file diff --git a/1.5/Languages/ChineseSimplified/DefInjected/TipSetDef/Tips.xml b/1.5/Languages/ChineseSimplified/DefInjected/TipSetDef/Tips.xml deleted file mode 100644 index 02aebb1..0000000 --- a/1.5/Languages/ChineseSimplified/DefInjected/TipSetDef/Tips.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 卖淫价格可以在生物标签的“显示性行为”菜单中查看（图标像一个心形）。 - 如果将避孕套放在床旁边的储藏区中，可以自动使用它们——如果你打算让殖民者卖淫，最好准备一些避孕套。 - \ No newline at end of file diff --git a/1.5/Languages/ChineseSimplified/keyed/Whoring.xml b/1.5/Languages/ChineseSimplified/keyed/Whoring.xml deleted file mode 100644 index fcd7e8d..0000000 --- a/1.5/Languages/ChineseSimplified/keyed/Whoring.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - 启用嫖娼选项卡 - 显示/隐藏嫖娼选项卡 - 显示床铺的卖淫价格因素 - 在启用了卖淫功能的床上显示卖淫价格系数的标签。 - 显示床铺小部件 - 显示床铺小部件，以标记公共/私人的床铺，供嫖客使用。 - - 货币印刷 - 客户将生成银币，而不是使用他们自己的/商队的 - 禁用客户随机性 - 客户总是接受招揽，而不是进行随机性判断。 - - 收集Debug日志信息 - 启用一些频繁的调试日志，以帮助查找卖淫招嫖操作中的错误。 - - - {0} 接受了 {1} 提供的交易。 - {0} 希望得到 {1} 的服务。 - {0} 拒绝了 {1} 提供的交易。 - {0} 拒绝了这个提议，因为 {1} 看起来并不健康 - - - 设为妓女 - - 不会同意成为妓女 - - - 允许所有人卖淫 - 允许所有妓女使用这张床招待顾客。 - 允许主人卖淫 - 是否允许床的拥有者使用这张床进行卖淫。 - 卖淫价格系数（基于舒适度、房间的豪华度和房间内的床位数）：{0} - - 嫖客的价格范围。 - 囚犯 - 奴隶 - \ No newline at end of file diff --git a/1.5/Source/Mod/Whoring_Bed_Utilities.cs b/1.5/Source/Mod/Whoring_Bed_Utilities.cs index 2891030..74ac8a1 100644 --- a/1.5/Source/Mod/Whoring_Bed_Utilities.cs +++ b/1.5/Source/Mod/Whoring_Bed_Utilities.cs @@ -290,7 +290,6 @@ namespace rjwwhoring if (!bed.def.building.bed_humanlike || bed.Faction != Faction.OfPlayerSilentFail || bed.Medical || - bed.def.building.bed_crib || bed.def.defName.Contains("Guest") || bed.def.defName.Contains("Android") ) { @@ -331,7 +330,6 @@ namespace rjwwhoring bed.Faction != Faction.OfPlayerSilentFail || bed.Medical || bed.ForPrisoners || - bed.def.building.bed_crib || bed.def.defName.Contains("Guest") || bed.def.defName.Contains("Android") || bed.GetRoom()?.IsPrisonCell == true) diff --git a/1.5/Source/Mod/Whoring_Helper.cs b/1.5/Source/Mod/Whoring_Helper.cs index bce34a4..e811658 100644 --- a/1.5/Source/Mod/Whoring_Helper.cs +++ b/1.5/Source/Mod/Whoring_Helper.cs @@ -52,7 +52,7 @@ namespace rjwwhoring public static float WhoreGenderAdjustment(Pawn whore) { - if (GenderHelper.GetSex(whore) == GenderHelper.Sex.Futa) + if (GenderHelper.GetSex(whore) == GenderHelper.Sex.futa) return 1.2f; return 1f; } diff --git a/1.5/Source/Mod/harmony_Building_BedPatches.cs b/1.5/Source/Mod/harmony_Building_BedPatches.cs index aba3bbf..d84a950 100644 --- a/1.5/Source/Mod/harmony_Building_BedPatches.cs +++ b/1.5/Source/Mod/harmony_Building_BedPatches.cs @@ -54,7 +54,6 @@ namespace rjwwhoring var isPrisonCell = __instance.GetRoom()?.IsPrisonCell == true; if (!__instance.ForPrisoners && !__instance.Medical && - !__instance.def.building.bed_crib && __instance.def.building.bed_humanlike && __instance.Faction == Faction.OfPlayerSilentFail && !__instance.def.defName.Contains("Guest") && diff --git a/About/Manifest.xml b/About/Manifest.xml index 0a2f16a..35528aa 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RimJobWorld Whoring - 1.0.9 + 1.0.8
  • RimJobWorld
    •  diff --git a/README.md b/README.md index 6482457..7c25383 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Requirements: Harmony Hugslib -Rimjobworld 5.5.0+(https://gitgud.io/Ed86/rjw) +Rimjobworld 5.0+(https://gitgud.io/Ed86/rjw) Features: Adds whoring, widgets to mark beds for whoring, beds price overlay.