From 621cd37bf5fa3cc3ec525bf2cad1d898478a4609 Mon Sep 17 00:00:00 2001 From: Rob Pearce Date: Tue, 31 May 2016 01:56:15 +1000 Subject: [PATCH] - Bad text: "Outside of battle, Hecta will respond to prayers by ." --- data.c | 3 +-- data/bones/bones1.vlt | 50 +++++++++++++++++++++++++++++++++++++ data/hiscores.db | Bin 17408 -> 17408 bytes io.c | 56 ++++++++++++++++++++++++------------------ 4 files changed, 83 insertions(+), 26 deletions(-) create mode 100644 data/bones/bones1.vlt diff --git a/data.c b/data.c index a7cfe71..daffebe 100644 --- a/data.c +++ b/data.c @@ -6024,7 +6024,7 @@ void initobjects(void) { addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_NEED, NA, NULL); addot(OT_A_TRAIN, "training", "Start training to gain a new experience level or enhance skill.", MT_NOTHING, 0, OC_ABILITY, SZ_TINY); addflag(lastot->flags, F_SPELLSCHOOL, SS_ABILITY, NA, NA, NULL); - addot(OT_A_TUMBLE, "tumble", "You can tumble two metres across the ground.", MT_NOTHING, 0, OC_ABILITY, SZ_TINY); + addot(OT_A_TUMBLE, "tumble", "Tumble two metres across the ground, but not through enemies or obstacles.", MT_NOTHING, 0, OC_ABILITY, SZ_TINY); addflag(lastot->flags, F_SPELLSCHOOL, SS_ABILITY, NA, NA, NULL); addflag(lastot->flags, F_STAMCOST, 2, NA, NA, NULL); addot(OT_A_WARCRY, "warcry", "Inspire fear in your enemies with a mighty war cry.", MT_NOTHING, 0, OC_ABILITY, SZ_TINY); @@ -11825,7 +11825,6 @@ void initrace(void) { addflag(lastrace->flags, F_GODBONUS, PL_ECSTATIC, GB_CANWILL, OT_S_DRAINLIFE, "10,NA,NA"); // sacrifices addflag(lastrace->flags, F_SACRIFICEOB, OT_CORPSE, NA, 2, "Bony claws rise up and drag OB underground."); - addflag(lastrace->flags, F_GODBATTLE, NA, NA, NA, "granting heavenly armour"); addflag(lastrace->flags, F_GODBATTLE, NA, NA, NA, "flaying the flesh of your enemies"); addflag(lastrace->flags, F_GODBATTLE, NA, NA, NA, "sending servants to aid you"); addflag(lastrace->flags, F_GODBATTLE, NA, NA, NA, "slaying a nearby enemy"); diff --git a/data/bones/bones1.vlt b/data/bones/bones1.vlt new file mode 100644 index 0000000..9b51b8c --- /dev/null +++ b/data/bones/bones1.vlt @@ -0,0 +1,50 @@ +@id:bones1 +@map +aaaaaaaaaaaaaaaaaaaaaaaaab +abbbbbbbbbbbbbbbbbbbbbbbba +abbbbbbbbbbbbbbbbbbbbbbbba +abbbbbbbbbbbbbbbbbbbbbbbba +abbbbbbbbbbbbbbbbbbbbbbbba +aaaaaaaaaaaaaaababaaaaaaab +@end +@legend +a:cell:rock wall +b:cell:rock floor +@end +@flags +at(25,0) ob:10 stones +at(19,1) ob:an uncursed robe +at(19,1) ob:3 chunks of cheese +at(19,1) ob:an uncursed pair of sandals +at(19,1) ob:a nylon rope +at(19,1) ob:an uncursed gas mask +at(19,1) ob:an uncursed toque +at(19,1) ob:an empty vial +at(19,1) ob:a scroll of remove curse +at(19,1) ob:a wand of opening +at(19,1) ob:a cursed potion of rum +at(19,1) ob:an uncursed pair of leather gloves +at(19,1) ob:an onion +at(19,1) ob:an uncursed golden crown +at(19,1) ob:a blood stain +at(20,1) ob:a flaming brazier +at(24,1) ob:a blood stain +at(8,2) ob:4 stones +at(9,2) lf:the pixie +at(18,2) lf:the troglodyte +at(20,2) lf:the wolf +at(23,2) ob:a blessed pair of spectacles +at(4,3) lf:the giant ant +at(8,3) lf:the hawk +at(19,3) lf:the sawgrass +at(24,3) lf:the young hawk +at(2,4) lf:the giant ant +at(3,4) lf:the giant ant +at(17,5) ob:5 stones +at(25,5) ob:a blood stain +tag:bones +rarity:frequent +goesin:dungeon +dlevmin:3 +dlevmax:3 +@end diff --git a/data/hiscores.db b/data/hiscores.db index 11d1b503acf97c4f7e6d13b2aeacdbd39f61d4c2..30adb5e51f6253b3b6c60401020638c843ef18c5 100644 GIT binary patch delta 138 zcmV;50CoR>hyj3z0gxL7OaK4?5s@H15(P{EE#f5&1N;C214aM?Mgz;San%B|MFYPC z16Tq`lLrW}0Z6mB2#^5<1Oos8ShGzEw-pcu0u}%RvIAlR5(2;iasn2yaRLGqT381F s0v{=X0RWJ4Z(?v|VRB<-lbV=w73?Mku<`IR|6yQac4J_6V?MpH@G8@0SLXdJ%;8MFli4{o wFs|6VgJS|CD=RYt6XRxIuI-|HtV~4=%$t~#n1z@QFcobqOkmnvq|~Pf0782h2><{9 diff --git a/io.c b/io.c index 4d71489..1e03c88 100644 --- a/io.c +++ b/io.c @@ -5851,36 +5851,44 @@ char *makedesc_god(lifeform_t *god, char *retbuf) { strcat(thisline, ".\n\n"); strncat(retbuf, thisline, HUGEBUFLEN); - sprintf(thisline, "During battle, %s will respond to prayers by ", godname); - getflags(god->flags, retflag, &nretflags, F_GODBATTLE, F_NONE); - for (i = 0; i < nretflags; i++) { - f = retflag[i]; - if (i == 0) { - strcat(thisline, f->text); - } else if (i == nretflags - 1) { - strcat(thisline, " and "); - strcat(thisline, f->text); - } else { - strcat(thisline, ", "); - strcat(thisline, f->text); + if (hasflag(god->flags, F_GODBATTLE)) { + sprintf(thisline, "During battle, %s will respond to prayers by ", godname); + getflags(god->flags, retflag, &nretflags, F_GODBATTLE, F_NONE); + for (i = 0; i < nretflags; i++) { + f = retflag[i]; + if (i == 0) { + strcat(thisline, f->text); + } else if (i == nretflags - 1) { + strcat(thisline, " and "); + strcat(thisline, f->text); + } else { + strcat(thisline, ", "); + strcat(thisline, f->text); + } } + } else { + sprintf(thisline, "During battle, %s will not respond to prayers", godname); } strcat(thisline, ".\n\n"); strncat(retbuf, thisline, HUGEBUFLEN); - sprintf(thisline, "Outside of battle, %s will respond to prayers by ", godname); - getflags(god->flags, retflag, &nretflags, F_GODNOBATTLE, F_NONE); - for (i = 0; i < nretflags; i++) { - f = retflag[i]; - if (i == 0) { - strcat(thisline, f->text); - } else if (i == nretflags - 1) { - strcat(thisline, " and "); - strcat(thisline, f->text); - } else { - strcat(thisline, ", "); - strcat(thisline, f->text); + if (hasflag(god->flags, F_GODNOBATTLE)) { + sprintf(thisline, "Outside of battle, %s will respond to prayers by ", godname); + getflags(god->flags, retflag, &nretflags, F_GODNOBATTLE, F_NONE); + for (i = 0; i < nretflags; i++) { + f = retflag[i]; + if (i == 0) { + strcat(thisline, f->text); + } else if (i == nretflags - 1) { + strcat(thisline, " and "); + strcat(thisline, f->text); + } else { + strcat(thisline, ", "); + strcat(thisline, f->text); + } } + } else { + sprintf(thisline, "Outside of battle, %s will not respond to prayers", godname); } strcat(thisline, ".\n\n"); strncat(retbuf, thisline, HUGEBUFLEN);