- Bad text: "Outside of battle, Hecta will respond to prayers by ."

This commit is contained in:
Rob Pearce 2016-05-31 01:56:15 +10:00
parent 09a8152cd3
commit 621cd37bf5
4 changed files with 83 additions and 26 deletions

3
data.c
View File

@ -6024,7 +6024,7 @@ void initobjects(void) {
addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_NEED, NA, NULL); 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); 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); 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_SPELLSCHOOL, SS_ABILITY, NA, NA, NULL);
addflag(lastot->flags, F_STAMCOST, 2, 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); 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"); addflag(lastrace->flags, F_GODBONUS, PL_ECSTATIC, GB_CANWILL, OT_S_DRAINLIFE, "10,NA,NA");
// sacrifices // sacrifices
addflag(lastrace->flags, F_SACRIFICEOB, OT_CORPSE, NA, 2, "Bony claws rise up and drag OB underground."); 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, "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, "sending servants to aid you");
addflag(lastrace->flags, F_GODBATTLE, NA, NA, NA, "slaying a nearby enemy"); addflag(lastrace->flags, F_GODBATTLE, NA, NA, NA, "slaying a nearby enemy");

50
data/bones/bones1.vlt Normal file
View File

@ -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

Binary file not shown.

8
io.c
View File

@ -5851,6 +5851,7 @@ char *makedesc_god(lifeform_t *god, char *retbuf) {
strcat(thisline, ".\n\n"); strcat(thisline, ".\n\n");
strncat(retbuf, thisline, HUGEBUFLEN); strncat(retbuf, thisline, HUGEBUFLEN);
if (hasflag(god->flags, F_GODBATTLE)) {
sprintf(thisline, "During battle, %s will respond to prayers by ", godname); sprintf(thisline, "During battle, %s will respond to prayers by ", godname);
getflags(god->flags, retflag, &nretflags, F_GODBATTLE, F_NONE); getflags(god->flags, retflag, &nretflags, F_GODBATTLE, F_NONE);
for (i = 0; i < nretflags; i++) { for (i = 0; i < nretflags; i++) {
@ -5865,9 +5866,13 @@ char *makedesc_god(lifeform_t *god, char *retbuf) {
strcat(thisline, f->text); strcat(thisline, f->text);
} }
} }
} else {
sprintf(thisline, "During battle, %s will not respond to prayers", godname);
}
strcat(thisline, ".\n\n"); strcat(thisline, ".\n\n");
strncat(retbuf, thisline, HUGEBUFLEN); strncat(retbuf, thisline, HUGEBUFLEN);
if (hasflag(god->flags, F_GODNOBATTLE)) {
sprintf(thisline, "Outside of battle, %s will respond to prayers by ", godname); sprintf(thisline, "Outside of battle, %s will respond to prayers by ", godname);
getflags(god->flags, retflag, &nretflags, F_GODNOBATTLE, F_NONE); getflags(god->flags, retflag, &nretflags, F_GODNOBATTLE, F_NONE);
for (i = 0; i < nretflags; i++) { for (i = 0; i < nretflags; i++) {
@ -5882,6 +5887,9 @@ char *makedesc_god(lifeform_t *god, char *retbuf) {
strcat(thisline, f->text); strcat(thisline, f->text);
} }
} }
} else {
sprintf(thisline, "Outside of battle, %s will not respond to prayers", godname);
}
strcat(thisline, ".\n\n"); strcat(thisline, ".\n\n");
strncat(retbuf, thisline, HUGEBUFLEN); strncat(retbuf, thisline, HUGEBUFLEN);