diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/json/GroundTypes.json ./json/GroundTypes.json --- ../current/json/GroundTypes.json 2017-08-07 17:40:50.507447432 +0000 +++ ./json/GroundTypes.json 2017-08-08 18:11:02.286601364 +0000 @@ -2258,26 +2258,28 @@ }, { "type": "0x82", "id": "Lab Bad Vat No Slow", "Texture": { "File": "lofiObj3", "Index": "0x133" }, - "Sink": "" + "Sink": "", + "Color": "0x3F7F3F" }, { "type": "0x83", "id": "Lab Good Vat No Slow", "Texture": { "File": "lofiObj3", "Index": "0x14e" }, - "Sink": "" + "Sink": "", + "Color": "0x3972A8" }, { "type": "0xa8", "id": "Liquid Evil", "Texture": { "File": "lofiEnvironment", "Index": "0x71" }, 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 2017-08-07 17:40:55.935447229 +0000 +++ ./json/Objects.json 2017-08-08 18:11:10.146601164 +0000 @@ -18495,18 +18495,18 @@ "Soulbound": "" }, { "type": "0xa1f", "id": "Potion of Attack", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x34" + "File": "d3LofiObjEmbed", + "Index": "0x102" }, "SlotType": "10", "Tier": "2", "Description": "A potion that permanently increases attack power by 1.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "20", @@ -18519,18 +18519,18 @@ "Track": "" }, { "type": "0xa20", "id": "Potion of Defense", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x35" + "File": "d3LofiObjEmbed", + "Index": "0x103" }, "SlotType": "10", "Tier": "2", "Description": "A potion that permanently increases defense power by 1.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "21", @@ -18543,18 +18543,18 @@ "Track": "" }, { "type": "0xa21", "id": "Potion of Speed", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x36" + "File": "d3LofiObjEmbed", + "Index": "0x104" }, "SlotType": "10", "Tier": "2", "Description": "A potion that permanently increases speed by 1.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "22", @@ -18567,18 +18567,18 @@ "Track": "" }, { "type": "0xa34", "id": "Potion of Vitality", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x30" + "File": "d3LofiObjEmbed", + "Index": "0x106" }, "SlotType": "10", "Tier": "2", "Description": "A potion that permanently increases vitality by 1.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "26", @@ -18591,18 +18591,18 @@ "Track": "" }, { "type": "0xa35", "id": "Potion of Wisdom", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x31" + "File": "d3LofiObjEmbed", + "Index": "0x107" }, "SlotType": "10", "Tier": "2", "Description": "A potion that permanently increases wisdom by 1.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "27", @@ -18615,18 +18615,18 @@ "Track": "" }, { "type": "0xa4c", "id": "Potion of Dexterity", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x37" + "File": "d3LofiObjEmbed", + "Index": "0x105" }, "SlotType": "10", "Tier": "2", "Description": "A potion that permanently increases dexterity by 1.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "28", @@ -18639,18 +18639,18 @@ "Track": "" }, { "type": "0xae9", "id": "Potion of Life", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x26" + "File": "d3LofiObjEmbed", + "Index": "0x100" }, "SlotType": "10", "Description": "A potion that permanently increases health by 5.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "0", "amount": "5" @@ -18662,18 +18662,18 @@ "Track": "" }, { "type": "0xaea", "id": "Potion of Mana", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x27" + "File": "d3LofiObjEmbed", + "Index": "0x101" }, "SlotType": "10", "Description": "A potion that permanently increases magic by 5.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "3", "amount": "5" @@ -18685,18 +18685,18 @@ "Track": "" }, { "type": "0x1559", "id": "Potion of Attack (SB)", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x34" + "File": "d3LofiObjEmbed", + "Index": "0x112" }, "SlotType": "10", "Description": "A potion that permanently increases attack power by 1.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "20", "amount": "1" @@ -18709,18 +18709,18 @@ "Track": "" }, { "type": "0x155A", "id": "Potion of Defense (SB)", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x35" + "File": "d3LofiObjEmbed", + "Index": "0x113" }, "SlotType": "10", "Description": "A potion that permanently increases defense power by 1.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "21", "amount": "1" @@ -18733,18 +18733,18 @@ "Track": "" }, { "type": "0x155B", "id": "Potion of Speed (SB)", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x36" + "File": "d3LofiObjEmbed", + "Index": "0x114" }, "SlotType": "10", "Description": "A potion that permanently increases speed by 1.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "22", "amount": "1" @@ -18757,18 +18757,18 @@ "Track": "" }, { "type": "0x155C", "id": "Potion of Vitality (SB)", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x30" + "File": "d3LofiObjEmbed", + "Index": "0x116" }, "SlotType": "10", "Description": "A potion that permanently increases vitality by 1.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "26", "amount": "1" @@ -18781,18 +18781,18 @@ "Track": "" }, { "type": "0x155D", "id": "Potion of Wisdom (SB)", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x31" + "File": "d3LofiObjEmbed", + "Index": "0x117" }, "SlotType": "10", "Description": "A potion that permanently increases wisdom by 1.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "27", "amount": "1" @@ -18805,18 +18805,18 @@ "Track": "" }, { "type": "0x155E", "id": "Potion of Dexterity (SB)", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x37" + "File": "d3LofiObjEmbed", + "Index": "0x115" }, "SlotType": "10", "Description": "A potion that permanently increases dexterity by 1.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "28", "amount": "1" @@ -18829,18 +18829,18 @@ "Track": "" }, { "type": "0x155F", "id": "Potion of Life (SB)", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x26" + "File": "d3LofiObjEmbed", + "Index": "0x110" }, "SlotType": "10", "Description": "A potion that permanently increases health by 5.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "0", "amount": "5" @@ -18853,18 +18853,18 @@ "Track": "" }, { "type": "0x1560", "id": "Potion of Mana (SB)", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x27" + "File": "d3LofiObjEmbed", + "Index": "0x111" }, "SlotType": "10", "Description": "A potion that permanently increases magic by 5.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "3", "amount": "5" @@ -25899,17 +25899,17 @@ "duration": "5" }, { "_": "Decoy", "duration": "5", "angleOffset": "180" } ], - "feedPower": "400", + "feedPower": "500", "Soulbound": "" }, { "type": "0xb21", "id": "Chicken Leg of Doom", "Class": "Equipment", "Item": "", "Texture": { @@ -32689,17 +32689,17 @@ { "_": "IncrementStat", "stat": "3", "amount": "80" } ], "FameBonus": "5", "BagType": "6", - "feedPower": "250", + "feedPower": "600", "Soulbound": "" }, { "type": "0x7449", "id": "Puppet Master Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { @@ -33013,17 +33013,17 @@ }, { "type": "0x2368", "id": "Greater Potion of Attack", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", - "Index": "0x0d" + "Index": "0x122" }, "SlotType": "10", "Tier": "4", "Description": "A potion that permanently increases attack power by 2.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "20", @@ -33037,17 +33037,17 @@ }, { "type": "0x2369", "id": "Greater Potion of Defense", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", - "Index": "0x0e" + "Index": "0x123" }, "SlotType": "10", "Tier": "4", "Description": "A potion that permanently increases defense power by 2.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "21", @@ -33061,17 +33061,17 @@ }, { "type": "0x236A", "id": "Greater Potion of Speed", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", - "Index": "0x0f" + "Index": "0x124" }, "SlotType": "10", "Tier": "4", "Description": "A potion that permanently increases speed by 2.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "22", @@ -33085,17 +33085,17 @@ }, { "type": "0x236B", "id": "Greater Potion of Vitality", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", - "Index": "0x10" + "Index": "0x126" }, "SlotType": "10", "Tier": "4", "Description": "A potion that permanently increases vitality by 2.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "26", @@ -33109,17 +33109,17 @@ }, { "type": "0x236C", "id": "Greater Potion of Wisdom", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", - "Index": "0x11" + "Index": "0x127" }, "SlotType": "10", "Tier": "4", "Description": "A potion that permanently increases wisdom by 2.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "27", @@ -33133,17 +33133,17 @@ }, { "type": "0x236D", "id": "Greater Potion of Dexterity", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", - "Index": "0x12" + "Index": "0x125" }, "SlotType": "10", "Tier": "4", "Description": "A potion that permanently increases dexterity by 2.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "28", @@ -33157,17 +33157,17 @@ }, { "type": "0x236E", "id": "Greater Potion of Life", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", - "Index": "0x13" + "Index": "0x120" }, "SlotType": "10", "Description": "A potion that permanently increases health by 10.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "0", "amount": "10" @@ -33180,17 +33180,17 @@ }, { "type": "0x236F", "id": "Greater Potion of Mana", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", - "Index": "0x14" + "Index": "0x121" }, "SlotType": "10", "Description": "A potion that permanently increases magic by 10.", "Sound": "use_potion", "Activate": { "_": "IncrementStat", "stat": "3", "amount": "10" @@ -40742,17 +40742,18 @@ "Sound": "use_key", "Consumable": "", "Soulbound": "", "Activate": { "_": "Create", "id": "Lost Halls Portal" }, "feedPower": "200", - "BagType": "5" + "BagType": "5", + "Track": "" }, { "type": "0x025c", "id": "LH Lost Halls Debug Item", "Class": "Equipment", "Item": "", "Texture": { "File": "LHObj", @@ -48417,16 +48418,116 @@ "DisplayId": "Ice Tomb", "DungeonName": "Ice Tomb", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x09" } }, { + "type": "0x8da", + "id": "Admin Prism", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "lofiObj6", + "Index": "0xb0" + }, + "SlotType": "22", + "Description": "A prism used for unprecedented velocity by the Cult of Admin.", + "Usable": "", + "MpCost": "0", + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "22", + "amount": "125" + }, + { + "_": "IncrementStat", + "stat": "27", + "amount": "1000" + } + ], + "Activate": { + "_": "Teleport", + "maxDistance": "20" + }, + "BagType": "6", + "feedPower": "100000", + "Soulbound": "" + }, + { + "type": "0xcf2", + "id": "TG", + "DisplayId": "Test Guill", + "Class": "Character", + "Enemy": "", + "AnimatedTexture": { + "File": "d3Chars8x8rEmbed", + "Index": "17" + }, + "AltTexture": { + "id": "1", + "AnimatedTexture": { + "File": "d3Chars8x8rEmbed", + "Index": "18" + } + }, + "Size": "160", + "XpMult": "1.0", + "MaxHitPoints": "10000", + "ShadowSize": "50", + "Projectile": [ + { + "id": "0", + "ObjectId": "Darkness Bolt", + "Speed": "80", + "Damage": "0", + "LifetimeMS": "2000", + "MultiHit": "" + }, + { + "id": "1", + "ObjectId": "Darkness Bolt", + "Speed": "20", + "Damage": "0", + "Size": "0", + "LifetimeMS": "2000", + "MultiHit": "" + }, + { + "id": "2", + "ObjectId": "Darkness Bolt", + "Speed": "77.3333", + "Damage": "0", + "LifetimeMS": "4000", + "MultiHit": "" + } + ], + "Color": "0x00ff00" + }, + { + "type": "0x63d", + "id": "Decaract", + "Enemy": "", + "Class": "Character", + "Texture": { + "File": "lofiChar8x8", + "Index": "0xb5" + }, + "MaxHitPoints": "10000", + "Size": "0", + "Hero": "", + "Quest": "", + "God": "", + "Encounter": "", + "Level": "20" + }, + { "type": "0xc0c", "id": "0Def", "Class": "Character", "Enemy": "", "AnimatedTexture": { "File": "d3Chars8x8rEmbed", "Index": "17" }, @@ -120054,16 +120155,18 @@ } ], "HitSound": "monster/eggs_hit", "DeathSound": "monster/eggs_death", "Size": "120", "MaxHitPoints": "300000", "Defense": "0", "StasisImmune": "", + "Terrain": "Mountains", + "SpawnProb": "1.0", "PerRealmMax": "1", "ShadowSize": "0", "DisplayId": "Mysterious Egg" }, { "type": "0x89f", "id": "BB Biff the Buffed Bunny", "DisplayId": "Biff the Buffed Bunny", Binary files ../current/sheets/d3LofiObj.png and ./sheets/d3LofiObj.png differ Binary files ../current/sheets/lofiInterface2.png and ./sheets/lofiInterface2.png differ