From fa1f8263091c105633afa63be211f7e430e8eb61 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Fri, 8 Sep 2023 10:49:06 -0500 Subject: [PATCH 1/3] bunch of item vmethod updates --- df.items.xml | 180 +++++++++++++++++++++++++++++---------------------- 1 file changed, 101 insertions(+), 79 deletions(-) diff --git a/df.items.xml b/df.items.xml index d7b37f46a..3c673c30d 100644 --- a/df.items.xml +++ b/df.items.xml @@ -203,6 +203,9 @@ + + -- 20 + @@ -210,83 +213,87 @@ + - -- 26 - + + -- 30 + - + - - -- 37 - + + -- 40 + - + - - -- 47 - - + + + -- 50 + - + - - -- 57 - + + - 60 + - - - - - + + + - ? - ? + + + + + + - -- 67 + -- 70 @@ -309,7 +316,7 @@ - -- 77 + -- 80 @@ -342,10 +349,10 @@ - - -- 88 + -- 90 + @@ -363,7 +370,7 @@ - -- 97 + -- 100 @@ -389,14 +396,15 @@ - - - -- 110 + + + + @@ -407,14 +415,15 @@ - - - -- 119 + -- 120 + + + @@ -422,7 +431,6 @@ - @@ -433,6 +441,9 @@ + + -- 130 + @@ -440,9 +451,6 @@ - - -- 129 - @@ -452,12 +460,12 @@ + - @@ -466,25 +474,25 @@ - - - -- 139 + -- 140 + + add to unit.owned_items/traded_items - + - - -- 149 + -- 150 + @@ -499,26 +507,26 @@ + - - - -- 159 + -- 160 + - + @@ -529,17 +537,17 @@ might be int8_t or bool - - -- 169 + -- 170 + - - + + @@ -548,17 +556,17 @@ - - -- 179 + -- 180 + - - only for item_cloth + + only for item_cloth for all constructed items @@ -569,13 +577,13 @@ any at all + + -- 190 + - - -- 189 - @@ -587,32 +595,32 @@ + - - + - - - -- 199 + -- 200 + + - + - - -- 208 + -- 210 + @@ -623,16 +631,32 @@ - - + + + + + + + + + + + + + + + - + + + -- 220 + @@ -640,29 +664,27 @@ - - -- 218 - - + - related to history_info + related to history_info also history_info history_info history_info - - -- 228 + -- 230 + + @@ -846,7 +868,7 @@ - + From 1fbd87f6d02b29c86f0720333e7a66131965abb8 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Fri, 8 Sep 2023 10:51:03 -0500 Subject: [PATCH 2/3] add changelog --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index d808b2cbf..5d97c0d4c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -21,6 +21,7 @@ Template for new versions: # Future ## Structures +- Identified a number of previously anonymous virtual methods in ``itemst`` # 50.09-r3 From 18cf15d60c18fb736156d462b640c0c1487daaf4 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Sat, 9 Sep 2023 19:49:55 -0500 Subject: [PATCH 3/3] remove 's' from `addImprovement` --- df.items.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/df.items.xml b/df.items.xml index 3c673c30d..ab0d5e971 100644 --- a/df.items.xml +++ b/df.items.xml @@ -631,7 +631,7 @@ - +