From 41acd32914a9a5800dd2efeb376584e2a1fd4e16 Mon Sep 17 00:00:00 2001 From: FateJH Date: Mon, 22 May 2017 00:26:38 -0400 Subject: [PATCH] set the MAX arms to ignore the ammunition checks because I have conflicted expectations for them right now --- .../game/objectcreate/ObjectClass.scala | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala index 970c6492c..217505b65 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala @@ -540,9 +540,9 @@ object ObjectClass { case ObjectClass.mediumtransport_weapon_systemB => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") case ObjectClass.mini_chaingun => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") case ObjectClass.oicw => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") - case ObjectClass.nchev_falcon => ConstructorData.genericCodec(DetailedWeaponData.codec(0), "weapon") - case ObjectClass.nchev_scattercannon => ConstructorData.genericCodec(DetailedWeaponData.codec(0), "weapon") - case ObjectClass.nchev_sparrow => ConstructorData.genericCodec(DetailedWeaponData.codec(0), "weapon") + case ObjectClass.nchev_falcon => ConstructorData.genericCodec(DetailedWeaponData.codec(-1), "weapon") + case ObjectClass.nchev_scattercannon => ConstructorData.genericCodec(DetailedWeaponData.codec(-1), "weapon") + case ObjectClass.nchev_sparrow => ConstructorData.genericCodec(DetailedWeaponData.codec(-1), "weapon") case ObjectClass.particle_beam_magrider => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") case ObjectClass.pellet_gun => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") case ObjectClass.peregrine_dual_machine_gun => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") @@ -584,14 +584,14 @@ object ObjectClass { case ObjectClass.thumper => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") case ObjectClass.thunderer_weapon_systema => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") case ObjectClass.thunderer_weapon_systemb => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") - case ObjectClass.trhev_burster => ConstructorData.genericCodec(DetailedWeaponData.codec(0), "weapon") - case ObjectClass.trhev_dualcycler => ConstructorData.genericCodec(DetailedWeaponData.codec(0), "weapon") - case ObjectClass.trhev_pounder => ConstructorData.genericCodec(DetailedWeaponData.codec(0), "weapon") + case ObjectClass.trhev_burster => ConstructorData.genericCodec(DetailedWeaponData.codec(-1), "weapon") + case ObjectClass.trhev_dualcycler => ConstructorData.genericCodec(DetailedWeaponData.codec(-1), "weapon") + case ObjectClass.trhev_pounder => ConstructorData.genericCodec(DetailedWeaponData.codec(-1), "weapon") case ObjectClass.vanguard_weapon_system => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") case ObjectClass.vanu_sentry_turret_weapon => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") - case ObjectClass.vshev_comet => ConstructorData.genericCodec(DetailedWeaponData.codec(0), "weapon") - case ObjectClass.vshev_starfire => ConstructorData.genericCodec(DetailedWeaponData.codec(0), "weapon") - case ObjectClass.vshev_quasar => ConstructorData.genericCodec(DetailedWeaponData.codec(0), "weapon") + case ObjectClass.vshev_comet => ConstructorData.genericCodec(DetailedWeaponData.codec(-1), "weapon") + case ObjectClass.vshev_starfire => ConstructorData.genericCodec(DetailedWeaponData.codec(-1), "weapon") + case ObjectClass.vshev_quasar => ConstructorData.genericCodec(DetailedWeaponData.codec(-1), "weapon") case ObjectClass.vulture_bomb_bay => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") case ObjectClass.vulture_nose_weapon_system => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") case ObjectClass.vulture_tail_cannon => ConstructorData.genericCodec(DetailedWeaponData.codec, "weapon") @@ -827,9 +827,9 @@ object ObjectClass { case ObjectClass.mediumtransport_weapon_systemA => ConstructorData.genericCodec(WeaponData.codec, "weapon") case ObjectClass.mediumtransport_weapon_systemB => ConstructorData.genericCodec(WeaponData.codec, "weapon") case ObjectClass.mini_chaingun => ConstructorData.genericCodec(WeaponData.codec, "weapon") - case ObjectClass.nchev_falcon => ConstructorData.genericCodec(WeaponData.codec(0), "weapon") - case ObjectClass.nchev_scattercannon => ConstructorData.genericCodec(WeaponData.codec(0), "weapon") - case ObjectClass.nchev_sparrow => ConstructorData.genericCodec(WeaponData.codec(0), "weapon") + case ObjectClass.nchev_falcon => ConstructorData.genericCodec(WeaponData.codec(-1), "weapon") + case ObjectClass.nchev_scattercannon => ConstructorData.genericCodec(WeaponData.codec(-1), "weapon") + case ObjectClass.nchev_sparrow => ConstructorData.genericCodec(WeaponData.codec(-1), "weapon") case ObjectClass.oicw => ConstructorData.genericCodec(WeaponData.codec, "weapon") case ObjectClass.particle_beam_magrider => ConstructorData.genericCodec(WeaponData.codec, "weapon") case ObjectClass.pellet_gun => ConstructorData.genericCodec(WeaponData.codec, "weapon") @@ -871,14 +871,14 @@ object ObjectClass { case ObjectClass.thumper => ConstructorData.genericCodec(WeaponData.codec, "weapon") case ObjectClass.thunderer_weapon_systema => ConstructorData.genericCodec(WeaponData.codec, "weapon") case ObjectClass.thunderer_weapon_systemb => ConstructorData.genericCodec(WeaponData.codec, "weapon") - case ObjectClass.trhev_burster => ConstructorData.genericCodec(WeaponData.codec(0), "weapon") - case ObjectClass.trhev_dualcycler => ConstructorData.genericCodec(WeaponData.codec(0), "weapon") - case ObjectClass.trhev_pounder => ConstructorData.genericCodec(WeaponData.codec(0), "weapon") + case ObjectClass.trhev_burster => ConstructorData.genericCodec(WeaponData.codec(-1), "weapon") + case ObjectClass.trhev_dualcycler => ConstructorData.genericCodec(WeaponData.codec(-1), "weapon") + case ObjectClass.trhev_pounder => ConstructorData.genericCodec(WeaponData.codec(-1), "weapon") case ObjectClass.vanguard_weapon_system => ConstructorData.genericCodec(WeaponData.codec, "weapon") case ObjectClass.vanu_sentry_turret_weapon => ConstructorData.genericCodec(WeaponData.codec, "weapon") - case ObjectClass.vshev_comet => ConstructorData.genericCodec(WeaponData.codec(0), "weapon") - case ObjectClass.vshev_quasar => ConstructorData.genericCodec(WeaponData.codec(0), "weapon") - case ObjectClass.vshev_starfire => ConstructorData.genericCodec(WeaponData.codec(0), "weapon") + case ObjectClass.vshev_comet => ConstructorData.genericCodec(WeaponData.codec(-1), "weapon") + case ObjectClass.vshev_quasar => ConstructorData.genericCodec(WeaponData.codec(-1), "weapon") + case ObjectClass.vshev_starfire => ConstructorData.genericCodec(WeaponData.codec(-1), "weapon") case ObjectClass.vulture_bomb_bay => ConstructorData.genericCodec(WeaponData.codec, "weapon") case ObjectClass.vulture_nose_weapon_system => ConstructorData.genericCodec(WeaponData.codec, "weapon") case ObjectClass.vulture_tail_cannon => ConstructorData.genericCodec(WeaponData.codec, "weapon")