diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/json/Objects.json ./json/Objects.json --- ../current/json/Objects.json 2018-08-09 10:10:42.516469880 +0000 +++ ./json/Objects.json 2018-08-16 10:00:40.470080045 +0000 @@ -43545,16 +43545,39 @@ "_": "CreatePortal", "id": "Wine Cellar Portal" }, "feedPower": "200", "BagType": "8", "Track": "" }, { + "type": "0x551", + "id": "Wine Cellar Short Key", + "Class": "Equipment", + "Item": "", + "DisplayId": "Wine Cellar Key", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0x5f" + }, + "SlotType": "10", + "Description": "A key which opens an entrance to the Wine Cellar Short version. For testing purposes.\\n\\nKeys can only be used once you have 10 or more stars!", + "Sound": "use_key", + "InvUse": "", + "Soulbound": "", + "Activate": { + "_": "CreatePortal", + "id": "Wine Cellar Portal" + }, + "feedPower": "200", + "BagType": "8", + "Track": "" + }, + { "type": "0x377", "id": "Oryx Chamber Key", "Class": "Equipment", "Item": "", "DisplayId": "Oryx Chamber Key", "Texture": { "File": "d3LofiObjEmbed", "Index": "0x5f" @@ -60049,16 +60072,36 @@ "_": "Teleport", "maxDistance": "20" }, "BagType": "6", "feedPower": "100000", "Soulbound": "" }, { + "type": "0x705e", + "id": "InvinceMe", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "lofiObj2", + "Index": "0x4e" + }, + "SlotType": "10", + "Description": "Renders the user invincible for a day.", + "InvUse": "", + "BagType": "6", + "Activate": { + "_": "ConditionEffectSelf", + "effect": "Invincible", + "duration": "86400" + }, + "Soulbound": "" + }, + { "type": "0x108f", "id": "TG TP", "Class": "GameObject", "Enemy": "", "AnimatedTexture": { "File": "chars16x16dEncounters2", "Index": "54" }, @@ -94842,16 +94885,28 @@ "DisplayId": "Wine Cellar", "DungeonName": "Wine Cellar", "Texture": { "File": "lofiEnvironment", "Index": "0x7c" } }, { + "type": "0x6020", + "id": "Wine Cellar Short Portal", + "Class": "Portal", + "IntergamePortal": "", + "DisplayId": "Wine Cellar Short", + "DungeonName": "Wine Cellar Short", + "Texture": { + "File": "lofiEnvironment", + "Index": "0x7c" + } + }, + { "type": "0x0721", "id": "Locked Wine Cellar Portal", "Class": "Portal", "LockedPortal": "", "Texture": { "File": "lofiObj2", "Index": "0xba" } Binary files ../current/sheets/chars8x8rPets1.png and ./sheets/chars8x8rPets1.png differ