OSDN Git Service
Eric Branlund [Mon, 15 Feb 2021 22:43:34 +0000 (14:43 -0800)]
In build_type17() English cheat message, replace "fix" with "fixed" and make capitalization like the other cheat messages.
Eric Branlund [Mon, 15 Feb 2021 22:42:01 +0000 (14:42 -0800)]
In English message for toragoroshi activation, add "the" and replace "enchanted" with "fascinated".
Eric Branlund [Mon, 15 Feb 2021 22:40:37 +0000 (14:40 -0800)]
Change to past tense for English message after a successful life rate change.
Eric Branlund [Mon, 15 Feb 2021 22:39:39 +0000 (14:39 -0800)]
Change English message for attempt to fish without nearby water.
Eric Branlund [Mon, 15 Feb 2021 22:38:05 +0000 (14:38 -0800)]
Since use a plural verb ("appear") with "group", emphasizing the individuals in the group, make the noun in "as your x" plural.
Eric Branlund [Mon, 15 Feb 2021 22:35:28 +0000 (14:35 -0800)]
To be more idiomatic, reword Enlgish message for genocide failing in an arena.
Eric Branlund [Mon, 15 Feb 2021 22:34:00 +0000 (14:34 -0800)]
Change "light item" to "light" for message about arcane spell to refuel a lantern or torch.
Eric Branlund [Mon, 15 Feb 2021 22:32:40 +0000 (14:32 -0800)]
Got rid of extraneous capitalization in the English immunity onset message. Dropped the extraneous "do" in that message for the case of an unhandled element type.
Eric Branlund [Mon, 15 Feb 2021 22:31:13 +0000 (14:31 -0800)]
Fix the English messages to select an item with the polish shield spell.
Eric Branlund [Mon, 15 Feb 2021 22:30:05 +0000 (14:30 -0800)]
Reword English mesage for the lapse of "An Eye for an Eye".
Eric Branlund [Mon, 15 Feb 2021 22:28:37 +0000 (14:28 -0800)]
Move negative from object to verb in English message for no hex spell to stop.
Eric Branlund [Mon, 15 Feb 2021 22:27:31 +0000 (14:27 -0800)]
"Resume" seems like a better fit than "restart" for the message about singing again.
Eric Branlund [Mon, 15 Feb 2021 22:26:30 +0000 (14:26 -0800)]
Drop "the" in front of "Judgement" to match what appears to be the normal way of referring to the Tarot card.
Eric Branlund [Mon, 15 Feb 2021 22:25:07 +0000 (14:25 -0800)]
For flavor, change the English messages about blinding for androids to be closer to what Google Translate gives for the Japanese messages.
Eric Branlund [Mon, 15 Feb 2021 22:23:12 +0000 (14:23 -0800)]
For flavor, specialize the stopped bleeding message in English for androids, like the Japanese version does.
Eric Branlund [Mon, 15 Feb 2021 22:17:51 +0000 (14:17 -0800)]
To avoid the impression that there are three regneration states (fast, normal, slow), reword the English message displayed when fast regeneration lapses.
Eric Branlund [Mon, 15 Feb 2021 22:15:08 +0000 (14:15 -0800)]
For "x resistant" insert a "-" (combining noun and adjective to form an adjective). Alternatively could use "resistant to x", but that's longer.
Eric Branlund [Mon, 15 Feb 2021 22:12:50 +0000 (14:12 -0800)]
To be more idiomatic, preface "Museum" with "the".
Eric Branlund [Mon, 15 Feb 2021 22:09:50 +0000 (14:09 -0800)]
Fill out English message for rejecting purchases in the museum.
Eric Branlund [Mon, 15 Feb 2021 22:08:22 +0000 (14:08 -0800)]
To be more idiomatic, change "don't have any item" to "don't have any items".
Eric Branlund [Mon, 15 Feb 2021 22:06:53 +0000 (14:06 -0800)]
For the English symbol descriptions of shop entrances, add "the" to be idiomatic (except for the player's home) and match the name (both words and capitalization) to what's in f_info.txt.
Eric Branlund [Mon, 15 Feb 2021 22:04:21 +0000 (14:04 -0800)]
For the English self information about demon forms, put "nether" after "breathe" to be more idiomatic and consistent with the breath messages elsewhere.
Eric Branlund [Mon, 15 Feb 2021 22:03:12 +0000 (14:03 -0800)]
Replaced "Bare hand" with "Barehanded".
Eric Branlund [Mon, 15 Feb 2021 22:02:27 +0000 (14:02 -0800)]
Fix English typo.
Eric Branlund [Fri, 19 Feb 2021 19:02:29 +0000 (11:02 -0800)]
Backport Hourier's English description of Emilio Michael from 3.0.0.
Eric Branlund [Mon, 15 Feb 2021 18:25:46 +0000 (10:25 -0800)]
Backport Hourier's fix for the English description for the Orb of Fate: it was displayed with the Japanese description when compiled for Japanese and not displayed at all when compiled for English.
Eric Branlund [Sun, 14 Feb 2021 05:37:21 +0000 (21:37 -0800)]
Backport Hourier's fix: description of nine-tailed fox displayed in both English and Japanese in Japanese version and is not present in the English version.
Eric Branlund [Sun, 14 Feb 2021 05:12:09 +0000 (21:12 -0800)]
Backport Hourier's fix for #41042: in Japanese, the flavor text for Unicorn is displayed both in English and Japanese; in English it isn't displayed at all.
Eric Branlund [Tue, 9 Feb 2021 03:51:36 +0000 (19:51 -0800)]
Add workflows to test that Mac and Linux builds work.
Eric Branlund [Sun, 31 Jan 2021 19:35:33 +0000 (11:35 -0800)]
Changed position of SLAY_EVIL in English version of essence_info so that it matches the Japanese version (backport of change made to 3.0.0.0).
Eric Branlund [Sun, 31 Jan 2021 02:04:31 +0000 (18:04 -0800)]
Corrected English for subject/verb agreement.
Eric Branlund [Sat, 30 Jan 2021 20:37:30 +0000 (12:37 -0800)]
Corrected English spelling mistake.
Eric Branlund [Sat, 30 Jan 2021 20:36:31 +0000 (12:36 -0800)]
Corrected English spelling mistake for same label in essence_info and essence_name arrays.
Eric Branlund [Sat, 30 Jan 2021 20:34:19 +0000 (12:34 -0800)]
Corrected English spelling mistake.
Eric Branlund [Sat, 30 Jan 2021 02:45:12 +0000 (18:45 -0800)]
Added English version of prompt for "Interact with Visuals" menu. At some point between version 1.6.2 and 2.2.1 that prompt had been dropped leaving only the Japanese version even if compiled for English.
Eric Branlund [Wed, 20 Jan 2021 23:02:38 +0000 (15:02 -0800)]
Change the KWD_* macros to be constant string pointers with definitions in cmd-spell.c. On platforms that use configure and automake, that allows the preprocessing done to switch character encoding to affect them since only the .c files that are compiled are preprocessed.
Eric Branlund [Wed, 20 Jan 2021 03:35:09 +0000 (19:35 -0800)]
Had renamed the mask file for Adam Bolt's tileset to 16x16-mask.bmp (to make it clearer what the mask was for). Adjust the path in main-win.c to match that.
Eric Branlund [Wed, 20 Jan 2021 02:59:13 +0000 (18:59 -0800)]
No longer use Angband 4's version of the tiles (with additional preference files to patch up the differences with Hengband's versions). Instead, convert Hengband's versions to PNG with the lib/xtra/graf/osx_bmp2png.py script so they're usable with the Mac front-end. Store the results of the conversion in the repository (so the prequisites for osx_bmp2png.py aren't needed for ordinary builds; only when the tiles have to be reconverted). Copy over the converted results during installation.
Eric Branlund [Wed, 20 Jan 2021 02:46:54 +0000 (18:46 -0800)]
Modified to handle Hengband's conversion requirements: allow use of a separate bmp input file to specify the transparency mask (as is used for Adam Bolt's tile set) and adjust the defaults for the --terrain option so the conversion of the original tile set is easy.
Eric Branlund [Wed, 20 Jan 2021 02:44:06 +0000 (18:44 -0800)]
Add the 1.0 version of Adam Bolt's tile set. Downloaded as heng-graf-16x16.tar.gz (file dated 2003/8/6) from Hengband's osdn page.
Eric Branlund [Wed, 20 Jan 2021 02:42:17 +0000 (18:42 -0800)]
Copy over the bmp to png conversion script from sil-q (lib/xtra/graf/osx_bmp2png.py as of 2020/8/24) so can adapt it to convert Hengband's versions of the tiles rather than reusing Angband 4's versions.
Eric Branlund [Tue, 19 Jan 2021 18:59:06 +0000 (10:59 -0800)]
Correct sanity check for a truncated Kanji character at the end of the changed sequence passed to Term_text_cocoa(). Resolves the report of uncleared character in the Japanese version when changing between pages in teh character description (No3.png in https://osdn.net/projects/hengbandforosx/ticket/41228 ). Also fixes at least some of the cases where the Japanese version garbles item names displayed in the shops (No4.png in ticket 41228).
Eric Branlund [Fri, 27 Nov 2020 01:40:57 +0000 (17:40 -0800)]
Since Cataline no longer includes the Osaka font (it does download it on demand if requested), use the Hiragino Maru Gothic ProN ("HiraMaruProN-W4") as the default font when compiled for Japanese.
Eric Branlund [Fri, 27 Nov 2020 01:37:50 +0000 (17:37 -0800)]
In the default preferences, use the keys, FontName-0 and FontSize-0, since those, rather than FontName and FontSize, are what are examined to get the name and sie of the font for the main window.
Eric Branlund [Sun, 22 Nov 2020 01:01:19 +0000 (17:01 -0800)]
In drawWChar(), allow for the unlikely possibility that the character to be rendered requires two UniChars (as a surrogate pair). Previously had assumed that only one UniChar was needed and cast the whcar_t to a UniChar.
Eric Branlund [Sun, 22 Nov 2020 00:53:16 +0000 (16:53 -0800)]
Bring over Term_mbcs_cocoa() (currently unused in Hengband) with more checks for bad UTF-8 from Angband.
Eric Branlund [Sun, 22 Nov 2020 00:43:58 +0000 (16:43 -0800)]
In case conversion from EUC-JP to Unicode requires surrogate pairs for some characters, use CFStringIsSurrogateHighCharacter() and CFStringGetLongCharacterForSurrogatePair() in the conversion. Both require 10.6.
Eric Branlund [Tue, 20 Oct 2020 00:00:36 +0000 (17:00 -0700)]
Fixed up another multi-line comment.
Eric Branlund [Thu, 8 Oct 2020 21:04:28 +0000 (14:04 -0700)]
Fixed up the formatting of more multi-line comments.
Eric Branlund [Tue, 6 Oct 2020 20:29:01 +0000 (13:29 -0700)]
Be more consistent about the format of comments.
Eric Branlund [Sat, 3 Oct 2020 00:40:30 +0000 (17:40 -0700)]
Aligned misaligned indent.
Eric Branlund [Wed, 30 Sep 2020 07:02:02 +0000 (00:02 -0700)]
Removed extraneous semicolon.
Eric Branlund [Wed, 30 Sep 2020 06:49:59 +0000 (23:49 -0700)]
Corrected two misspellings in comments. Added an article in a comment for clarity.
Eric Branlund [Tue, 29 Sep 2020 21:22:58 +0000 (14:22 -0700)]
Since the contents of Term aren't used, don't bother to call Term_activate() from drawRect().
Eric Branlund [Tue, 29 Sep 2020 06:48:35 +0000 (23:48 -0700)]
Moved some commented out code and adjusted the comment to match up with what's in Angband.
Eric Branlund [Tue, 29 Sep 2020 01:29:53 +0000 (18:29 -0700)]
Changed to use VERSION_NAME rather than Hengband in a log message.
Eric Branlund [Tue, 29 Sep 2020 01:23:36 +0000 (18:23 -0700)]
Use VERSION_NAME rather than Hengband when setting name of the directory with the user's files.
Eric Branlund [Tue, 29 Sep 2020 01:15:29 +0000 (18:15 -0700)]
Changed some whitespace to better match Angband's Mac OS X front end.
Eric Branlund [Mon, 28 Sep 2020 22:12:57 +0000 (15:12 -0700)]
Removed synthesize statements that are redundant with the property declarations.
Eric Branlund [Mon, 28 Sep 2020 21:07:52 +0000 (14:07 -0700)]
Moved comment so that it makes more sense.
Eric Branlund [Tue, 22 Sep 2020 02:03:29 +0000 (19:03 -0700)]
Fix some whitespace from a recent change.
Eric Branlund [Tue, 22 Sep 2020 00:25:44 +0000 (17:25 -0700)]
Update the instructions about rebuilding the nib file for Xcode 12.
Eric Branlund [Tue, 22 Sep 2020 00:23:10 +0000 (17:23 -0700)]
Corrected an incorrect verb tense and made some wording changes in teh comments about how to rebuild the nib file.
Eric Branlund [Tue, 22 Sep 2020 00:21:02 +0000 (17:21 -0700)]
In the comments about rebuilding the nib file, corrected the paths given for MainMenu.xib and MainMenu.nib in the source directories.
Eric Branlund [Tue, 22 Sep 2020 00:06:23 +0000 (17:06 -0700)]
Moved loadPrefs(), initWindows(), and linkTermData() from the application delegate to file-level static functions: that's where they were in the past and they weren't gaining anything by being in the delegate.
Eric Branlund [Mon, 21 Sep 2020 21:30:30 +0000 (14:30 -0700)]
Rearranged whitespace in some comments
Eric Branlund [Mon, 21 Sep 2020 21:07:07 +0000 (14:07 -0700)]
Group Term_mbcs_cocoa() with the other Term_* functions.
Eric Branlund [Sun, 20 Sep 2020 01:24:18 +0000 (18:24 -0700)]
Wasn't considering the full GLYPH_COUNT glyphs in updateGlyphInfo() (regression introduced with the change to dynamically allocate working space). Fixed.
Eric Branlund [Sat, 19 Sep 2020 01:00:24 +0000 (18:00 -0700)]
Since gettimeofday() is called when not on Windows even if CHUUKEI is not set, make an effort to pick up the prototype.
Eric Branlund [Sun, 23 Aug 2020 02:15:20 +0000 (19:15 -0700)]
Changed to remove the empty .deps directory in 'make distclean'.
Eric Branlund [Sat, 15 Aug 2020 06:17:20 +0000 (23:17 -0700)]
Updated comment for create_angband_image() since it no longer looks up the path in the bundle directory.
Eric Branlund [Sat, 15 Aug 2020 06:05:47 +0000 (23:05 -0700)]
In Term_pict_cocoa(), step through the passed in arrays in increments of the tile width scaling (i.e. 2 in big tile mode; 1 otherwise). Does not matter in the current configuration, with always_pict off, but would matter if always_pict was on or if the core terminal code was modified to pass more than one tile at a time when higher_pict is on.
Eric Branlund [Thu, 2 Jul 2020 15:50:32 +0000 (08:50 -0700)]
Dropped period in English knowledge menu entry for consistency with the other entries.
Eric Branlund [Mon, 6 Apr 2020 00:33:28 +0000 (17:33 -0700)]
The setting for big tiles initially shown in the menu wasn't being initialized from the stored value in the settings and was always shown as big tiles enabled. Fixed.
Eric Branlund [Mon, 6 Apr 2020 00:18:58 +0000 (17:18 -0700)]
Changed to mark the writeable files directory (~/Documents/Hengband previously) with a version number (so it's now ~/Documents/Hengband-2.2.1). That's to make it harder to load an incompatible save file since the plan is to put out the new Mac OS X interface with the old code base, 1.6.2, and presumably at some point put out a version for the code being called 2.2.2.
Eric Branlund [Sun, 5 Apr 2020 23:58:23 +0000 (16:58 -0700)]
Set player_egid before calling init_angband(). For good measure also set player_euid as well. Does not appear to have an effect with Hengband 2.2.1.7 but was necessary with Hengband 1.6.4.
Eric Branlund [Sun, 29 Mar 2020 20:54:36 +0000 (13:54 -0700)]
Corrected typo: "price" instead of the intended "prize".
Eric Branlund [Sun, 29 Mar 2020 18:43:17 +0000 (11:43 -0700)]
Changed the English diary entries about the gender and personality selections so "gender" appears in the one about gender, rather than the "personality" that was there before, and "personality" appears in the one about personality.
Eric Branlund [Sun, 29 Mar 2020 18:40:34 +0000 (11:40 -0700)]
Corrected English diary entry about realm selection to put "and" between the realms if there are two and use "realm" or "realms" as appropriate.
Eric Branlund [Sun, 29 Mar 2020 17:20:51 +0000 (10:20 -0700)]
In the English version, the period at the end of the Trump realm short description wasn't being cleared on the birth realm selection screen (an earlier change made it longer and it then exceeded the length of the string used for clearing). To fix that, use prt() to clear to the end of the line when displaying the selected realm and realm short description. Also share more code between the Japanese and English versions for that display.
Eric Branlund [Fri, 27 Mar 2020 03:43:21 +0000 (20:43 -0700)]
Since terminals other than terminal zero are configured to be panels and can not become the main window, test the keyWindow property for deciding where to apply font changes.
Eric Branlund [Wed, 25 Mar 2020 07:50:21 +0000 (00:50 -0700)]
Corrected English typo ('Arane' rather than 'Arena' in diary messages).
Eric Branlund [Tue, 24 Mar 2020 16:03:17 +0000 (09:03 -0700)]
For the English messages related to damage from the dust robe, changed the tense on the destruction message to match the other destruction messages and changed the damage message from "gets zapped" to "gets sliced" to better indicate the nature of the damage.
Eric Branlund [Tue, 24 Mar 2020 15:59:57 +0000 (08:59 -0700)]
Made "cinder" plural in English message for electric aura to be more idiomatic.
Eric Branlund [Tue, 24 Mar 2020 15:56:09 +0000 (08:56 -0700)]
Corrected English typo on first birth screen.
Eric Branlund [Tue, 24 Mar 2020 04:14:58 +0000 (21:14 -0700)]
For consistency, changed English diary entries to use simple past tense. Also omitted the subject in most (since it's implicitly the adventurer). Made a couple of changes in the diary text to be more idiomatic.
Eric Branlund [Sun, 22 Mar 2020 19:02:28 +0000 (12:02 -0700)]
It's not currently used in hengband, but bring over the change to mouse event handling from Angband that prevents clicks on the title bar from being passed to the core.
Eric Branlund [Fri, 20 Mar 2020 03:49:54 +0000 (20:49 -0700)]
Corrected spelling in English description of the hatchet of Elmi the Murderer.
Eric Branlund [Fri, 20 Mar 2020 02:35:20 +0000 (19:35 -0700)]
Ported faster rendering strategy for OS X from Angband.
Eric Branlund [Wed, 18 Mar 2020 06:32:29 +0000 (23:32 -0700)]
When calculating the number of columns, round down as is done with the number of rows: prefer blank space to partially cut off character in both directions.
Eric Branlund [Wed, 18 Mar 2020 05:32:54 +0000 (22:32 -0700)]
Changed to user changes to the window size are in increments of the current width for a column or the current height for a row. Requires at least 10.3 for NSWindow's contentResizeIncrements.
Eric Branlund [Tue, 10 Mar 2020 01:03:19 +0000 (18:03 -0700)]
Changed so the auxiliary windows are not floating panels; otherwise they're always in front of the main window, which is annoying.
Eric Branlund [Mon, 9 Mar 2020 16:19:59 +0000 (09:19 -0700)]
Put the do_cmd_redraw() and wakeup_event_loop() combination in a separate function. Also, character_generated always implies game_in_progress, so don't need to test the latter when testing the former.
Eric Branlund [Mon, 9 Mar 2020 15:19:33 +0000 (08:19 -0700)]
Refactored some tests of the graphics mode. Replaced a direct test of current_graphics_mode with a call to graphics_are_enabled(). Added an analogue to graphics_are_enabled() which tests the requested graphics mode.
Eric Branlund [Sat, 7 Mar 2020 22:18:08 +0000 (14:18 -0800)]
Changed to use the line from news_j.txt as the Japanese string for the copyright.
Eric Branlund [Sat, 7 Mar 2020 22:02:18 +0000 (14:02 -0800)]
Added instructions about how to set an exception for the hengband application since it is not signed.
Eric Branlund [Sat, 7 Mar 2020 21:54:11 +0000 (13:54 -0800)]
Use "Xcode" rather than "XCode" to be consistent how Apple capitalizes it.
Eric Branlund [Sat, 7 Mar 2020 21:51:51 +0000 (13:51 -0800)]
Changed to 10.8 since the current Cocoa client uses Base internationalization which is supported on 10.8 or later.
Eric Branlund [Sat, 7 Mar 2020 21:50:57 +0000 (13:50 -0800)]
Corrected typo: "Mac OS X 7" instead of the intended "Mac OS X 10.7".
Eric Branlund [Sat, 7 Mar 2020 20:58:36 +0000 (12:58 -0800)]
Changed the order of the directories in init_file_paths to match what's in the For2.2.2-Refactoring-Cocoa2 branch (which used the ordering from PHO's patch).