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-10-24 17:10:54.844777747 +0000
+++ ./json/Objects.json 2017-10-26 20:11:09.842235057 +0000
@@ -43784,17 +43784,17 @@
"id": "Ducky Knight Skin",
"Class": "Equipment",
"Item": "",
"AnimatedTexture": {
"File": "playerskins",
"Index": "254"
},
"SlotType": "10",
- "Description": "True knight prepare to fight anywhere, included beaches and waters. quack\\n\\nSkin Class: Knight\\nSprite Credits: PoloKai",
+ "Description": "True knights are prepared to fight anywhere, including beaches and waters. Quack!\\n\\nSkin Class: Knight\\nSprite Credits: PoloKai",
"Activate": {
"_": "UnlockSkin",
"skinType": "6039"
},
"Consumable": "",
"BagType": "8",
"Soulbound": "",
"feedPower": "2000"
@@ -44370,17 +44370,18 @@
"arcDegrees": "15",
"totalDamage": "820",
"decrDamage": "20",
"wisDamageBase": "100",
"maxTargets": "1",
"color": "0xE28A8A",
"wisPerTarget": "20"
},
- "feedPower": "900"
+ "feedPower": "900",
+ "Soulbound": ""
},
{
"type": "0x7ba",
"id": "pD Armor",
"DisplayId": "pD Armor",
"Description": "Armaw? xD",
"Class": "Equipment",
"Item": "",
@@ -52907,17 +52908,16 @@
},
"HitSound": "monster/skeletons_hit",
"DeathSound": "monster/skeletons_death",
"Size": "175",
"MaxHitPoints": "120000",
"Defense": "40",
"XpMult": "1.0",
"Level": "20",
- "Quest": "",
"God": "",
"ParalyzeImmune": "",
"DazedImmune": "",
"StasisImmune": "",
"StunImmune": "",
"Projectile": [
{
"id": "0",
@@ -53016,17 +53016,16 @@
},
"HitSound": "monster/skeletons_hit",
"DeathSound": "monster/skeletons_death",
"Size": "225",
"MaxHitPoints": "120000",
"Defense": "75",
"XpMult": "1.0",
"Level": "20",
- "Quest": "",
"God": "",
"ParalyzeImmune": "",
"DazedImmune": "",
"StasisImmune": "",
"StunImmune": "",
"Projectile": [
{
"id": "0",
@@ -53229,17 +53228,16 @@
},
"HitSound": "monster/skeletons_hit",
"DeathSound": "monster/skeletons_death",
"Size": "200",
"MaxHitPoints": "100000",
"Defense": "40",
"XpMult": "5.0",
"Level": "20",
- "Quest": "",
"God": "",
"ParalyzeImmune": "",
"DazedImmune": "",
"StasisImmune": "",
"StunImmune": "",
"Projectile": [
{
"id": "0",
@@ -53383,17 +53381,16 @@
},
"HitSound": "monster/skeletons_hit",
"DeathSound": "monster/skeletons_death",
"Size": "225",
"MaxHitPoints": "100000",
"Defense": "40",
"XpMult": "1.0",
"Level": "20",
- "Quest": "",
"God": "",
"ParalyzeImmune": "",
"DazedImmune": "",
"StasisImmune": "",
"StunImmune": "",
"Projectile": [
{
"id": "0",
@@ -53597,17 +53594,16 @@
},
"HitSound": "monster/skeletons_hit",
"DeathSound": "monster/skeletons_death",
"Size": "175",
"MaxHitPoints": "110000",
"Defense": "60",
"XpMult": "5.0",
"Level": "20",
- "Quest": "",
"God": "",
"ParalyzeImmune": "",
"DazedImmune": "",
"StasisImmune": "",
"StunImmune": "",
"Projectile": [
{
"id": "0",
@@ -53713,17 +53709,16 @@
},
"HitSound": "monster/skeletons_hit",
"DeathSound": "monster/skeletons_death",
"Size": "225",
"MaxHitPoints": "110000",
"Defense": "60",
"XpMult": "1.0",
"Level": "20",
- "Quest": "",
"God": "",
"ParalyzeImmune": "",
"DazedImmune": "",
"StasisImmune": "",
"StunImmune": "",
"Projectile": [
{
"id": "0",
@@ -53966,17 +53961,16 @@
}
],
"HitSound": "monster/skeletons_hit",
"DeathSound": "monster/skeletons_death",
"Size": "240",
"MaxHitPoints": "110000",
"Defense": "70",
"XpMult": "7.5",
- "Quest": "",
"God": "",
"ParalyzeImmune": "",
"DazedImmune": "",
"StasisImmune": "",
"StunImmune": "",
"Projectile": [
{
"id": "0",
@@ -54127,17 +54121,16 @@
}
],
"HitSound": "monster/skeletons_hit",
"DeathSound": "monster/skeletons_death",
"Size": "240",
"MaxHitPoints": "110000",
"Defense": "70",
"XpMult": "7.5",
- "Quest": "",
"God": "",
"ParalyzeImmune": "",
"DazedImmune": "",
"StasisImmune": "",
"StunImmune": "",
"Projectile": [
{
"id": "0",
@@ -62864,17 +62857,17 @@
"DisplayId": "Event Chest",
"Class": "Character",
"Enemy": "",
"KeepDamageRecord": "",
"Texture": {
"File": "d2LofiObjEmbed",
"Index": "0x70"
},
- "MaxHitPoints": "180000",
+ "MaxHitPoints": "60000",
"Defense": "0",
"Size": "160",
"XpMult": "5.13",
"StasisImmune": ""
},
{
"type": "0x744F",
"id": "Event Chest Portal",
@@ -76185,17 +76178,17 @@
"DisplayId": "Mini Model Ship Pet Skin",
"Class": "Equipment",
"Item": "",
"AnimatedTexture": {
"File": "chars8x8rPets1",
"Index": "164"
},
"SlotType": "10",
- "Description": "Latest product from Nexus Model Shop, best decoration for your vault!\\n\\nSprite Credits: PoloKai\\n\\nTransform your pet into Mini Model Ship of the ? ? ? ? family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.",
+ "Description": "The latest product from the Nexus Model Shop, it'll look great in your vault!\\n\\nSprite Credits: PoloKai\\n\\nTransform your pet into Mini Model Ship of the ? ? ? ? family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.",
"Activate": {
"_": "PetSkin",
"skinId": "6065"
},
"Consumable": "",
"Soulbound": "",
"BagType": "8",
"feedPower": "2000"
@@ -76390,17 +76383,17 @@
"DisplayId": "Flying Eyeball Skin",
"Class": "Equipment",
"Item": "",
"AnimatedTexture": {
"File": "chars8x8rPets1",
"Index": "168"
},
"SlotType": "10",
- "Description": "Cousin to the Flying Brain, he has his eye on you!\\n\\nSprite Credits: WunderWafe\\n\\nTransform your pet into Flying Eyeball of the Spooky family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.",
+ "Description": "Cousin to the Flying Brain, he's got an eye on you!\\n\\nSprite Credits: WunderWafe\\n\\nTransform your pet into Flying Eyeball of the Spooky family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.",
"Activate": {
"_": "PetSkin",
"skinId": "6083"
},
"Consumable": "",
"Soulbound": "",
"BagType": "8",
"feedPower": "2000"
@@ -154377,17 +154370,17 @@
"File": "oryxHordeObjects16x16",
"Index": "0x0e"
},
"StasisImmune": "",
"StunImmune": "",
"ParalyzeImmune": "",
"HitSound": "monster/eggs_hit",
"DeathSound": "monster/eggs_death",
- "MaxHitPoints": "3000",
+ "MaxHitPoints": "15000",
"Defense": "0",
"XpMult": "0.0",
"Size": "120",
"ShadowSize": "100",
"Terrain": "MidPlains",
"PerRealmMax": "20",
"SpawnProb": "1.0",
"Level": "20"
@@ -154402,17 +154395,17 @@
"File": "oryxHordeObjects16x16",
"Index": "0x0e"
},
"StasisImmune": "",
"StunImmune": "",
"ParalyzeImmune": "",
"HitSound": "monster/eggs_hit",
"DeathSound": "monster/eggs_death",
- "MaxHitPoints": "3000",
+ "MaxHitPoints": "15000",
"Defense": "0",
"XpMult": "0.0",
"Size": "120",
"ShadowSize": "100",
"PerRealmMax": "20",
"Terrain": "HighPlains",
"SpawnProb": "1.0",
"Level": "20"
@@ -154427,17 +154420,17 @@
"File": "oryxHordeObjects16x16",
"Index": "0x0e"
},
"StasisImmune": "",
"StunImmune": "",
"ParalyzeImmune": "",
"HitSound": "monster/eggs_hit",
"DeathSound": "monster/eggs_death",
- "MaxHitPoints": "3000",
+ "MaxHitPoints": "15000",
"Defense": "0",
"XpMult": "0.0",
"Size": "120",
"ShadowSize": "100",
"PerRealmMax": "20",
"Terrain": "Mountains",
"SpawnProb": "1.0",
"Level": "20"
@@ -157124,16 +157117,100 @@
"LifetimeMS": "2400",
"Size": "120",
"MultiHit": "",
"PassesCover": ""
},
"ParalyzeImmune": ""
},
{
+ "type": "0x7c7",
+ "id": "pD Maw Scout",
+ "DisplayId": "Horror Maw",
+ "Class": "Character",
+ "Enemy": "",
+ "AnimatedTexture": {
+ "File": "parasiteDenChars16x16",
+ "Index": "0"
+ },
+ "HitSound": "monster/abyss_brutes_hit",
+ "DeathSound": "monster/abyss_demons_death",
+ "Size": "115",
+ "ShadowSize": "75",
+ "MaxHitPoints": "6000",
+ "Defense": "20",
+ "XpMult": "4.1026",
+ "Projectile": [
+ {
+ "id": "0",
+ "ObjectId": "pD Maw Shot",
+ "Damage": "140",
+ "Speed": "65",
+ "LifetimeMS": "1600",
+ "Size": "130",
+ "Amplitude": "1.8",
+ "Frequency": "0.492",
+ "MultiHit": "",
+ "FaceDir": "",
+ "PassesCover": ""
+ },
+ {
+ "id": "1",
+ "ObjectId": "pD Maw Shot",
+ "Damage": "140",
+ "Speed": "55",
+ "LifetimeMS": "1400",
+ "Size": "130",
+ "Amplitude": "2.9",
+ "Frequency": "0.492",
+ "MultiHit": "",
+ "FaceDir": "",
+ "PassesCover": ""
+ },
+ {
+ "id": "2",
+ "ObjectId": "pD Maw Shot 2",
+ "Damage": "160",
+ "Speed": "46",
+ "LifetimeMS": "1800",
+ "Size": "120",
+ "PassesCover": ""
+ }
+ ],
+ "StunImmune": ""
+ },
+ {
+ "type": "0x7c8",
+ "id": "pD Tongue Scout",
+ "DisplayId": "Furious Lasher",
+ "Class": "Character",
+ "Enemy": "",
+ "AnimatedTexture": {
+ "File": "parasiteDenChars16x16",
+ "Index": "2"
+ },
+ "HitSound": "monster/demons_hit",
+ "DeathSound": "monster/abyss_brutes_death",
+ "Size": "110",
+ "ShadowSize": "75",
+ "MaxHitPoints": "5000",
+ "Defense": "20",
+ "XpMult": "4.1026",
+ "Projectile": {
+ "id": "0",
+ "ObjectId": "pD Tongue Shot",
+ "Damage": "140",
+ "Speed": "65",
+ "LifetimeMS": "1600",
+ "Size": "100",
+ "MultiHit": "",
+ "PassesCover": ""
+ }
+ },
+ {
"type": "0x794",
"id": "pD Maw",
"DisplayId": "Horror Maw",
"Class": "Character",
"Enemy": "",
"AnimatedTexture": {
"File": "parasiteDenChars16x16",
"Index": "0"