From 747b87798049d6ecfaed2cdd10e70e18cadbba78 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Sat, 23 Mar 2019 02:19:46 -0700 Subject: [PATCH] Added additional fields to item excel files --- core/src/com/riiablo/codec/excel/Armor.java | 6 +++--- core/src/com/riiablo/codec/excel/ItemEntry.java | 8 ++++++++ core/src/com/riiablo/codec/excel/Weapons.java | 12 +++++++++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/core/src/com/riiablo/codec/excel/Armor.java b/core/src/com/riiablo/codec/excel/Armor.java index 783e42eb..9c139adb 100644 --- a/core/src/com/riiablo/codec/excel/Armor.java +++ b/core/src/com/riiablo/codec/excel/Armor.java @@ -1,8 +1,5 @@ package com.riiablo.codec.excel; -import com.riiablo.codec.excel.Excel; -import com.riiablo.codec.excel.ItemEntry; - public class Armor extends Excel { public static class Entry extends ItemEntry { @Column public int Torso; @@ -11,5 +8,8 @@ public class Armor extends Excel { @Column public int lArm; @Column public int lSPad; @Column public int rSPad; + @Column public int reqstr; + @Column public int durability; + @Column public int block; } } diff --git a/core/src/com/riiablo/codec/excel/ItemEntry.java b/core/src/com/riiablo/codec/excel/ItemEntry.java index 61aad327..e8abb982 100644 --- a/core/src/com/riiablo/codec/excel/ItemEntry.java +++ b/core/src/com/riiablo/codec/excel/ItemEntry.java @@ -28,7 +28,15 @@ public class ItemEntry extends Excel.Entry { @Column public String dropsound; @Column public int dropsfxframe; @Column public boolean stackable; + @Column public int minstack; + @Column public int maxstack; @Column public boolean useable; @Column public String usesound; @Column public int quest; + @Column public boolean nodurability; + @Column public int level; + @Column public int levelreq; + @Column public int mindam; + @Column public int maxdam; + @Column public int speed; } diff --git a/core/src/com/riiablo/codec/excel/Weapons.java b/core/src/com/riiablo/codec/excel/Weapons.java index 887ae7eb..85100875 100644 --- a/core/src/com/riiablo/codec/excel/Weapons.java +++ b/core/src/com/riiablo/codec/excel/Weapons.java @@ -1,8 +1,5 @@ package com.riiablo.codec.excel; -import com.riiablo.codec.excel.Excel; -import com.riiablo.codec.excel.ItemEntry; - public class Weapons extends Excel { public static class Entry extends ItemEntry { @Column public String wclass; @@ -12,5 +9,14 @@ public class Weapons extends Excel { public boolean _1or2handed; @Column(format = "2handed") public boolean _2handed; + @Column(format = "2handmindam") + public int _2handmindam; + @Column(format = "2handmaxdam") + public int _2handmaxdam; + @Column public int minmisdam; + @Column public int maxmisdam; + @Column public int reqstr; + @Column public int reqdex; + @Column public int durability; } }