Tweaks
branches/test/Body.java (diff)| @@ -487,10 +487,22 @@ | ||
| 487 | 487 | } |
| 488 | 488 | if (hasPants) { |
| 489 | 489 | setDirty(true); |
| 490 | - setHappiness(Happiness.VERY_SAD); | |
| 491 | 490 | babyList.clear(); |
| 491 | + showAbort(); | |
| 492 | 492 | } |
| 493 | 493 | } |
| 494 | + if (babyList.size() > getMaxHaveBaby()) { | |
| 495 | + for (Body baby: babyList) { | |
| 496 | + baby.toDead(); | |
| 497 | + } | |
| 498 | + hasBaby = false; | |
| 499 | + birth = false; | |
| 500 | + pregnantPeriod = 0; | |
| 501 | + pregnantPeriodBoost = 0; | |
| 502 | + setDirty(true); | |
| 503 | + strike(HAMMER * 2); | |
| 504 | + showAbort(); | |
| 505 | + } | |
| 494 | 506 | } |
| 495 | 507 | return cantMove; |
| 496 | 508 | } |
| @@ -1112,6 +1124,14 @@ | ||
| 1112 | 1124 | stay(); |
| 1113 | 1125 | } |
| 1114 | 1126 | } |
| 1127 | + | |
| 1128 | + public void showAbort() { | |
| 1129 | + setMessage(getMessage("Abort")); | |
| 1130 | + setHappiness(Happiness.VERY_SAD); | |
| 1131 | + angry = false; | |
| 1132 | + scare = false; | |
| 1133 | + stay(); | |
| 1134 | + } | |
| 1115 | 1135 | |
| 1116 | 1136 | public void showHateShit() { |
| 1117 | 1137 | if (toShit) { |
| @@ -2168,14 +2188,6 @@ | ||
| 2168 | 2188 | } |
| 2169 | 2189 | } |
| 2170 | 2190 | if (babyList.size() > getMaxHaveBaby()) { |
| 2171 | - for (Body baby: babyList) { | |
| 2172 | - baby.toDead(); | |
| 2173 | - } | |
| 2174 | - strike(HAMMER * 2); | |
| 2175 | - angry = false; | |
| 2176 | - scare = false; | |
| 2177 | - setDirty(true); | |
| 2178 | - setHappiness(Happiness.VERY_SAD); | |
| 2179 | 2191 | if (!hasPants()) { |
| 2180 | 2192 | return Event.STILLBIRTH; |
| 2181 | 2193 | } |
mimisuke