{"head":"153dec7cfc83be9823504c1522f26a0a6e670488","size":13,"push_id":47103982,"commits":[{"sha":"d6aa262e697fedeff406684b90d097bb0ce117c6","author":{"name":"magnate","email":"3f8c2c7a23c3ab5cb1532a581fd399e5cb1bfb63@gmail.com"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/d6aa262e697fedeff406684b90d097bb0ce117c6","message":"Initial changes to readme and version strings."},{"sha":"48ccc16f4f473963ca4ffba57ba74bae89e345b6","author":{"name":"magnate","email":"3f8c2c7a23c3ab5cb1532a581fd399e5cb1bfb63@gmail.com"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/48ccc16f4f473963ca4ffba57ba74bae89e345b6","message":"Merge the affixes branch\n\n* affixes: (62 commits)\n  Remove compiler warnings.\n  List the affixes on an item in the 'I'nspect screen. Such a display may or may not be suitable for a production release, but will help playtesters to report their findings.\n  Set everseen flag for affixes, fixing ego knowledge menu.\n  Ensure that branding spells fail if any brand is already on the object. This leaves the melee branding spell useful but not abusable. The ammo branding spell is arguably still too powerful. We could restrict it to 2x brands.\n  Ensure that objects sold in stores have all affixes known (thanks fizzix).\n  Fix a bug where the prefix/suffix weren't being shown if the 0th affix was the best (thanks Noz).\n  Change ODESC_PREFIX to ODESC_ARTICLE, to avoid confusion with affixes Fix generation of correct 'a'/'an' article in presence of prefix\n  Sort out saving and loading of affixes, themes and extents (charges, fuel, gold, chests). Pls note that ego items from old savefiles will retain all their old flags and bonuses, but will not display the ego name.\n  Correct obj_affix_names so that it (once again) doesn't show affix names which are part of an object's theme.\n  Print flavour text for themes when 'I'nspecting.\n  Provide flavour info from affixes when 'I'nspecting objects.\n  Initial implementation of affix identification.\n  Replace indeces with pointers, on the grounds that since we're still using global arrays, they don't take any more memory. Also some initial ID changes.\n  Ensure that themed object names don't mention affixes which are part of the theme.\n  Require at least two relevant affixes before acquiring a theme.\n  Apply themes properly. Next up, rune-based ID.\n  Selection and naming of themed items. Theme affixes not yet applied.\n  Be more thorough about removing extraneous stuff from ammo, in case it is applied by affixes or themes.\n  Parse ego_themes.txt into themes[z_info->theme_max]. TODO: de-globalise this and encapsulate it in obj-make.c\n  Turn of Slicing into an affix by the same logic as of Chaos and of Disruption.\n  ...\n\nConflicts:\n\tlib/edit/artifact.txt\n\tlib/edit/ego_item.txt\n\tlib/edit/object.txt\n\tsrc/object/obj-make.c"},{"sha":"1f194d1c89f4eb9279c4c32d5bc2010dda94c8b3","author":{"name":"magnate","email":"3f8c2c7a23c3ab5cb1532a581fd399e5cb1bfb63@gmail.com"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/1f194d1c89f4eb9279c4c32d5bc2010dda94c8b3","message":"Add the Large Metal Shield of the Sun, fully closing #1039. Overdue thanks\nto Paul Blay.\n(cherry picked from commit c7408fbab25c7e924fa10970923cc95da3a2ab15)"},{"sha":"4d948dd2cb76779452d9b651007beff78cff0a39","author":{"name":"Fizzix","email":"4fd60527539e2d8582fed15ab6d536662d738af9@gmail.com"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/4d948dd2cb76779452d9b651007beff78cff0a39","message":"Add descriptions for objects and ego_items (fixing some typos along the way).\n(cherry picked from commit e20fbb7849b1bce6c2df34888c6f1fb84f8a8f2a)"},{"sha":"b990eb623daca21e7ed2073417da65d07e4cf8d8","author":{"name":"magnate","email":"3f8c2c7a23c3ab5cb1532a581fd399e5cb1bfb63@gmail.com"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/b990eb623daca21e7ed2073417da65d07e4cf8d8","message":"Fix broken unit tests.\n(cherry picked from commit a561a26211c823fa45ab8f38636a2b4401736bc0)"},{"sha":"cced3d92502d93bdfc0e1fddacc486a65c7da684","author":{"name":"Peter Denison","email":"f557730300b3a0548a88bb4a9d7bb7208caff6ee@marshadder.org"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/cced3d92502d93bdfc0e1fddacc486a65c7da684","message":"Fix object knowledge menu with randarts enabled.\nRemove unused INSTA_ART kinds from the kind array after randart generation\n  is complete.\n\nSigned-off-by: Peter Denison <angband@marshadder.org>\n(cherry picked from commit 6f1b06e13f1315d1a2cef567fd8c428407f21644)"},{"sha":"af831a82be962330abc16d45e161a5cc16906d63","author":{"name":"Peter Denison","email":"f557730300b3a0548a88bb4a9d7bb7208caff6ee@marshadder.org"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/af831a82be962330abc16d45e161a5cc16906d63","message":"Move artifact kind fixup to main initialisation from randart code so it can\neventually do more than just removing unused kinds\n\nSigned-off-by: Peter Denison <angband@marshadder.org>\n(cherry picked from commit e79c4dc76aefa49a8103823b65d389948e65acdc)"},{"sha":"70496b4dddeb57e461554e96dcc92cc18fac8941","author":{"name":"Peter Denison","email":"f557730300b3a0548a88bb4a9d7bb7208caff6ee@marshadder.org"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/70496b4dddeb57e461554e96dcc92cc18fac8941","message":"Get rid of special kinds for jewelry in object.txt, and dynamically create them\nas necessary\n\nSigned-off-by: Peter Denison <angband@marshadder.org>\n(cherry picked from commit 8e820677b04d204d3daf51856a9d0d37e08d66ef)"},{"sha":"5ee94f1fb77288a41012c7b4f2522b8970d3153f","author":{"name":"magnate","email":"3f8c2c7a23c3ab5cb1532a581fd399e5cb1bfb63@gmail.com"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/5ee94f1fb77288a41012c7b4f2522b8970d3153f","message":"Tidy up descriptions.\n(cherry picked from commit 3c4c2f817647464d9b6dccf29fd13f8ae0cc8c63)"},{"sha":"25b2d0a27a1fe36ea80794e60cd89254a843902a","author":{"name":"magnate","email":"3f8c2c7a23c3ab5cb1532a581fd399e5cb1bfb63@gmail.com"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/25b2d0a27a1fe36ea80794e60cd89254a843902a","message":"Initial balancing updates to affixes.\n(cherry picked from commit 90736e43b3b273bb64d78989bdddceba4963d37d)"},{"sha":"1a794f4692b83a0768405f3ec6d7b4643982fcf1","author":{"name":"magnate","email":"3f8c2c7a23c3ab5cb1532a581fd399e5cb1bfb63@gmail.com"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/1a794f4692b83a0768405f3ec6d7b4643982fcf1","message":"Temporarily fix up a-info tests by commenting out badsval1.\n(cherry picked from commit f532133ddc1af889b32a5ac4da4f21a4e289495f)"},{"sha":"6b174d450dc77d50383605836f768f167dbc6a10","author":{"name":"magnate","email":"3f8c2c7a23c3ab5cb1532a581fd399e5cb1bfb63@gmail.com"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/6b174d450dc77d50383605836f768f167dbc6a10","message":"Initial stats update to count occurrences of affixes and themes. Does not\nyet dump themes (nor R/R2 lines of affixes).\n(cherry picked from commit 720d31394ce322e9968da38384a8f3078a1ee37b)"},{"sha":"153dec7cfc83be9823504c1522f26a0a6e670488","author":{"name":"Peter Denison","email":"f557730300b3a0548a88bb4a9d7bb7208caff6ee@marshadder.org"},"url":"https://api.github.com/repos/NickMcConnell/v4/commits/153dec7cfc83be9823504c1522f26a0a6e670488","message":"Fix tables for affixes and themes in Stats database\n\nSigned-off-by: Peter Denison <angband@marshadder.org>\n(cherry picked from commit 614691d1c482e162735e0929f8063d486cb53b1a)"}],"ref":"refs/heads/v4-master","legacy":{"head":"153dec7cfc83be9823504c1522f26a0a6e670488","size":13,"push_id":47103982,"shas":[["d6aa262e697fedeff406684b90d097bb0ce117c6","rantingman@gmail.com","Initial changes to readme and version strings.","magnate"],["48ccc16f4f473963ca4ffba57ba74bae89e345b6","rantingman@gmail.com","Merge the affixes branch\n\n* affixes: (62 commits)\n  Remove compiler warnings.\n  List the affixes on an item in the 'I'nspect screen. Such a display may or may not be suitable for a production release, but will help playtesters to report their findings.\n  Set everseen flag for affixes, fixing ego knowledge menu.\n  Ensure that branding spells fail if any brand is already on the object. This leaves the melee branding spell useful but not abusable. The ammo branding spell is arguably still too powerful. We could restrict it to 2x brands.\n  Ensure that objects sold in stores have all affixes known (thanks fizzix).\n  Fix a bug where the prefix/suffix weren't being shown if the 0th affix was the best (thanks Noz).\n  Change ODESC_PREFIX to ODESC_ARTICLE, to avoid confusion with affixes Fix generation of correct 'a'/'an' article in presence of prefix\n  Sort out saving and loading of affixes, themes and extents (charges, fuel, gold, chests). Pls note that ego items from old savefiles will retain all their old flags and bonuses, but will not display the ego name.\n  Correct obj_affix_names so that it (once again) doesn't show affix names which are part of an object's theme.\n  Print flavour text for themes when 'I'nspecting.\n  Provide flavour info from affixes when 'I'nspecting objects.\n  Initial implementation of affix identification.\n  Replace indeces with pointers, on the grounds that since we're still using global arrays, they don't take any more memory. Also some initial ID changes.\n  Ensure that themed object names don't mention affixes which are part of the theme.\n  Require at least two relevant affixes before acquiring a theme.\n  Apply themes properly. Next up, rune-based ID.\n  Selection and naming of themed items. Theme affixes not yet applied.\n  Be more thorough about removing extraneous stuff from ammo, in case it is applied by affixes or themes.\n  Parse ego_themes.txt into themes[z_info->theme_max]. TODO: de-globalise this and encapsulate it in obj-make.c\n  Turn of Slicing into an affix by the same logic as of Chaos and of Disruption.\n  ...\n\nConflicts:\n\tlib/edit/artifact.txt\n\tlib/edit/ego_item.txt\n\tlib/edit/object.txt\n\tsrc/object/obj-make.c","magnate"],["1f194d1c89f4eb9279c4c32d5bc2010dda94c8b3","rantingman@gmail.com","Add the Large Metal Shield of the Sun, fully closing #1039. Overdue thanks\nto Paul Blay.\n(cherry picked from commit c7408fbab25c7e924fa10970923cc95da3a2ab15)","magnate"],["4d948dd2cb76779452d9b651007beff78cff0a39","aaroncbader@gmail.com","Add descriptions for objects and ego_items (fixing some typos along the way).\n(cherry picked from commit e20fbb7849b1bce6c2df34888c6f1fb84f8a8f2a)","Fizzix"],["b990eb623daca21e7ed2073417da65d07e4cf8d8","rantingman@gmail.com","Fix broken unit tests.\n(cherry picked from commit a561a26211c823fa45ab8f38636a2b4401736bc0)","magnate"],["cced3d92502d93bdfc0e1fddacc486a65c7da684","angband@marshadder.org","Fix object knowledge menu with randarts enabled.\nRemove unused INSTA_ART kinds from the kind array after randart generation\n  is complete.\n\nSigned-off-by: Peter Denison <angband@marshadder.org>\n(cherry picked from commit 6f1b06e13f1315d1a2cef567fd8c428407f21644)","Peter Denison"],["af831a82be962330abc16d45e161a5cc16906d63","angband@marshadder.org","Move artifact kind fixup to main initialisation from randart code so it can\neventually do more than just removing unused kinds\n\nSigned-off-by: Peter Denison <angband@marshadder.org>\n(cherry picked from commit e79c4dc76aefa49a8103823b65d389948e65acdc)","Peter Denison"],["70496b4dddeb57e461554e96dcc92cc18fac8941","angband@marshadder.org","Get rid of special kinds for jewelry in object.txt, and dynamically create them\nas necessary\n\nSigned-off-by: Peter Denison <angband@marshadder.org>\n(cherry picked from commit 8e820677b04d204d3daf51856a9d0d37e08d66ef)","Peter Denison"],["5ee94f1fb77288a41012c7b4f2522b8970d3153f","rantingman@gmail.com","Tidy up descriptions.\n(cherry picked from commit 3c4c2f817647464d9b6dccf29fd13f8ae0cc8c63)","magnate"],["25b2d0a27a1fe36ea80794e60cd89254a843902a","rantingman@gmail.com","Initial balancing updates to affixes.\n(cherry picked from commit 90736e43b3b273bb64d78989bdddceba4963d37d)","magnate"],["1a794f4692b83a0768405f3ec6d7b4643982fcf1","rantingman@gmail.com","Temporarily fix up a-info tests by commenting out badsval1.\n(cherry picked from commit f532133ddc1af889b32a5ac4da4f21a4e289495f)","magnate"],["6b174d450dc77d50383605836f768f167dbc6a10","rantingman@gmail.com","Initial stats update to count occurrences of affixes and themes. Does not\nyet dump themes (nor R/R2 lines of affixes).\n(cherry picked from commit 720d31394ce322e9968da38384a8f3078a1ee37b)","magnate"],["153dec7cfc83be9823504c1522f26a0a6e670488","angband@marshadder.org","Fix tables for affixes and themes in Stats database\n\nSigned-off-by: Peter Denison <angband@marshadder.org>\n(cherry picked from commit 614691d1c482e162735e0929f8063d486cb53b1a)","Peter Denison"]],"ref":"refs/heads/v4-master"}}