From c587a44ad103180720d09d683ebfcc3cf48a32f1 Mon Sep 17 00:00:00 2001
From: aevojoey <aevojoey412@gmail.com>
Date: Sat, 2 Jan 2016 19:57:52 -0500
Subject: [PATCH] .06.02.25 - Major rewrite of Slave Market to allow sending
 girls anywhere when purchased

---
  crazys-wm-mod/BrothelMaster-vse2013.v12.suo  | Bin 317952 -> 317440 bytes
 .../J_1024x768/slavemarket_screen.xml         |  43 +-
  crazys-wm-mod/Revision.h                     |   2 +-
  crazys-wm-mod/WorkHealing.cpp                |  16 +-
  crazys-wm-mod/cGirls.h                       |   4 +-
  crazys-wm-mod/cScreenSlaveMarket.cpp         | 460 ++++++++++++------
  crazys-wm-mod/cScreenSlaveMarket.h           |  46 +-
  crazys-wm-mod/changelog-j2.txt               |  11 +
 8 files changed, 410 insertions(+), 172 deletions(-)

diff --git a/ crazys-wm-mod/BrothelMaster-vse2013.v12.suo b/ crazys-wm-mod/BrothelMaster-vse2013.v12.suo
index 7a950602da7659ce33c0d395bb8a4312ede97ea0..08a3a08e04f4c631273bb015350ee9fb084cd318 100644
GIT binary patch
delta 13323
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
Iw#lyl6BB>h1poj5

delta 14037
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

diff --git a/ crazys-wm-mod/Resources/Interface/J_1024x768/slavemarket_screen.xml b/ crazys-wm-mod/Resources/Interface/J_1024x768/slavemarket_screen.xml
index d4e2950de..93bdc9fef 100644
--- a/ crazys-wm-mod/Resources/Interface/J_1024x768/slavemarket_screen.xml	
+++ b/ crazys-wm-mod/Resources/Interface/J_1024x768/slavemarket_screen.xml	
@@ -1,13 +1,34 @@
 <Screen>
-<Window	Name="Slave Market Window"				XPos="16"	YPos="12"	Width="768"	Height="576"	Border="1"	/>
-<Button  	Name="BackButton"	Image="Back"			XPos="600"	YPos="540"	Width="160"	Height="32"	Transparency="true"	Scale="true"	/>
-<Button  	Name="ShowMoreButton"	Image="ShowMore"		XPos="376"	YPos="540"	Width="160"	Height="32"	Transparency="true"	Scale="true"	/>
-<Button  	Name="BuySlaveButton"	Image="BuySlave"		XPos="184"	YPos="540"	Width="160"	Height="32"	Transparency="true"	Scale="true"	/>
-<Text    	Name="CurrentBrothel"	Text=""			XPos="4"	YPos="0"	Width="232"	Height="30"	FontSize="14"	/>
-<Text    	Name="ScreenHeader"	Text="Slave Market"	XPos="256"	YPos="8"	Width="304"	Height="32"	FontSize="20"	/>
-<ListBox	Name="SlaveList"						XPos="8"	YPos="398"	Width="160"	Height="162"	Border="1"	Events="true"	Multi="true"	/>
-<ListBox	Name="TraitList"						XPos="616"	YPos="8"	Width="144"	Height="363"	Border="1"	Events="true"	Multi="false"	/>
-<Text    	Name="SlaveDetails"	Text=""			XPos="8"	YPos="40"	Width="160"	Height="350"	FontSize="9"	/>
-<Text    	Name="TraitDesc"	Text=""				XPos="616"	YPos="371"	Width="144"	Height="149"	FontSize="10"	/>
-<Image	Name="SlaveImage"	File="blank.png"			XPos="176"	YPos="40"	Width="432"	Height="480"	/>
+<Window  Name="Slave Market Window"                           XPos="0"   YPos="0"   Width="800" Height="600" Border="1"         />
+<Text    Name="SlaveMarket"     Text="Slave Market"           XPos="16"   YPos="8"   Width="140" Height="32"  FontSize="25" Red="128"         />
+<Text    Name="Gold"            Text="Gold: 0"                XPos="630" YPos="8"   Width="220" Height="32"  FontSize="20"         />
+
+<ListBox Name="SlaveList"                                     XPos="630" YPos="40"  Width="160" Height="250" Border="1"         Events="true"         Multi="true"         />
+<Button  Name="BuySlaveButton"  Image="BuySlave"              XPos="630" YPos="300" Width="160" Height="32"  Transparency="true"         Scale="true"         />
+<Text    Name="GirlDesc"        Text=""                       XPos="630" YPos="340" Width="160" Height="200" FontSize="10"         />
+<Button  Name="BackButton"      Image="Back"                  XPos="630" YPos="540" Width="160" Height="32" Transparency="true" Scale="true" />
+
+<Text    Name="SlaveDetails"    Text=""                       XPos="8"   YPos="40"  Width="140" Height="350" FontSize="9"         />
+<Button  Name="ShowMoreButton"  Image="ShowMore"              XPos="18"  YPos="400" Width="120" Height="24"  Transparency="true"         Scale="true"         />
+<Text    Name="TraitListT"                                    XPos="8"   YPos="430" Width="140" Height="160" FontSize="9"         />
+
+<Image   Name="SlaveImage"      File="blank.png"              XPos="160" YPos="8"  Width="460" Height="510" />
+
+<Text    Name="ReleaseTo"  Text="Send Girl to: Brothel 0"     XPos="176" YPos="525" Width="350" Height="22"  FontSize="16" />
+<Text    Name="RoomsFree"  Text="Room for # more girls."      XPos="450" YPos="525" Width="200" Height="22"  FontSize="12" />
+<Button  Name="Brothel0"     Image="Brothel"      Disabled="" XPos="020" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />
+<Button  Name="Brothel1"     Image="Brothel2"     Disabled="" XPos="060" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />      
+<Button  Name="Brothel2"     Image="Brothel3"     Disabled="" XPos="100" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />      
+<Button  Name="Brothel3"     Image="Brothel4"     Disabled="" XPos="140" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />      
+<Button  Name="Brothel4"     Image="Brothel5"     Disabled="" XPos="180" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />
+<Button  Name="Brothel5"     Image="Brothel6"     Disabled="" XPos="220" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />
+<Button  Name="Brothel6"     Image="Brothel7"     Disabled="" XPos="260" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />
+<Button  Name="Studio"       Image="Studio"       Disabled="" XPos="340" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />
+<Button  Name="Arena"        Image="Arena"        Disabled="" XPos="380" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />
+<Button  Name="Centre"       Image="Centre"       Disabled="" XPos="420" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />      
+<Button  Name="Clinic"       Image="Clinic"       Disabled="" XPos="460" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />
+<Button  Name="Farm"         Image="Farm"         Disabled="" XPos="500" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />
+<Button  Name="House"        Image="House"        Disabled="" XPos="540" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />
+<Button  Name="Dungeon"      Image="SlaveMarket"  Disabled="" XPos="580" YPos="550" Width="32"  Height="32"  Transparency="true" Scale="true" />
+
 </Screen>
