notnotdnethack

noisytoot/notnotdnethack

Fork 0

mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-05-08 16:25:23 +01:00

Commit graph

f690963474 Fix lightsource radius code. ChrisANG 2020-12-22 18:44:32 -05:00
1b5177051a Tweak arti prices 1) shks don't overcharge 4x selling artis (but still pay 1/4 when buying) 2) Artifact prices override modifications (like +10/enchantment). NeroOneTrueKing 2020-12-22 15:48:19 -06:00
9788e99fa9 Loyal monsters slowly recover tameness ChrisANG 2020-12-22 15:51:02 -05:00
3979cc16ee Propperly handle the appearance of Iris's tentacles in the mirror. ChrisANG 2020-12-22 15:10:37 -05:00
ba6e5bb44e Ill-regard specimens and prisoners can't sing ChrisANG 2020-12-22 15:09:24 -05:00
3a0e7ff145 Discourage the goat from disintegrating you due to weapon sacs. ChrisANG 2020-12-22 15:09:03 -05:00
32267f161f

Merge pull request #1312 from NeroOneTrueKing/patch-maybe-refix-potions Chris-plus-alphanumericgibberish 2020-12-22 14:15:07 -05:00
1c29dabdba

Merge pull request #1309 from NeroOneTrueKing/patch-binder-signs Chris-plus-alphanumericgibberish 2020-12-22 14:14:36 -05:00
32a219f838

Merge pull request #1308 from NeroOneTrueKing/patch-chris-pls Chris-plus-alphanumericgibberish 2020-12-22 14:11:18 -05:00
0639da9e8c

Merge pull request #1307 from NeroOneTrueKing/patch-pictures-of-dark-young Chris-plus-alphanumericgibberish 2020-12-22 14:11:04 -05:00
8211616265 Undo most of previous potion change in favour of a smaller change NeroOneTrueKing 2020-12-22 13:08:22 -06:00
af0d294dbe Fix the second half of mplayer equipment generation. ChrisANG 2020-12-22 14:01:52 -05:00
2e6a1f40dc More diverse ceremorphosis hostes ChrisANG 2020-12-22 13:20:19 -05:00
9d234fc3c2 Mind flayer skeletons are normal human skeletons ChrisANG 2020-12-22 13:05:05 -05:00
83447b35b5 Re-implement lightsaber glyph colors. ChrisANG 2020-12-22 12:58:24 -05:00
74f4757ec0 Better align how you can self-inspect and monsters can see binder signs Mostly what I'd call fixes, though notably you can now see your own shadow -- Chris, if you'd rather keep the player's shadow a mystery to them, that's cool too. NeroOneTrueKing 2020-12-22 00:48:51 -06:00
d7f6f5aa18 Use O_POWER() NeroOneTrueKing 2020-12-21 23:04:07 -06:00
8186097160 Better handle photography of minors NeroOneTrueKing 2020-12-21 22:54:23 -06:00
e4e37af37e Merge branch 'devel-3.19.2' of https://github.com/Chris-plus-alphanumericgibberish/dNAO.git into devel-3.19.2 ChrisANG 2020-12-21 23:39:49 -05:00
f4f7ef54ed

Merge pull request #1306 from NeroOneTrueKing/patch-sunglasses-hallu-item Chris-plus-alphanumericgibberish 2020-12-21 23:38:23 -05:00
e254a6ef64 Sunglasses ChrisANG 2020-12-21 23:37:37 -05:00
ccff69aad9 Add sunglasses hallu item NeroOneTrueKing 2020-12-21 18:19:28 -06:00
27e7394f85

Merge pull request #1305 from NeroOneTrueKing/patch-xhity-inv-elemental-resists Chris-plus-alphanumericgibberish 2020-12-20 21:44:59 -05:00
1a6bb4a2b0 Use players' InvElem_resistance macros for xhity InvElem_resist(mdef) NeroOneTrueKing 2020-12-20 19:55:42 -06:00
0c47ee7c6f Merge branch 'devel-3.19.2' of https://github.com/Chris-plus-alphanumericgibberish/dNAO.git into devel-3.19.2 ChrisANG 2020-12-20 20:04:03 -05:00
ac8fdc4ee4 Make Magic melee attacks bypass armor MC, and fix spacing. ChrisANG 2020-12-20 20:01:52 -05:00
39b368226f Finish Ringed Brass Armor ChrisANG 2020-12-20 20:01:20 -05:00
cca4665460

