• R/O
  • SSH
  • HTTPS

simyukkuri: 提交


Commit MetaInfo

修订版256 (tree)
时间2015-09-03 21:08:05
作者mimisuke

Log Message

Tweaks

更改概述

差异

--- branches/test/Body.java (revision 255)
+++ branches/test/Body.java (revision 256)
@@ -487,10 +487,22 @@
487487 }
488488 if (hasPants) {
489489 setDirty(true);
490- setHappiness(Happiness.VERY_SAD);
491490 babyList.clear();
491+ showAbort();
492492 }
493493 }
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+ }
494506 }
495507 return cantMove;
496508 }
@@ -1112,6 +1124,14 @@
11121124 stay();
11131125 }
11141126 }
1127+
1128+ public void showAbort() {
1129+ setMessage(getMessage("Abort"));
1130+ setHappiness(Happiness.VERY_SAD);
1131+ angry = false;
1132+ scare = false;
1133+ stay();
1134+ }
11151135
11161136 public void showHateShit() {
11171137 if (toShit) {
@@ -2168,14 +2188,6 @@
21682188 }
21692189 }
21702190 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);
21792191 if (!hasPants()) {
21802192 return Event.STILLBIRTH;
21812193 }
Show on old repository browser