\ No newline at end of file
diff --git a/ crazys-wm-mod/Revision.h b/ crazys-wm-mod/Revision.h
index 4bd795065..515f42be5 100644
--- a/ crazys-wm-mod/Revision.h	
+++ b/ crazys-wm-mod/Revision.h	
@@ -1 +1 @@
-static char svn_revision[] = "Crazy and PP's mod version .06.02.24";
\ No newline at end of file
+static char svn_revision[] = "Crazy and PP's mod version .06.02.25";
\ No newline at end of file
diff --git a/ crazys-wm-mod/WorkHealing.cpp b/ crazys-wm-mod/WorkHealing.cpp
index 0df7a38cb..1366e0cdd 100644
--- a/ crazys-wm-mod/WorkHealing.cpp	
+++ b/ crazys-wm-mod/WorkHealing.cpp	
@@ -133,12 +133,12 @@ bool cJobManager::WorkHealing(sGirl* girl, sBrothel* brothel, bool Day0Night1, s
 	return false;
 }
 
-double cJobManager::JP_Healing(sGirl* girl, bool estimate)
-{
-	if (g_Girls.HasTrait(girl, "Construct")) return -1000;
-	double jobperformance = 1.0;
-	jobperformance += (100 - girl->health());
-	jobperformance += (100 - girl->happiness());
-	jobperformance += girl->tiredness();
-	return jobperformance;
+double cJobManager::JP_Healing(sGirl* girl, bool estimate)
+{
+	if (g_Girls.HasTrait(girl, "Construct")) return -1000;
+	double jobperformance = 1.0;
+	jobperformance += (100 - girl->health());
+	jobperformance += (100 - girl->happiness());
+	jobperformance += girl->tiredness();
+	return jobperformance;
 }
\ No newline at end of file
diff --git a/ crazys-wm-mod/cGirls.h b/ crazys-wm-mod/cGirls.h
index 4c86882fa..f78051397 100644
--- a/ crazys-wm-mod/cGirls.h	
+++ b/ crazys-wm-mod/cGirls.h	
@@ -334,12 +334,12 @@ struct sGirl
 
 	vector<string> m_Canonical_Daughters;
 
-	bool m_InClinic;
 	bool m_InStudio;
 	bool m_InArena;
 	bool m_InCentre;
-	bool m_InHouse;
+	bool m_InClinic;
 	bool m_InFarm;
+	bool m_InHouse;
 	int where_is_she;
 	int m_PrevWorkingDay;						// `J` save the last count of the number of working days
 	int m_WorkingDay;							// count the number of working day
diff --git a/ crazys-wm-mod/cScreenSlaveMarket.cpp b/ crazys-wm-mod/cScreenSlaveMarket.cpp
index 238a9a475..4c7a89030 100644
--- a/ crazys-wm-mod/cScreenSlaveMarket.cpp	
+++ b/ crazys-wm-mod/cScreenSlaveMarket.cpp	
@@ -16,7 +16,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <vector>
 #include "cBrothel.h"
+#include "main.h"
 #include "cScreenSlaveMarket.h"
 #include "cWindowManager.h"
 #include "cGold.h"
@@ -56,7 +58,10 @@ extern	bool	g_X_Key;
 extern	bool	g_C_Key;
 extern	int		g_CurrentScreen;
 
+static string ReleaseGirlToWhere = "Br0";
+
 bool cScreenSlaveMarket::ids_set = false;
+cTariff tariff;
 
 void cScreenSlaveMarket::set_ids()
 {
@@ -67,10 +72,32 @@ void cScreenSlaveMarket::set_ids()
 	cur_brothel_id = get_id("CurrentBrothel");
 	slave_list_id = get_id("SlaveList");
 	trait_list_id = get_id("TraitList");
+	trait_list_text_id = get_id("TraitListT");
 	details_id = get_id("SlaveDetails");
 	trait_id = get_id("TraitDesc");
+	girl_desc_id = get_id("GirlDesc");
 	slave_image_id = get_id("SlaveImage");
 	header_id = get_id("ScreenHeader");
+	gold_id = get_id("Gold");
+	slave_market_id = get_id("SlaveMarket");
+
+	releaseto_id = get_id("ReleaseTo");
+	roomsfree_id = get_id("RoomsFree");
+
+	brothel0_id = get_id("Brothel0");
+	brothel1_id = get_id("Brothel1");
+	brothel2_id = get_id("Brothel2");
+	brothel3_id = get_id("Brothel3");
+	brothel4_id = get_id("Brothel4");
+	brothel5_id = get_id("Brothel5");
+	brothel6_id = get_id("Brothel6");
+	house_id = get_id("House");
+	clinic_id = get_id("Clinic");
+	studio_id = get_id("Studio");
+	arena_id = get_id("Arena");
+	centre_id = get_id("Centre");
+	farm_id = get_id("Farm");
+	dungeon_id = get_id("Dungeon");
 }
 
 void cScreenSlaveMarket::init()
@@ -88,12 +115,45 @@ void cScreenSlaveMarket::init()
 	if (cfg.debug.log_girls()) g_LogFile.os() << "setting up slave market: genGirls = " << g_GenGirls << endl;
 
 	ImageNum = -1;
-	string brothel = gettext("Current Brothel: ");
-	brothel += g_Brothels.GetName(g_CurrBrothel);
-	EditTextItem(brothel, cur_brothel_id);
+	stringstream ss;
+	if (cur_brothel_id >= 0)
+	{
+		ss << "Current Brothel: " << g_Brothels.GetName(g_CurrBrothel);
+		EditTextItem(ss.str(), cur_brothel_id);
+	}
 
-	// clear the list
-	ClearListBox(slave_list_id);
+	string sub = ReleaseGirlToWhere.substr(0, 2);
+	sBrothel *releaseto = g_Brothels.GetBrothel(g_CurrBrothel);
+	char a = ReleaseGirlToWhere[2]; char b = "0"[0]; int sendtonum = a - b;	// `J` cheap fix to get brothel number
+	/* */if (sub == "Br") releaseto = g_Brothels.GetBrothel(sendtonum);
+	else if (sub == "Ho") releaseto = g_House.GetBrothel(sendtonum);
+	else if (sub == "Cl") releaseto = g_Clinic.GetBrothel(sendtonum);
+	else if (sub == "St") releaseto = g_Studios.GetBrothel(sendtonum);
+	else if (sub == "Ar") releaseto = g_Arena.GetBrothel(sendtonum);
+	else if (sub == "Ce") releaseto = g_Centre.GetBrothel(sendtonum);
+	else if (sub == "Fa") releaseto = g_Farm.GetBrothel(sendtonum);
+	else if (sub == "Du") releaseto = g_Brothels.GetBrothel(0);
+
+	ss.str("");
+	ss << "Send Girl to: " << (sub == "Du" ? "The Dungeon" : releaseto->m_Name);
+	EditTextItem(ss.str(), releaseto_id);
+	ss.str("");
+	if (sub != "Du") ss << "Room for " << releaseto->free_rooms() << " more girls.";
+	EditTextItem(ss.str(), roomsfree_id);
+
+	HideButton(brothel1_id, g_Brothels.GetNumBrothels() < 2 || g_Brothels.GetBrothel(1) == 0);
+	HideButton(brothel2_id, g_Brothels.GetNumBrothels() < 3 || g_Brothels.GetBrothel(2) == 0);
+	HideButton(brothel3_id, g_Brothels.GetNumBrothels() < 4 || g_Brothels.GetBrothel(3) == 0);
+	HideButton(brothel4_id, g_Brothels.GetNumBrothels() < 5 || g_Brothels.GetBrothel(4) == 0);
+	HideButton(brothel5_id, g_Brothels.GetNumBrothels() < 6 || g_Brothels.GetBrothel(5) == 0);
+	HideButton(brothel6_id, g_Brothels.GetNumBrothels() < 7 || g_Brothels.GetBrothel(6) == 0);
+	HideButton(clinic_id, g_Clinic.GetNumBrothels()		< 1 || g_Clinic.GetBrothel(0) == 0);
+	HideButton(studio_id, g_Studios.GetNumBrothels()	< 1 || g_Studios.GetBrothel(0) == 0);
+	HideButton(arena_id, g_Arena.GetNumBrothels()		< 1 || g_Arena.GetBrothel(0) == 0);
+	HideButton(centre_id, g_Centre.GetNumBrothels()		< 1 || g_Centre.GetBrothel(0) == 0);
+	HideButton(farm_id, g_Farm.GetNumBrothels()			< 1 || g_Farm.GetBrothel(0) == 0);
+
+	ClearListBox(slave_list_id);	// clear the list
 
 	int numgirls = g_Dice.bell(cfg.slavemarket.slavesnewweeklymin(), cfg.slavemarket.slavesnewweeklymax());
 
@@ -183,11 +243,19 @@ void cScreenSlaveMarket::init()
 	*/
 	g_GenGirls = (g_Cheats) ? false : true;
 
-	string message = gettext("Slave Market, ");
-	message += g_Gold.sval();
-	message += gettext(" gold");
-	EditTextItem(message, header_id);
-
+	if (header_id >= 0)
+	{
+		ss.str("");
+		ss << "Slave Market, " << g_Gold.sval() << gettext(" gold");
+		EditTextItem(ss.str(), header_id);
+	}
+	if (gold_id >= 0)
+	{
+		ss.str("");
+		ss << "Gold:  " << g_Gold.sval();
+		EditTextItem(ss.str(), gold_id);
+	}
+	
 	// Finds the first girl in the selection, so she is highlighted. This stops the No girl selected that was normal before. --PP
 	for (int i = numgirls-1; i > -1; i--)
 	{
@@ -198,7 +266,9 @@ void cScreenSlaveMarket::init()
 	// if there is still as selection (a non empty slave list) then highlight the current selection
 	if (selection >= 0) SetSelectedItemInList(slave_list_id, selection, true);
 	// now we need to populate the trait box
-	ClearListBox(trait_list_id);
+	if (trait_list_id >= 0) ClearListBox(trait_list_id);
+	if (trait_list_text_id >= 0) EditTextItem("Traits:", trait_list_text_id);
+	if (girl_desc_id >= 0)	EditTextItem("", girl_desc_id);
 	int tmp = GetLastSelectedItemFromList(slave_list_id);
 	// if the last item was -1 I assume the list is empty so we can go home early (and probably should have earlier still)
 	if (tmp == -1) return;
@@ -209,14 +279,7 @@ void cScreenSlaveMarket::init()
 		g_LogFile.os() << "error: null pointer for cursor entry in market" << endl;
 		return;
 	}
-	// loop through her traits, populating the box
-	for (int i = 0; i < MAXNUM_TRAITS; i++)
-	{
-		if (!g->m_Traits[i]) continue;
-		AddToListBox(trait_list_id, i, g_Traits.GetTranslateName(g->m_Traits[i]->m_Name));
-	}
-	// and finally, highlight the selected entry?
-	SetSelectedItemInList(trait_list_id, 0);
+	preparescreenitems(g);
 }
 
 bool cScreenSlaveMarket::check_keys()
