diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 977b2532f3be32a57fbb63984b4dfbce109ea91a..8a9555251cd9d6ac7ba6e1379332bba856b063f4 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -4604,24 +4604,20 @@ window.originPronounReplace = function(slave) { case "She was the private slave of a con artist cult leader before he had to abandon her and flee.": case "You helped her give birth, leaving her deeply indebted to you.": case "You purchased her from a King after she expressed knowledge of the prince's affair with another servant.": - /* - r = r.replace(/(?<=\s)herself(?=\s|,|\.|;|\?|!)/g, slave.objectReflexive); - r = r.replace(/(?<=\s|^)Herself(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.objectReflexive)); - r = r.replace(/(?<=\s)she(?=\s|,|\.|;|\?|!)/g, slave.pronoun); - r = r.replace(/(?<=\s|^)She(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.pronoun)); - r = r.replace(/(?<=\s)her(?=\s|,|\.|;|\?|!)/g, slave.object); - r = r.replace(/(?<=\s|^)Her(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.object)); - */ + r = r.replace(/\bherself\b/g, slave.objectReflexive); + r = r.replace(/\bHerself\b/g, capFirstChar(slave.objectReflexive)); + r = r.replace(/\bshe\b/g, slave.pronoun); + r = r.replace(/\bShe\b/g, capFirstChar(slave.pronoun)); + r = r.replace(/\bher\b/g, slave.object); + r = r.replace(/\bHer\b/g, capFirstChar(slave.object)); return r; default: - /* - r = r.replace(/(?<=\s)herself(?=\s|,|\.|;|\?|!)/g, slave.objectReflexive); - r = r.replace(/(?<=\s|^)Herself(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.objectReflexive)); - r = r.replace(/(?<=\s)she(?=\s|,|\.|;|\?|!)/g, slave.pronoun); - r = r.replace(/(?<=\s|^)She(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.pronoun)); - r = r.replace(/(?<=\s)her(?=\s|,|\.|;|\?|!)/g, slave.possessive); - r = r.replace(/(?<=\s|^)Her(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.possessive)); - */ + r = r.replace(/\bherself\b/g, slave.objectReflexive); + r = r.replace(/\bHerself\b/g, capFirstChar(slave.objectReflexive)); + r = r.replace(/\bshe\b/g, slave.pronoun); + r = r.replace(/\bShe\b/g, capFirstChar(slave.pronoun)); + r = r.replace(/\bher\b/g, slave.possessive); + r = r.replace(/\bHer\b/g, capFirstChar(slave.possessive)); return r; } }; diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw index 24934d79dc667f2682a9eec9b06fb4d03e8cbe01..82a4a5c10834bb64588e54df7f73e305c136c25d 100644 --- a/src/init/setupVars.tw +++ b/src/init/setupVars.tw @@ -21,6 +21,8 @@ canineL: {type: "canineL", normalOvaMin:2, normalOvaMax: 6, normalBirth: 9, minL pig: {type: "pig", normalOvaMin:8, normalOvaMax: 12, normalBirth: 16, minLiveBirth: 14, drugsEffect: 0.5, fetusWeek: [0, 3, 16, 16+28, 16+48, 99999], fetusSize: [0, 1, 1700, 94000, 170000, 170000], fetusRate: [4, 4, 4, 4, 4, 4], sizeType: 1}, +cow: {type: "cow", normalOvaMin:1, normalOvaMax: 1, normalBirth: 41, minLiveBirth: 38, drugsEffect: 0.05, fetusWeek: [0, 1*4, 2*4, 3*4, 4*4, 5*4, 6*4, 7*4, 8*4, 9*4, 9*4+90, 9*4+180, 99999], fetusSize: [0, 1, 20, 280, 1500, 3200, 6100, 15000, 23000, 50000, 350000, 500000, 500000], fetusRate: [4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], sizeType: 1}, + equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLiveBirth: 44, drugsEffect: 0.05, fetusWeek: [0, 5.7, 8.5, 11.4, 14.2, 21.4, 25.7, 34.2, 38.5, 45.7, 48, 192, 99999], fetusSize: [0, 14.1, 28.3, 56.7, 453, 2721, 11339, 20411, 34019, 54431, 57000, 600000, 600000], fetusRate: [4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4], sizeType: 1} }>> /* Source data for canine include CTR (not head to toe size), so CTR do not apply anywhere, always 1.*/ diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw index a8f4d647cc0faf766f4550fac3d6dea94235df25..e06e9ff130c6de307669d2e68d7dd52c0149729c 100644 --- a/src/js/utilJS.tw +++ b/src/js/utilJS.tw @@ -1219,24 +1219,20 @@ window.originPronounReplace = function(slave) { case "She was the private slave of a con artist cult leader before he had to abandon her and flee.": case "You helped her give birth, leaving her deeply indebted to you.": case "You purchased her from a King after she expressed knowledge of the prince's affair with another servant.": - /* - r = r.replace(/(?<=\s)herself(?=\s|,|\.|;|\?|!)/g, slave.objectReflexive); - r = r.replace(/(?<=\s|^)Herself(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.objectReflexive)); - r = r.replace(/(?<=\s)she(?=\s|,|\.|;|\?|!)/g, slave.pronoun); - r = r.replace(/(?<=\s|^)She(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.pronoun)); - r = r.replace(/(?<=\s)her(?=\s|,|\.|;|\?|!)/g, slave.object); - r = r.replace(/(?<=\s|^)Her(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.object)); - */ + r = r.replace(/\bherself\b/g, slave.objectReflexive); + r = r.replace(/\bHerself\b/g, capFirstChar(slave.objectReflexive)); + r = r.replace(/\bshe\b/g, slave.pronoun); + r = r.replace(/\bShe\b/g, capFirstChar(slave.pronoun)); + r = r.replace(/\bher\b/g, slave.object); + r = r.replace(/\bHer\b/g, capFirstChar(slave.object)); return r; default: - /* - r = r.replace(/(?<=\s)herself(?=\s|,|\.|;|\?|!)/g, slave.objectReflexive); - r = r.replace(/(?<=\s|^)Herself(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.objectReflexive)); - r = r.replace(/(?<=\s)she(?=\s|,|\.|;|\?|!)/g, slave.pronoun); - r = r.replace(/(?<=\s|^)She(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.pronoun)); - r = r.replace(/(?<=\s)her(?=\s|,|\.|;|\?|!)/g, slave.possessive); - r = r.replace(/(?<=\s|^)Her(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.possessive)); - */ + r = r.replace(/\bherself\b/g, slave.objectReflexive); + r = r.replace(/\bHerself\b/g, capFirstChar(slave.objectReflexive)); + r = r.replace(/\bshe\b/g, slave.pronoun); + r = r.replace(/\bShe\b/g, capFirstChar(slave.pronoun)); + r = r.replace(/\bher\b/g, slave.possessive); + r = r.replace(/\bHer\b/g, capFirstChar(slave.possessive)); return r; } };