From 38eeab652ff8c5862d842d88374ab8743a855b61 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 31 Aug 2020 18:47:05 -0400
Subject: [PATCH] fixes
---
src/markets/marketUI.js | 8 --------
src/markets/specificMarkets/slaveMarkets.js | 10 ++++++----
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/markets/marketUI.js b/src/markets/marketUI.js
index f0e9b0301cd..c42efeda584 100644
--- a/src/markets/marketUI.js
+++ b/src/markets/marketUI.js
@@ -28,14 +28,6 @@ App.Markets.purchaseFramework = function(slaveMarket, {numArcology, sTitleSingul
cost += Math.trunc(cost * ((V.slavesSeen - V.slaveMarketLimit) * 0.1));
}
- // Tweak for neighbor
- if (slaveMarket === "neighbor") {
- let _opinion = App.Neighbor.opinion(0, numArcology);
- if (_opinion !== 0) {
- cost -= Math.trunc(cost * _opinion * 0.05);
- }
- }
-
cost = 500 * Math.trunc(cost / 500);
return cost;
}
diff --git a/src/markets/specificMarkets/slaveMarkets.js b/src/markets/specificMarkets/slaveMarkets.js
index b139c07c551..c8102736321 100644
--- a/src/markets/specificMarkets/slaveMarkets.js
+++ b/src/markets/specificMarkets/slaveMarkets.js
@@ -23,7 +23,7 @@ App.Markets.wetware = function() {
const el = new DocumentFragment();
let r = [];
const {heU, hisU} = getNonlocalPronouns(V.seeDicks).appendSuffix('U');
- r.push(`You're in the corner of the slave market occupied by scientists and programmers, pioneers in perfecting the skills of slaves by removing all external stimuli and subjecting them to an inhumane regimen of simulated sexual and career training. Although their bodies are ruined, these slaves are guaranteed to be intelligent, skilled and trained in a variety of jobs. If you're willing to perform extensive repairs${(V.bodyswapAnnounced)?`, or have a spare body ready`:``}, these slaves have high potential in almost any role in your arcology.`);
+ r.push(`You're in the corner of the slave market occupied by scientists and programmers, pioneers in perfecting the skills of slaves by removing all external stimuli and subjecting them to an inhumane regimen of simulated sexual and career training. Although their bodies are ruined, these slaves are guaranteed to be intelligent, skilled and trained in a variety of jobs. If you're willing to perform extensive repairs${(V.bodyswapAnnounced) ? `, or have a spare body ready` : ``}, these slaves have high potential in almost any role in your arcology.`);
let _wetware = jsRandom(1, 4);
if (_wetware === 1) {
@@ -78,7 +78,7 @@ App.Markets.kidnappers = function() {
App.Markets.indentures = function() {
const el = new DocumentFragment();
let r = [];
- const {girlU, hisU} =getNonlocalPronouns(V.seeDicks).appendSuffix('U');
+ const {girlU, hisU} = getNonlocalPronouns(V.seeDicks).appendSuffix('U');
r.push(`You're in the area of the slave market that deals in indentured servants. The people sold here are slaves, but they are temporary slaves, and many of them have clauses in their indentures that prohibit some of the most severe practices. They exhibit a strange variety, with some looking more frightened than the most downtrodden slave and some looking almost cheerful.`);
if (V.arcologies[0].FSPaternalistSMR === 1) {
r.push(`The generous protections for slaves in your arcology lend this last group extra confidence.`);
@@ -197,23 +197,25 @@ App.Markets.neighbor = function(numArcology) {
let r = [];
r.push(`You're in the area of the slave market that specializes in slaves from within the Free City, viewing slaves from <span class="bold>${V.arcologies[numArcology].name}</span>. Some were trained there, specifically for sale, while others are simply being sold.`);
let _opinion = App.Neighbor.opinion(0, numArcology);
+ let costMod = 1;
if (_opinion !== 0) {
if (_opinion > 2) {
r.push(`Your cultural ties with ${V.arcologies[numArcology].name} helps keep the price reasonable.`);
} else if (_opinion < -2) {
r.push(`Your social misalignment with ${V.arcologies[numArcology].name} drives up the price.`);
}
+ costMod = (_opinion * 0.05);
}
el.append(r.join(" "));
- el.append(App.Markets.purchaseFramework("neighbor", {numArcology:numArcology}));
+ el.append(App.Markets.purchaseFramework("neighbor", {numArcology: numArcology, costMod:costMod}));
return el;
};
App.Markets.trainers = function() {
const el = new DocumentFragment();
let r = [];
- getNonlocalPronouns(V.seeDicks).appendSuffix('U');
+ const {girlU} = getNonlocalPronouns(V.seeDicks).appendSuffix('U');
r.push(`You're in the area of the slave market populated by slave trainers, easily the wealthiest vendors. The slaves here have received obedience training and medical care, and many have had some basic sexual skills forced on them.`);
if (V.arcologies[0].FSPaternalistSMR === 1) {
r.push(`Though the rules of your arcology protected them from the worst excesses of the training profession, many of the slaves on sale have the haunted look of people still coming to terms with the idea that they no longer have any bodily autonomy.`);
--
GitLab