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-11-13 20:40:49.700552955 +0000
+++ ./json/Objects.json 2017-11-14 18:40:57.674635394 +0000
@@ -11459,16 +11459,17 @@
"DeathSound": "monster/skull_shrine_death",
"Size": "120",
"MaxHitPoints": "15000",
"Defense": "40",
"Enemy": "",
"Hero": "",
"Quest": "",
"God": "",
+ "Encounter": "",
"StasisImmune": "",
"Level": "20",
"Projectile": {
"ObjectId": "Purple Magic",
"Speed": "100",
"Damage": "100",
"LifetimeMS": "2400"
}
@@ -11535,17 +11536,16 @@
"DeathSound": "monster/skull_shrine_death",
"Size": "120",
"MaxHitPoints": "15000",
"Defense": "40",
"Enemy": "",
"Hero": "",
"Quest": "",
"God": "",
- "Encounter": "",
"StasisImmune": "",
"Level": "20",
"Projectile": {
"ObjectId": "Purple Magic",
"Speed": "100",
"Damage": "100",
"LifetimeMS": "2400"
}
@@ -12366,19 +12366,17 @@
"Index": "50"
}
},
"MaxHitPoints": "100000",
"XpMult": "0.0",
"God": "",
"Hero": "",
"Quest": "",
- "Encounter": "",
- "Level": "20",
- "PerRealmMax": "10"
+ "Level": "20"
},
{
"type": "0x0e5c",
"id": "Bonegrind 2",
"DisplayId": "Bonegrind the Undead Butcher",
"Class": "Character",
"Enemy": "",
"AnimatedTexture": {
@@ -37667,88 +37665,16 @@
"Description": "Grants a random Pet Stone when used! The Pet Stone rarity will depend on the quality of the Mystery Item (Gold, Silver, Bronze)",
"Activate": "MysteryDyes",
"Consumable": "",
"Soulbound": "",
"BagType": "8",
"Track": ""
},
{
- "type": "0x9bd",
- "id": "Moss Bag MotMG 2017",
- "DisplayId": "Moss Bag",
- "Class": "Equipment",
- "Item": "",
- "Texture": {
- "File": "d2LofiObjEmbed",
- "Index": "0x2f"
- },
- "SlotType": "10",
- "Description": "A bag covered in moss that contains rewards!",
- "ExtraTooltipData": {
- "EffectInfo": {
- "name": "Event",
- "description": "MotMG 2017"
- }
- },
- "Activate": "MysteryDyes",
- "Consumable": "",
- "Soulbound": "",
- "BagType": "8",
- "Track": ""
- },
- {
- "type": "0x9be",
- "id": "Stone Bag MotMG 2017",
- "DisplayId": "Stone Bag",
- "Class": "Equipment",
- "Item": "",
- "Texture": {
- "File": "d2LofiObjEmbed",
- "Index": "0x2d"
- },
- "SlotType": "10",
- "Description": "A bag made of stone that contains rewards!",
- "ExtraTooltipData": {
- "EffectInfo": {
- "name": "Event",
- "description": "MotMG 2017"
- }
- },
- "Activate": "MysteryDyes",
- "Consumable": "",
- "Soulbound": "",
- "BagType": "8",
- "Track": ""
- },
- {
- "type": "0x9bf",
- "id": "Mad God Bag MotMG 2017",
- "DisplayId": "Mad God Bag",
- "Class": "Equipment",
- "Item": "",
- "Texture": {
- "File": "d2LofiObjEmbed",
- "Index": "0x30"
- },
- "SlotType": "10",
- "Description": "The Mad God's own loot bag. It contains great rewards!",
- "ExtraTooltipData": {
- "EffectInfo": {
- "name": "Event",
- "description": "MotMG 2017"
- }
- },
- "Activate": "MysteryDyes",
- "Consumable": "",
- "Soulbound": "",
- "BagType": "8",
- "Track": ""
- },
- {
"type": "0x13d9",
"id": "Yellow Goodie Bag",
"Class": "Equipment",
"Item": "",
"Texture": {
"File": "lofiObj3",
"Index": "0x5af"
},
@@ -42983,16 +42909,36 @@
"Activate": {
"_": "TeleportToObject",
"id": "Death Flower"
},
"BagType": "8",
"InvUse": ""
},
{
+ "type": "0x10a2",
+ "id": "Shatters TP",
+ "DisplayId": "Cursed Crown Teleporter",
+ "Class": "Equipment",
+ "Item": "",
+ "AnimatedTexture": {
+ "File": "chars16x16dEncounters2",
+ "Index": "87"
+ },
+ "SlotType": "10",
+ "Description": "Teleports the user to the Cursed Crown in the Shatters.",
+ "Soulbound": "",
+ "Activate": {
+ "_": "TeleportToObject",
+ "id": "shtrs The Cursed Crown"
+ },
+ "BagType": "8",
+ "InvUse": ""
+ },
+ {
"type": "0x10fa",
"id": "Test Close",
"DisplayId": "Realm Closer",
"Class": "Equipment",
"Item": "",
"Texture": {
"File": "lofiObj2",
"Index": "0xf4"
@@ -65964,34 +65910,46 @@
"Damage": "150",
"Speed": "40",
"Size": "140",
"LifetimeMS": "2000"
}
]
},
{
- "_": "\n \n \n \n \n -->\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n ",
"type": "0x0932",
"id": "Oryx the Mad God 2",
"DisplayId": "Oryx the Mad God",
"Enemy": "",
"Class": "Character",
- "AnimatedTexture": {
- "File": "d3Chars16x16rEmbed",
- "Index": "0x07",
- "Right": ""
+ "Texture": {
+ "File": "lofiChar16x16",
+ "Index": "0x54"
},
- "AltTexture": {
+ "AltTexture": [
+ {
+ "id": "1",
+ "Texture": {
+ "File": "lofiChar16x16",
+ "Index": "0x54"
+ }
+ },
+ {
"id": "1",
"AnimatedTexture": {
"File": "d3Chars16x16rEmbed",
"Index": "0x06",
"Right": ""
}
+ }
+ ],
+ "AnimatedTexture": {
+ "File": "d3Chars16x16rEmbed",
+ "Index": "0x07",
+ "Right": ""
},
"HitSound": "monster/oryx_hit",
"DeathSound": "monster/oryx_death",
"Size": "120",
"MaxHitPoints": "75000",
"Defense": "60",
"Quest": "",
"God": "",
@@ -87361,116 +87319,92 @@
},
"MultiHit": ""
}
]
},
{
"type": "0x736c",
"id": "shtrs Mage Closer 1",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x736d",
"id": "shtrs Mage Bridge Check",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x717c",
"id": "shtrs Final Fight Check",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x722e",
"id": "shtrs KillWall 1",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x722f",
"id": "shtrs KillWall 2",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x731d",
"id": "shtrs KillWall 3",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x725a",
"id": "shtrs KillWall 4",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x734b",
"id": "shtrs KillWall 7",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x727a",
"id": "shtrs MagiGenerators",
"DisplayId": "Magi-Generator",
"Class": "Character",
"Enemy": "",
"Texture": {
@@ -87540,116 +87474,92 @@
}
]
}
]
},
{
"type": "0x727b",
"id": "shtrs KillWall 6",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x725b",
"id": "shtrs Bridge Closer",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x725c",
"id": "shtrs Player Check",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x726f",
"id": "shtrs Spawn Bridge",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x728e",
"id": "shtrs Bridge Review Board",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x725f",
"id": "shtrs Goo Spawner",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x730c",
"id": "shtrs Player Check Archmage",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x734c",
"id": "shtrs Monster Cluster",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x726a",
"id": "shtrs Blobomb",
"DisplayId": "Blobomb",
"Class": "Character",
"Enemy": "",
"AnimatedTexture": {
@@ -89177,54 +89087,42 @@
"duration": "3"
}
]
}
},
{
"type": "0x729f",
"id": "shtrs BirdSpawn 1",
- "Class": "Character",
- "Enemy": "",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x730a",
"id": "shtrs BirdSpawn 2",
- "Class": "Character",
- "Enemy": "",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x730b",
"id": "shtrs Bird Check",
- "Class": "Character",
- "Enemy": "",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x730d",
"id": "shtrs Ice Shield 2",
"DisplayId": "Ice Sphere",
"Class": "Character",
"Group": "Ice Mages",
"Enemy": "",
@@ -89476,51 +89374,42 @@
"Size": "150",
"MaxHitPoints": "25000",
"Defense": "60",
"XpMult": "0.0"
},
{
"type": "0x732c",
"id": "shtrs Crystal Check",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x732d",
"id": "shtrs Add Lava",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x732e",
"id": "shtrs Final Mediator Lava",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x732f",
"id": "shtrs Laser1",
"DisplayId": "The Forgotten King",
"Class": "Character",
"Enemy": "",
"Texture": {
@@ -89680,62 +89569,52 @@
"duration": "3"
}
]
}
},
{
"type": "0x734a",
"id": "shtrs Soul Spawner",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
"Size": "0"
},
{
"type": "0x737d",
"id": "shtrs Bridge Balloon Spawner",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x737e",
"id": "shtrs Mage Balloon Spawner",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x737f",
"id": "shtrs King Balloon Spawner",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x731a",
"id": "shtrs Loot Balloon Bridge",
"DisplayId": "Sentinel Chest",
"Class": "Character",
"Group": "Ice Mages",
"Enemy": "",
@@ -89778,25 +89657,22 @@
"MaxHitPoints": "120000",
"Defense": "35",
"Size": "160",
"XpMult": "0.0"
},
{
"type": "0x7380",
"id": "shtrs Pause Watcher",
- "Class": "Character",
+ "Class": "GameObject",
"Texture": {
- "File": "invisible",
- "Index": "0"
+ "File": "lofiEnvironment",
+ "Index": "0xa4"
},
- "NoMiniMap": "",
- "Size": "0",
- "XpMult": "0.0",
- "StasisImmune": ""
+ "Size": "0"
},
{
"type": "0x600",
"id": "Pirate",
"Group": "Pirates",
"Enemy": "",
"Class": "Character",
"AnimatedTexture": {
@@ -138831,18 +138707,17 @@
},
"MaxHitPoints": "100000",
"NoMiniMap": "",
"Size": "0",
"ShadowSize": "0",
"StasisImmune": "",
"Enemy": "",
"Encounter": "",
- "PerRealmMax": "1",
- "Hero": ""
+ "PerRealmMax": "1"
},
{
"type": "0x08ac",
"id": "EH Event Taunt Controller",
"Class": "Character",
"DeathSound": "silence",
"Texture": {
"File": "invisible",
@@ -138891,18 +138766,16 @@
"HitSound": "monster/wooden_walls_hit",
"DeathSound": "monster/wooden_walls_death",
"MaxHitPoints": "100000",
"Defense": "40",
"XpMult": "5.128205128205129",
"StasisImmune": "",
"DontFaceAttacks": "",
"God": "",
- "Quest": "",
- "Level": "20",
"Projectile": [
{
"id": "0",
"ObjectId": "EH Red Ball",
"Damage": "75",
"Speed": "30",
"Size": "100",
"LifetimeMS": "3000",
@@ -139471,19 +139344,17 @@
},
"Size": "120",
"HitSound": "monster/snake_queen_hit",
"DeathSound": "monster/snake_queen_death",
"MaxHitPoints": "75000",
"Defense": "25",
"XpMult": "5.128205128205129",
"Flying": "",
- "Quest": "",
"God": "",
- "Level": "20",
"KeepDamageRecord": "",
"Z": "0.24",
"Projectile": [
{
"id": "0",
"ObjectId": "EH Yellow Stinger Large",
"Damage": "120",
"Speed": "50",
@@ -139570,19 +139441,17 @@
"Size": "120",
"HitSound": "monster/snake_queen_hit",
"DeathSound": "monster/snake_queen_death",
"MaxHitPoints": "75000",
"Defense": "25",
"XpMult": "5.128205128205129",
"Flying": "",
"Z": "0.24",
- "Quest": "",
"God": "",
- "Level": "20",
"KeepDamageRecord": "",
"Projectile": [
{
"id": "0",
"ObjectId": "EH Red Stinger Large",
"Damage": "100",
"Speed": "60",
"Size": "100",
@@ -139650,19 +139519,17 @@
"Size": "120",
"HitSound": "monster/snake_queen_hit",
"DeathSound": "monster/snake_queen_death",
"MaxHitPoints": "75000",
"Defense": "25",
"XpMult": "5.128205128205129",
"Flying": "",
"Z": "0.24",
- "Quest": "",
"God": "",
- "Level": "20",
"KeepDamageRecord": "",
"Projectile": [
{
"id": "0",
"ObjectId": "EH Blue Stinger Large",
"Damage": "120",
"Speed": "70",
"Size": "100",
@@ -154340,91 +154207,16 @@
"_": "Stasis",
"duration": "5",
"target": "1"
},
"ArmorPiercing": ""
}
},
{
- "type": "0x203f",
- "id": "Pile of Bones Mid",
- "Class": "Character",
- "DisplayId": "Pile of Bones",
- "Enemy": "",
- "Texture": {
- "File": "oryxHordeObjects16x16",
- "Index": "0x0e"
- },
- "StasisImmune": "",
- "StunImmune": "",
- "ParalyzeImmune": "",
- "HitSound": "monster/eggs_hit",
- "DeathSound": "monster/eggs_death",
- "MaxHitPoints": "15000",
- "Defense": "0",
- "XpMult": "0.0",
- "Size": "120",
- "ShadowSize": "100",
- "Terrain": "MidPlains",
- "PerRealmMax": "20",
- "SpawnProb": "1.0",
- "Level": "20"
- },
- {
- "type": "0x2040",
- "id": "Pile of Bones High",
- "Class": "Character",
- "DisplayId": "Pile of Bones",
- "Enemy": "",
- "Texture": {
- "File": "oryxHordeObjects16x16",
- "Index": "0x0e"
- },
- "StasisImmune": "",
- "StunImmune": "",
- "ParalyzeImmune": "",
- "HitSound": "monster/eggs_hit",
- "DeathSound": "monster/eggs_death",
- "MaxHitPoints": "15000",
- "Defense": "0",
- "XpMult": "0.0",
- "Size": "120",
- "ShadowSize": "100",
- "PerRealmMax": "20",
- "Terrain": "HighPlains",
- "SpawnProb": "1.0",
- "Level": "20"
- },
- {
- "type": "0x2041",
- "id": "Pile of Bones God",
- "Class": "Character",
- "DisplayId": "Pile of Bones",
- "Enemy": "",
- "Texture": {
- "File": "oryxHordeObjects16x16",
- "Index": "0x0e"
- },
- "StasisImmune": "",
- "StunImmune": "",
- "ParalyzeImmune": "",
- "HitSound": "monster/eggs_hit",
- "DeathSound": "monster/eggs_death",
- "MaxHitPoints": "15000",
- "Defense": "0",
- "XpMult": "0.0",
- "Size": "120",
- "ShadowSize": "100",
- "PerRealmMax": "20",
- "Terrain": "Mountains",
- "SpawnProb": "1.0",
- "Level": "20"
- },
- {
"type": "0x203d",
"id": "Oryx Horde Small Burst",
"Class": "Projectile",
"Texture": {
"File": "oryxHordeObjects8x8",
"Index": "0x2a"
},
"AngleCorrection": "1"
Binary files ../current/sheets/playersSkinsMask.png and ./sheets/playersSkinsMask.png differ
Binary files ../current/sheets/playersSkins.png and ./sheets/playersSkins.png differ