v0.3.1 fix for not resetting body size values after units PR merge

Innoxia · Feb 12, 2019 · 1b4f789 · 1b4f789
1 parent 20bf28c
commit 1b4f789
Show file tree

Hide file tree

Showing 7 changed files with 384 additions and 339 deletions.
diff --git a/src/com/lilithsthrone/controller/MainController.java b/src/com/lilithsthrone/controller/MainController.java
@@ -1320,7 +1320,7 @@ private void manageAttributeListeners() {
 			TooltipInformationEventListener el2 = new TooltipInformationEventListener().setInformation("Toggle Calendar Display",
 					"Toggle the date's display between a calendar and day count.<br/>"
 						+ "The current date is: <b style='color:"+Colour.BASE_BLUE_LIGHT.toWebHexString()+";'>"
-						+ Main.game.getDisplayDate()
+						+ Main.game.getDisplayDate(true)
 						+"</b><br/>"
 						+ "You've been in this new world for: <b style='color:"+Colour.GENERIC_EXCELLENT.toWebHexString()+";'>"+Main.game.getDayNumber()+" day"+(Main.game.getDayNumber()>1?"s":"")+"</b>");
 			addEventListener(documentAttributes, id, "mouseenter", el2, false);

diff --git a/src/com/lilithsthrone/game/Game.java b/src/com/lilithsthrone/game/Game.java
@@ -2928,14 +2928,25 @@ public LocalDateTime getDateNow() {
 		return getStartingDate().plusSeconds(Main.game.getSecondsPassed());
 	}
 
-	public String getDisplayDate() {
+	public String getDisplayDate(boolean withYear) {
 		if(isInNewWorld()) {
 			if(getDialogueFlags().hasFlag(DialogueFlagValue.knowsDate)) {
-				return Units.date(getDateNow(), Units.DateType.LONG);
+				if(withYear) {
+					return Units.date(getDateNow(), Units.DateType.LONG);
+				} else {
+					String date = Units.date(getDateNow(), Units.DateType.LONG);
+					return date.substring(0, date.length()-5);
+				}
 			}
 			return "Unknown";
 		}
-		return Units.date(getDateNow().minusYears(TIME_SKIP_YEARS), Units.DateType.LONG);
+
+		if(withYear) {
+			return Units.date(getDateNow().minusYears(TIME_SKIP_YEARS), Units.DateType.LONG);
+		} else {
+			String date = Units.date(getDateNow().minusYears(TIME_SKIP_YEARS), Units.DateType.LONG);
+			return date.substring(0, date.length()-5);
+		}
 	}
 
 	public int getYear() {

diff --git a/src/com/lilithsthrone/game/character/body/Body.java b/src/com/lilithsthrone/game/character/body/Body.java
@@ -1454,7 +1454,7 @@ public static Body loadFromXML(StringBuilder log, Element parentElement, Documen
 		}
 
 
-		if(Main.isVersionOlderThan(Game.loadingVersion, "0.3.0.6")) { // FIXME update version after merging
+		if(Main.isVersionOlderThan(Game.loadingVersion, "0.3.1")) {
 			// Convert all sizes from inch to cm
 			importedHair.length *= 2.54;
 			importedHorn.length *= 2.54;
@@ -1592,7 +1592,7 @@ public static Body loadFromXML(StringBuilder log, Element parentElement, Documen
 
 
 		if(importedCrotchBreast!=null) {
-			if(Main.isVersionOlderThan(Game.loadingVersion, "0.3.0.6")) { // FIXME update version after merging
+			if(Main.isVersionOlderThan(Game.loadingVersion, "0.3.1")) {
 				importedCrotchBreast.nipples.orificeNipples.capacity *= 2.54;
 				importedCrotchBreast.nipples.orificeNipples.stretchedCapacity *= 2.54;
 			}

diff --git a/src/com/lilithsthrone/game/inventory/enchanting/AbstractItemEffectType.java b/src/com/lilithsthrone/game/inventory/enchanting/AbstractItemEffectType.java
diff --git a/src/com/lilithsthrone/main/Main.java b/src/com/lilithsthrone/main/Main.java
@@ -68,7 +68,7 @@ public class Main extends Application {
 	public static Stage primaryStage;
 	public static String author = "Innoxia";
 
-	public static final String VERSION_NUMBER = "0.3.0.7";
+	public static final String VERSION_NUMBER = "0.3.1";
 	public static final String VERSION_DESCRIPTION = "Alpha";
 
 	/**

diff --git a/src/com/lilithsthrone/rendering/RenderingEngine.java b/src/com/lilithsthrone/rendering/RenderingEngine.java
@@ -980,7 +980,7 @@ public void renderAttributesPanelLeft() {
 								+SVGImages.SVG_IMAGE_PROVIDER.getCalendarIcon()
 							+ "</div>"
 							+ (Main.getProperties().hasValue(PropertyValue.calendarDisplay)
-								? Main.game.getDisplayDate()
+								? Main.game.getDisplayDate(false)
 								:"Day "+Main.game.getDayNumber())
 						+ "</div>"	
 					+"</div>"

diff --git a/src/com/lilithsthrone/res/doc/todo_list.txt b/src/com/lilithsthrone/res/doc/todo_list.txt
@@ -126,11 +126,41 @@
 	Contributors:
 		Localised all units in the game, and added toggles for 12/24 hour clock and imperial/metric measurements in the options menu. (PR#931 by DJ Addi)
 
+	Bugs:
+		If you lack the body part on which a clothing transformation is trying to be applied, the game's dialogue will no longer be interrupted with a 'you lack a X, so nothing happens' message.
+
+
 
 
+
+
+	1. Add world map travel system.
+	    - Keyboard movement.
+	    - Mouse click path movement.
+	2. Add unique dialogue for offspring moving in to live with you.
+	    - Initial encounter scene variation.
+	    - Moving in variation.
+	    - Unique talk scenes.
+	    - Their apartment scenes.
+	3. Add orgasm denial scenes.
+	    - Add NPC behaviour for denial.
+	    - Add sex action(s).
+	    - Add variations for if chastity belt/cage is being worn.
+	4. Add a centaur field exploration encounter. (Will be cut if I run out of time.)
+	    - Tidy up encounter code.
+	    - Enable movement over field tiles.
+	    - Add dialogue framework.
+	    - Write dialogue.
+	    - Test.
+	5. Fix bugs and polish.
+
 	credits
 
-	PR#931
+
+
+
+
+
 
 	stop sex is appearing after switching positions
 
@@ -168,8 +198,6 @@
 
 	NPC wants anal and yet didn't start it?
 
-	Need to stop "lack a vagina, so nothing happens..." from clothing effects, along with all other no-effect ones
-
 	need to make a more unified NPC class
 
 	refine clothing presets