@@ -253,42 +316,67 @@ bool cScreenSlaveMarket::check_keys()
 	}
 	if (g_SpaceKey)
 	{
-		cTariff tariff;
-		sGirl *girl = MarketSlaveGirls[selection];
-		g_SpaceKey = false;
-		for (selection = multi_slave_first(); selection != -1; selection = multi_slave_next())
-		{
-			girl = MarketSlaveGirls[selection];
-			int cost = tariff.slave_buy_price(girl);
-			cerr << "Selection = " << selection << ", girl = " << girl->m_Realname << endl;
-			// can the player afford this particular playmate?
-			if (g_Gold.slave_cost(cost) == false)
-			{
-				string text = "You don't have enough money to purchase ";
-				text += girl->m_Realname;
-				g_MessageQue.AddToQue(text, 0);
-				break;
-			}
+		return buy_slaves();
+	}
+	return false;
+}
 
-			sBrothel* brothel = g_Brothels.GetBrothel(g_CurrBrothel);
-			string text = get_buy_slave_string(girl);
-			if (g_Girls.GetRebelValue(girl, false) >= 35 || (brothel->m_NumRooms - brothel->m_NumGirls) == 0)
-			{
-				g_MessageQue.AddToQue(text, 0);
-				g_Brothels.GetDungeon()->AddGirl(girl, DUNGEON_NEWSLAVE);
-			}
-			else
-			{
-				g_MessageQue.AddToQue(text, 0);
-				g_Brothels.AddGirl(g_CurrBrothel, girl);
-			}
-			EditTextItem("", details_id);
-			MarketSlaveGirls[selection] = 0;
-		}
-		selection = -1;
+bool cScreenSlaveMarket::check_events()
+{
+	sGirl *girl = MarketSlaveGirls[selection];
+
+	if (g_InterfaceEvents.GetNumEvents() == 0) return true;	// no events means we can go home
+
+	// if it's the back button, pop the window off the stack and we're done
+	if (g_InterfaceEvents.CheckButton(back_id))
+	{
+		girl = 0;
 		g_InitWin = true;
+		g_WinManager.Pop();
+		return true;
+	}
+
+	if (g_InterfaceEvents.CheckButton(buy_slave_id))
+	{
+		return buy_slaves();
+	}
+	if (g_InterfaceEvents.CheckButton(more_id))
+	{
+		if (DetailLevel == 0)		{ DetailLevel = 1; EditTextItem(g_Girls.GetMoreDetailsString(girl, true), details_id); }
+		else if (DetailLevel == 1)	{ DetailLevel = 2; EditTextItem(g_Girls.GetThirdDetailsString(girl), details_id); }
+		else						{ DetailLevel = 0; EditTextItem(g_Girls.GetDetailsString(girl, true), details_id); }
+		return true;
+	}
+	if (g_InterfaceEvents.CheckListbox(trait_list_id))
+	{
+		int tmp = GetLastSelectedItemFromList(trait_list_id);
+		selection = GetLastSelectedItemFromList(slave_list_id);
+		if (tmp != -1 && selection != -1 && MarketSlaveGirls[selection]->m_NumTraits > 0)
+		{
+			if (tmp > MarketSlaveGirls[selection]->m_NumTraits)	tmp = 0;
+			if (trait_id >= 0)	EditTextItem(MarketSlaveGirls[selection]->m_Traits[tmp]->m_Desc, trait_id);
+		}
+		else if (trait_id >= 0)	EditTextItem("", trait_id);
 		return true;
 	}
+	if (g_InterfaceEvents.CheckListbox(slave_list_id)) return change_selected_girl();
+
+
+	/* */if (g_InterfaceEvents.CheckButton(brothel0_id))	change_release("Br0");
+	else if (g_InterfaceEvents.CheckButton(brothel1_id))	change_release("Br1");
+	else if (g_InterfaceEvents.CheckButton(brothel2_id))	change_release("Br2");
+	else if (g_InterfaceEvents.CheckButton(brothel3_id))	change_release("Br3");
+	else if (g_InterfaceEvents.CheckButton(brothel4_id))	change_release("Br4");
+	else if (g_InterfaceEvents.CheckButton(brothel5_id))	change_release("Br5");
+	else if (g_InterfaceEvents.CheckButton(brothel6_id))	change_release("Br6");
+	else if (g_InterfaceEvents.CheckButton(house_id))		change_release("Ho0");
+	else if (g_InterfaceEvents.CheckButton(clinic_id))		change_release("Cl0");
+	else if (g_InterfaceEvents.CheckButton(studio_id))		change_release("St0");
+	else if (g_InterfaceEvents.CheckButton(arena_id))		change_release("Ar0");
+	else if (g_InterfaceEvents.CheckButton(centre_id))		change_release("Ce0");
+	else if (g_InterfaceEvents.CheckButton(farm_id))		change_release("Fa0");
+	else if (g_InterfaceEvents.CheckButton(dungeon_id))		change_release("Du0");
+
 	return false;
 }
 
