commit b88e17d04ec2bb37e2c12842e9f4c4a9 changed the order of some
objects but neglected to update the win/share/objects.txt tiles
to match.

In fairness, the error-alerting was broken at the time but has
since been resolved.

warning: for tile 46 (numbered 46) of objects.txt,
found 'lance' while expecting 'angled poleaxe / halberd'
warning: for tile 47 (numbered 47) of objects.txt,
found 'angled poleaxe / halberd' while expecting 'long poleaxe /
bardiche'
warning: for tile 48 (numbered 48) of objects.txt,
found 'long poleaxe / bardiche' while expecting 'pole cleaver / voulge'
warning: for tile 49 (numbered 49) of objects.txt,
found 'pole cleaver / voulge' while expecting 'pole sickle / fauchard'
warning: for tile 50 (numbered 50) of objects.txt,
found 'broad pick / dwarvish mattock' while expecting 'pruning hook /
guisarme'
warning: for tile 51 (numbered 51) of objects.txt,
found 'pole sickle / fauchard' while expecting 'hooked polearm /
bill-guisarme'
warning: for tile 52 (numbered 52) of objects.txt,
found 'pruning hook / guisarme' while expecting 'pronged polearm /
lucern hammer'
warning: for tile 53 (numbered 53) of objects.txt,
found 'hooked polearm / bill-guisarme' while expecting 'beaked polearm /
bec de corbin'
warning: for tile 54 (numbered 54) of objects.txt,
found 'pronged polearm / lucern hammer' while expecting 'broad pick /
dwarvish mattock
warning: for tile 55 (numbered 55) of objects.txt,
found 'beaked polearm / bec de corbin' while expecting 'lance'
This commit is contained in:
nhmall
2021-10-28 16:22:26 -04:00
parent b6250b412d
commit f539f97346
+46 -46
View File
@@ -901,26 +901,7 @@ Z = (195, 195, 195)
JAA............. JAA.............
AA.............. AA..............
} }
# tile 46 (lance) # tile 46 (angled poleaxe / halberd)
{
PA..............
.PA.............
..BA............
...OA...........
....OA..........
.....NA.........
......NA........
......PNA.......
.......PNA......
........BNA.....
.........ONA....
..........NNOOOA
..........OONOA.
..........OOONOA
..........OA.ONO
..............ON
}
# tile 47 (angled poleaxe / halberd)
{ {
................ ................
.........OOOA... .........OOOA...
@@ -939,7 +920,7 @@ Z = (195, 195, 195)
JJAA............ JJAA............
JAA............. JAA.............
} }
# tile 48 (long poleaxe / bardiche) # tile 47 (long poleaxe / bardiche)
{ {
.............NA. .............NA.
............POPA ............POPA
@@ -958,7 +939,7 @@ Z = (195, 195, 195)
JAA............. JAA.............
................ ................
} }
# tile 49 (pole cleaver / voulge) # tile 48 (pole cleaver / voulge)
{ {
.............NA. .............NA.
............NNOA ............NNOA
@@ -977,26 +958,7 @@ Z = (195, 195, 195)
JAA............. JAA.............
AA.............. AA..............
} }
# tile 50 (broad pick / dwarvish mattock) # tile 49 (pole sickle / fauchard)
{
................
................
......ONOA......
........PNOA....
.........NONA...
........KJAANA..
.......KJA...NA.
......KJA.......
.....KJA........
....KJA.........
...KJA..........
..KJA...........
.KJA............
................
................
................
}
# tile 51 (pole sickle / fauchard)
{ {
..........NNN... ..........NNN...
.........NPPPN.. .........NPPPN..
@@ -1015,7 +977,7 @@ Z = (195, 195, 195)
KJA............. KJA.............
.A.............. .A..............
} }
# tile 52 (pruning hook / guisarme) # tile 50 (pruning hook / guisarme)
{ {
.............NA. .............NA.
............POPA ............POPA
@@ -1034,7 +996,7 @@ Z = (195, 195, 195)
JAA............. JAA.............
AA.............. AA..............
} }
# tile 53 (hooked polearm / bill-guisarme) # tile 51 (hooked polearm / bill-guisarme)
{ {
.............PN. .............PN.
............PNA. ............PNA.
@@ -1053,7 +1015,7 @@ Z = (195, 195, 195)
PNPAA........... PNPAA...........
OPAA............ OPAA............
} }
# tile 54 (pronged polearm / lucern hammer) # tile 52 (pronged polearm / lucern hammer)
{ {
.........NP..... .........NP.....
.........PNP.... .........PNP....
@@ -1072,7 +1034,7 @@ Z = (195, 195, 195)
.JJAA........... .JJAA...........
JJAA............ JJAA............
} }
# tile 55 (beaked polearm / bec de corbin) # tile 53 (beaked polearm / bec de corbin)
{ {
................ ................
................ ................
@@ -1091,6 +1053,44 @@ Z = (195, 195, 195)
................ ................
................ ................
} }
# tile 54 (broad pick / dwarvish mattock)
{
................
................
......ONOA......
........PNOA....
.........NONA...
........KJAANA..
.......KJA...NA.
......KJA.......
.....KJA........
....KJA.........
...KJA..........
..KJA...........
.KJA............
................
................
................
}
# tile 55 (lance)
{
PA..............
.PA.............
..BA............
...OA...........
....OA..........
.....NA.........
......NA........
......PNA.......
.......PNA......
........BNA.....
.........ONA....
..........NNOOOA
..........OONOA.
..........OOONOA
..........OA.ONO
..............ON
}
# tile 56 (mace) # tile 56 (mace)
{ {
................ ................