Fix skilldesc IDs
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
"text/template"
|
"text/template"
|
||||||
)
|
)
|
||||||
@@ -108,6 +109,10 @@ func generateFile(sourcePath, destinationPath, tpl string) error {
|
|||||||
"list": func() []string {
|
"list": func() []string {
|
||||||
return make([]string, 0)
|
return make([]string, 0)
|
||||||
},
|
},
|
||||||
|
"extractInt": func(s string) string {
|
||||||
|
reg := regexp.MustCompile("[^0-9]")
|
||||||
|
return reg.ReplaceAllString(s, "")
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
t := template.Must(template.New("tpl").Funcs(funcMap).Parse(tpl))
|
t := template.Must(template.New("tpl").Funcs(funcMap).Parse(tpl))
|
||||||
|
|||||||
@@ -32,7 +32,11 @@ package skill
|
|||||||
|
|
||||||
var Desc = map[ID]Description{
|
var Desc = map[ID]Description{
|
||||||
{{- range $key, $value := . }}
|
{{- range $key, $value := . }}
|
||||||
{{ $key }}: {Page: {{ $value.SkillPage }}, Row: {{ $value.SkillRow }}, Column: {{ $value.SkillColumn }}, ListRow: {{ $value.ListRow }}, IconCel: {{ $value.IconCel }}},
|
{{- if and (contains (index $value "str name") "kill") (extractInt (index $value "str name")) }}
|
||||||
|
{{- if ne (index $value "skilldesc") "townportal" }}
|
||||||
|
{{ extractInt (index $value "str name") }}: {Page: {{ $value.SkillPage }}, Row: {{ $value.SkillRow }}, Column: {{ $value.SkillColumn }}, ListRow: {{ $value.ListRow }}, IconCel: {{ $value.IconCel }}},
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
}`
|
}`
|
||||||
|
|
||||||
|
|||||||
@@ -159,80 +159,68 @@ var Desc = map[ID]Description{
|
|||||||
153: {Page: 2, Row: 6, Column: 3, ListRow: 2, IconCel: 54},
|
153: {Page: 2, Row: 6, Column: 3, ListRow: 2, IconCel: 54},
|
||||||
154: {Page: 3, Row: 6, Column: 1, ListRow: 3, IconCel: 56},
|
154: {Page: 3, Row: 6, Column: 1, ListRow: 3, IconCel: 56},
|
||||||
155: {Page: 3, Row: 6, Column: 2, ListRow: 3, IconCel: 58},
|
155: {Page: 3, Row: 6, Column: 2, ListRow: 3, IconCel: 58},
|
||||||
156: {Page: 0, Row: 0, Column: 0, ListRow: 4, IconCel: 14},
|
217: {Page: 0, Row: 0, Column: 0, ListRow: 4, IconCel: 14},
|
||||||
157: {Page: 0, Row: 0, Column: 0, ListRow: 4, IconCel: 14},
|
218: {Page: 0, Row: 0, Column: 0, ListRow: 4, IconCel: 14},
|
||||||
158: {Page: 0, Row: 0, Column: 0, ListRow: 4, IconCel: 18},
|
219: {Page: 0, Row: 0, Column: 0, ListRow: 4, IconCel: 18},
|
||||||
159: {Page: 0, Row: 0, Column: 0, ListRow: 4, IconCel: 18},
|
220: {Page: 0, Row: 0, Column: 0, ListRow: 4, IconCel: 18},
|
||||||
160: {Page: 1, Row: 1, Column: 2, ListRow: 1, IconCel: 0},
|
222: {Page: 1, Row: 1, Column: 2, ListRow: 1, IconCel: 0},
|
||||||
161: {Page: 1, Row: 1, Column: 3, ListRow: 1, IconCel: 2},
|
223: {Page: 1, Row: 1, Column: 3, ListRow: 1, IconCel: 2},
|
||||||
162: {Page: 2, Row: 1, Column: 1, ListRow: 2, IconCel: 20},
|
224: {Page: 2, Row: 1, Column: 1, ListRow: 2, IconCel: 20},
|
||||||
163: {Page: 2, Row: 1, Column: 2, ListRow: 2, IconCel: 52},
|
225: {Page: 2, Row: 1, Column: 2, ListRow: 2, IconCel: 52},
|
||||||
164: {Page: 3, Row: 1, Column: 1, ListRow: 3, IconCel: 32},
|
226: {Page: 3, Row: 1, Column: 1, ListRow: 3, IconCel: 32},
|
||||||
165: {Page: 1, Row: 2, Column: 1, ListRow: 1, IconCel: 16},
|
227: {Page: 1, Row: 2, Column: 1, ListRow: 1, IconCel: 16},
|
||||||
166: {Page: 1, Row: 2, Column: 2, ListRow: 1, IconCel: 6},
|
228: {Page: 1, Row: 2, Column: 2, ListRow: 1, IconCel: 6},
|
||||||
167: {Page: 2, Row: 2, Column: 3, ListRow: 2, IconCel: 22},
|
229: {Page: 2, Row: 2, Column: 3, ListRow: 2, IconCel: 22},
|
||||||
168: {Page: 3, Row: 2, Column: 1, ListRow: 3, IconCel: 34},
|
230: {Page: 3, Row: 2, Column: 1, ListRow: 3, IconCel: 34},
|
||||||
169: {Page: 3, Row: 2, Column: 3, ListRow: 3, IconCel: 36},
|
231: {Page: 3, Row: 2, Column: 3, ListRow: 3, IconCel: 36},
|
||||||
170: {Page: 1, Row: 3, Column: 3, ListRow: 1, IconCel: 8},
|
232: {Page: 1, Row: 3, Column: 3, ListRow: 1, IconCel: 8},
|
||||||
171: {Page: 2, Row: 3, Column: 1, ListRow: 2, IconCel: 54},
|
233: {Page: 2, Row: 3, Column: 1, ListRow: 2, IconCel: 54},
|
||||||
172: {Page: 2, Row: 3, Column: 3, ListRow: 2, IconCel: 56},
|
234: {Page: 2, Row: 3, Column: 3, ListRow: 2, IconCel: 56},
|
||||||
173: {Page: 3, Row: 3, Column: 1, ListRow: 3, IconCel: 38},
|
235: {Page: 3, Row: 3, Column: 1, ListRow: 3, IconCel: 38},
|
||||||
174: {Page: 3, Row: 3, Column: 3, ListRow: 3, IconCel: 40},
|
236: {Page: 3, Row: 3, Column: 3, ListRow: 3, IconCel: 40},
|
||||||
175: {Page: 1, Row: 4, Column: 1, ListRow: 1, IconCel: 10},
|
237: {Page: 1, Row: 4, Column: 1, ListRow: 1, IconCel: 10},
|
||||||
176: {Page: 1, Row: 4, Column: 2, ListRow: 1, IconCel: 12},
|
238: {Page: 1, Row: 4, Column: 2, ListRow: 1, IconCel: 12},
|
||||||
177: {Page: 2, Row: 4, Column: 1, ListRow: 2, IconCel: 24},
|
239: {Page: 2, Row: 4, Column: 1, ListRow: 2, IconCel: 24},
|
||||||
178: {Page: 2, Row: 4, Column: 2, ListRow: 2, IconCel: 26},
|
240: {Page: 2, Row: 4, Column: 2, ListRow: 2, IconCel: 26},
|
||||||
179: {Page: 3, Row: 4, Column: 2, ListRow: 3, IconCel: 42},
|
241: {Page: 3, Row: 4, Column: 2, ListRow: 3, IconCel: 42},
|
||||||
180: {Page: 1, Row: 5, Column: 3, ListRow: 1, IconCel: 14},
|
242: {Page: 1, Row: 5, Column: 3, ListRow: 1, IconCel: 14},
|
||||||
181: {Page: 2, Row: 5, Column: 2, ListRow: 2, IconCel: 58},
|
243: {Page: 2, Row: 5, Column: 2, ListRow: 2, IconCel: 58},
|
||||||
182: {Page: 2, Row: 5, Column: 3, ListRow: 2, IconCel: 28},
|
244: {Page: 2, Row: 5, Column: 3, ListRow: 2, IconCel: 28},
|
||||||
183: {Page: 3, Row: 5, Column: 1, ListRow: 3, IconCel: 44},
|
245: {Page: 3, Row: 5, Column: 1, ListRow: 3, IconCel: 44},
|
||||||
184: {Page: 3, Row: 5, Column: 2, ListRow: 3, IconCel: 46},
|
246: {Page: 3, Row: 5, Column: 2, ListRow: 3, IconCel: 46},
|
||||||
185: {Page: 1, Row: 6, Column: 1, ListRow: 1, IconCel: 4},
|
247: {Page: 1, Row: 6, Column: 1, ListRow: 1, IconCel: 4},
|
||||||
186: {Page: 1, Row: 6, Column: 2, ListRow: 1, IconCel: 18},
|
248: {Page: 1, Row: 6, Column: 2, ListRow: 1, IconCel: 18},
|
||||||
187: {Page: 2, Row: 6, Column: 1, ListRow: 2, IconCel: 30},
|
249: {Page: 2, Row: 6, Column: 1, ListRow: 2, IconCel: 30},
|
||||||
188: {Page: 3, Row: 6, Column: 1, ListRow: 3, IconCel: 50},
|
250: {Page: 3, Row: 6, Column: 1, ListRow: 3, IconCel: 50},
|
||||||
189: {Page: 3, Row: 6, Column: 2, ListRow: 3, IconCel: 48},
|
251: {Page: 3, Row: 6, Column: 2, ListRow: 3, IconCel: 48},
|
||||||
190: {Page: 1, Row: 1, Column: 2, ListRow: 1, IconCel: 0},
|
252: {Page: 1, Row: 1, Column: 2, ListRow: 1, IconCel: 0},
|
||||||
191: {Page: 2, Row: 1, Column: 2, ListRow: 2, IconCel: 20},
|
253: {Page: 2, Row: 1, Column: 2, ListRow: 2, IconCel: 20},
|
||||||
192: {Page: 2, Row: 1, Column: 3, ListRow: 2, IconCel: 22},
|
254: {Page: 2, Row: 1, Column: 3, ListRow: 2, IconCel: 22},
|
||||||
193: {Page: 3, Row: 1, Column: 2, ListRow: 3, IconCel: 40},
|
255: {Page: 3, Row: 1, Column: 2, ListRow: 3, IconCel: 40},
|
||||||
194: {Page: 3, Row: 1, Column: 3, ListRow: 3, IconCel: 42},
|
256: {Page: 3, Row: 1, Column: 3, ListRow: 3, IconCel: 42},
|
||||||
195: {Page: 1, Row: 2, Column: 1, ListRow: 1, IconCel: 2},
|
257: {Page: 1, Row: 2, Column: 1, ListRow: 1, IconCel: 2},
|
||||||
196: {Page: 1, Row: 2, Column: 3, ListRow: 1, IconCel: 4},
|
258: {Page: 1, Row: 2, Column: 3, ListRow: 1, IconCel: 4},
|
||||||
197: {Page: 2, Row: 2, Column: 1, ListRow: 2, IconCel: 36},
|
259: {Page: 2, Row: 2, Column: 1, ListRow: 2, IconCel: 36},
|
||||||
198: {Page: 3, Row: 2, Column: 1, ListRow: 3, IconCel: 44},
|
260: {Page: 3, Row: 2, Column: 1, ListRow: 3, IconCel: 44},
|
||||||
199: {Page: 3, Row: 2, Column: 3, ListRow: 3, IconCel: 46},
|
261: {Page: 3, Row: 2, Column: 3, ListRow: 3, IconCel: 46},
|
||||||
200: {Page: 1, Row: 3, Column: 1, ListRow: 1, IconCel: 6},
|
262: {Page: 1, Row: 3, Column: 1, ListRow: 1, IconCel: 6},
|
||||||
201: {Page: 1, Row: 3, Column: 2, ListRow: 1, IconCel: 8},
|
263: {Page: 1, Row: 3, Column: 2, ListRow: 1, IconCel: 8},
|
||||||
202: {Page: 2, Row: 3, Column: 2, ListRow: 2, IconCel: 26},
|
264: {Page: 2, Row: 3, Column: 2, ListRow: 2, IconCel: 26},
|
||||||
203: {Page: 2, Row: 3, Column: 3, ListRow: 2, IconCel: 24},
|
265: {Page: 2, Row: 3, Column: 3, ListRow: 2, IconCel: 24},
|
||||||
204: {Page: 3, Row: 3, Column: 2, ListRow: 3, IconCel: 50},
|
266: {Page: 3, Row: 3, Column: 2, ListRow: 3, IconCel: 50},
|
||||||
205: {Page: 1, Row: 4, Column: 3, ListRow: 1, IconCel: 10},
|
267: {Page: 1, Row: 4, Column: 3, ListRow: 1, IconCel: 10},
|
||||||
206: {Page: 2, Row: 4, Column: 1, ListRow: 2, IconCel: 30},
|
268: {Page: 2, Row: 4, Column: 1, ListRow: 2, IconCel: 30},
|
||||||
207: {Page: 2, Row: 4, Column: 2, ListRow: 2, IconCel: 38},
|
269: {Page: 2, Row: 4, Column: 2, ListRow: 2, IconCel: 38},
|
||||||
208: {Page: 3, Row: 4, Column: 1, ListRow: 3, IconCel: 58},
|
270: {Page: 3, Row: 4, Column: 1, ListRow: 3, IconCel: 58},
|
||||||
209: {Page: 3, Row: 4, Column: 3, ListRow: 3, IconCel: 48},
|
271: {Page: 3, Row: 4, Column: 3, ListRow: 3, IconCel: 48},
|
||||||
210: {Page: 1, Row: 5, Column: 1, ListRow: 1, IconCel: 12},
|
272: {Page: 1, Row: 5, Column: 1, ListRow: 1, IconCel: 12},
|
||||||
211: {Page: 1, Row: 5, Column: 2, ListRow: 1, IconCel: 14},
|
273: {Page: 1, Row: 5, Column: 2, ListRow: 1, IconCel: 14},
|
||||||
212: {Page: 2, Row: 5, Column: 3, ListRow: 2, IconCel: 34},
|
274: {Page: 2, Row: 5, Column: 3, ListRow: 2, IconCel: 34},
|
||||||
213: {Page: 3, Row: 5, Column: 1, ListRow: 3, IconCel: 52},
|
275: {Page: 3, Row: 5, Column: 1, ListRow: 3, IconCel: 52},
|
||||||
214: {Page: 3, Row: 5, Column: 3, ListRow: 3, IconCel: 54},
|
276: {Page: 3, Row: 5, Column: 3, ListRow: 3, IconCel: 54},
|
||||||
215: {Page: 1, Row: 6, Column: 1, ListRow: 1, IconCel: 16},
|
277: {Page: 1, Row: 6, Column: 1, ListRow: 1, IconCel: 16},
|
||||||
216: {Page: 1, Row: 6, Column: 3, ListRow: 1, IconCel: 18},
|
278: {Page: 1, Row: 6, Column: 3, ListRow: 1, IconCel: 18},
|
||||||
217: {Page: 2, Row: 6, Column: 1, ListRow: 2, IconCel: 28},
|
279: {Page: 2, Row: 6, Column: 1, ListRow: 2, IconCel: 28},
|
||||||
218: {Page: 2, Row: 6, Column: 2, ListRow: 2, IconCel: 32},
|
280: {Page: 2, Row: 6, Column: 2, ListRow: 2, IconCel: 32},
|
||||||
219: {Page: 3, Row: 6, Column: 2, ListRow: 3, IconCel: 56},
|
281: {Page: 3, Row: 6, Column: 2, ListRow: 3, IconCel: 56},
|
||||||
220: {Page: 0, Row: 0, Column: 0, ListRow: 0, IconCel: 2},
|
|
||||||
221: {Page: 0, Row: 0, Column: 0, ListRow: 0, IconCel: 2},
|
|
||||||
222: {Page: 0, Row: 0, Column: 0, ListRow: 0, IconCel: 2},
|
|
||||||
223: {Page: 0, Row: 0, Column: 0, ListRow: 0, IconCel: 18},
|
|
||||||
224: {Page: 0, Row: 0, Column: 0, ListRow: 0, IconCel: 2},
|
|
||||||
225: {Page: 0, Row: 0, Column: 0, ListRow: 0, IconCel: 2},
|
|
||||||
226: {Page: 0, Row: 0, Column: 0, ListRow: 0, IconCel: 2},
|
|
||||||
227: {Page: 0, Row: 0, Column: 0, ListRow: 0, IconCel: 2},
|
|
||||||
228: {Page: 0, Row: 0, Column: 0, ListRow: 0, IconCel: 2},
|
|
||||||
229: {Page: 0, Row: 0, Column: 0, ListRow: 0, IconCel: 2},
|
|
||||||
230: {Page: 0, Row: 0, Column: 0, ListRow: 0, IconCel: 2},
|
|
||||||
231: {Page: 0, Row: 0, Column: 0, ListRow: 0, IconCel: 2},
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user