@@ -301,19 +389,160 @@ void cScreenSlaveMarket::process()
 	HideImage(slave_image_id, (selection == -1));	// hide/show image based on whether a girl is selected
 	if (selection == -1)							// if no girl is selected, clear girl info
 	{
-		EditTextItem(gettext("No girl selected"), details_id);
-		EditTextItem("", trait_id);
+		EditTextItem("No girl selected", details_id);
+		if (trait_id >= 0) EditTextItem("", trait_id);
 	}
 	// nothing selected == nothing further to do
 	int index = selected_item();
 	if (index == -1) return;
-	sGirl *girl;
-	girl = MarketSlaveGirls[index];
-	if (!girl)
+	sGirl* girl = MarketSlaveGirls[index];
+	if (!girl) g_LogFile.os() << "... no girl at index " << index << "- returning " << endl;
+}
+
+bool cScreenSlaveMarket::buy_slaves()
+{
+	g_SpaceKey = false;
+	stringstream ss;
+	stringstream sendtotext;
+	// set the brothel
+	sBrothel *brothel = g_Brothels.GetBrothel(g_CurrBrothel);
+	string sub = ReleaseGirlToWhere.substr(0, 2);
+	char a = ReleaseGirlToWhere[2]; char b = "0"[0]; int sendtonum = a - b;	// `J` cheap fix to get brothel number
+	if (sub == "Du") sendtotext << "the Dungeon";
+	else
 	{
-		g_LogFile.os() << "... no girl at index " << index << "- returning " << endl;
-		return;
+		/* */if (sub == "Br")	{ brothel = g_Brothels.GetBrothel(sendtonum);	sendtotext << "your brothel: " << brothel->m_Name;	}
+		else if (sub == "Ho")	{ brothel = g_House.GetBrothel(sendtonum);		sendtotext << "your House";							}
+		else if (sub == "Cl")	{ brothel = g_Clinic.GetBrothel(sendtonum);		sendtotext << "the Clinic";							}
+		else if (sub == "St")	{ brothel = g_Studios.GetBrothel(sendtonum);	sendtotext << "the Studio";							}
+		else if (sub == "Ar")	{ brothel = g_Arena.GetBrothel(sendtonum);		sendtotext << "the Arena";							}
+		else if (sub == "Ce")	{ brothel = g_Centre.GetBrothel(sendtonum);		sendtotext << "the Community Centre";				}
+		else if (sub == "Fa")	{ brothel = g_Farm.GetBrothel(sendtonum);		sendtotext << "the Farm";							}
+	}
+
+	// set the girls
+	sGirl *girl = MarketSlaveGirls[selection];
+	vector<string> girlsnames;
+
+	int totalcost = 0;
+	for (int sel = multi_slave_first(); sel != -1; sel = multi_slave_next())
+	{
+		girl = MarketSlaveGirls[sel];
+		totalcost += tariff.slave_buy_price(girl);
+		girlsnames.push_back(girl->m_Realname);
+	}
+
+	// Check if there is enough room where we want to send her
+	if (sub != "Du")	// Dungeon has no limit so don't bother checking if sending them there.
+	{
+		if (brothel->free_rooms() < 0)
+		{
+			g_MessageQue.AddToQue("The current building has no more room.\nChoose another building to send them to.", 0);
+			return false;
+		}
+		if (brothel->free_rooms() < (int)girlsnames.size())
+		{
+			g_MessageQue.AddToQue("The current building does not have enough room for all the girls you want to send there.\nChoose another building or select fewer girls at a time to buy.", 0);
+			return false;
+		}
 	}
+
+	// `J` check if we can afford all the girls selected
+	if (!g_Gold.slave_cost(totalcost))	// this pays for them if you can afford them
+	{									// otherwise this part runs and returns a fail message.
+		stringstream text;
+		if (girlsnames.size() > 4 && g_Gold.ival() < totalcost / 2) text << "Calm down!  ";
+		text << "You don't have enough money to purchase ";
+		if (girlsnames.size() == 1) text << girlsnames[0];
+		else
+		{
+			if (girlsnames.size() == 2) text << "these two";
+			else if (girlsnames.size() == 3) text << "these three";
+			else text << girlsnames.size();
+			text << " girls";
+		}
+		text << ".";
+		g_MessageQue.AddToQue(text.str(), 0);
+		return false;
+	}
+
+	// `J` we could afford the girls so lets get to it
+	ss << "You buy ";
+
+	/* */if (girlsnames.size() == 1)	ss << "a girl,   " << girlsnames[0] << "   and send her to " << sendtotext.str();
+	else if (girlsnames.size() == 2)	ss << "two girls,   " << girlsnames[0] << "   and   " << girlsnames[1] << ". You send them to " << sendtotext.str();
+	else /*                       */	ss << girlsnames.size() << " girls and send them to " << sendtotext.str();
+	ss << ".\n\n";
+
+	// `J` zzzzzz - add in flavor texts here
+	
+	
+
+
+
+
+
+
+
+
+
+
+
+	// `J` end flavor texts
+	
+	// `J` send them where they need to go
+	for (int sel = multi_slave_first(); sel != -1; sel = multi_slave_next())
+	{
+		girl = MarketSlaveGirls[sel];
+		/* */if (sub == "Br") g_Brothels.AddGirl(brothel->m_id, girl);
+		else if (sub == "Ho") g_House.AddGirl(brothel->m_id, girl);
+		else if (sub == "Cl") g_Clinic.AddGirl(brothel->m_id, girl);
+		else if (sub == "St") g_Studios.AddGirl(brothel->m_id, girl);
+		else if (sub == "Ar") g_Arena.AddGirl(brothel->m_id, girl);
+		else if (sub == "Ce") g_Centre.AddGirl(brothel->m_id, girl);
+		else if (sub == "Fa") g_Farm.AddGirl(brothel->m_id, girl);
+		else	// if something fails this will catch it and send them to the dungeon
+		{
+			g_Brothels.GetDungeon()->AddGirl(girl, DUNGEON_NEWSLAVE);
+		}
+		MarketSlaveGirls[sel] = 0;
+	}
+
+	// `J` now tell the player what happened
+	if (girlsnames.size() <= 0)	g_MessageQue.AddToQue("Error, no girls names in the list", 0);
+	else g_MessageQue.AddToQue(ss.str(), 0);
+
+	// finish it
+	EditTextItem("", details_id);
+	selection = -1;
+	g_InitWin = true;
+	return true;
+}
+
+void cScreenSlaveMarket::change_release(string towhere)
+{
+	ReleaseGirlToWhere = towhere;
+	stringstream ss;
+	string sub = ReleaseGirlToWhere.substr(0, 2);
+	sBrothel *releaseto = g_Brothels.GetBrothel(g_CurrBrothel);
+	char a = ReleaseGirlToWhere[2]; char b = "0"[0]; int sendtonum = a - b;	// `J` cheap fix to get brothel number
+	/* */if (sub == "Br") releaseto = g_Brothels.GetBrothel(sendtonum);
+	else if (sub == "Ho") releaseto = g_House.GetBrothel(sendtonum);
+	else if (sub == "Cl") releaseto = g_Clinic.GetBrothel(sendtonum);
+	else if (sub == "St") releaseto = g_Studios.GetBrothel(sendtonum);
+	else if (sub == "Ar") releaseto = g_Arena.GetBrothel(sendtonum);
+	else if (sub == "Ce") releaseto = g_Centre.GetBrothel(sendtonum);
+	else if (sub == "Fa") releaseto = g_Farm.GetBrothel(sendtonum);
+	else if (sub == "Du") releaseto = g_Brothels.GetBrothel(0);
+
+	ss.str("");
+	ss << "Send Girl to: " << (sub == "Du" ? "The Dungeon" : releaseto->m_Name);
+	EditTextItem(ss.str(), releaseto_id);
+	ss.str("");
+	if (sub != "Du") ss << "Room for " << releaseto->free_rooms() << " more girls.";
+	EditTextItem(ss.str(), roomsfree_id);
+
+
 }
 
 void cScreenSlaveMarket::generate_unique_girl(int i, bool &unique)
