diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index 4a77399f395454cd849890315253ee53c03114fe..a6908240ed182c5423283046b173f41493b0aebe 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -944,7 +944,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr ''anon'' for putting up with my javascript incompetence. ''anon'' for player family listing. ''anon'' for interchangeable prosthetics, advanced facial surgeries, custom nationality distribution and corporation assets overhaul. -''FCGudder'' for advanced economy reports, image improvements, cleaning and fixing extended-extended family mode and likely one to two of these other anon credits. +''FCGudder'' for advanced economy reports, image improvements, cleaning and fixing extended-extended family mode, extending building widgets, name cleaning and likely one to two of these other anon credits. ''anon'' for filter by assgnment. ''anon'' for forcing dicks onto slavegirls. ''anon'' for forcing dicks into slavegirls and forced slave riding. @@ -956,6 +956,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr ''anon'' for writing forced marriages, extra escape outcomes and more player refreshment types. ''anon'' for global realism stave trade setting. ''anon'' for new recruit events. +''anon'' for expanding the cheat edit menu for slaves. ''thaumx'' for bigger player balls, cum production, self-impregnation and FCTV. ''Bane70'' optimized huge swaths of code with notable professionalism. ''Circle Tritagonist'' provided several new collars and outfits. diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw index 7e0420533b84769efce325f5174cdd4b373ffb24..31aa9e4b687f53ca3cc0c0424095c916ba413414 100644 --- a/src/uncategorized/main.tw +++ b/src/uncategorized/main.tw @@ -193,7 +193,9 @@ __''MAIN MENU''__ //[[Summary Options]]// <<if $sortSlavesBy != "name">>[[Name|Main][$sortSlavesBy = "name"]]<<else>>Name<</if>> | <<if $sortSlavesBy != "assignment">>[[Assignment|Main][$sortSlavesBy = "assignment"]]<<else>>Assignment<</if>> | <<if $sortSlavesBy != "seniority">>[[Seniority purchased|Main][$sortSlavesBy = "seniority"]]<<else>>Seniority<</if>> | - <<if $sortSlavesBy != "age">>[[Age|Main][$sortSlavesBy = "age"]]<<else>>Age<</if>> + <<if $sortSlavesBy != "actualAge">>[[Age|Main][$sortSlavesBy = "actualAge"]]<<else>>Age<</if>> | + <<if $sortSlavesBy != "visualAge">>[[Apparent Age|Main][$sortSlavesBy = "visualAge"]]<<else>>Apparent Age<</if>> | + <<if $sortSlavesBy != "physicalAge">>[[Bodily Age|Main][$sortSlavesBy = "physicalAge"]]<<else>>Bodily Age<</if>> Sort: <<if $sortSlavesOrder != "descending">>[[Descending|Main][$sortSlavesOrder = "descending"]]<<else>>Descending<</if>> | <<if $sortSlavesOrder != "ascending">>[[Ascending|Main][$sortSlavesOrder = "ascending"]]<<else>>Ascending<</if>> diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw index a0767742b771c3a4ceefdf2574cf8b8930352c99..a352754b7825ae7a7d8bd217a434e59f215420a8 100644 --- a/src/uncategorized/summaryOptions.tw +++ b/src/uncategorized/summaryOptions.tw @@ -19,15 +19,19 @@ Slaves are sorted on the main menu by @@.yellow;NAME.@@ <<elseif $sortSlavesBy == "seniority">> Slaves are sorted on the main menu by @@.yellow;SENIORITY.@@ -<<elseif $sortSlavesBy == "age">> - Slaves are sorted on the main menu by @@.yellow;AGE.@@ +<<elseif $sortSlavesBy == "actualAge">> + Slaves are sorted on the main menu by @@.yellow;TRUE AGE.@@ +<<elseif $sortSlavesBy == "visualAge">> + Slaves are sorted on the main menu by @@.yellow;APPARENT AGE.@@ +<<elseif $sortSlavesBy == "physicalAge">> + Slaves are sorted on the main menu by @@.yellow;BODILY AGE.@@ <<elseif $sortSlavesBy == "assignment">> Slaves are sorted on the main menu by @@.yellow;ASSIGNMENT.@@ <<else>> Slaves are sorted on the main menu by @@.yellow;DEVOTION.@@ <</if>> -//[[Devotion|Summary Options][$sortSlavesBy = "devotion"]] | [[Name|Summary Options][$sortSlavesBy = "name"]] | [[Assignment|Summary Options][$sortSlavesBy = "assignment"]] | [[Date purchased|Summary Options][$sortSlavesBy = "seniority"]] | [[Age|Summary Options][$sortSlavesBy = "age"]]// +//[[Devotion|Summary Options][$sortSlavesBy = "devotion"]] | [[Name|Summary Options][$sortSlavesBy = "name"]] | [[Assignment|Summary Options][$sortSlavesBy = "assignment"]] | [[Date purchased|Summary Options][$sortSlavesBy = "seniority"]] | [[Age|Summary Options][$sortSlavesBy = "actualAge"]] | [[How old they look|Summary Options][$sortSlavesBy = "visualAge"]] | [[Age of their body|Summary Options][$sortSlavesBy = "physicalAge"]]// <br> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 4d04ee7b84b350b2fe8318033076032f6f120d17..f6f7281badf05ade279fb3685cd063a46f22f5df 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -1661,11 +1661,23 @@ Call as <<SlaveSort [$slaves]>> <<else>> <<set $args[0] = $args[0].sort(function(a, b){return a.weekAcquired-b.weekAcquired})>> <</if>> - <<case "age">> + <<case "actualAge">> <<if ($sortSlavesOrder == "ascending")>> - <<set $args[0] = $args[0].sort(function(a, b){return a.age-b.age})>> + <<set $args[0] = $args[0].sort(function(a, b){return a.actualAge-b.actualAge})>> <<else>> - <<set $args[0] = $args[0].sort(function(a, b){return b.age-a.age})>> + <<set $args[0] = $args[0].sort(function(a, b){return b.actualAge-a.actualAge})>> + <</if>> + <<case "visualAge">> + <<if ($sortSlavesOrder == "ascending")>> + <<set $args[0] = $args[0].sort(function(a, b){return a.visualAge-b.visualAge})>> + <<else>> + <<set $args[0] = $args[0].sort(function(a, b){return b.visualAge-a.visualAge})>> + <</if>> + <<case "physicalAge">> + <<if ($sortSlavesOrder == "physicalAge")>> + <<set $args[0] = $args[0].sort(function(a, b){return a.physicalAge-b.physicalAge})>> + <<else>> + <<set $args[0] = $args[0].sort(function(a, b){return b.physicalAge-a.physicalAge})>> <</if>> <<default>> <<if ($sortSlavesOrder == "ascending")>>