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-07-31 18:40:41.984614364 +0000 +++ ./json/Objects.json 2018-08-02 13:30:39.808610235 +0000 @@ -30276,17 +30276,17 @@ "LifetimeMS": "1000", "MinDamage": "10", "MaxDamage": "15", "Amplitude": "0.15", "Frequency": "2" }, "ArcGap": "36", "NumProjectiles": "10", - "BagType": "2", + "BagType": "4", "FameBonus": "1", "OldSound": "bladeSwing" }, { "type": "0x2325", "id": "Precisely Calibrated Stringstick", "Class": "Equipment", "Item": "", @@ -30302,17 +30302,17 @@ "ObjectId": "Cat Cavalcade", "Speed": "25", "LifetimeMS": "2000", "MinDamage": "10", "MaxDamage": "15", "Amplitude": "2", "Frequency": "2" }, - "BagType": "6", + "BagType": "4", "NumProjectiles": "5", "ArcGap": "15", "OldSound": "arrowShoot" }, { "type": "0x2326", "id": "Barely Attuned Magic Thingy", "Class": "Equipment", @@ -30358,17 +30358,17 @@ "Speed": "12.5", "LifetimeMS": "3000", "MinDamage": "20", "MaxDamage": "40", "Parametric": "", "PassesCover": "" }, "NumProjectiles": "4", - "BagType": "2", + "BagType": "4", "OldSound": "magicShoot", "feedPower": "145" }, { "type": "0x2328", "id": "Toy Knife", "Class": "Equipment", "Item": "", @@ -30382,17 +30382,17 @@ "Sound": "weapon/fire_dagger", "Projectile": { "ObjectId": "Toy Attack", "Speed": "50", "LifetimeMS": "1000", "MinDamage": "50", "MaxDamage": "50" }, - "BagType": "2", + "BagType": "4", "OldSound": "daggerSwing", "feedPower": "145" }, { "type": "0x233a", "id": "The Devil Tarot Card", "Class": "Equipment", "Item": "", @@ -154942,31 +154942,32 @@ "MaxHitPoints": "1250", "Size": "80", "Exp": "6", "Projectile": [ { "id": "0", "ObjectId": "Green Bolt", "Speed": "150", - "Damage": "75", + "Damage": "55", "LifetimeMS": "500", "MultiHit": "", "ArmorPiercing": "" }, { "id": "1", "ObjectId": "White Bolt", - "Speed": "180", + "Speed": "80", "Damage": "85", - "LifetimeMS": "500", + "LifetimeMS": "800", "MultiHit": "", + "Size": "120", "ConditionEffect": { "_": "Sick", - "duration": "4.0" + "duration": "2.5" } } ] }, { "type": "0x550", "id": "Oryx Eye Ultra", "DisplayId": "Oryx Eye", @@ -155382,16 +155383,36 @@ "Index": "0x07" }, "Size": "0", "ShadowSize": "0", "MaxHitPoints": "45000", "NoMiniMap": "" }, { + "type": "0x552", + "id": "Decaract Teleporter Target", + "Class": "GameObject", + "Texture": { + "File": "invisible", + "Index": "0" + }, + "Size": "0" + }, + { + "type": "0x553", + "id": "Decaract Teleporter", + "Class": "GameObject", + "Texture": { + "File": "autumnNexusObjects16x16", + "Index": "0x201" + }, + "Size": "0" + }, + { "type": "0x427", "id": "Easter Egg Basket Mid", "Class": "Character", "DisplayId": "Easter Egg Basket", "Enemy": "", "Texture": { "File": "buffedBunnyObjects16x16", "Index": "0x17" Binary files ../current/sheets/playersSkinsMask.png and ./sheets/playersSkinsMask.png differ Binary files ../current/sheets/playersSkins.png and ./sheets/playersSkins.png differ