diff --git a/gamedir/Data/TableData/Merges.xml b/gamedir/Data/TableData/Merges.xml index 900dc246c..f77bacaa3 100644 --- a/gamedir/Data/TableData/Merges.xml +++ b/gamedir/Data/TableData/Merges.xml @@ -4,8 +4,10 @@ Attribute Field Reference: firstItemIndex - index of original item secondItemIndex - item index to merge with - resultingItemIndex - resulting item index - mergeType - type of merge to perform, see below + firstResultingItemIndex - resulting item index + secondResultingItemIndex - resulting item index 2 (secondary merge output, only works for standard merges) + mergeType - type of merge to perform, see below + APCost - APs deducted to perform the merge MERGE TYPES: @@ -22,321 +24,425 @@ MERGE TYPES: 201 201 - 201 + 201 + 0 1 + 8 202 202 - 202 + 202 + 0 1 + 8 214 214 - 214 + 214 + 0 1 + 8 204 204 - 204 + 204 + 0 1 + 8 203 203 - 203 + 203 + 0 1 + 8 327 327 - 327 + 327 + 0 1 + 8 205 205 - 205 + 205 + 0 1 + 8 256 256 - 256 + 256 + 0 1 + 8 255 255 - 255 + 255 + 0 1 + 8 245 245 - 245 + 245 + 0 1 + 8 216 161 - 162 + 162 + 0 2 + 8 216 164 - 165 + 165 + 0 2 + 8 216 196 - 197 + 197 + 0 2 + 8 216 167 - 168 + 168 + 0 2 + 8 216 189 - 190 + 190 + 0 2 + 8 216 170 - 171 + 171 + 0 2 + 8 216 173 - 174 + 174 + 0 2 + 8 216 177 - 178 + 178 + 0 2 + 8 216 180 - 181 + 181 + 0 2 + 8 216 163 - 0 + 0 + 0 0 + 8 216 166 - 0 + 0 + 0 0 + 8 216 169 - 0 + 0 + 0 0 + 8 216 191 - 0 + 0 + 0 0 + 8 216 172 - 0 + 0 + 0 0 + 8 216 175 - 0 + 0 + 0 0 + 8 216 179 - 0 + 0 + 0 0 + 8 216 182 - 0 + 0 + 0 0 + 8 217 161 - 163 + 163 + 0 2 + 8 217 164 - 166 + 166 + 0 2 + 8 217 167 - 169 + 169 + 0 2 + 8 217 189 - 191 + 191 + 0 2 + 8 217 196 - 198 + 198 + 0 2 + 8 217 170 - 172 + 172 + 0 2 + 8 217 173 - 175 + 175 + 0 2 + 8 217 177 - 179 + 179 + 0 2 + 8 217 180 - 182 + 182 + 0 2 + 8 217 162 - 0 + 0 + 0 0 + 8 217 165 - 0 + 0 + 0 0 + 8 217 197 - 0 + 0 + 0 0 + 8 217 168 - 0 + 0 + 0 0 + 8 217 190 - 0 + 0 + 0 0 + 8 217 171 - 0 + 0 + 0 0 + 8 217 174 - 0 + 0 + 0 0 + 8 217 178 - 0 + 0 + 0 0 + 8 217 181 - 0 + 0 + 0 0 + 8 136 137 - 138 + 138 + 0 3 + 8 136 139 - 142 + 142 + 0 3 + 8 137 136 - 138 + 138 + 0 3 + 8 139 136 - 142 + 142 + 0 3 + 8 311 312 - 313 + 313 + 0 4 + 8 312 311 - 313 + 313 + 0 4 + 8 321 317 - 324 + 324 + 0 5 + 8 317 321 - 324 + 324 + 0 5 - - + 8 \ No newline at end of file