Merge pull request #1304 from NeroOneTrueKing/patch-refix-readafterfree Chris-plus-alphanumericgibberish 2020-12-20 18:33:52 -05:00
400040c9d5

Merge pull request #1303 from NeroOneTrueKing/patch-getspiritlet-oob Chris-plus-alphanumericgibberish 2020-12-20 18:33:39 -05:00
1ab68fdca1 Set *weapon_p before early returns NeroOneTrueKing 2020-12-20 16:13:12 -06:00
6760819da0 Check u.spiritPOrder[i] != -1 NeroOneTrueKing 2020-12-20 16:04:29 -06:00
ac64b0e8c7 Merge branch 'devel-3.19.2' of https://github.com/Chris-plus-alphanumericgibberish/dNAO.git into devel-3.19.2 ChrisANG 2020-12-20 16:54:46 -05:00
c453ab6bc0

Merge pull request #1302 from NeroOneTrueKing/patch-unwep-wielded-potion Chris-plus-alphanumericgibberish 2020-12-20 16:53:08 -05:00
91a6f08e14

Merge pull request #1301 from NeroOneTrueKing/patch-untame-function Chris-plus-alphanumericgibberish 2020-12-20 16:52:45 -05:00
b8662485c5

Merge pull request #1300 from NeroOneTrueKing/patch-merge-conflict Chris-plus-alphanumericgibberish 2020-12-20 16:51:50 -05:00
fccd36b2d0

Merge pull request #1299 from NeroOneTrueKing/patch-fix-null-searing-potion-weapon Chris-plus-alphanumericgibberish 2020-12-20 16:51:05 -05:00
6c616402f8

Merge pull request #1297 from NeroOneTrueKing/patch-show-weapon-skill-on-inspection Chris-plus-alphanumericgibberish 2020-12-20 16:47:17 -05:00
d33e6dd13e

Merge pull request #1295 from NeroOneTrueKing/patch-farcast-clairvoyance-restriction Chris-plus-alphanumericgibberish 2020-12-20 16:42:05 -05:00
37ed972560

Merge pull request #1293 from NeroOneTrueKing/patch-ad_vamp-fix Chris-plus-alphanumericgibberish 2020-12-20 16:41:44 -05:00
2d1e8325c8 Add more safety checks NeroOneTrueKing 2020-12-20 15:13:03 -06:00
5d72430ca9 Call uwepgone() when appropriate Because for SOME REASON freeinv() doesn't, and I'm not sure changing freeinv() to do so won't cause even more bugs >_> NeroOneTrueKing 2020-12-20 15:10:14 -06:00
033dbd7693 Use a proper untame() function to remember to clean MX_EDOG as needed NeroOneTrueKing 2020-12-20 15:05:28 -06:00
0422f1d20f Fix const char * warning NeroOneTrueKing 2020-12-20 13:49:57 -06:00
1d6456e867 Fix merge conflict NeroOneTrueKing 2020-12-20 13:44:52 -06:00
a37c128ccf

Merge pull request #1291 from NeroOneTrueKing/patch-zombie-groupsize-nerf Chris-plus-alphanumericgibberish 2020-12-20 14:28:43 -05:00
ccccfff790

Merge branch 'devel-3.19.2' into patch-zombie-groupsize-nerf Chris-plus-alphanumericgibberish 2020-12-20 14:27:58 -05:00
001237fc7b

Merge pull request #1290 from NeroOneTrueKing/patch-cleaning-templates-a-little Chris-plus-alphanumericgibberish 2020-12-20 14:23:16 -05:00
2b8b3e421e

