From bd6204cc7590e4d214b85c040b1d7718d80a57a6 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sat, 1 Mar 2014 22:26:43 +0000 Subject: [PATCH] Merged revision(s) 1970 from branches/ja2_data_official_2014: Added sleeping bag item (#1709), as was unused. git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1971 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/BigItems/p2item223.sti | Bin 0 -> 2522 bytes Data-1.13/Interface/MDP2ITEMS.STI | Bin 106424 -> 107178 bytes .../Inventory/ItemChoices_Enemy_Elite.xml | 4 +-- Data-1.13/TableData/Items/Items.xml | 26 ++++++++++++++++++ .../TableData/NPCInventory/TinaInventory.xml | 5 ++++ Data-1.13/tilesets/0/SMP2ITEMS.STI | Bin 36240 -> 36469 bytes 6 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 Data-1.13/BigItems/p2item223.sti diff --git a/Data-1.13/BigItems/p2item223.sti b/Data-1.13/BigItems/p2item223.sti new file mode 100644 index 0000000000000000000000000000000000000000..c8421d6515b55954b6aad274415e7ddcff3deecb GIT binary patch literal 2522 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 bm$#NCiRV7I&t|l>G1|X7f840g=qvgUjP 6 Misc - 45 + 46 49 214 214 @@ -379,7 +379,7 @@ 1570 1576 1626 - 0 + 1709 0 0 0 diff --git a/Data-1.13/TableData/Items/Items.xml b/Data-1.13/TableData/Items/Items.xml index ea509cd38..f19b7a057 100644 --- a/Data-1.13/TableData/Items/Items.xml +++ b/Data-1.13/TableData/Items/Items.xml @@ -51254,4 +51254,30 @@ + + 1709 + Sleeping bag + Sleeping bag + A basic sleeeping bag. Beats the bare floor. + Sleeping bag + No more sleeping on the dirty floor! Sweet dreams, sugar. + 268435456 + 1 + 2 + 223 + 13 + 27 + 35 + 3 + 1 + 1 + 1 + 1 + 2 + 6 + 20 + + + + \ No newline at end of file diff --git a/Data-1.13/TableData/NPCInventory/TinaInventory.xml b/Data-1.13/TableData/NPCInventory/TinaInventory.xml index c66aeace5..dd2e6d8a1 100644 --- a/Data-1.13/TableData/NPCInventory/TinaInventory.xml +++ b/Data-1.13/TableData/NPCInventory/TinaInventory.xml @@ -160,4 +160,9 @@ 311 10 + + 32 + 1709 + 3 + \ No newline at end of file diff --git a/Data-1.13/tilesets/0/SMP2ITEMS.STI b/Data-1.13/tilesets/0/SMP2ITEMS.STI index a9dd0d8e501612ae07fa6d80e0bde7feb2cc269e..d533cfa54728d3d822c6d8cfe071cdc31761d88d 100644 GIT binary patch delta 319 zcmbO*o9XKuCfVQ+XV2+k3=F2V3}B!EBp)y~FflL!>5a1A1+-^FBp7%Yco~jYGce3T z;wRQHFkFH2g*NL8uB+ze_!kklFg`x&ZzI!W-=3BA9UT9lpoyW056UbqzTupE<6jd) zqrks^CwJY|KDl4(@X6gLPyYMY$RPOd-acOsG1W0g` zcEmGx--tlTwSD`wwCsTjftJh(^qsf=zq(iva)v9-1Hk delta 77 zcmex5hiSrWCfVQ+XV2+k3=9c13}B!EBp)y~FflMPFx=lL`&~eK7DR%9hk=*jSTzF! Q5`VM3;JWI`JG(an0HMASQUCw|