From 8ce8a74e2ec1b34b597a6abcfe7566ab62cba7d2 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 13 Nov 2017 20:30:10 -0500
Subject: [PATCH] fixes to name linking widgets, fixes, and scalemail to the
RA.
---
src/gui/Encyclopedia/encyclopedia.tw | 2 +-
src/uncategorized/randomIndividualEvent.tw | 2 ++
src/uncategorized/rulesAssistant.tw | 6 ++++++
src/utility/miscWidgets.tw | 25 ++--------------------
4 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 41420236c87..c36ec352dd4 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2552,7 +2552,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
<br>''anon'' for considerable bugfixing, most notably that infernal reputation bug.
<br>''anon'' added a pair of fairy PA appearances.
<br>''anon'' for their clitoral surgery, SMRs, and hip changes.
-<br>''anon'' for the Scotts, Belarus, Dominicans, gilfwork and additional nicknames.
+<br>''DarkTalon25'' for the Scotts, Belarus, Dominicans, gilfwork, additional nicknames and a scalemail bikini.
<br>''anon'' for FAbuse alterations, gang leader start, and scarring.
<br>''anon'' for numerous pointed out typos.
<br>''anon'' for grorious nihon starting rocation.
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 926523e3717..755ce0d0c31 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -953,6 +953,7 @@
<</if>>
<</if>>
<</if>>
+<</if>>
<<if $eventSlave.trust > 20>>
<<if $eventSlave.devotion > 20>>
@@ -1425,6 +1426,7 @@
<<set $RESSevent.push("nice guys")>>
<</if>>
<</if>>
+<</if>>
<<if $eventSlave.assignment == "please you">>
<<if $eventSlave.devotion > 20>>
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index 2a46f4f0a0a..55b6268a665 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -531,6 +531,12 @@ Clothes:
<<RARuleModified>>
<</link>>
|
+<<link "Scalemail bikini">>
+ <<set $currentRule.clothes = "a scalemail bikini">>
+ <<RAChangeClothes>>
+ <<RARuleModified>>
+<</link>>
+|
<<link "Succubus costume">>
<<set $currentRule.clothes = "a succubus outfit">>
<<RAChangeClothes>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 77461b287d6..4aa835b8da9 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -2786,34 +2786,13 @@ This experience
Call as <<EventNameLink>>
$args[0]: Slave.
*/
-<<widget "EventNameLink">>
- <<switch $args[0].nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
- <<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>>
- <<default>>
- <<set _name = $args[0].slaveName>>
- <<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>>
- <</switch>>
- /*
- <<switch $activeSlave.nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">>
- <<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname + " " + $args[0].slaveName>><</if>>
- <<default>>
- <<if $args[0].slaveSurname>><<set _name = $args[0].slaveName + " " + $args[0].slaveSurname>><</if>>
- <</switch>>
- */
- <span id="name"><<print "[[_name|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span>
-<</widget>>
+<<widget "EventNameLink">><<switch $args[0].nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian" "Mongolian">><<if $args[0].slaveSurname>><<set _name = $args[0].slaveSurname>><<set _name += " " + $args[0].slaveName>><<else>><<set _name = $args[0].slaveName>><</if>><<default>><<set _name = $args[0].slaveName>><<if $args[0].slaveSurname>><<set _name += " " + $args[0].slaveSurname>><</if>><</switch>><span id="name"><<print "[[_name|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span><</widget>>
/*
Call as <<EventNameDelink>>
$args[0]: Slave.
*/
-<<widget "EventNameDelink">>
- <<replace "#name">>
- <<SlaveFullName $args[0]>>
- <</replace>>
-<</widget>>
+<<widget "EventNameDelink">><<replace "#name">><<SlaveFullName $args[0]>><</replace>><</widget>>
/*
Call as <<DegradingName $slave>> where $slave is any slave object
--
GitLab