Merge pull request #104 from SickBoySB/0.8.2

0.8.2

ui/gameplayMainUI.xml

@@ -437,6 +437,57 @@
 			</container>
 
 			<container name="commandsActivitiesHolderOuter" 
+					 type="horizbox" 
+					 hsp="minimum" 
+					 vsp="minimum" 
+					 hap="center" 
+					 vap="bottom" 
+					 vertical_margin="15"
+					 vertical_padding="5" 
+					 horizontal_padding="5"
+					 horizontal_gutter="15" 
+					 skin="ui/styles/styleAlerts.xml">
+
+				<container name="commandsActivitiesHolder" type="horizbox" hsp="minimum" vsp="minimum" horizontal_gutter="15" skin="ui/styles/styleAlerts.xml">
+
+				</container>
+				<containerbutton name="AssignmentsButton" 
+							  hsp="minimum" 
+							  vsp="minimum" 
+							  vap="center"
+							  state="cecommPop">
+
+					<container name="assignmentsContainer"
+							type="horizbox"
+								hsp="minimum" vsp="minimum"
+								horizontal_padding="10"
+								horizontal_margin="2"
+								vertical_padding="9"
+								skin="ui/styles/default.xml">
+						<tooltip width="1" height="1" mouseRestDelay="0" followCursor="1">
+							<container type="vertbox"
+									hsp="minimum" 
+									vsp="minimum"
+									horizontal_padding="6" 
+									vertical_padding="6"
+									solidfill="1" 
+									solidfillname="glassBrassBorderDarkMoreOpaque" >
+
+								<container name="assignmentsTooltipVB" type="vertbox" hsp="fixed" fixed_width="345" vsp="minimum" horizontal_padding="4" vertical_padding="4" vertical_gutter="3"/>
+
+							</container>
+						</tooltip>
+
+						<label name="assignmentsCounter" vap="center" text="Assignments:         " state="tooltip_small" />
+
+					</container>
+
+				</containerbutton>
+
+			</container> 
+
+
+			<!--<container name="commandsActivitiesHolderOuter" 
 					 type="horizbox" 
 					 hsp="minimum" 
 					 vsp="minimum" 
@@ -489,7 +540,7 @@
 
 				</containerbutton>
 
-			</container>      
+			</container>-->  
 			<!--<container type="vertbox" hsp="expand" vsp="expand" vap="bottom">
       
 				<decor name="screenBottomRepeater" hsp="expand" vap="bottom" element="screenBottomRepeater_normal" skin="ui/styles/styleGameplay.xml" />

ui/houseDialog.xml