@@ -369,7 +598,9 @@ bool cScreenSlaveMarket::change_selected_girl()
 	// disable/enable buttons based on whether a girl is selected
 	DisableButton(more_id, (selection == -1));
 	DisableButton(buy_slave_id, (selection == -1));
-	ClearListBox(trait_list_id);
+	if (trait_list_id >= 0) ClearListBox(trait_list_id);
+	if (trait_list_text_id >= 0) EditTextItem("Traits:", trait_list_text_id);
+	if (girl_desc_id >= 0)	EditTextItem("", girl_desc_id);
 	// selection of -1 means nothing selected so we get to go home early
 	if (selection == -1) return true;
 	/*
@@ -392,90 +623,11 @@ bool cScreenSlaveMarket::change_selected_girl()
 	else						detail = g_Girls.GetThirdDetailsString(girl);
 	EditTextItem(detail, details_id);
 	ImageNum = -1;										// I don't understand where this is used...
-	for (int i = 0; i < MAXNUM_TRAITS; i++)						// whizz down the girl's trait list
-	{
-		sTrait *trait = girl->m_Traits[i];
-		if (!trait) continue;							// skip any that are absent
-		AddToListBox(trait_list_id, i, trait->m_Name);	// mention the rest in the trait listbox
-	}
 
+	preparescreenitems(girl);
 	PrepareImage(slave_image_id, girl, IMGTYPE_PRESENTED, true, ImageNum);
-	SetSelectedItemInList(trait_list_id, 0);
-	return true;
-}
-
-bool cScreenSlaveMarket::check_events()
-{
-	cTariff tariff;
-	sGirl *girl = MarketSlaveGirls[selection];
-
-	if (g_InterfaceEvents.GetNumEvents() == 0) return true;	// no events means we can go home
 
-	// if it's the back button, pop the window off the stack and we're done
-	if (g_InterfaceEvents.CheckButton(back_id))
-	{
-		girl = 0;
-		g_InitWin = true;
-		g_WinManager.Pop();
-		return true;
-	}
-
-	if (g_InterfaceEvents.CheckButton(buy_slave_id))
-	{
-		for (selection = multi_slave_first(); selection != -1; selection = multi_slave_next())
-		{
-			girl = MarketSlaveGirls[selection];
-			int cost = tariff.slave_buy_price(girl);
-			cerr << "Selection = " << selection << ", girl = " << girl->m_Realname << endl;
-			// can the player afford this particular playmate?
-			if (g_Gold.slave_cost(cost) == false)
-			{
-				string text = gettext("You don't have enough money to purchase ");
-				text += girl->m_Realname;
-				g_MessageQue.AddToQue(text, 0);
-				break;
-			}
-
-			sBrothel* brothel = g_Brothels.GetBrothel(g_CurrBrothel);
-			string text = get_buy_slave_string(girl);
-			if (g_Girls.GetRebelValue(girl, false) >= 35 || (brothel->m_NumRooms - brothel->m_NumGirls) == 0)
-			{
-				g_MessageQue.AddToQue(text, 0);
-				g_Brothels.GetDungeon()->AddGirl(girl, DUNGEON_NEWSLAVE);
-			}
-			else
-			{
-				g_MessageQue.AddToQue(text, 0);
-				g_Brothels.AddGirl(g_CurrBrothel, girl);
-			}
-			EditTextItem("", details_id);
-			MarketSlaveGirls[selection] = 0;
-		}
-		selection = -1;
-		g_InitWin = true;
-		return true;
-	}
-	if (g_InterfaceEvents.CheckButton(more_id))
-	{
-		if (DetailLevel == 0)		{ DetailLevel = 1; EditTextItem(g_Girls.GetMoreDetailsString(girl, true), details_id); }
-		else if (DetailLevel == 1)	{ DetailLevel = 2; EditTextItem(g_Girls.GetThirdDetailsString(girl), details_id); }
-		else						{ DetailLevel = 0; EditTextItem(g_Girls.GetDetailsString(girl, true), details_id); }
-		return true;
-	}
-	if (g_InterfaceEvents.CheckListbox(trait_list_id))
-	{
-		int tmp = GetLastSelectedItemFromList(trait_list_id);
-		selection = GetLastSelectedItemFromList(slave_list_id);
-		if (tmp != -1 && selection != -1 && MarketSlaveGirls[selection]->m_NumTraits > 0)
-		{
-			if (tmp > MarketSlaveGirls[selection]->m_NumTraits)	tmp = 0;
-			EditTextItem(MarketSlaveGirls[selection]->m_Traits[tmp]->m_Desc, trait_id);
-		}
-		else EditTextItem("", trait_id);
-		return true;
-	}
-	if (g_InterfaceEvents.CheckListbox(slave_list_id)) return change_selected_girl();
-	return false;
+	return true;
 }
 
 string cScreenSlaveMarket::get_buy_slave_string(sGirl* girl)
@@ -558,4 +710,32 @@ string cScreenSlaveMarket::get_buy_slave_string(sGirl* girl)
 		}
 	}
 	return text;
+}
+
+void cScreenSlaveMarket::preparescreenitems(sGirl* girl)
+{
+
+	int trait_count = 0;
+	stringstream traits_text;
+	traits_text << "Traits:      ";
+
+	// loop through her traits, populating the box
+	for (int i = 0; i < MAXNUM_TRAITS; i++)
+	{
+		if (!girl->m_Traits[i]) continue;
+		trait_count++;
+		if (trait_list_id >= 0) AddToListBox(trait_list_id, i, g_Traits.GetTranslateName(girl->m_Traits[i]->m_Name));
+		if (trait_list_text_id)
+		{
+			if (trait_count > 1) traits_text << ",   ";
+			traits_text << g_Traits.GetTranslateName(girl->m_Traits[i]->m_Name);
+		}
+	}
+	// and finally, highlight the selected entry?
+	if (trait_list_id >= 0) SetSelectedItemInList(trait_list_id, 0);
+	if (trait_list_text_id >= 0) EditTextItem(traits_text.str(), trait_list_text_id);
+	if (girl_desc_id >= 0)	EditTextItem(girl->m_Desc, girl_desc_id);
+
+
+
 }
\ No newline at end of file
diff --git a/ crazys-wm-mod/cScreenSlaveMarket.h b/ crazys-wm-mod/cScreenSlaveMarket.h
index 51d013976..3f53ebd29 100644
--- a/ crazys-wm-mod/cScreenSlaveMarket.h	
+++ b/ crazys-wm-mod/cScreenSlaveMarket.h	
@@ -39,16 +39,38 @@ class cScreenSlaveMarket : public cInterfaceWindowXML
 /*
  *	interface/event IDs
  */
