From 7c63ea9394e4222cd03dde1b3d30f8069e752689 Mon Sep 17 00:00:00 2001 From: Taxi Service Date: Mon, 3 Apr 2023 20:13:57 +0200 Subject: [PATCH 01/10] added BOLD_FRAME and INTERIOR_MEDIUM_FRAME --- data/art/border-bold.png | Bin 0 -> 836 bytes docs/dev/Lua API.rst | 17 ++++++++++++++--- library/LuaApi.cpp | 1 + library/include/modules/Textures.h | 1 + library/lua/gui.lua | 3 +++ library/modules/Textures.cpp | 7 +++++++ 6 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 data/art/border-bold.png diff --git a/data/art/border-bold.png b/data/art/border-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..16423a3a7477fd94d1e27a45f0f91b2f6f28af84 GIT binary patch literal 836 zcmV-K1H1f*P)3>q_IhpTDzpXQV0Ya?T#%Xxr4<(f~1J)^xK_v z@@{6{+>ARL0>0vIZ+Q3ioA>jZnai?lapBheUis|74G}Nf!?XRecX0F*&y&gI>$|+a zx`5|zpO5f)Z(|Jm#(FWj{^Ub}b*I7cWb9m*3gz3)r_I9gUN}m;wc6gW6r#Zj5dBrr zgpNR&M&70tTt0+>W*viH}Jt$jww56!b)+K_TRg8Rz#8txYu7Rov6doV85+(tm zzsi!#qr0!>gvj-j*Uj?bz#Yu@kLFc(qpScAd6wI>0ok7nDBBmAJ~~qj+HfU8&$h+C zv>|2aWBaJh3TPiNr%6Jf$}zOkDM~;6Q>p8*Ujyu=WbD!Z(<9-18i9MR?h-};GAoOHFC$XbICkwsN*rO)9eZ;l(Wt-^G z@ohKun8|L4V?fAO8Aisp^IRWIUYS7;eHj%L4-HFpu4nAX$e^$^%;2M((8*5q@!sv> znTNv4z43|In!5A~ia3c55(Y-_0)vloqM_LO9-=L|ORvD_7&lfkqhU;Tst=T&tdsj? zPlysq;a7Qvz@0FXW%E%ti5!3B&ik^yDXy^o!zE0WHbUsD@lNHB00RKGR=gVn;~Fyn O0000 Date: Mon, 3 Apr 2023 20:37:45 +0200 Subject: [PATCH 02/10] fixed vertical divider characters in ascii mode --- plugins/lua/buildingplan/pens.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/lua/buildingplan/pens.lua b/plugins/lua/buildingplan/pens.lua index 973bb7bc6..ed8f393d6 100644 --- a/plugins/lua/buildingplan/pens.lua +++ b/plugins/lua/buildingplan/pens.lua @@ -19,8 +19,8 @@ function reload_pens() local tb_texpos = dfhack.textures.getThinBordersTexposStart() VERT_TOP_PEN = to_pen{tile=tp(tb_texpos, 10), ch=194, fg=COLOR_GREY, bg=COLOR_BLACK} - VERT_MID_PEN = to_pen{tile=tp(tb_texpos, 4), ch=192, fg=COLOR_GREY, bg=COLOR_BLACK} - VERT_BOT_PEN = to_pen{tile=tp(tb_texpos, 11), ch=179, fg=COLOR_GREY, bg=COLOR_BLACK} + VERT_MID_PEN = to_pen{tile=tp(tb_texpos, 4), ch=179, fg=COLOR_GREY, bg=COLOR_BLACK} + VERT_BOT_PEN = to_pen{tile=tp(tb_texpos, 11), ch=193, fg=COLOR_GREY, bg=COLOR_BLACK} local cp_texpos = dfhack.textures.getControlPanelTexposStart() BUTTON_START_PEN = to_pen{tile=tp(cp_texpos, 13), ch='[', fg=COLOR_YELLOW} From d04780ee86d6038b6a9f52abe2a17efa25cea5d9 Mon Sep 17 00:00:00 2001 From: Taxi Service Date: Mon, 3 Apr 2023 20:38:57 +0200 Subject: [PATCH 03/10] tweaked some item names shown on buildingplan uis --- plugins/lua/buildingplan.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua index a33c1684f..2de467f7c 100644 --- a/plugins/lua/buildingplan.lua +++ b/plugins/lua/buildingplan.lua @@ -103,6 +103,14 @@ function get_desc(filter) desc = 'Mechanism' elseif desc == 'Wood' then desc = 'Log' + elseif desc == 'Any weapon' then + desc = 'Weapon' + elseif desc == 'Any spike' then + desc = 'Spike' + elseif desc == 'Ballistapart' then + desc = 'Ballista part' + elseif desc == 'Catapultpart' then + desc = 'Catapult part' end return desc From 57146c527a04be2cf8ceb2cbbbfb4f2539a9ac69 Mon Sep 17 00:00:00 2001 From: Taxi Service Date: Mon, 3 Apr 2023 21:20:45 +0200 Subject: [PATCH 04/10] added changelog entry --- docs/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index b0b86c4cd..522ed00c0 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -48,6 +48,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## API ## Lua +- `gui`: added two new window borders, "BOLD_FRAME" and "INTERIOR_MEDIUM_FRAME" ## Removed From 4dc7b3cc43fc7b2bbf97781f2d6f081b7c3ab827 Mon Sep 17 00:00:00 2001 From: Taxi Service Date: Mon, 3 Apr 2023 21:25:59 +0200 Subject: [PATCH 05/10] attempt to make changelog entry work --- docs/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index 522ed00c0..d85231266 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -48,7 +48,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## API ## Lua -- `gui`: added two new window borders, "BOLD_FRAME" and "INTERIOR_MEDIUM_FRAME" +- `widget`: added two new window borders, ``BOLD_FRAME`` and ``INTERIOR_MEDIUM_FRAME`` ## Removed From 3628f8c5545ad190620705311c33f84fa772c969 Mon Sep 17 00:00:00 2001 From: TaxiService Date: Mon, 3 Apr 2023 21:29:24 +0200 Subject: [PATCH 06/10] Update docs/changelog.txt YES PLS Co-authored-by: Myk --- docs/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index d85231266..ff9d05b0f 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -48,7 +48,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## API ## Lua -- `widget`: added two new window borders, ``BOLD_FRAME`` and ``INTERIOR_MEDIUM_FRAME`` +- added two new window borders: ``gui.BOLD_FRAME`` for accented elements and ``gui.INTERIOR_MEDIUM_FRAME`` for a signature-less frame that's thicker than the existing ``gui.INTERIOR_FRAME`` ## Removed From 824f7ed038066ea5a3c2666eb489e8518cdbc830 Mon Sep 17 00:00:00 2001 From: Taxi Service Date: Tue, 4 Apr 2023 00:08:01 +0200 Subject: [PATCH 07/10] clean up Items.cpp quality symbols definitions --- library/modules/Items.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp index 303f9771e..03d6cda4a 100644 --- a/library/modules/Items.cpp +++ b/library/modules/Items.cpp @@ -720,13 +720,14 @@ df::coord Items::getPosition(df::item *item) return item->pos; } -// These '\xFF' chars refer to quality markers from curses.png, namely: 250 (≡), 15 (☼), 174 («) and 175 (»). -static const char MARKER_EXCEPTIONAL = '\xF0'; -static const char MARKER_MASTERWORK = '\x0F'; -static const char MARKER_IMPROVED_LEFT = '\xAE'; -static const char MARKER_IMPROVED_RIGHT = '\xAF'; - -static char quality_table[] = { 0, '-', '+', '*', MARKER_EXCEPTIONAL, MARKER_MASTERWORK }; +static const char quality_table[] = { + '\0', // (base) + '-', // well-crafted + '+', // finely-crafted + '*', // superior quality + '\xF0', // (≡) exceptional + '\x0F' // (☼) masterful +}; static void addQuality(std::string &tmp, int quality) { @@ -831,7 +832,7 @@ std::string Items::getDescription(df::item *item, int type, bool decorate) addQuality(tmp, item->getQuality()); if (item->isImproved()) { - tmp = MARKER_IMPROVED_LEFT + tmp + MARKER_IMPROVED_RIGHT; + tmp = '\xAE' + tmp + '\xAF'; // («) + tmp + (») addQuality(tmp, item->getImprovementQuality()); } } From e8fb2c5a4671e613dcb3c6b58a4c76f786e0c11c Mon Sep 17 00:00:00 2001 From: TaxiService Date: Tue, 4 Apr 2023 01:37:03 +0200 Subject: [PATCH 08/10] Update docs/changelog.txt Co-authored-by: Myk --- docs/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index dd1a29e28..cbc7b284d 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -42,7 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Misc Improvements - `buildingplan`: items in the item selection dialog should now use the same item quality symbols as the base game -- `buildingplan`: rearranged elements of ``itemselection`` interface +-@ `buildingplan`: rearranged elements of ``itemselection`` interface ## Documentation From 0cf4497328807fe9d2b3531e15fe498040d013e2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 02:55:13 +0000 Subject: [PATCH 09/10] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/python-jsonschema/check-jsonschema: 0.21.0 → 0.22.0](https://github.com/python-jsonschema/check-jsonschema/compare/0.21.0...0.22.0) - [github.com/Lucas-C/pre-commit-hooks: v1.4.2 → v1.5.1](https://github.com/Lucas-C/pre-commit-hooks/compare/v1.4.2...v1.5.1) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 94bfad310..c305de56c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,11 +20,11 @@ repos: args: ['--fix=lf'] - id: trailing-whitespace - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.21.0 + rev: 0.22.0 hooks: - id: check-github-workflows - repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.4.2 + rev: v1.5.1 hooks: - id: forbid-tabs exclude_types: From d12938fb238f24e2dcfbe4e8703f7ea16eb7a71e Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Tue, 4 Apr 2023 07:13:18 +0000 Subject: [PATCH 10/10] Auto-update submodules library/xml: master scripts: master --- library/xml | 2 +- scripts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/xml b/library/xml index 739d17867..d7f07e54b 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 739d1786723bbe912f448064c5705092a7936cc6 +Subproject commit d7f07e54b4ea7832b226f8d8678906c9c366918a diff --git a/scripts b/scripts index d2dad272e..53f0aedf9 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit d2dad272e4b24c043ca62f843511c763fb1f67b5 +Subproject commit 53f0aedf9f7df33a4f79246ba46de02794619d09