Browse Source

Weapon field parsing

combat-2
MagicBot 9 months ago
parent
commit
e6dd2b22d8
  1. 22
      src/engine/objects/ItemTemplate.java

22
src/engine/objects/ItemTemplate.java

@ -158,22 +158,18 @@ public class ItemTemplate {
if (item_type.equals(Enum.ItemType.WEAPON)) { if (item_type.equals(Enum.ItemType.WEAPON)) {
JSONArray item_weapon = (JSONArray) jsonObject.get("item_weapon"); JSONObject item_weapon = (JSONObject) jsonObject.get("item_weapon");
item_weapon_wepspeed = ((Double) item_weapon.get("weapon_wepspeed")).floatValue();
for (Object o : item_weapon) { item_weapon_max_range = ((Double) item_weapon.get("weapon_max_range")).floatValue();
JSONObject weapon_struct = (JSONObject) o; item_weapon_projectile_id = ((Long) item_weapon.get("weapon_projectile_id")).intValue();
item_weapon_projectile_speed = ((Double) item_weapon.get("weapon_projectile_speed")).floatValue();
item_weapon_wepspeed = ((Double) weapon_struct.get("weapon_wepspeed")).floatValue(); item_weapon_combat_idle_anim = ((Long) item_weapon.get("weapon_combat_idle_anim")).intValue();
item_weapon_max_range = ((Double) weapon_struct.get("weapon_max_range")).floatValue();
item_weapon_projectile_id = ((Long) weapon_struct.get("weapon_projectile_id")).intValue(); JSONObject weapon_damage = (JSONObject) item_weapon.get("weapon_damage");
item_weapon_projectile_speed = ((Double) weapon_struct.get("weapon_projectile_speed")).floatValue();
item_weapon_combat_idle_anim = ((Long) weapon_struct.get("weapon_combat_idle_anim")).intValue();
JSONObject weapon_damage = (JSONObject) weapon_struct.get("weapon_damage");
item_weapon_damage_type = Enum.DamageType.valueOf((String) weapon_damage.get("damage_type")); item_weapon_damage_type = Enum.DamageType.valueOf((String) weapon_damage.get("damage_type"));
item_weapon_damage_min = ((Long) weapon_damage.get("damage_min")).intValue(); item_weapon_damage_min = ((Long) weapon_damage.get("damage_min")).intValue();
item_weapon_damage_max = ((Long) weapon_damage.get("damage_max")).intValue(); item_weapon_damage_max = ((Long) weapon_damage.get("damage_max")).intValue();
}
} }
JSONArray itemflags = (JSONArray) jsonObject.get("item_flags"); JSONArray itemflags = (JSONArray) jsonObject.get("item_flags");

Loading…
Cancel
Save