diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
| commit | 5ea6c568c86d9c0f76983705258951e2db9974fa (patch) | |
| tree | 94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/npc/021-2 | |
| parent | 2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff) | |
| parent | cba4de9a5f7b9de412b9f458c80904cee9764a85 (diff) | |
| download | serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.gz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.bz2 serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.xz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.zip | |
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/npc/021-2')
| -rw-r--r-- | world/map/npc/021-2/bakery.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/021-2/government_building.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt index 8a6dbdb2..1fa60134 100644 --- a/world/map/npc/021-2/bakery.txt +++ b/world/map/npc/021-2/bakery.txt @@ -27,7 +27,7 @@ L_Begin: mes "\"Would you mind bringing me 6 acorns please? I need them to make flour for the chocolate cakes. I will be so delicious!\""; next; mes "\"Um, I mean, the cakes will be delicious...\""; - emotion 8; + emotion EMOTE_BLUSH; next; set @dq_level, 15; diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt index f4f9d0de..52a20fbe 100644 --- a/world/map/npc/021-2/government_building.txt +++ b/world/map/npc/021-2/government_building.txt @@ -7,7 +7,7 @@ next; L_main: - if (getpartnerid2(0)) + if (getpartnerid2()) goto L_main_married; menu @@ -97,7 +97,7 @@ L_do_divorce: if (zeny < @divorce_cost) goto L_not_enough_money; - if divorce(0) goto L_divorce_done; + if (divorce()) goto L_divorce_done; mes "[Estard]"; mes "\"I'm having trouble finding the record. \""; |