diff --git a/Data-1.13/BigItems/p1item901.sti b/Data-1.13/BigItems/p1item901.sti new file mode 100644 index 000000000..22710b48a Binary files /dev/null and b/Data-1.13/BigItems/p1item901.sti differ diff --git a/Data-1.13/BigItems/p1item902.sti b/Data-1.13/BigItems/p1item902.sti new file mode 100644 index 000000000..f7fd18b1e Binary files /dev/null and b/Data-1.13/BigItems/p1item902.sti differ diff --git a/Data-1.13/Interface/MDP1ITEMS.sti b/Data-1.13/Interface/MDP1ITEMS.sti index 2f2f93557..d6c8f7baa 100644 Binary files a/Data-1.13/Interface/MDP1ITEMS.sti and b/Data-1.13/Interface/MDP1ITEMS.sti differ diff --git a/Data-1.13/Item_Settings.ini b/Data-1.13/Item_Settings.ini index fbb7c5b70..f862cc3ef 100644 --- a/Data-1.13/Item_Settings.ini +++ b/Data-1.13/Item_Settings.ini @@ -345,4 +345,18 @@ DAMAGE_HEALTH_MOVE_EXPLOSIVE_MODIFIER = 0.1 DAMAGE_BREATH_MOVE_EXPLOSIVE_MODIFIER = 0.1 ;****************************************************************************************************************************** +;****************************************************************************************************************************** + +[Misc Settings] +;****************************************************************************************************************************** +; +; Modifiers for various item categories belong here. +; +;****************************************************************************************************************************** + +;****************************************************************************************************************************** +; AP costs for movement are multiplied by this if a shield is equipped. +; Valid values are from 1.0 to 10.0 . +; Default is 1.7 +SHIELD_MOVEMENT_APCOST_MODIFIER = 1.7 ;****************************************************************************************************************************** \ No newline at end of file diff --git a/Data-1.13/TableData/Items/Items.xml b/Data-1.13/TableData/Items/Items.xml index f6c4df3e8..8e66b4e75 100644 --- a/Data-1.13/TableData/Items/Items.xml +++ b/Data-1.13/TableData/Items/Items.xml @@ -191,6 +191,8 @@ 0 0 0 + 0 + 0 0 0 @@ -50267,7 +50269,7 @@ Multicam Molle Vest The Multicam MOLLE tactical vest is mounted on tough mesh material for superior ventilation, and is equipped with a multitude of ammo pouches and holsters for all your firearms. Multicam Molle Vest - The Multicam MOLLE compatible cross draw military vest is the maximum in practicality and durabilty for a tactical vest. + The Multicam MOLLE compatible cross draw military vest is the maximum in practicality and durability for a tactical vest. 131072 8 1 @@ -51744,7 +51746,7 @@ 2 237 120 - 949 + 6 1 1 1 @@ -51766,7 +51768,7 @@ 2 239 150 - 949 + 6 100 1 1 @@ -51789,7 +51791,7 @@ 2 240 3 - 916 + 13 5 1 1 @@ -52230,4 +52232,86 @@ + + 1742 + Wood Shield + Wooden Shield + These pieces of construction wood were hastily nailed together to form a primitive shield. They won't stop much, but it's better than nothing. + Wood Shield + Not for sale through BR. + 268435456 + 1 + 2 + 239 + 25 + 1 + 34 + 50 + 1 + 1 + 1 + 1724 + 10 + 1 + + + + + + 1743 + Riot Shield + Riot Shield + This shield protects against small arms fire, but hinders mobility. A crenel allows the simultaneous use of a handgun. + Riot Shield + Part of our 'Agents of (Riot) S.H.I.E.L.D' merchandise. + 268435456 + 1 + 1 + 902 + 25 + 1 + 34 + 200 + 2 + -1 + 1 + 1 + 1 + 4 + 1 + 28 + 2 + + + + + + 1744 + Ballistic Shield + Ballistic Shield + This shield protects against weapons fire. You can still use a handgun while carrying this. However it will slow you down. + Ballistic Shield + Shields like these are used by SWAT and military teams to provide protection against weapons fire. They offer tremendous protection against all but the heaviest firearms. Get yours today! + 268435456 + 1 + 1 + 901 + 102 + 1 + 34 + 2700 + 6 + -3 + 1 + 1 + 1 + 1 + 4 + 1 + 50 + 0 + + + + \ No newline at end of file diff --git a/Data-1.13/TableData/Items/Merges.xml b/Data-1.13/TableData/Items/Merges.xml index 5250f5104..4f792a281 100644 --- a/Data-1.13/TableData/Items/Merges.xml +++ b/Data-1.13/TableData/Items/Merges.xml @@ -5864,4 +5864,12 @@ 4 90 + + 1726 + 1725 + 1742 + 0 + 4 + 90 + \ No newline at end of file diff --git a/Data-1.13/Tilecache/riotshield.sti b/Data-1.13/Tilecache/riotshield.sti new file mode 100644 index 000000000..24c7650c8 Binary files /dev/null and b/Data-1.13/Tilecache/riotshield.sti differ diff --git a/Data-1.13/tilesets/0/SMP1ITEMS.STI b/Data-1.13/tilesets/0/SMP1ITEMS.STI index c664217b8..d57b14ae1 100644 Binary files a/Data-1.13/tilesets/0/SMP1ITEMS.STI and b/Data-1.13/tilesets/0/SMP1ITEMS.STI differ diff --git a/Data/Interface/ItemInfoSecondaryIcons.sti b/Data/Interface/ItemInfoSecondaryIcons.sti index a5856bbd7..d8570a431 100644 Binary files a/Data/Interface/ItemInfoSecondaryIcons.sti and b/Data/Interface/ItemInfoSecondaryIcons.sti differ