Merge branch 'devel-3.19.2' into patch-cleaning-templates-a-little Chris-plus-alphanumericgibberish 2020-12-20 14:13:35 -05:00
51704064e7

Merge pull request #1289 from NeroOneTrueKing/patch-shining-weapon-typo Chris-plus-alphanumericgibberish 2020-12-20 14:11:31 -05:00
799b089edd

Merge pull request #1288 from NeroOneTrueKing/patch-boulders-are-scary Chris-plus-alphanumericgibberish 2020-12-20 14:11:12 -05:00
4a4a67632f Don't immediately NULL weapon, it's needed for messaging NeroOneTrueKing 2020-12-20 12:44:17 -06:00
c7edfddde4

Merge pull request #1298 from NeroOneTrueKing/patch-dont-web-traps Chris-plus-alphanumericgibberish 2020-12-20 11:53:35 -05:00
e503e2c63e Oops fix bracketing NeroOneTrueKing 2020-12-20 01:42:04 -06:00
a375b8ef4d

Merge pull request #1287 from NeroOneTrueKing/patch-more-artifact-encyc-entries Chris-plus-alphanumericgibberish 2020-12-20 01:39:45 -05:00
13c9520122

Merge pull request #1286 from NeroOneTrueKing/patch-trap-ammo-return Chris-plus-alphanumericgibberish 2020-12-20 01:38:41 -05:00
ee6ca2aeb5

Merge pull request #1285 from NeroOneTrueKing/patch-dont-web-traps Chris-plus-alphanumericgibberish 2020-12-20 01:36:45 -05:00
471eac03be

Merge pull request #1284 from NeroOneTrueKing/patch-shk-merge-with-zombie Chris-plus-alphanumericgibberish 2020-12-20 01:32:58 -05:00
d2eb494184

Merge pull request #1283 from NeroOneTrueKing/patch-corpsenm-safety Chris-plus-alphanumericgibberish 2020-12-20 01:32:27 -05:00
c83dd7d6ac

Merge pull request #1282 from NeroOneTrueKing/devel-crown_c Chris-plus-alphanumericgibberish 2020-12-19 23:05:48 -05:00
7064df7e0b

Merge pull request #1281 from NeroOneTrueKing/patch-fix-skill-dtype-switchup Chris-plus-alphanumericgibberish 2020-12-19 23:03:36 -05:00
1cefb1f2c1

Merge pull request #1280 from NeroOneTrueKing/patch-use-launcher-skill Chris-plus-alphanumericgibberish 2020-12-19 23:02:54 -05:00
4b9a14798a

Merge pull request #1279 from NeroOneTrueKing/devel-new-arti-scorpion-carapace Chris-plus-alphanumericgibberish 2020-12-19 23:01:51 -05:00
4a896a127d

Merge pull request #1278 from NeroOneTrueKing/patch-set_material-wornbugs Chris-plus-alphanumericgibberish 2020-12-19 23:00:57 -05:00
263e0139c2

Merge pull request #1277 from gebulmer/fix/armor-off-segfault Chris-plus-alphanumericgibberish 2020-12-19 22:56:26 -05:00
cf38ac5a47

