From 63f3cfe87ab154ee4b36d3ddc4403e2dc1ccd2b9 Mon Sep 17 00:00:00 2001 From: Lisac2k Date: Sat, 5 Aug 2006 12:26:59 +0000 Subject: [PATCH] -Updated images for wood/urban/desert camo kits (big, inventory, ground). Updated Attachments.xml, EnemyItemChoices.xml, FranzInventory.xml, Items.xml, Merges.xml git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@301 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/BigItems/P1ITEM513.sti | Bin 0 -> 2629 bytes Data-1.13/BigItems/P1ITEM514.sti | Bin 0 -> 2629 bytes Data-1.13/Interface/MDP1ITEMS.sti | Bin 214280 -> 215308 bytes Data-1.13/TableData/Attachments.xml | 144 +++++++++++++ Data-1.13/TableData/EnemyItemChoices.xml | 6 +- Data-1.13/TableData/FranzInventory.xml | 38 ++-- Data-1.13/TableData/Items.xml | 252 ++++++++++++++++++++++- Data-1.13/TableData/Merges.xml | 12 ++ Data-1.13/tilesets/0/SMP1ITEMS.STI | Bin 54135 -> 54229 bytes 9 files changed, 429 insertions(+), 23 deletions(-) create mode 100644 Data-1.13/BigItems/P1ITEM513.sti create mode 100644 Data-1.13/BigItems/P1ITEM514.sti diff --git a/Data-1.13/BigItems/P1ITEM513.sti b/Data-1.13/BigItems/P1ITEM513.sti new file mode 100644 index 0000000000000000000000000000000000000000..cdd6adcee8eb4faa85258ad762dbecd4b69ee92b GIT binary patch literal 2629 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 j5bgj<1026 756 + + 1027 + 282 + + + 1027 + 283 + + + 1027 + 808 + + + 1027 + 809 + + + 1027 + 842 + + + 1027 + 843 + + + 1027 + 844 + + + 1027 + 845 + + + 1027 + 846 + + + 1027 + 865 + + + 1027 + 866 + + + 1027 + 867 + + + 1027 + 868 + + + 1027 + 869 + + + 1027 + 870 + + + 1027 + 871 + + + 1027 + 872 + + + 1027 + 873 + + + 1028 + 282 + + + 1028 + 283 + + + 1028 + 808 + + + 1028 + 809 + + + 1028 + 842 + + + 1028 + 843 + + + 1028 + 844 + + + 1028 + 845 + + + 1028 + 846 + + + 1028 + 865 + + + 1028 + 866 + + + 1028 + 867 + + + 1028 + 868 + + + 1028 + 869 + + + 1028 + 870 + + + 1028 + 871 + + + 1028 + 872 + + + 1028 + 873 + \ No newline at end of file diff --git a/Data-1.13/TableData/EnemyItemChoices.xml b/Data-1.13/TableData/EnemyItemChoices.xml index 862ea245c..0d3cb2221 100644 --- a/Data-1.13/TableData/EnemyItemChoices.xml +++ b/Data-1.13/TableData/EnemyItemChoices.xml @@ -218,7 +218,7 @@ 4 - 8 + 10 201 202 204 @@ -227,8 +227,8 @@ 201 202 203 - -1 - -1 + 1027 + 1028 -1 -1 -1 diff --git a/Data-1.13/TableData/FranzInventory.xml b/Data-1.13/TableData/FranzInventory.xml index f22b6c964..5c6814759 100644 --- a/Data-1.13/TableData/FranzInventory.xml +++ b/Data-1.13/TableData/FranzInventory.xml @@ -72,76 +72,86 @@ 14 + 1027 + 2 + + + 15 + 1028 + 2 + + + 16 258 1 - 15 + 17 315 1 - 16 + 18 318 1 - 17 + 19 264 1 - 18 + 20 265 1 - 19 + 21 246 3 - 20 + 22 1024 2 - 21 + 23 1025 1 - 22 + 24 1021 1 - 23 + 25 1016 1 - 24 + 26 1006 2 - 25 + 27 1005 2 - 26 + 28 1004 2 - 27 + 29 1001 1 - 28 + 30 1002 1 diff --git a/Data-1.13/TableData/Items.xml b/Data-1.13/TableData/Items.xml index e948c63f7..0ae0534f9 100644 --- a/Data-1.13/TableData/Items.xml +++ b/Data-1.13/TableData/Items.xml @@ -24602,17 +24602,17 @@ 205 - Camo Kit - Camouflage kit - The Military Camo Compact includes: olive drab, olive green, tan and white cream-based facial paint, a mirror, and a manual on the proper use and care of your camo compact. - Camouflage kit - The Military Camo Compact includes olive drab, olive green, tan and white cream based facial paint, and a mirror. This long-lasting, non-running, facial paint can be easily removed with soap and water. The kit also includes a manual that outlines the proper use and care of your compact. + Wood Camo Kit + Wood Camouflage Kit + The Military Wood Camo Compact includes several green and brown nuanced facial paints, a mirror, and a manual on the proper use and care of your camo compact. + Camouflage Kit - Wood + The Military Wood Camo Compact includes several green and brown nuanced facial paints, and a mirror. This long-lasting, non-running, facial paint can be easily removed with soap and water. The kit also includes a manual that outlines the proper use and care of your compact. 8192 0 0 0 1 - 58 + 514 1 4 250 @@ -123240,4 +123240,244 @@ 0 0 + + 1027 + Urban Camo Kit + Urban Camouflage Kit + The Military Urban Camo Compact includes several grey nuanced facial paints, a mirror, and a manual on the proper use and care of your camo compact. + Camouflage Kit - Urban + The Military Urban Camo Compact includes several grey nuanced facial paints, and a mirror. This long-lasting, non-running, facial paint can be easily removed with soap and water. The kit also includes a manual that outlines the proper use and care of your compact. + 8192 + 0 + 0 + 0 + 1 + 513 + 1 + 4 + 250 + 5 + 0 + 0 + 1 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 100 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 1028 + Desert Camo Kit + Desert Camouflage Kit + The Military Desert Camo Compact includes light brown, tan and white cream-based facial paint, a mirror, and a manual on the proper use and care of your camo compact. + Camouflage Kit - Desert + The Military Desert Camo Compact includes light brown, tan and white cream based facial paint, and a mirror. This long-lasting, non-running, facial paint can be easily removed with soap and water. The kit also includes a manual that outlines the proper use and care of your compact. + 8192 + 0 + 0 + 0 + 1 + 58 + 1 + 4 + 250 + 5 + 0 + 0 + 1 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 100 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + \ No newline at end of file diff --git a/Data-1.13/TableData/Merges.xml b/Data-1.13/TableData/Merges.xml index 421ba764b..ea88fa370 100644 --- a/Data-1.13/TableData/Merges.xml +++ b/Data-1.13/TableData/Merges.xml @@ -678,4 +678,16 @@ 979 4 + + 1027 + 1027 + 1027 + 1 + + + 1027 + 1027 + 1027 + 1 + \ No newline at end of file diff --git a/Data-1.13/tilesets/0/SMP1ITEMS.STI b/Data-1.13/tilesets/0/SMP1ITEMS.STI index 00ce617bbd6085ab85ef37590ff3e2b6edfc9a4d..98044b6421d7b681453939e639195be6715c3b80 100644 GIT binary patch delta 149 zcmeyqjQQ$vX4&8nXU_;_28PrP3}B!EBp)y~FflMPFfebFHCC2a2g=ApBpFzN&<&Np v`J!?>^W+c8O`8qW-PhPPG5%{}Xk`9(?O!7U>%ZgIuKfe?jstmM83NJ(GSV@R delta 54 zcmcb*oca4QX4&8nXU_;_1_t#F3}B!EBp)y~FflMPFfeYEHCEpINjZ*rvVcm{<^Xl~ FH2{1~4gvrG