@@ -0,0 +1,322 @@
+<container type="vertbox" hsp="expand" vsp="expand">
+
+	<!-- top control bar -->
+	<container type="horizbox"
+			hsp="expand" vsp="minimum"
+			horizontal_padding="2" vertical_padding="2"
+			solidfill="1" solidfillname="miniPaperBrassLight" >
+
+		<!--<imagebutton name="BuildingIcon"
+				   text="Building Icon"
+				   hsp="minimum" vsp="minimum"
+					imageSkin="ui/orderIcons.xml" image="housing">
+ 
+			<tooltip width="240" height="45" mouseRestDelay="0" followCursor="1">
+				<container type="vertbox"
+						 hsp="expand" vsp="expand"
+						 horizontal_padding="4" vertical_padding="4"
+						 solidfill="1" solidfillname="glassBrassBorderDark" >
+					
+					<label text="Focus camera on this House" vap="center" state="tooltip_text"/>
+				</container>
+			</tooltip>
+		</imagebutton>-->
+
+		<container type="vertbox" hsp="expand" vsp="expand" name="houseTypeContainer">
+			<label name="workshopnamelabel" text="A House" vsp="minimum" hap="center" vap="center"/>
+		</container>
+
+		<imagebutton name="DemolishBuildingButton"
+					text="Demolish Building"
+					sfx="button_pneumatic"
+					hsp="minimum" vsp="minimum"
+					imageSkin="ui/orderIcons.xml" image="demolish_building">
+
+			<tooltip width="240" height="45" mouseRestDelay="0" followCursor="1">
+				<container type="vertbox" hsp="expand" vsp="expand" horizontal_padding="4" vertical_padding="4"
+						solidfill="1" solidfillname="glassBrassBorderDark">
+					<label text="Order this House demolished" vsp="center" state="tooltip_text"/>
+				</container>
+			</tooltip>
+		</imagebutton>
+	</container>
+
+	<!-- middle content. -->
+	<container type="vertbox" hsp="expand" vsp="minimum"
+			horizontal_padding="2" horizontal_margin="2"
+			vertical_padding="2" vertical_margin="2"
+			solidfill="1" solidfillname="miniPaperBrassDark" >
+
+		<container type="horizbox" hsp="expand" vsp="minimum"
+			horizontal_padding="2" horizontal_margin="0"
+			vertical_padding="2" vertical_margin="0"
+			solidfill="1" solidfillname="miniPaperLighter"
+			name="houseDescriptionLabelContainer" >
+			<!--
+			<paragraph vertical_margin="3" horizontal_margin="3"
+					text="A home for common labourers. Adds a base of +2 Lower Class population capacity to the colony." />
+			
+			<paragraph vertical_margin="3" horizontal_margin="3"
+					 text="Each Lower Class House increases the population cap for lower class colonists by two. Each Middle Class House increases the population cap for middle class colonists by one." />
+			-->
+		</container>
+
+		<container type="vertbox" hsp="expand" vsp="minimum"
+			horizontal_padding="2" horizontal_margin="0"
+			vertical_padding="2" vertical_margin="0"
+			solidfill="1" solidfillname="miniPaperBrassLight" >
+
+			<container type="horizbox" hsp="expand" vsp="minimum" horizontal_margin="20">
+				<label vertical_margin="2" horizontal_margin="2" text="Amenities" hap="center" state="text_large" />
+
+				<tooltip width="200" height="1" mouseRestDelay="0" followCursor="1" skin="ui/styles/styleTooltip.xml">
+					<container type="vertbox" hsp="fixed" fixed_width="200"
+							 horizontal_padding="5" vertical_padding="5"
+							 solidfill="1" solidfillname="glassBrassBorderDark" >
+						<paragraph text="Fulfilling various requirements will increase the capacity of a house. To unlock the bonuses below, build the modules or fulfill the conditions described." alignment="left" state="tooltip_text"/>
+					</container>
+				</tooltip>
+
+			</container>
+
+			<container type="vertbox"
+					hsp="expand" vsp="minimum"
+					horizontal_padding="4" horizontal_margin="8"
+					vertical_padding="4" vertical_margin="2"
+					solidfill="1" solidfillname="miniPaperLighter" >
+
+			<!-- <container type="scrollablevertbox"
+					hsp="expand" 
+					vsp="fixed" fixed_height="120"
+					horizontal_padding="2" horizontal_margin="8"
+					vertical_padding="2" vertical_margin="2"
+					solidfill="1" solidfillname="miniPaperLighter" > -->
+
+					<!-- uncompleted amenities -->
+
+					<container type="vertbox"
+						hsp="minimum"
+						vsp="minimum"
+						name="testHolder"
+						horizontal_padding="6"
+						vertical_padding="6" />
+
+					<container type="vertbox" hsp="expand" vsp="minimum" >
+						<label vertical_margin="2" horizontal_margin="2" text="To Do:" hap="left" state="text" />
+						<container type="horizbox" hsp="expand" vsp="minimum" horizontal_margin="10">
+							<container name="condition1todoContainerText" type="horizbox" hsp="minimum" vsp="minimum" hap="left" horizontal_margin="4"/>
+							<container name="condition1todoContainerInt" type="horizbox" hsp="minimum" vsp="minimum" hap="right" horizontal_margin="8"/>
+						</container>
+
+						<container type="horizbox" hsp="expand" vsp="minimum" horizontal_margin="10">
+							<container name="condition2todoContainerText" type="horizbox" hsp="minimum" vsp="minimum" hap="left" horizontal_margin="4"/>
+							<container name="condition2todoContainerInt" type="horizbox" hsp="minimum" vsp="minimum" hap="right" horizontal_margin="8"/>
+						</container>
+
+						<container type="horizbox" hsp="expand" vsp="minimum" horizontal_margin="10">
+							<container name="condition3todoContainerText" type="horizbox" hsp="minimum" vsp="minimum" hap="left" horizontal_margin="4"/>
+							<container name="condition3todoContainerInt" type="horizbox" hsp="minimum" vsp="minimum" hap="right" horizontal_margin="8"/>
+						</container>
+
+						<tooltip width="200" height="1" mouseRestDelay="0" followCursor="1" skin="ui/styles/styleTooltip.xml">
+							<container type="vertbox" hsp="fixed" fixed_width="200"
+									 horizontal_padding="5" vertical_padding="5"
+									 solidfill="1" solidfillname="glassBrassBorderDark">
+								<paragraph text="These amenities have not been built. Construct the indicated modules or fulfill the conditions to gain population capacity bonuses." />
+							</container>
+						</tooltip>
+					</container>
+
+					<container type="vertbox" hsp="expand" vsp="minimum" >
+						<label vertical_margin="2" horizontal_margin="2" text="Done:" hap="left" state="text_faded" />
+						<container type="horizbox" hsp="expand" vsp="minimum" horizontal_margin="10">
+							<container name="condition1doneContainerText" type="horizbox" hsp="minimum" vsp="minimum" hap="left" horizontal_margin="4"/>
+							<container name="condition1doneContainerInt" type="horizbox" hsp="minimum" vsp="minimum" hap="right" horizontal_margin="8"/>
+						</container>
+
+						<container type="horizbox" hsp="expand" vsp="minimum" horizontal_margin="10">
+							<container name="condition2doneContainerText" type="horizbox" hsp="minimum" vsp="minimum" hap="left" horizontal_margin="4"/>
+							<container name="condition2doneContainerInt" type="horizbox" hsp="minimum" vsp="minimum" hap="right" horizontal_margin="8"/>
+						</container>
+
+						<container type="horizbox" hsp="expand" vsp="minimum" horizontal_margin="10">
+							<container name="condition3doneContainerText" type="horizbox" hsp="minimum" vsp="minimum" hap="left" horizontal_margin="4"/>
+							<container name="condition3doneContainerInt" type="horizbox" hsp="minimum" vsp="minimum" hap="right" horizontal_margin="8"/>
+						</container>
+
+						<container type="horizbox" hsp="expand" vsp="minimum" horizontal_margin="10">
+							<container name="condition4doneContainerText" type="horizbox" hsp="minimum" vsp="minimum" hap="left" horizontal_margin="4"/>
+							<container name="condition4doneContainerInt" type="horizbox" hsp="minimum" vsp="minimum"  hap="right" horizontal_margin="8"/>
+						</container>
+
+						<tooltip width="200" height="1" mouseRestDelay="0" followCursor="1" skin="ui/styles/styleTooltip.xml">
+							<container type="vertbox" hsp="fixed" fixed_width="200"
+									 horizontal_padding="5" vertical_padding="5"
+									 solidfill="1" solidfillname="glassBrassBorderDark">
+								<paragraph text="These amenities are complete. They add bonuses to the houses' base population cap increase." />
+							</container>
+						</tooltip>
+					</container>
+			</container>
+
+			<container type="horizbox"
+					hsp="minimum"
+					vsp="minimum" hap="right"
+					horizontal_padding="4" horizontal_margin="4"
+					vertical_padding="4" vertical_margin="4" >
+
+				<!--<label text="Lower Class Population Cap Bonus: " vap="center" /> -->
+
+				<container name="popCapBonusTitleContainer" type="horizbox" hsp="minimum" vsp="minimum" vap="center">
+					<tooltip width="300" height="50" mouseRestDelay="0" followCursor="1" skin="ui/styles/styleTooltip.xml">
+						<container type="vertbox" hsp="fixed" fixed_width="200"
+								 horizontal_padding="5" vertical_padding="5"
+								 solidfill="1" solidfillname="glassBrassBorderDark"
+								 name="popcapTooltip">
+							<label text="Immigrants will arrive up to the cap amount." />
+						</container>
+					</tooltip>
+				</container>
+
+				<container type="horizbox"
+					hsp="minimum"
+					vsp="minimum"
+					vap="center" 
+					horizontal_padding="10" horizontal_margin="4"
+					vertical_padding="3" vertical_margin="2"
+					solidfill="1" solidfillname="miniPaperLighter" >
+
+					<container name="popCapBonusHolder1" type="horizbox" hsp="minimum" vsp="minimum" vap="center" horizontal_margin="1"/>
+					<label text="/" state="tooltip_title" />
+					<container name="popCapBonusHolder2" type="horizbox" hsp="minimum" vsp="minimum" vap="center" horizontal_margin="1"/>
+				</container>
+
+			</container>
+
+		</container>
+
+	</container>
+
+<!-- 
+	<container type="vertbox"
+						hsp="expand" vsp="minimum"
+						horizontal_padding="8" horizontal_margin="8"
+						vertical_padding="6" vertical_margin="4"
+						solidfill="1" solidfillname="miniPaperBrassDarker" >
+		
+		<container type="horizbox"
+							hsp="expand" vsp="minimum"
+							horizontal_padding="4" horizontal_margin="4"
+							vertical_padding="2" vertical_margin="4"
+							solidfill="1" solidfillname="miniPaper" >
+			
+			<label text="Residents" />
+		</container>
+		
+		<container type="scrollablevertbox"
+				hsp="expand"
+				horizontal_padding="4" horizontal_margin="8"
+				vertical_padding="4" vertical_margin="4"
+				vsp="fixed" fixed_height="120"
+				solidfill="1" solidfillname="miniPaperBrassLight" >
+				
+				<label text="Sadie Brazenwright" />
+				<label text="Maude Rivet" />
+				<label text="Zachariah Thomphewer" />
+				<label text="Lucinda Solderhewer" />
+				<label text="Ambrose Crimble" />
+				<label text="Tillie Porridge" />
+				<label text="Mildred Cruncher" />
+		</container>
+	</container>
+-->
+
+	<!-- Quality display container. -->
+	<container type="horizbox" vsp="fixed" fixed_height="38" hsp="expand" horizontal_margin="2" vertical_margin="2" >
+
+		<!-- row 1 -->
+		<container type="horizbox" hsp="expand" vsp="expand"
+				 horizontal_gutter="6"
+				 horizontal_margin="2" vertical_margin="2"
+				 horizontal_padding="6" vertical_padding="2"
+				 solidfill="1" solidfillname="miniPaper">
+
+			<!-- HP display -->
+			<container type="horizbox" hsp="minimum" vsp="expand"
+					 horizontal_padding="2"
+					 vertical_padding="2"
+					 vap="center" >
+
+				<label text="HP:" vap="center"/>
+
+				<container type="horizbox"
+						 hsp="minimum" vsp="expand"
+						  horizontal_padding="8"
+						  horizontal_margin="4" 
+						 solidfill="1" solidfillname="label_background_grayer">
+
+					<container name="HPNumberContainer" type="horizbox" hsp="minimum" vsp="minimum" vap="center"/>
+					<label text="/" vap="center" />
+					<container name="HPMaxContainer" type="horizbox" hsp="minimum" vsp="minimum" vap="center"/>
+
+				</container>
+
+				<tooltip width="200" height="1" mouseRestDelay="0" followCursor="1" skin="ui/styles/styleTooltip.xml">
+					<container type="vertbox" hsp="fixed" fixed_width="200"
+							horizontal_padding="5" vertical_padding="5"
+							solidfill="1" solidfillname="glassBrassBorderDark" >
+
+						<label text="Building Hitpoints" state="tooltip_text" hap="center"/>
+						<paragraph text="When a building reaches 0 HP, it is destroyed. Repair jobs are automatically created when a building is damaged and will be taken up by available Overseers." alignment="left" state="tooltip_text"/>
+					</container>
+				</tooltip>
+			</container>
+		</container>
+
+		<!-- Quality -->
+		<container type="horizbox"
+				 hsp="minimum" vsp="expand"
+				 horizontal_margin="2" vertical_margin="2"
+				 horizontal_padding="0" vertical_padding="0"
+				 solidfill="1" solidfillname="miniPaper">
+
+			<container type="vertbox" hsp="minimum" vsp="minimum" vap="center"
+					 horizontal_padding="8"
+					 hap="left">
+
+				<label text="Building Quality:" vap="center" />
+			</container>
+
+			<container type="vertbox" hsp="minimum" vsp="expand"
+						horizontal_padding="12" vertical_padding="4"
+						solidfill="1"  solidfillname="miniPaperBrassDarkest">
+
+				<container type="vertbox" hsp="minimum" vsp="minimum"
+						 vap="center"
+						 name="qualityNumberContainer" />
+
+			</container>
+
+			<tooltip width="250" height="1" mouseRestDelay="0" followCursor="1" skin="ui/styles/styleTooltip.xml">
+				<container type="vertbox" hsp="fixed" fixed_width="240" horizontal_padding="4" vertical_padding="4" vertical_gutter="4" solidfill="1" solidfillname="glassBrassBorderDark">
+					<container type="horizbox" hsp="minimum" vsp="minimum">
+						<label text="Building Quality:" state="text" />
+						<container name="qualityDescriptionContainer"
+								 type="horizbox" hsp="minimum" vsp="minimum"
+								 vertical_padding="2" horizontal_padding="4"
+								 vap="center" />
+
+					</container> 
+					<container type="vertbox" hsp="fixed" fixed_width="240">
+						<paragraph text="- House Quality can range from -6 to +6" alignment="left" state="tooltip_text"/>
+						<paragraph text="- Beds reduce quality, while decor modules increase quality" alignment="left" state="tooltip_text"/>
+						<paragraph text="- High house quality makes colonists happy and increases population limits." alignment="left" state="tooltip_text"/>
+					</container>
+				</container>
+			</tooltip>
+		</container>
+	</container>
+
+	<container type="vertbox" hsp="minimum" vsp="minimum" name="contentsVB">
+	</container>
+</container>