Skip to content

Commit

Permalink
.06.02.25 - Major rewrite of Slave Market to allow sending girls anyw…
Browse files Browse the repository at this point in the history 
…here when purchased
  • Loading branch information
@aevojoey
aevojoey committed Jan 3, 2016
1 parent d9688a0 commit c587a44
Show file tree
Hide file tree
Showing 8 changed files with 410 additions and 172 deletions.
Binary file modified crazys-wm-mod/BrothelMaster-vse2013.v12.suo
View file
Binary file not shown.
43 changes: 32 additions & 11 deletions crazys-wm-mod/Resources/Interface/J_1024x768/slavemarket_screen.xml
View file
@@ -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>
2 changes: 1 addition & 1 deletion crazys-wm-mod/Revision.h
View file
@@ -1 +1 @@
static char svn_revision[] = "Crazy and PP's mod version .06.02.24";
static char svn_revision[] = "Crazy and PP's mod version .06.02.25";
16 changes: 8 additions & 8 deletions crazys-wm-mod/WorkHealing.cpp
View file
Expand Up @@ -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;
}
4 changes: 2 additions & 2 deletions crazys-wm-mod/cGirls.h
View file
Expand Up @@ -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
Expand Down

0 comments on commit c587a44

Please sign in to comment.