noisytoot/notnotdnethack
1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-05-10 01:05:27 +01:00
Code Issues Activity

Merge branch 'devel-3.22.1' of https://github.com/Chris-plus-alphanumericgibberish/dNAO.git into devel-3.22.1

Browse source 
# Conflicts:
#	src/weapon.c
This commit is contained in:
chris 2024-01-24 21:03:36 -05:00
commit 166d82d4a6
3 changed files with 39 additions and 38 deletions

13
src/attrib.c
View file

@ -941,18 +941,15 @@ int oldlevel, newlevel;
lose_weapon_skill(skillslots);
}
}
int message = 0;
if ((oldlevel >= 14 && newlevel < 14) || (newlevel >= 14 && oldlevel < 14)){
boolean message = FALSE;
if (newlevel >= 14 && oldlevel < 14){
for (int i = 0; i < P_NUM_SKILLS; i++) {
if (roleSkill(i)){
message = oldlevel - newlevel;
if (oldlevel > newlevel) restrict_weapon_skill(i);
else expert_weapon_skill(i);
message = TRUE;
expert_weapon_skill(i);
}
}
if (message != 0){
You_feel("your skills %s!", (message > 0) ? "slipping away" : "increasing");
}
if (message) You_feel("like you've unlocked new potential!");
}
}

2
src/eat.c
View file

@ -2932,7 +2932,7 @@ doeat() /* generic "eat" command funtion (see cmd.c) */
case TOOL_CLASS:
u.uconduct.food++;
if (otmp->otyp == MAGIC_WHISTLE){
poly_obj(otmp, WHISTLE);
otmp = poly_obj(otmp, WHISTLE);
You("drain the %s of its magic.", xname(otmp));
} else {
curspe = otmp->spe;

62
src/weapon.c
View file

@ -3513,6 +3513,36 @@ get_your_size()
return wielder_size;
}
int
max_offhand_weight(){
/* Sporkhack:
* Heavy things are hard to use in your offhand unless you're
* very good at what you're doing.
*
* No real need to restrict unskilled here since knives and such
* are very hard to find and people who are restricted can't
* #twoweapon even at unskilled...
*/
int maxweight = 0;
switch (P_SKILL(P_TWO_WEAPON_COMBAT)) {
case P_ISRESTRICTED:
case P_UNSKILLED: maxweight = 10; break; /* not silver daggers */
case P_BASIC: maxweight = 20; break; /* daggers, crysknife, sickle, aklys, flail, bullwhip, unicorn horn */
case P_SKILLED: maxweight = 30; break; /* shortswords and spears (inc silver), mace, club, lightsaber, grappling hook */
case P_EXPERT: maxweight = 40; break; /* sabers and long swords, axe weighs 60, war hammer 50, pickaxe 80, beamsword */
case P_MASTER: maxweight = 50; break;
case P_GRAND_MASTER: maxweight = 60; break;
default: impossible("weapon_hit_bonus: bad skill %d", P_SKILL(P_TWO_WEAPON_COMBAT));
}
int wielder_size = get_your_size();
if (wielder_size > 0) maxweight *= 1+wielder_size;
return maxweight;
}
/*
* Return hit bonus/penalty based on skill of weapon.
* Treat restricted weapons as unskilled.
@ -3523,7 +3553,7 @@ struct obj *weapon;
int wep_type;
{
int type, skill, bonus = 0, aumpenalty = 0;
unsigned int maxweight = 0;
int maxweight = max_offhand_weight();
static boolean twowepwarn = TRUE;
static boolean makashiwarn = TRUE;
@ -3586,33 +3616,6 @@ int wep_type;
2W weapons -6 -6 +0 +1 +2
*/
/* Sporkhack:
* Heavy things are hard to use in your offhand unless you're
* very good at what you're doing.
*
* No real need to restrict unskilled here since knives and such
* are very hard to find and people who are restricted can't
* #twoweapon even at unskilled...
*/
switch (P_SKILL(P_TWO_WEAPON_COMBAT)) {
default: impossible("weapon_hit_bonus: bad skill %d", P_SKILL(P_TWO_WEAPON_COMBAT));
case P_ISRESTRICTED:
case P_UNSKILLED: maxweight = 10; break; /* not silver daggers */
case P_BASIC: maxweight = 20; break; /* daggers, crysknife, sickle, aklys, flail, bullwhip, unicorn horn */
case P_SKILLED: maxweight = 30; break; /* shortswords and spears (inc silver), mace, club, lightsaber, grappling hook */
case P_EXPERT: maxweight = 40; break; /* sabers and long swords, axe weighs 60, war hammer 50, pickaxe 80, beamsword */
case P_MASTER: maxweight = 50; break;
case P_GRAND_MASTER: maxweight = 60; break;
}
int wielder_size = (youracedata->msize - MZ_MEDIUM);
if (Role_if(PM_CAVEMAN))
wielder_size += 1;
if (u.sealsActive&SEAL_YMIR)
wielder_size += 1;
if (wielder_size > 0)
maxweight *= 1+wielder_size;
if (wep_type == P_BARE_HANDED_COMBAT) {
bonus -= abs(bonus * 2 / 3);
}
@ -4287,7 +4290,8 @@ boolean youagr;
&& !(otmp->oartifact && !always_twoweapable_artifact(otmp)) // ok artifact
&& (!bimanual(otmp, pa) || pa->mtyp == PM_GYNOID || pa->mtyp == PM_PARASITIZED_GYNOID)// not two-handed
&& (youagr || (otmp != MON_WEP(magr) && otmp != MON_SWEP(magr))) // not wielded already (monster)
&& (!youagr || otmp->owt <= max(10, P_SKILL(P_TWO_WEAPON_COMBAT)*10))// not too heavy
&& (!youagr || otmp->owt <= max_offhand_weight())// not too heavy
&& (!(otmp->cursed) || (youagr && Weldproof) || (!youagr && is_weldproof_mon(magr)))
&& (!youagr || (otmp != uwep && (!u.twoweap || otmp != uswapwep))) // not wielded already (player)
&& !(is_ammo(otmp) || (is_bad_melee_pole(otmp) && !melee_polearms(pa)) || is_missile(otmp)) // not unsuitable for melee (ammo, polearm, missile)
&& !otmp->owornmask); // not worn