Merge pull request #1276 from NeroOneTrueKing/patch-template-polymorphing Chris-plus-alphanumericgibberish 2020-12-19 22:56:07 -05:00
dfabcdff8a Only mind flayer tentacles rewire android brains. ChrisANG 2020-12-19 22:41:45 -05:00
64e9e304c2 Slightly buff Baalzebub ChrisANG 2020-12-19 22:40:55 -05:00
6221775ba6 Give Malcanthet sneak attack, and cap sneak attack die size ChrisANG 2020-12-19 19:11:51 -05:00
4a1bda30dc Ringed Armor ChrisANG 2020-12-19 19:10:48 -05:00
c2a4262400 Add an artifact for Malcanthet ChrisANG 2020-12-19 19:10:18 -05:00
817951504e Show weapon skill on inspection. NeroOneTrueKing 2020-12-19 13:09:50 -06:00
40bebe392a Restrict farcasting Clairvoyance on no-map levels The spell Clairvoyance should not be better than Magic Mapping. NeroOneTrueKing 2020-12-18 15:15:52 -06:00
33029664c2 Player Vampires should get nutrition from draining foes NeroOneTrueKing 2020-12-18 13:51:46 -06:00
a4af8f53f4 Boost nessian pit fiend damage slightly. ChrisANG 2020-12-18 13:04:07 -05:00
5b25eefc00 Daemon has a 9 DR aura ChrisANG 2020-12-18 13:02:12 -05:00
230dbba1e8 The Wizard doesn't actually want the quest artifact. ChrisANG 2020-12-18 13:01:49 -05:00
8d3e0930b8 Reduce the size of nessian pit fiend weapons. ChrisANG 2020-12-18 13:00:14 -05:00
6255b35a81 Give Asmo black clothes ChrisANG 2020-12-18 12:59:22 -05:00
daee6564e0 Give Daemon a different equip set. ChrisANG 2020-12-18 12:59:04 -05:00
1085b805aa Mothering masses have dark young tentacles ChrisANG 2020-12-18 12:58:14 -05:00
fbf9362c42 Sub "S_eel" for "underswimmer" macro and apply it to crystal oozes. ChrisANG 2020-12-18 12:57:59 -05:00
155b53a98f Reduce dependency on magic numbers Any %s in titles are marked with an int. The int controls the title-generating function, so that the function doesn't have to care about the actual index numbers of the hand_of_elbereth[] array. Remove special case around "Nasu no Playername" by checking if the title starts with "the" instead of hardcasing (via magic number) when it doesn't. NeroOneTrueKing 2020-12-18 02:02:52 -06:00
bf3200b15b Add different "fail" messages to Necronomicon if LAST_PAGE NeroOneTrueKing 2020-12-17 18:47:28 -06:00
3201b8a66e Remove test code NeroOneTrueKing 2020-12-17 17:54:48 -06:00
2d5a0266c4 Tie groupsize of zombies to the inverse of their strength NeroOneTrueKing 2020-12-17 17:50:45 -06:00
94d2f275ec Some backend cleanup about templates/factions NeroOneTrueKing 2020-12-17 13:44:23 -06:00
302e18bdb2 Fix spacing NeroOneTrueKing 2020-12-16 22:49:28 -06:00
b1ee1c4fb1 Reduce nomul() from -1 to 0. Makes chain boulder-throwing and being knocked into water much less lethal. NeroOneTrueKing 2020-12-15 18:10:49 -06:00
2476eee65f Make boulders scary NeroOneTrueKing 2020-12-15 17:53:17 -06:00
fa2d04a8e1 Add more artifact encyc entries NeroOneTrueKing 2020-12-15 13:27:46 -06:00
02e1d9fac1 Don't let AD_WEBS replace traps NeroOneTrueKing 2020-12-15 00:57:52 -06:00
46e6b5e5d9 Drop trap ammo when replacing traps NeroOneTrueKing 2020-12-15 00:21:17 -06:00
37907fadd1 Fix shks merging with zombies when trying to block the door NeroOneTrueKing 2020-12-14 13:11:00 -06:00
9b7a797c80 Couple other maybe-issues NeroOneTrueKing 2020-12-14 12:47:20 -06:00
9546db3d54 is_chupodible() was unsafe NeroOneTrueKing 2020-12-14 12:29:25 -06:00
a073fe65e6 Set obj to 0 when appropriate NeroOneTrueKing 2020-12-14 11:26:59 -06:00
4ade32b296 Split gcrownu off into its own file, rewrite it. NeroOneTrueKing 2020-12-14 02:03:24 -06:00
d502e06083 Add exception for Pen of the Void NeroOneTrueKing 2020-12-13 18:21:38 -06:00
20d9d36d94 Fix dtype/skill mixup NeroOneTrueKing 2020-12-13 18:14:14 -06:00
819a8c0133 Multishot uses the launcher's skill, when ammo/launcher differ in skill NeroOneTrueKing 2020-12-13 17:58:33 -06:00