mirror of
https://github.com/OMGeeky/ATCS.git
synced 2025-12-27 14:58:55 +01:00
v0.4.4 !
- Projects can now use either loadresources.xml or loadresources_debug.xml, or none (as before). This must be selected at project creation and cannot be changed. - NPC and Items comparators now include both the source and altered version of elements present in both. - Spritesheets view should now be better laid out, as insets were not taken into account, thus cropping a few pixels right and down.
This commit is contained in:
@@ -18,7 +18,7 @@ public class ItemsTableView extends ElementTableView {
|
||||
private static final long serialVersionUID = 1474255176349837609L;
|
||||
|
||||
public ItemsTableView(Project proj) {
|
||||
super(new ItemsTableModel(proj), "Compare "+proj.getItemCount()+" items.", new ImageIcon(DefaultIcons.getItemIcon()));
|
||||
super(new ItemsTableModel(proj), "Compare "+proj.getItemCountIncludingAltered()+" items.", new ImageIcon(DefaultIcons.getItemIcon()));
|
||||
}
|
||||
|
||||
private static class ItemsTableModel implements TableModel {
|
||||
@@ -32,7 +32,7 @@ public class ItemsTableView extends ElementTableView {
|
||||
@Override
|
||||
public int getRowCount() {
|
||||
// return proj.getItemCount() + 1;
|
||||
return proj.getItemCount();
|
||||
return proj.getItemCountIncludingAltered();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -130,7 +130,7 @@ public class ItemsTableView extends ElementTableView {
|
||||
// return getColumnName(columnIndex);
|
||||
// }
|
||||
// Item item = proj.getItem(rowIndex - 1);
|
||||
Item item = proj.getItem(rowIndex);
|
||||
Item item = proj.getItemIncludingAltered(rowIndex);
|
||||
boolean canUse = item.category != null && item.category.action_type == ItemCategory.ActionType.use;
|
||||
boolean canEquip = item.category != null && item.category.action_type == ItemCategory.ActionType.equip;
|
||||
switch (columnIndex) {
|
||||
|
||||
Reference in New Issue
Block a user