Menu

Commit [r3763]  Maximize  Restore  History

Refactored Living Accommodations building function generateWaste method to change the rate of grey water and black water production. Grey water is produced from both wash water and waste water use, while black water is produced from only waste water use. I think the production rate of both is more accurate to average daily water use per person, but we may want to move all of this to tasks rather than this building function at some point.

Added isWashWaterRationing method to Settlement class. This checks if inhabitants are rationing wash water usage due to low water inventory. If water stored at a settlement is less than 10% of their yearly drinking water needs, the settlement requires wash water rationing, in which inhabitants will only use 10% of normal wash water each Sol. (Perhaps we should make this affect morale?)

Adding getToiletryUsageDemand method to GoodsManager class for determining demand for toilet paper. We can also add other toiletry resources later when they're added to the sim, such as soap, shampoo, deodorant, toothpaste, etc. This may give value to other goods in the paper manufacturing tree.

Refactored Manufacture building function code to remove static references to BuildingConfig, BuildingManager, MarsClock, GoodsManager, and UnitManager. This can cause problems when loading a sim if the static references are not initialized, but also for general decoupling purposes. Instead they get the references to these class instances from the simulation instance as needed.

scud1 2016-10-26

changed /trunk/mars-sim/mars-sim-core/src/main/java/org/mars_sim/msp/core/structure/Settlement.java
changed /trunk/mars-sim/mars-sim-core/src/main/java/org/mars_sim/msp/core/structure/building/function/LivingAccommodations.java
changed /trunk/mars-sim/mars-sim-core/src/main/java/org/mars_sim/msp/core/structure/building/function/Manufacture.java
changed /trunk/mars-sim/mars-sim-core/src/main/java/org/mars_sim/msp/core/structure/goods/GoodsManager.java
/trunk/mars-sim/mars-sim-core/src/main/java/org/mars_sim/msp/core/structure/Settlement.java Diff Switch to side-by-side view
Loading...
/trunk/mars-sim/mars-sim-core/src/main/java/org/mars_sim/msp/core/structure/building/function/LivingAccommodations.java Diff Switch to side-by-side view
Loading...
/trunk/mars-sim/mars-sim-core/src/main/java/org/mars_sim/msp/core/structure/building/function/Manufacture.java Diff Switch to side-by-side view
Loading...
/trunk/mars-sim/mars-sim-core/src/main/java/org/mars_sim/msp/core/structure/goods/GoodsManager.java Diff Switch to side-by-side view
Loading...