From: likeyou d. <a12...@ya...> - 2007-04-26 17:55:24
|
just a missing capital in the title. --- src/monst.c 2007-04-26 10:40:27.000000000 -0700 +++ /home/michael/slashem_static/slashem-0.0.8E0F1/src/monst.c 2006-12-30 05:04:53.000000000 -0800 @@ -1473,7 +1473,7 @@ SIZ(20, 12, 0, MS_SQEEK, MZ_TINY), MR_FIRE, MR_FIRE, M1_ANIMAL|M1_NOHANDS|M1_CARNIVORE, M2_HOSTILE, M3_INFRAVISIBLE, CLR_RED), - MON("The Rat King", S_RODENT, + MON("the Rat King", S_RODENT, LVL(12, 15, 7, 0, 0), (G_UNIQ|1), A(ATTK(AT_WEAP, AD_PHYS, 2, 4), ATTK(AT_BITE, AD_PHYS, 2, 3), NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK), cheers, Michael --------------------------------- Ahhh...imagining that irresistible "new car" smell? Check outnew cars at Yahoo! Autos. |
From: J. A. H. <al...@ju...> - 2007-04-27 07:21:47
|
On 2007-04-26 06:55:16 PM, likeyou dontknow wrote: > just a missing capital in the title. >=20 > --- src/monst.c 2007-04-26 10:40:27.000000000 -0700 > +++ /home/michael/slashem_static/slashem-0.0.8E0F1/src/monst.c > 2006-12-30 05:04:53.000000000 -0800 > @@ -1473,7 +1473,7 @@ > SIZ(20, 12, 0, MS_SQEEK, MZ_TINY), MR_FIRE, MR_FIRE, > M1_ANIMAL|M1_NOHANDS|M1_CARNIVORE, > M2_HOSTILE, M3_INFRAVISIBLE, CLR_RED), > - MON("The Rat King", S_RODENT, > + MON("the Rat King", S_RODENT, > LVL(12, 15, 7, 0, 0), (G_UNIQ|1), > A(ATTK(AT_WEAP, AD_PHYS, 2, 4), ATTK(AT_BITE, AD_PHYS, 2, 3), >=20 > NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK), Your patches are still coming out back-to-front. The above says to =20 remove (-) a line with a capital letter and add (+) a line with a lower =20 case letter which is the opposite of what you mean. Try calling diff =20 with the arguments in the other order. Ie., you need to say: % diff -Naurd <old> <new> The reason we don't use "The" in monst.c is that messages such as "You =20 hit the Rat King!" (when verbose is on) look better without (standard =20 capitalisation rules say that articles, conjunctions and prepositions =20 of three or fewer letters should only be capitalised at the start of a =20 sentence). The proper fix is rather more difficult, I'm afraid. You'd =20 need to modify the call to food_xname() in eat.c around line 1620 so =20 that in the problem case (uniq && type_is_pname) it gets capitalised. =20 That probably means adding a Food_xname() similar to Monnam() et. al. Cheers, Ali. |