-	int back_id;		// Back button
-	int more_id;		// More Details button
-	int buy_slave_id;	// Buy button
-	int cur_brothel_id;	// Current Brothel text
-	int slave_list_id;	// Slave listbox
-	int trait_list_id;	// Trait listbox
-	int details_id;		// Girl Details text
-	int trait_id;		// Trait text
-	int slave_image_id;	// Image of selected slave
-	int header_id;		// page header text ("Slave Market")
+	int back_id;			// Back button
+	int more_id;			// More Details button
+	int buy_slave_id;		// Buy button
+	int cur_brothel_id;		// Current Brothel text
+	int slave_list_id;		// Slave listbox
+	int trait_list_id;		// Trait listbox
+	int trait_list_text_id;	// Trait list text
+	int details_id;			// Girl Details text
+	int girl_desc_id;		// Girl desc text
+	int trait_id;			// Trait text
+	int slave_image_id;		// Image of selected slave
+	int header_id;			// page header text ("Slave Market")
+	int slave_market_id;	// "Slave Market" text
+	int gold_id;			// Player's Gold
+
+	int releaseto_id;		// Where to release girls to Text
+	int roomsfree_id;		// how many rooms are available 
+	int house_id;			// Player's House button
+	int clinic_id;			// Clinic's House button
+	int studio_id;			// Studio's House button
+	int arena_id;			// Arena's House button
+	int centre_id;			// Centre's House button
+	int farm_id;			// Farm's button
+	int dungeon_id;			// Dungeon's button
+	int brothel0_id;		// Brothel 0 button
+	int brothel1_id;		// Brothel 1 button
+	int brothel2_id;		// Brothel 2 button
+	int brothel3_id;		// Brothel 3 button
+	int brothel4_id;		// Brothel 4 button
+	int brothel5_id;		// Brothel 5 button
+	int brothel6_id;		// Brothel 6 button
+
 
 	void set_ids();
 public:
