rob/nexus
rob
/
nexus
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases Wiki Activity

- [+] shoulder armour:pauldron

This commit is contained in:
Rob Pearce 2012-10-26 04:09:57 +00:00
parent 9387a67755
commit 48a3533aef
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data.c
View File

@ -572,7 +572,7 @@ void initjobs(void) {
addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "50 arrows"); addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "50 arrows");
addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "throwing net"); addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "throwing net");
addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "leather armour"); addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "leather armour");
addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "fur cloak armour"); addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "fur cloak");
addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "cloth trousers"); addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "cloth trousers");
addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "pair of leather boots"); addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "pair of leather boots");
addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "pair of leather gloves"); addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "pair of leather gloves");
@ -7566,6 +7566,14 @@ void initobjects(void) {
addflag(lastot->flags, F_WATERPROOF, B_TRUE, NA, NA, NULL); addflag(lastot->flags, F_WATERPROOF, B_TRUE, NA, NA, NULL);
addflag(lastot->flags, F_CRITPROTECTION, 80, NA, NA, NULL); addflag(lastot->flags, F_CRITPROTECTION, 80, NA, NA, NULL);
addflag(lastot->flags, F_STARTSPLAIN, B_TRUE, NA, NA, NULL); addflag(lastot->flags, F_STARTSPLAIN, B_TRUE, NA, NA, NULL);
addot(OT_PAULDRON, "pauldron", "A large dome-shaped metal covering for the shoulders and neck.", MT_METAL, 5, OC_ARMOUR, SZ_MEDIUM);
addflag(lastot->flags, F_RARITY, H_ALL, 100, RR_UNCOMMON, NULL);
addflag(lastot->flags, F_MULTISIZE, B_TRUE, NA, NA, NULL);
addflag(lastot->flags, F_GOESON, BP_SHOULDERS, NA, NA, NULL);
addflag(lastot->flags, F_ARMOURRATING, 4, NA, NA, NULL);
addflag(lastot->flags, F_OBHP, 40, 40, NA, NULL);
addflag(lastot->flags, F_CRITPROTECTION, 100, NA, NA, NULL);
addflag(lastot->flags, F_EQUIPCONFER, F_ARMOURPENALTY, NA, 10, NULL);
// armour - waist // armour - waist
addot(OT_BELTLEATHER, "leather belt", "A plain leather belt.", MT_LEATHER, 0.2, OC_ARMOUR, SZ_SMALL); addot(OT_BELTLEATHER, "leather belt", "A plain leather belt.", MT_LEATHER, 0.2, OC_ARMOUR, SZ_SMALL);
addflag(lastot->flags, F_RARITY, H_ALL, 100, RR_COMMON, NULL); addflag(lastot->flags, F_RARITY, H_ALL, 100, RR_COMMON, NULL);

7
defs.h
View File

@ -2124,7 +2124,6 @@ enum OBTYPE {
// armour - multipart // armour - multipart
OT_WETSUIT, OT_WETSUIT,
// armour - body // armour - body
OT_APRON,
OT_ARMOURDEMON, OT_ARMOURDEMON,
OT_ARMOURLEATHER, OT_ARMOURLEATHER,
OT_ARMOURTHORN, OT_ARMOURTHORN,
@ -2141,8 +2140,10 @@ enum OBTYPE {
OT_ROBE, OT_ROBE,
OT_VELVETROBE, OT_VELVETROBE,
// armour - shoulders // armour - shoulders
OT_APRON,
OT_CLOAK, OT_CLOAK,
OT_CLOAKFUR, OT_CLOAKFUR,
OT_PAULDRON,
// armour - waist // armour - waist
OT_BELTLEATHER, OT_BELTLEATHER,
// armour - legs // armour - legs
@ -3001,6 +3002,8 @@ enum FLAG {
F_ARMOURIGNORE, // armour has no effect F_ARMOURIGNORE, // armour has no effect
F_ARMOURPIERCE, // goes through armour. armour can't reduce the F_ARMOURPIERCE, // goes through armour. armour can't reduce the
// damage dealt to less than v0. // damage dealt to less than v0.
// if v0 = b_true (or less than 0) it will
// pierce ALL armour
F_TWOHANDED, // weapon uses two hands to weild, if lf is size v0 F_TWOHANDED, // weapon uses two hands to weild, if lf is size v0
// or smaller. // or smaller.
F_NEEDSSPACE, // weapon needs space to swing - 75% chance of hitting F_NEEDSSPACE, // weapon needs space to swing - 75% chance of hitting
@ -3230,8 +3233,6 @@ enum FLAG {
F_ARMOURPENALTY, // lower your acc/ev by val0 due to cumbersome F_ARMOURPENALTY, // lower your acc/ev by val0 due to cumbersome
// armour. lowered by sk_armour skill. // armour. lowered by sk_armour skill.
// v0 is accuracy penalty, v1 is evasion penalty. // v0 is accuracy penalty, v1 is evasion penalty.
// if v0 = b_true (or less than 0) it will
// pierce ALL armour
F_MINDSHIELD, // lf is immune to psionic attacks F_MINDSHIELD, // lf is immune to psionic attacks
F_MISCASTCHANCE, // lf has +v0% chance of spell failure F_MISCASTCHANCE, // lf has +v0% chance of spell failure
F_LEVRACE, // at level v0, this race is promoted to race v1 F_LEVRACE, // at level v0, this race is promoted to race v1