fix abduction NPCs

sugarcube/src/locations/pavlov/brothel/abduction.tw

@@ -7,7 +7,7 @@
 		<<image "locations/shared/brothel/roombedtied.jpg">>
 		<<npc 'brothel_bar' undefined 'The barman'>><</npc>> drops you on the bed face down, stripped you and tied your hands and feet to the corners of the bed.
 		You are barely able to resist, giving minimal resistance to your aggressor.
-		<<say 'brothel_bar' '"Ha slut! Now you will get another drink from me, the freshest one!"'>>
+		<<say 'brothel_bar' "Ha slut! Now you will get another drink from me, the freshest one!">>
 		<<act 'Continue'>>
 			<<gt 'brothel_abduction' '1'>>
 		<</act>>

sugarcube/src/locations/pavlov/brothel/brothel.ts

@@ -1,4 +1,6 @@
 /// <reference path="../../../items/consumables/consumableMenus.ts" />
+/// <reference path="../../../npcs/_system/NPCAccessor.ts" />
+
 
 setup.consumableMenus.brothel = {
     payment:'both',
@@ -21,4 +23,46 @@ setup.consumableMenus.brothel = {
             }
         },
     }
-};
+};
+
+setup.npcs["brothel_bar"] = {
+	firstname:'Mirchik',
+	lastname:'Zhukov',
+	usedname:'The barman',
+	notes:'The barman of the hotel near the main road of Pavlovsk',
+	hotcat_rating:6,
+	intel:60,
+	defaults:['defaults'],
+	//nameknown: false,
+	rel: 50,
+	image: 'locations/shared/brothel/barman.jpg',
+	gender:EGender.MALE
+}
+
+setup.npcs["brothel_rec"] = {
+	firstname:'Nikolai',
+	lastname:'Zhukov',
+	usedname:'Receptionist',
+	notes:'',
+	hotcat_rating:4,
+	intel:70,
+	defaults:['defaults'],
+	//nameknown: false,
+	rel: 50,
+	image: 'locations/shared/brothel/receptionist.jpg',
+	gender:0
+}
+
+setup.npcs["brothel_sec"] = {
+	firstname:'Kristian',
+	lastname:'Chomski',
+	usedname:'Bouncer',
+	notes:'',
+	hotcat_rating:9,
+	intel:60,
+	defaults:['defaults'],
+	//nameknown: false,
+	rel: 50,
+	image: 'locations/shared/brothel/bouncer.jpg',
+	gender:0
+}

sugarcube/src/locations/pavlov/brothel/brothel.tw

@@ -1,47 +1,3 @@
-:: brothel_scripts[script]
-setup.npcs ??= {};
-setup.npcs["brothel_bar"] = {
-	firstname:'Mirchik',
-	lastname:'Zhukov',
-	usedname:'The barman',
-	notes:'The barman of the hotel near the main road of Pavlovsk',
-	hotcat_rating:6,
-	intel:60,
-	defaults:['defaults'],
-	nameknown: false,
-	rel: 50,
-	image: 'locations/shared/brothel/barman.jpg',
-	gender:0
-}
-
-setup.npcs["brothel_rec"] = {
-	firstname:'Nikolai',
-	lastname:'Zhukov',
-	usedname:'Receptionist',
-	notes:'',
-	hotcat_rating:4,
-	intel:70,
-	defaults:['defaults'],
-	nameknown: false,
-	rel: 50,
-	image: 'locations/shared/brothel/receptionist.jpg',
-	gender:0
-}
-
-setup.npcs["brothel_sec"] = {
-	firstname:'Kristian',
-	lastname:'Chomski',
-	usedname:'Bouncer',
-	notes:'',
-	hotcat_rating:9,
-	intel:60,
-	defaults:['defaults'],
-	nameknown: false,
-	rel: 50,
-	image: 'locations/shared/brothel/bouncer.jpg',
-	gender:0
-}
-
 :: brothel_deprecated[deprecated]
 <<set $here = 'brothel'>>
 <<set $ARGS = $location_var[$here]>>