@@ -67,6 +89,10 @@ class cScreenSlaveMarket : public cInterfaceWindowXML
 	void init();
 	void process();
 
+	bool buy_slaves();			// `J` used when buying slaves
+	void change_release(string towhere);
+	void preparescreenitems(sGirl* girl);
+
 	void generate_unique_girl(int i, bool &unique);
 	bool check_events();
 	bool check_keys();
diff --git a/ crazys-wm-mod/changelog-j2.txt b/ crazys-wm-mod/changelog-j2.txt
index 012bd3029..b80a0764e 100644
--- a/ crazys-wm-mod/changelog-j2.txt	
+++ b/ crazys-wm-mod/changelog-j2.txt	
@@ -45,6 +45,17 @@ Updated ScriptCommands.txt so the old script editor can use the new stats
 !!!!!!!!!!!!!!!!!!!! pushed to GitHub
 !!!!!!!!!!!!!!!!!!!! pushed Whore Master version .06.02.24
 
+###  Changes 12/31/2015
+Checked Blacksmith, Cobbler, Jeweler and Tailor for adding item creation
+
+###  Changes 1/1-2/2016
+Started reworking slave buying code
+* Made buy_slaves() function to remove duplicate code in events and keys.
+* Total rewrite of transfer of girls out of the Slave Market
+
+!!!!!!!!!!!!!!!!!!!! pushed to GitHub
+!!!!!!!!!!!!!!!!!!!! pushed Whore Master version .06.02.25
+