diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index e2ef6334bbe0c6b78170113d024b8473e91329d4..9da28d8774b5718075d06aa7d1ea30e2e2ac7140 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,14 @@ 0.10.7.1-0.5.x +7/27/2018 + + 7 + -fixes + -more widget to JS conversion + -lots more implementation of pronouns + -anon's hpreg event + 7/26/2018 6 diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index 7c4b714933c767e41c86234df4b84048f3398abe..6086e044fde5cbf4607fa69270c3e0c9af2d3949 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -510,7 +510,7 @@ <<elseif (_Slave.indentureRestrictions > 1)>> <br>//_Slave.slaveName's indenture forbids fighting.// <<continue>> - <<elseif (_Slave.breedingMark != 1 || $propOutcome == 0)>> + <<elseif _Slave.breedingMark == 1 && $propOutcome == 1>> <br>//_Slave.slaveName may not participate in combat// <<continue>> <<else>>