-
Notifications
You must be signed in to change notification settings - Fork 0
/
bugfixes.patch
1288 lines (1243 loc) · 51.2 KB
/
bugfixes.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/bugfixes.txt nethack-3.4.3-bugfix/bugfixes.txt
--- nethack-3.4.3/bugfixes.txt 1969-12-31 19:00:00.000000000 -0500
+++ nethack-3.4.3-bugfix/bugfixes.txt 2014-11-09 17:39:36.277533970 -0500
@@ -0,0 +1,190 @@
+List of bugs fixed in this repository:
+
+* C343-248: You can't put candles in a candelabrum while underwater.
+ Author: Sgeo
+ Source: http://bilious.alt.org/?257
+
+* C343-324: Cutting a long worm in two will crash the game if the cut takes
+ the worm to 1 HP or if long worms had become extinct.
+ Author: Patric Mueller
+ Source: http://bilious.alt.org/?332
+
+* C343-19: Dipping acid in a fountain may not destroy the acid.
+* C343-179: If a monster is killed by a drawbridge while carrying a potion of
+ acid, the game may panic.
+* C343-268: Used up potion of acid may end up in bones file.
+* C343-394: Throwing a potion of acid into water may panic the game.
+ Author: Patric Mueller
+ Source: http://bilious.alt.org/?340
+
+* C343-100: Game may crash if thrown potion hits bars before a monster.
+ Author: Patric Mueller
+ Source: http://bilious.alt.org/?341
+
+* C343-218: Applying a wielded cream pie can crash the game. This generalizes
+ to wielded objects being destroyed.
+* C343-275: If a lit, wielded, candle or potion of oil burns out, the game may
+ crash.
+* C343-276: If a figurine auto-transforms while wielded or worn, the game may
+ crash.
+ Author: Patric Mueller
+ Source: http://bilious.alt.org/?342
+
+* C343-162: Using Magicbane may cause an ungrammatical message.
+ Author: Ray Chason
+ Source: http://bilious.alt.org/?445
+
+* C343-1: At a pit the game can give messages with poor grammar.
+ Author: Tung Nguyen
+ Source: https://github.com/tung/NitroHack/commit/5d40e9f86486141df827e2afef78e992c4aac01b
+
+* C343-175: Chatting to hostile prisoners may give an inappropriate message.
+ Author: Bulwersator
+ Source: https://github.com/Bulwersator/UnNetHackPlus/commit/541d0b417bb81df10b4486b895ca78f5bb938247
+ Comment: Actually tame prisoners give the inappropriate message.
+
+* C343-299: Killing tame engulfer from inside gives a warning message.
+ Author: Jared Minch
+ Source: https://github.com/sgrunt/GruntHack/commit/3df702230a3f767a4c7dd6f98d0156ed621a49ac
+
+* C343-72: You get confusing messages when you stop levitating while on a
+ flying steed.
+ Author: Edoardo Spadolini
+ Source: http://sourceforge.net/apps/trac/unnethack/changeset/958
+
+* C343-171: Silver weapon damage message is sometimes missing when hero is
+ polymorphed.
+ Author: Patric Mueller
+ Source: http://sourceforge.net/apps/trac/unnethack/changeset/910
+
+* C343-174: Drum of earthquake gives inappropriate message if hero
+ or monster is in a pit.
+ Author: Patric Mueller
+ Source: http://sourceforge.net/apps/trac/unnethack/changeset/948
+
+* C343-30: Cursed scroll of destroy armor on cursed armor doesn't always
+ interact correctly.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/e7afc1b022dd5e1b39dd2c69db077b533e66f3f4
+
+* C343-109: There is a grammar error in the Tourist leader's greeting.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/6da48e6dd87737f1e207a2759e69075d62eb9569
+
+* C343-351: Alchemy-caused explosions don't wake nearby monsters.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/63dbb6485ccc8df690cdbd8eb2cec4d0f30139e4
+ Comment: The original patch makes two additional changes to
+ features present in GruntHack but not in vanilla.
+
+* C343-355: Archeologists start out at basic skill level in sling.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/ccf75ee3bce3fe3295870c262ad28845e9f0bac8
+
+* C343-17: After polymorphing into a xorn and returning to human form, player
+ can be stuck in a pit that isn't there.
+ Author: Bulwersator
+ Source: https://github.com/Bulwersator/UnNetHackPlus/commit/f58badbede0dc6ebcf2a0f4218bfdb0f8423acaa
+
+* C343-24: Documented default for option "null" is "off"; default is actually
+ "on".
+ Author: Bulwersator
+ Source: https://github.com/Bulwersator/UnNetHackPlus/commit/a6d7e394d2f5a624205fd082545650915f2e3ad9
+
+* C343-52: Worn or wielded objects destroyed by dipping into lit potions of
+ oil are not handled properly; this can result in odd game behavior.
+ Author: Patric Mueller
+ Source: http://sourceforge.net/p/unnethack/code/1422/
+
+* C343-57: #enhance command descriptions in Guidebook and game do not match.
+ Author: SGrunt (via Bulwersator)
+ Source: https://github.com/Bulwersator/UnNetHackPlus/commit/5e60f1e82d9a26f7c899a01584c6304fcd41ad09
+
+* C343-58: #conduct command description grammar is poor
+ Author: SGrunt (via Bulwersator)
+ Source: https://github.com/Bulwersator/UnNetHackPlus/commit/2c09c93ade52da17a16fd0cd1304952ceb0f3387
+
+* C343-77: Some messages referring to monsters that look like horses refer
+ to claws.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/0333ed27591ecbb57f90e7adc6ae8aecfdbaf7a5
+
+* C343-95: If killed by the wish from a magic lamp (or similar situation) and
+ a bones file is produced, the bones file has the lamp in the wrong
+ state.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/3d7a8538f5b6d58b68d9b50c6a370bf66d8255e7
+
+* C343-115: Sleeping or paralyzed unicorns can catch gems.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/b977028350449cdbcd3b90292de637e9a92d9c77
+
+* C343-134: Being petrified by swallowing a cockatrice violates foodless
+ conduct.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/a65cf627f512c63fbae610e2f94806c86b0fe118
+
+* C343-172: Crash could occur when monster uses potion or food to cure stoning
+ or confusion.
+ Author: Ray Chason
+ Source: https://github.com/chasonr/nethack-3.4.3-bugfix/commit/7da438e44d491aa6098ce75df65650521f166028
+
+* C343-243: Hero can throw without hands.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/b6416957f7e6dd468d9491be8f7ca3814b1a5622
+
+* C343-305: Attacking with an applied polearm ignores the "confirm" option.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/dca24d18e51eea2ca7b71dca2564b266cc73d27d
+
+* C343-343: Helm of Opposite alignment gives incorrect piety level.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/fbf885966b11084817ad2ca2003db3bd5e28d079
+
+* C343-345: Attempting to remove cursed lenses gives a message with poor
+ grammar.
+ Author: SGrunt (via Bulwersator)
+ Source: https://github.com/Bulwersator/UnNetHackPlus/commit/aba5543d03c5c0d914c51705d3166e8d5a687660
+
+* C343-383: Applying a bullwhip while hero is at edge of map may cause a panic
+ or crash.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/7831df3dda7f811c0609cba0523e6b24bdf1d23e
+
+* C343-406: One of the coyote names is spelled wrong.
+ Author: Bulwersator
+ Source: https://github.com/Bulwersator/UnNetHackPlus/commit/2304213f3e68baa89a539984cde950ded066ddd0
+
+* C343-409: Unlocking a mimic pretending to be a door is not handled properly.
+ Author: SGrunt
+ Source: https://github.com/sgrunt/GruntHack/commit/18465ffea7214bff81ec5b5687222b63cdd7460b
+
+* SC343-11: It's possible to easily find the identity of a high priest on the
+ Astral plane.
+* SC343-12: Hero using telepathy can abuse Call on the Astral Plane.
+ Author: Patric Mueller
+ Source: http://bilious.alt.org/?337
+
+* W343-3: Under the Polish version of Windows 2000 SP4, screen output with a
+ raster font shows wrong characters for many dungeon features.
+* W343-4: Keyboard may stop responding after locking or unlocking a door
+ when using altkeyhandler=nhraykey.dll
+ Author: Ray Chason
+ Source: http://bilious.alt.org/?313
+
+Bugs not mentioned on the DevTeam's website
+
+* Color of mithril objects is wrong
+ Author: Bulwersator
+ Source: https://github.com/Bulwersator/UnNetHackPlus/commit/67c167367b8b118c9bc9b7f4e19bdd41bbc3b308
+* Amnesia should forget more than one spell
+ Author: Ray Chason
+ Source: https://github.com/chasonr/nethack-3.4.3-bugfix/commit/5ddb88e650e6ce0cc3107a9f08711f6334604ab7
+
+Rejected patches:
+
+* M343-1: Release code does not build under Carbon.
+ Reason: Patch does not apply cleanly; changes to sys/mac/macwin.c
+ refer to lines that do not exist.
+ Author: Kevin Hugo
+ Source: http://www.nethack.org/v343/bugmore/src-diff-mac.txt
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/dat/cmdhelp nethack-3.4.3-bugfix/dat/cmdhelp
--- nethack-3.4.3/dat/cmdhelp 2003-12-07 18:39:12.000000000 -0500
+++ nethack-3.4.3-bugfix/dat/cmdhelp 2013-08-03 21:11:19.689365008 -0400
@@ -103,7 +103,7 @@
M-a Adjust inventory letters
M-c Talk to someone
M-d Dip an object into something
-M-e Advance or check weapons skills
+M-e Advance or check weapon and spell skills
M-f Force a lock
M-i Invoke an object's special powers
M-j Jump to another location
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/dat/hh nethack-3.4.3-bugfix/dat/hh
--- nethack-3.4.3/dat/hh 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/dat/hh 2013-08-03 21:11:23.157365117 -0400
@@ -88,7 +88,7 @@
M-a adjust adjust inventory letters
M-c chat talk to someone
M-d dip dip an object into something
-M-e enhance advance or check weapons skills
+M-e enhance advance or check weapon and spell skills
M-f force force a lock
M-i invoke invoke an object's special powers
M-j jump jump to another location
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/dat/quest.txt nethack-3.4.3-bugfix/dat/quest.txt
--- nethack-3.4.3/dat/quest.txt 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/dat/quest.txt 2013-04-07 14:27:24.000000000 -0400
@@ -2619,7 +2619,7 @@
"Did you bring me back any souvenirs?"
%E
%Cc Tou 00015
-"Is it really you, %p! I had given up hope for your return.
+"It is really you, %p! I had given up hope for your return.
As you can %x, we are desperately in need of your talents. Someone must
defeat %n if our town is become what it once was.
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/doc/Guidebook.mn nethack-3.4.3-bugfix/doc/Guidebook.mn
--- nethack-3.4.3/doc/Guidebook.mn 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/doc/Guidebook.mn 2013-08-03 21:16:35.445374969 -0400
@@ -678,7 +678,7 @@
.lp #chat
Talk to someone.
.lp #conduct
-List which challenges you have adhered to. See the section below entitled
+List status of voluntary challenges. See the section below entitled
``Conduct'' for details.
.lp #dip
Dip an object into something.
@@ -2006,7 +2006,7 @@
Since the news is shown at the beginning of the game, there's no point
in setting this with the `O' command.
.lp "null "
-Send padding nulls to the terminal (default off).
+Send padding nulls to the terminal (default on).
.lp number_pad
Use the number keys to move instead of [yuhjklbn] (default 0 or off).
(number_pad:2 invokes the old DOS behavior where `5' means `g', meta-`5'
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/doc/Guidebook.tex nethack-3.4.3-bugfix/doc/Guidebook.tex
--- nethack-3.4.3/doc/Guidebook.tex 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/doc/Guidebook.tex 2013-08-03 21:16:40.417375125 -0400
@@ -899,7 +899,7 @@
Talk to someone.
%.lp
\item[\tb{\#conduct}]
-List which challenges you have adhered to. See the section below entitled
+List status of voluntary challenges. See the section below entitled
``Conduct'' for details.
%.lp
\item[\tb{\#dip}]
@@ -2463,7 +2463,7 @@
in setting this with the `{\tt O}' command.
%.lp
\item[\ib{null}]
-Send padding nulls to the terminal (default off).
+Send padding nulls to the terminal (default on).
%.lp
\item[\ib{number\_pad}]
Use the number keys to move instead of {\tt [yuhjklbn]} (default 0 or off).
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/doc/Guidebook.txt nethack-3.4.3-bugfix/doc/Guidebook.txt
--- nethack-3.4.3/doc/Guidebook.txt 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/doc/Guidebook.txt 2013-08-03 21:16:54.633375574 -0400
@@ -876,8 +876,8 @@
Talk to someone.
#conduct
- List which challenges you have adhered to. See the section
- below entitled ``Conduct'' for details.
+ List status of voluntary challenges. See the section below
+ entitled ``Conduct'' for details.
#dip Dip an object into something.
@@ -2584,7 +2584,7 @@
setting this with the `O' command.
null
- Send padding nulls to the terminal (default off).
+ Send padding nulls to the terminal (default on).
number_pad
Use the number keys to move instead of [yuhjklbn] (default 0 or
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/include/color.h nethack-3.4.3-bugfix/include/color.h
--- nethack-3.4.3/include/color.h 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/include/color.h 2013-04-07 19:17:49.000000000 -0400
@@ -38,6 +38,7 @@
#define HI_METAL CLR_CYAN
#define HI_COPPER CLR_YELLOW
#define HI_SILVER CLR_GRAY
+#define HI_MITHRIL HI_SILVER
#define HI_GOLD CLR_YELLOW
#define HI_LEATHER CLR_BROWN
#define HI_CLOTH CLR_BROWN
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/include/extern.h nethack-3.4.3-bugfix/include/extern.h
--- nethack-3.4.3/include/extern.h 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/include/extern.h 2013-03-31 22:13:58.000000000 -0400
@@ -1576,6 +1576,7 @@
E const char *FDECL(a_gname_at, (XCHAR_P x,XCHAR_P y));
E const char *FDECL(align_gname, (ALIGNTYP_P));
E const char *FDECL(halu_gname, (ALIGNTYP_P));
+E const char *FDECL(rnd_gname, (int));
E const char *FDECL(align_gtitle, (ALIGNTYP_P));
E void FDECL(altar_wrath, (int,int));
@@ -2016,7 +2017,7 @@
E void FDECL(fill_pit, (int,int));
E int FDECL(float_down, (long, long));
E int FDECL(fire_damage, (struct obj *,BOOLEAN_P,BOOLEAN_P,XCHAR_P,XCHAR_P));
-E void FDECL(water_damage, (struct obj *,BOOLEAN_P,BOOLEAN_P));
+E boolean FDECL(water_damage, (struct obj *,BOOLEAN_P,BOOLEAN_P));
E boolean NDECL(drown);
E void FDECL(drain_en, (int));
E int NDECL(dountrap);
@@ -2367,7 +2368,7 @@
E void FDECL(hit, (const char *,struct monst *,const char *));
E void FDECL(miss, (const char *,struct monst *));
E struct monst *FDECL(bhit, (int,int,int,int,int (*)(MONST_P,OBJ_P),
- int (*)(OBJ_P,OBJ_P),struct obj *));
+ int (*)(OBJ_P,OBJ_P),struct obj *, boolean *));
E struct monst *FDECL(boomhit, (int,int));
E int FDECL(burn_floor_paper, (int,int,BOOLEAN_P,BOOLEAN_P));
E void FDECL(buzz, (int,int,XCHAR_P,XCHAR_P,int,int));
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/README nethack-3.4.3-bugfix/README
--- nethack-3.4.3/README 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/README 2013-03-31 21:01:18.000000000 -0400
@@ -1,3 +1,19 @@
+This repository consists of the original vanilla NetHack 3.4.3 sources, plus
+fixes for bugs discovered and reported by the community -- primarily on
+NetHackWiki (http://nethackwiki.com/), on Bilious (http://bilious.alt.org/) and
+on rec.games.roguelike.nethack. The aim is to provide "one stop shopping" for
+fixes for known bugs; Bilious, SourceForge, GitHub and the like are the places
+for new features.
+
+Priority is given to bugs listed by the DevTeam.
+
+The file "bugfixes.patch" contains the diff between the unmodified sources and
+this repository. The file "bugfixes.txt" contains the list of bugs fixed.
+
+The original NetHack README follows:
+
+==============================================================================
+
NetHack 3.4.3 -- General information
NetHack 3.4 is an enhancement to the dungeon exploration game NetHack.
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/apply.c nethack-3.4.3-bugfix/src/apply.c
--- nethack-3.4.3/src/apply.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/apply.c 2013-08-03 22:08:40.625473554 -0400
@@ -80,7 +80,7 @@
} else if ((mtmp = bhit(u.dx, u.dy, COLNO, FLASHED_LIGHT,
(int FDECL((*),(MONST_P,OBJ_P)))0,
(int FDECL((*),(OBJ_P,OBJ_P)))0,
- obj)) != 0) {
+ obj, NULL)) != 0) {
obj->ox = u.ux, obj->oy = u.uy;
(void) flash_hits_mon(mtmp, obj);
}
@@ -670,7 +670,7 @@
mtmp = bhit(u.dx, u.dy, COLNO, INVIS_BEAM,
(int FDECL((*),(MONST_P,OBJ_P)))0,
(int FDECL((*),(OBJ_P,OBJ_P)))0,
- obj);
+ obj, NULL);
if (!mtmp || !haseyes(mtmp->data))
return 1;
@@ -922,13 +922,13 @@
You(no_elbow_room);
return;
}
- if(Underwater) {
- pline("Sorry, fire and water don't mix.");
- return;
- }
otmp = carrying(CANDELABRUM_OF_INVOCATION);
if(!otmp || otmp->spe == 7) {
+ if(Underwater) {
+ pline("Sorry, fire and water don't mix.");
+ return;
+ }
use_lamp(obj);
return;
}
@@ -938,6 +938,10 @@
safe_qbuf(qbuf, sizeof(" to ?"), the(xname(otmp)),
the(simple_typename(otmp->otyp)), "it"));
if(yn(qbuf) == 'n') {
+ if(Underwater) {
+ pline("Sorry, fire and water don't mix.");
+ return;
+ }
if (!obj->lamplit)
You("try to light %s...", the(xname(obj)));
use_lamp(obj);
@@ -1183,12 +1187,12 @@
if (uwep->otyp == MAGIC_LAMP) {
if (uwep->spe > 0 && !rn2(3)) {
check_unpaid_usage(uwep, TRUE); /* unusual item use */
- djinni_from_bottle(uwep);
makeknown(MAGIC_LAMP);
uwep->otyp = OIL_LAMP;
uwep->spe = 0; /* for safety */
uwep->age = rn1(500,1000);
if (uwep->lamplit) begin_burn(uwep, TRUE);
+ djinni_from_bottle(uwep);
update_inventory();
} else if (rn2(2) && !Blind)
You("see a puff of smoke.");
@@ -2124,6 +2128,7 @@
if (!getdir((char *)0)) return res;
if (Stunned || (Confusion && !rn2(5))) confdir();
+ mtmp = (isok(rx, ry)) ? m_at(rx, ry) : (struct monst *)0;
rx = u.ux + u.dx;
ry = u.uy + u.dy;
mtmp = m_at(rx, ry);
@@ -2208,6 +2213,13 @@
*/
const char *wrapped_what = (char *)0;
+ if (!isok(rx, ry)) {
+ pline("%s",
+ Is_airlevel(&u.uz) ? "You snap your whip through thin air."
+ : msg_snap);
+ return 1;
+ }
+
if (mtmp) {
if (bigmonst(mtmp->data)) {
wrapped_what = strcpy(buf, mon_nam(mtmp));
@@ -2388,7 +2400,7 @@
cc.x = u.ux;
cc.y = u.uy;
if (getpos(&cc, TRUE, "the spot to hit") < 0)
- return 0; /* user pressed ESC */
+ return res; /* user pressed ESC */
/* Calculate range */
typ = uwep_skill_type();
@@ -2415,6 +2427,8 @@
if ((mtmp = m_at(cc.x, cc.y)) != (struct monst *)0) {
int oldhp = mtmp->mhp;
+ if (attack_checks(mtmp, obj)) return res;
+
bhitpos = cc;
check_caitiff(mtmp);
(void) thitmonst(mtmp, uwep);
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/artifact.c nethack-3.4.3-bugfix/src/artifact.c
--- nethack-3.4.3/src/artifact.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/artifact.c 2013-03-31 22:55:38.000000000 -0400
@@ -905,7 +905,7 @@
if (youattack || youdefend || vis) {
(void) upstart(hittee); /* capitalize */
if (resisted) {
- pline("%s %s!", hittee, vtense(hittee, "resist"));
+ pline("%s resist%s!", hittee, youdefend ? "" : "s");
shieldeff(youdefend ? u.ux : mdef->mx,
youdefend ? u.uy : mdef->my);
}
@@ -916,7 +916,7 @@
if (do_stun) Strcat(buf, "stunned");
if (do_stun && do_confuse) Strcat(buf, " and ");
if (do_confuse) Strcat(buf, "confused");
- pline("%s %s %s%c", hittee, vtense(hittee, "are"),
+ pline("%s %s %s%c", hittee, youdefend ? "are" : "is",
buf, (do_stun && do_confuse) ? '!' : '.');
}
}
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/cmd.c nethack-3.4.3-bugfix/src/cmd.c
--- nethack-3.4.3/src/cmd.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/cmd.c 2013-08-03 21:17:03.125375842 -0400
@@ -1477,9 +1477,9 @@
struct ext_func_tab extcmdlist[] = {
{"adjust", "adjust inventory letters", doorganize, TRUE},
{"chat", "talk to someone", dotalk, TRUE}, /* converse? */
- {"conduct", "list which challenges you have adhered to", doconduct, TRUE},
+ {"conduct", "list status of voluntary challenges", doconduct, TRUE},
{"dip", "dip an object into something", dodip, FALSE},
- {"enhance", "advance or check weapons skills", enhance_weapon_skill,
+ {"enhance", "advance or check weapon and spell skills", enhance_weapon_skill,
TRUE},
{"force", "force a lock", doforce, FALSE},
{"invoke", "invoke an object's powers", doinvoke, TRUE},
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/dig.c nethack-3.4.3-bugfix/src/dig.c
--- nethack-3.4.3/src/dig.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/dig.c 2013-08-03 20:05:53.661241159 -0400
@@ -548,8 +548,7 @@
if(at_u) {
if (!wont_fall) {
- if (!Passes_walls)
- u.utrap = rn1(4,2);
+ u.utrap = rn1(4,2);
u.utraptype = TT_PIT;
vision_full_recalc = 1; /* vision limits change */
} else
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/do.c nethack-3.4.3-bugfix/src/do.c
--- nethack-3.4.3/src/do.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/do.c 2013-04-02 00:33:09.000000000 -0400
@@ -208,15 +208,14 @@
map_background(x, y, 0);
newsym(x, y);
}
- water_damage(obj, FALSE, FALSE);
+ return water_damage(obj, FALSE, FALSE);
} else if (u.ux == x && u.uy == y &&
(!u.utrap || u.utraptype != TT_PIT) &&
(t = t_at(x,y)) != 0 && t->tseen &&
(t->ttyp==PIT || t->ttyp==SPIKED_PIT)) {
/* you escaped a pit and are standing on the precipice */
if (Blind && flags.soundok)
- You_hear("%s %s downwards.",
- The(xname(obj)), otense(obj, "tumble"));
+ You_hear("%s tumble downwards.", the(xname(obj)));
else
pline("%s %s into %s pit.",
The(xname(obj)), otense(obj, "tumble"),
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/dokick.c nethack-3.4.3-bugfix/src/dokick.c
--- nethack-3.4.3/src/dokick.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/dokick.c 2013-03-31 21:51:15.000000000 -0400
@@ -553,7 +553,7 @@
mon = bhit(u.dx, u.dy, range, KICKED_WEAPON,
(int FDECL((*),(MONST_P,OBJ_P)))0,
(int FDECL((*),(OBJ_P,OBJ_P)))0,
- kickobj);
+ kickobj, NULL);
if(mon) {
if (mon->isshk &&
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/do_name.c nethack-3.4.3-bugfix/src/do_name.c
--- nethack-3.4.3/src/do_name.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/do_name.c 2013-08-03 22:13:43.533483110 -0400
@@ -1024,7 +1024,7 @@
"Evereadii Eatibus","Apetitius Giganticus",
"Hungrii Flea-Bagius","Overconfidentii Vulgaris",
"Caninus Nervous Rex","Grotesques Appetitus",
- "Nemesis Riduclii","Canis latrans"
+ "Nemesis Ridiculii","Canis latrans"
};
char *
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/dothrow.c nethack-3.4.3-bugfix/src/dothrow.c
--- nethack-3.4.3/src/dothrow.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/dothrow.c 2013-08-03 21:50:52.581439862 -0400
@@ -203,7 +203,7 @@
shotlimit = (multi || save_cm) ? multi + 1 : 0;
multi = 0; /* reset; it's been used up */
- if (notake(youmonst.data)) {
+ if (notake(youmonst.data) || nohands(youmonst.data)) {
You("are physically incapable of throwing anything.");
return 0;
}
@@ -980,14 +980,17 @@
if (Underwater) range = 1;
+ boolean obj_destroyed = FALSE;
mon = bhit(u.dx, u.dy, range, THROWN_WEAPON,
(int FDECL((*),(MONST_P,OBJ_P)))0,
(int FDECL((*),(OBJ_P,OBJ_P)))0,
- obj);
+ obj, &obj_destroyed);
/* have to do this after bhit() so u.ux & u.uy are correct */
if(Is_airlevel(&u.uz) || Levitation)
hurtle(-u.dx, -u.dy, urange, TRUE);
+
+ if (obj_destroyed) return; /* fixes C343-100 */
}
if (mon) {
@@ -1236,7 +1239,8 @@
tmp += 1000; /* Guaranteed hit */
}
- if (obj->oclass == GEM_CLASS && is_unicorn(mon->data)) {
+ if (obj->oclass == GEM_CLASS && is_unicorn(mon->data) &&
+ mon->mcanmove && !mon->msleeping && !mon->mburied) {
if (mon->mtame) {
pline("%s catches and drops %s.", Monnam(mon), the(xname(obj)));
return 0;
@@ -1748,7 +1752,7 @@
mon = bhit(u.dx, u.dy, range, THROWN_WEAPON,
(int FDECL((*),(MONST_P,OBJ_P)))0,
(int FDECL((*),(OBJ_P,OBJ_P)))0,
- obj);
+ obj, NULL);
if(mon) {
if (ghitm(mon, obj)) /* was it caught? */
return 1;
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/do_wear.c nethack-3.4.3-bugfix/src/do_wear.c
--- nethack-3.4.3/src/do_wear.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/do_wear.c 2013-10-12 23:17:21.954252676 -0400
@@ -317,6 +317,7 @@
if (u.ualign.type == A_NEUTRAL)
u.ualign.type = rn2(2) ? A_CHAOTIC : A_LAWFUL;
else u.ualign.type = -(u.ualign.type);
+ u.ualign.record = -1; /* consistent with altar conversion */
u.ublessed = 0; /* lose your god's protection */
/* makeknown(uarmh->otyp); -- moved below, after xname() */
/*FALLTHRU*/
@@ -378,6 +379,7 @@
break;
case HELM_OF_OPPOSITE_ALIGNMENT:
u.ualign.type = u.ualignbase[A_CURRENT];
+ u.ualign.record = -1; /* consistent with altar conversion */
u.ublessed = 0; /* lose the other god's protection */
flags.botl = 1;
break;
@@ -1168,7 +1170,7 @@
/* Curses, like chickens, come home to roost. */
if((otmp == uwep) ? welded(otmp) : (int)otmp->cursed) {
You("can't. %s cursed.",
- (is_boots(otmp) || is_gloves(otmp) || otmp->quan > 1L)
+ (is_boots(otmp) || is_gloves(otmp) || otmp->otyp == LENSES || otmp->quan > 1L)
? "They are" : "It is");
otmp->bknown = TRUE;
return(1);
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/hack.c nethack-3.4.3-bugfix/src/hack.c
--- nethack-3.4.3/src/hack.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/hack.c 2013-08-03 20:07:17.553243805 -0400
@@ -1135,7 +1135,10 @@
return;
}
if(u.utrap) {
- if(u.utraptype == TT_PIT) {
+ if(u.utraptype == TT_PIT && Passes_walls) {
+ You("phase through walls and escape from the pit.");
+ u.utrap = 0;
+ } else if(u.utraptype == TT_PIT) {
if (!rn2(2) && sobj_at(BOULDER, u.ux, u.uy)) {
Your("%s gets stuck in a crevice.", body_part(LEG));
display_nhwindow(WIN_MESSAGE, FALSE);
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/lock.c nethack-3.4.3-bugfix/src/lock.c
--- nethack-3.4.3/src/lock.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/lock.c 2013-08-03 22:18:43.253492565 -0400
@@ -373,6 +373,14 @@
pline("I don't think %s would appreciate that.", mon_nam(mtmp));
return(0);
}
+ if (mtmp &&
+ (mtmp->m_ap_type == M_AP_FURNITURE) &&
+ (mtmp->mappearance == S_hcdoor ||
+ mtmp->mappearance == S_vcdoor) &&
+ !Protection_from_shape_changers) {
+ stumble_onto_mimic(mtmp);
+ return(1);
+ }
if(!IS_DOOR(door->typ)) {
if (is_drawbridge_wall(cc.x,cc.y) >= 0)
You("%s no lock on the drawbridge.",
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/mhitu.c nethack-3.4.3-bugfix/src/mhitu.c
--- nethack-3.4.3/src/mhitu.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/mhitu.c 2013-04-07 13:55:23.000000000 -0400
@@ -943,6 +943,10 @@
goto do_stone;
}
dmg += dmgval(otmp, &youmonst);
+ if (objects[otmp->otyp].oc_material == SILVER &&
+ hates_silver(youmonst.data)) {
+ pline("The silver sears your flesh!");
+ }
if (dmg <= 0) dmg = 1;
if (!(otmp->oartifact &&
artifact_hit(mtmp, &youmonst, otmp, &dmg,dieroll)))
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/monmove.c nethack-3.4.3-bugfix/src/monmove.c
--- nethack-3.4.3/src/monmove.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/monmove.c 2013-04-07 13:17:00.000000000 -0400
@@ -212,6 +212,8 @@
boolean first;
boolean fleemsg;
{
+ if (DEADMONSTER(mtmp)) return;
+
if (u.ustuck == mtmp) {
if (u.uswallow)
expels(mtmp, mtmp->data, TRUE);
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/mthrowu.c nethack-3.4.3-bugfix/src/mthrowu.c
--- nethack-3.4.3/src/mthrowu.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/mthrowu.c 2013-08-03 21:30:13.933400788 -0400
@@ -328,7 +328,8 @@
if (singleobj->oclass == GEM_CLASS &&
singleobj->otyp <= LAST_GEM+9 /* 9 glass colors */
- && is_unicorn(youmonst.data)) {
+ && is_unicorn(youmonst.data)
+ && multi >= 0) {
if (singleobj->otyp > LAST_GEM) {
You("catch the %s.", xname(singleobj));
You("are not interested in %s junk.",
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/muse.c nethack-3.4.3-bugfix/src/muse.c
--- nethack-3.4.3/src/muse.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/muse.c 2014-02-01 10:38:12.984050690 -0500
@@ -2127,7 +2127,10 @@
boolean by_you;
boolean stoning;
{
- int nutrit = (obj->otyp == CORPSE) ? dog_nutrition(mon, obj) : 0;
+ /* Save otyp and corpsenm for use after m_useup */
+ short obj_otyp = obj->otyp;
+ int obj_corpsenm = obj->corpsenm;
+ int nutrit = (obj_otyp == CORPSE) ? dog_nutrition(mon, obj) : 0;
/* also sets meating */
/* give a "<mon> is slowing down" message and also remove
@@ -2139,13 +2142,13 @@
obj->quan = 1L;
pline("%s %ss %s.", Monnam(mon),
- (obj->otyp == POT_ACID) ? "quaff" : "eat",
+ (obj_otyp == POT_ACID) ? "quaff" : "eat",
distant_name(obj,doname));
obj->quan = save_quan;
} else if (flags.soundok)
- You_hear("%s.", (obj->otyp == POT_ACID) ? "drinking" : "chewing");
+ You_hear("%s.", (obj_otyp == POT_ACID) ? "drinking" : "chewing");
m_useup(mon, obj);
- if (((obj->otyp == POT_ACID) || acidic(&mons[obj->corpsenm])) &&
+ if (((obj_otyp == POT_ACID) || acidic(&mons[obj_corpsenm])) &&
!resists_acid(mon)) {
mon->mhp -= rnd(15);
pline("%s has a very bad case of stomach acid.",
@@ -2164,7 +2167,7 @@
else
pline("%s seems limber!", Monnam(mon));
}
- if (obj->otyp == CORPSE && obj->corpsenm == PM_LIZARD && mon->mconf) {
+ if (obj_otyp == CORPSE && obj_corpsenm == PM_LIZARD && mon->mconf) {
mon->mconf = 0;
if (canseemon(mon))
pline("%s seems steadier now.", Monnam(mon));
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/music.c nethack-3.4.3-bugfix/src/music.c
--- nethack-3.4.3/src/music.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/music.c 2013-04-07 14:18:04.000000000 -0400
@@ -316,7 +316,7 @@
xkilled(mtmp,0);
}
}
- } else if (x == u.ux && y == u.uy) {
+ } else if (!u.utrap && x == u.ux && y == u.uy) {
if (Levitation || Flying ||
is_clinger(youmonst.data)) {
pline("A chasm opens up under you!");
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/objects.c nethack-3.4.3-bugfix/src/objects.c
--- nethack-3.4.3/src/objects.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/objects.c 2013-04-07 19:17:49.000000000 -0400
@@ -377,9 +377,9 @@
ARMOR("banded mail", (char *)0,
1, 0, 1, 0, 72, 5, 350, 90, 4, 0, ARM_SUIT, IRON, HI_METAL),
ARMOR("dwarvish mithril-coat", (char *)0,
- 1, 0, 0, 0, 10, 1, 150, 240, 4, 3, ARM_SUIT, MITHRIL, HI_METAL),
+ 1, 0, 0, 0, 10, 1, 150, 240, 4, 3, ARM_SUIT, MITHRIL, HI_MITHRIL),
ARMOR("elven mithril-coat", (char *)0,
- 1, 0, 0, 0, 15, 1, 150, 240, 5, 3, ARM_SUIT, MITHRIL, HI_METAL),
+ 1, 0, 0, 0, 15, 1, 150, 240, 5, 3, ARM_SUIT, MITHRIL, HI_MITHRIL),
ARMOR("chain mail", (char *)0,
1, 0, 0, 0, 72, 5, 300, 75, 5, 1, ARM_SUIT, IRON, HI_METAL),
ARMOR("orcish chain mail", "crude chain mail",
@@ -554,10 +554,10 @@
AMULET("amulet of magical breathing", "octagonal", MAGICAL_BREATHING, 65),
OBJECT(OBJ("cheap plastic imitation of the Amulet of Yendor",
"Amulet of Yendor"), BITS(0,0,1,0,0,0,0,0,0,0,0,0,PLASTIC), 0,
- AMULET_CLASS, 0, 0, 20, 0, 0, 0, 0, 0, 1, HI_METAL),
+ AMULET_CLASS, 0, 0, 20, 0, 0, 0, 0, 0, 1, HI_MITHRIL),
OBJECT(OBJ("Amulet of Yendor", /* note: description == name */
"Amulet of Yendor"), BITS(0,0,1,0,1,0,1,1,0,0,0,0,MITHRIL), 0,
- AMULET_CLASS, 0, 0, 20, 30000, 0, 0, 0, 0, 20, HI_METAL),
+ AMULET_CLASS, 0, 0, 20, 30000, 0, 0, 0, 0, 20, HI_MITHRIL),
#undef AMULET
/* tools ... */
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/polyself.c nethack-3.4.3-bugfix/src/polyself.c
--- nethack-3.4.3/src/polyself.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/polyself.c 2013-08-03 21:20:40.765382707 -0400
@@ -332,7 +332,6 @@
{
boolean sticky = sticks(youmonst.data) && u.ustuck && !u.uswallow,
was_blind = !!Blind, dochange = FALSE;
- boolean could_pass_walls = Passes_walls;
int mlvl;
if (mvitals[mntmp].mvflags & G_GENOD) { /* allow G_EXTINCT */
@@ -464,13 +463,6 @@
else
u.uundetected = 0;
- if (u.utraptype == TT_PIT) {
- if (could_pass_walls && !Passes_walls) {
- u.utrap = rn1(6,2);
- } else if (!could_pass_walls && Passes_walls) {
- u.utrap = 0;
- }
- }
if (was_blind && !Blind) { /* previous form was eyeless */
Blinded = 1L;
make_blinded(0L, TRUE); /* remove blindness */
@@ -1153,7 +1145,7 @@
"light headed", "neck", "spine", "toe",
"feathers", "blood", "lung", "bill", "stomach" },
*horse_parts[] = { "foreleg", "eye", "face", "forehoof", "hoof tip",
- "rear hoof", "foreclaw", "hooved", "head", "rear leg",
+ "rear hoof", "forehoof", "hooved", "head", "rear leg",
"light headed", "neck", "backbone", "rear hoof tip",
"mane", "blood", "lung", "nose", "stomach"},
*sphere_parts[] = { "appendage", "optic nerve", "body", "tentacle",
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/potion.c nethack-3.4.3-bugfix/src/potion.c
--- nethack-3.4.3/src/potion.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/potion.c 2013-08-03 20:58:40.377341055 -0400
@@ -1438,6 +1438,7 @@
if (obj->otyp == POT_ACID) {
pline("It boils vigorously!");
You("are caught in the explosion!");
+ wake_nearby();
losehp(rnd(10), "elementary chemistry", KILLED_BY);
makeknown(obj->otyp);
update_inventory();
@@ -1668,6 +1669,7 @@
/* KMH, balance patch -- acid is particularly unstable */
if (obj->cursed || obj->otyp == POT_ACID || !rn2(10)) {
pline("BOOM! They explode!");
+ wake_nearby();
exercise(A_STR, FALSE);
if (!breathless(youmonst.data) || haseyes(youmonst.data))
potionbreathe(obj);
@@ -1783,6 +1785,7 @@
obj->oeroded == MAX_ERODE ? "destroys" : "damages",
yname(obj));
if (obj->oeroded == MAX_ERODE) {
+ setnotworn(obj);
obj_extract_self(obj);
obfree(obj, (struct obj *)0);
obj = (struct obj *) 0;
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/pray.c nethack-3.4.3-bugfix/src/pray.c
--- nethack-3.4.3/src/pray.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/pray.c 2013-03-31 22:13:58.000000000 -0400
@@ -1788,12 +1788,21 @@
halu_gname(alignment)
aligntyp alignment;
{
+ if (!Hallucination) return align_gname(alignment);
+
+ return rnd_gname(ROLE_RANDOM);
+}
+
+/* select a random god based on role if provided */
+const char *
+rnd_gname(role)
+int role;
+{
const char *gnam;
int which;
- if (!Hallucination) return align_gname(alignment);
-
- which = randrole();
+ /* select random role if valid role supplied */
+ which = (validrole(role)) ? role : randrole();
switch (rn2(3)) {
case 0: gnam = roles[which].lgod; break;
case 1: gnam = roles[which].ngod; break;
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/priest.c nethack-3.4.3-bugfix/src/priest.c
--- nethack-3.4.3/src/priest.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/priest.c 2013-03-31 22:13:58.000000000 -0400
@@ -274,7 +274,14 @@
Strcat(pname, "priest ");
}
Strcat(pname, "of ");
+ /* Astral Call bugfix */
+ if (mon->data == &mons[PM_HIGH_PRIEST] && !Hallucination &&
+ Is_astralevel(&u.uz) && distu(mon->mx, mon->my) > 2) {
+ Strcat(pname, rnd_gname(str2role((char*)urole.name.m)));
+ Strcat(pname, "?");
+ } else {
Strcat(pname, halu_gname((int)EPRI(mon)->shralign));
+ }
return(pname);
}
/* use emin instead of epri */
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/read.c nethack-3.4.3-bugfix/src/read.c
--- nethack-3.4.3/src/read.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/read.c 2013-04-07 14:24:21.000000000 -0400
@@ -804,7 +804,10 @@
known = TRUE;
} else { /* armor and scroll both cursed */
Your("%s %s.", xname(otmp), otense(otmp, "vibrate"));
- if (otmp->spe >= -6) otmp->spe--;
+ if (otmp->spe >= -6) {
+ otmp->spe--;
+ adj_abon(otmp, -1);
+ }
make_stunned(HStun + rn1(10, 10), TRUE);
}
}
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/shk.c nethack-3.4.3-bugfix/src/shk.c
--- nethack-3.4.3/src/shk.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/shk.c 2013-03-31 21:56:19.000000000 -0400
@@ -833,6 +833,12 @@
#endif
}
}
+
+ /* fix for C343-218, C343-275 and C343-276 */
+ if (obj == uwep) uwepgone();
+ if (obj == uswapwep) uswapwepgone();
+ if (obj == uquiver) uqwepgone();
+
dealloc_obj(obj);
}
#endif /* OVLB */
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/sounds.c nethack-3.4.3-bugfix/src/sounds.c
--- nethack-3.4.3/src/sounds.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/sounds.c 2013-04-07 13:02:41.000000000 -0400
@@ -643,6 +643,20 @@
case MS_DJINNI:
if (mtmp->mtame) {
verbl_msg = "Sorry, I'm all out of wishes.";
+ if (ptr == &mons[PM_PRISONER]) {
+ const char *honorific;
+ if (is_neuter(youmonst.data)) {
+ honorific = "creature";
+ } else if(flags.female) {
+ honorific = "woman";
+ } else {
+ honorific = "man";
+ }
+ Sprintf(verbuf, "I understand you're a %s who knows how to get things.", honorific);
+ verbl_msg = verbuf;
+ } else {
+ verbl_msg = "Sorry, I'm all out of wishes.";
+ }
} else if (mtmp->mpeaceful) {
if (ptr == &mons[PM_WATER_DEMON])
pline_msg = "gurgles.";
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/spell.c nethack-3.4.3-bugfix/src/spell.c
--- nethack-3.4.3/src/spell.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/spell.c 2014-11-09 17:10:49.601479501 -0500
@@ -1010,7 +1010,7 @@
for (n = 0; n < MAXSPELL && spellid(n) != NO_SPELL; n++)
continue;
if (n) {
- nzap = rnd(n) + confused ? 1 : 0;
+ nzap = rnd(n) + (confused ? 1 : 0);
if (nzap > n) nzap = n;
for (i = n - nzap; i < n; i++) {
spellid(i) = NO_SPELL;
diff -U 3 -Nr '--exclude=.*.sw[a-z]' '--exclude=bugfixes.patch' '--exclude=.git*' nethack-3.4.3/src/trap.c nethack-3.4.3-bugfix/src/trap.c
--- nethack-3.4.3/src/trap.c 2003-12-07 18:39:13.000000000 -0500
+++ nethack-3.4.3-bugfix/src/trap.c 2013-08-03 20:08:23.693245892 -0400
@@ -915,8 +915,7 @@
#endif
You("land %s!", predicament);
}
- if (!Passes_walls)
- u.utrap = rn1(6,2);
+ u.utrap = rn1(6,2);
u.utraptype = TT_PIT;
#ifdef STEED
if (!steedintrap(trap, (struct obj *)0)) {
@@ -2313,7 +2312,8 @@
ELevitation &= ~emask;
if(Levitation) return(0); /* maybe another ring/potion/boots */
if(u.uswallow) {
- You("float down, but you are still %s.",
+ You((Flying) ? "feel less buoyant, but you are still %s.":
+ "float down, but you are still %s.",
is_animal(u.ustuck->data) ? "swallowed" : "engulfed");
return(1);
}
@@ -2360,9 +2360,10 @@
}
if (!trap) {
trap = t_at(u.ux,u.uy);
- if(Is_airlevel(&u.uz))
- You("begin to tumble in place.");
- else if (Is_waterlevel(&u.uz) && !no_msg)
+ if(Is_airlevel(&u.uz)) {
+ if (Flying) You("feel less buoyant.");
+ else You("begin to tumble in place.");
+ } else if (Is_waterlevel(&u.uz) && !no_msg)
You_feel("heavier.");
/* u.uinwater msgs already in spoteffects()/drown() */
else if (!u.uinwater && !no_msg) {
@@ -2377,10 +2378,11 @@
"splashed down" : sokoban_trap ? "crashed" :