diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/json/EquipmentSets.json ./json/EquipmentSets.json
--- ../current/json/EquipmentSets.json 2019-02-05 13:30:38.153091472 +0000
+++ ./json/EquipmentSets.json 2019-02-14 13:20:40.062110515 +0000
@@ -323,76 +323,16 @@
{
"_": "IncrementStat",
"stat": "28",
"amount": "2"
}
]
},
{
- "type": "0x1e48",
- "id": "Phantom Archer Set",
- "Setpiece": [
- {
- "_": "Equipment",
- "slot": "0",
- "itemtype": "0x1e44"
- },
- {
- "_": "Equipment",
- "slot": "1",
- "itemtype": "0x1e45"
- },
- {
- "_": "Equipment",
- "slot": "2",
- "itemtype": "0x1e46"
- },
- {
- "_": "Equipment",
- "slot": "3",
- "itemtype": "0x1e47"
- }
- ],
- "ActivateOnEquipAll": [
- {
- "_": "ChangeSkin",
- "skinType": "0x4bcb",
- "size": "120",
- "color": "0x1a4a6b",
- "bulletType": "Archer ST Arrow Big"
- },
- {
- "_": "IncrementStat",
- "stat": "0",
- "amount": "105"
- },
- {
- "_": "IncrementStat",
- "stat": "3",
- "amount": "95"
- },
- {
- "_": "IncrementStat",
- "stat": "21",
- "amount": "9"
- },
- {
- "_": "IncrementStat",
- "stat": "28",
- "amount": "5"
- },
- {
- "_": "IncrementStat",
- "stat": "26",
- "amount": "5"
- }
- ]
- },
- {
"type": "0x0003",
"id": "Swoll Paladin Set",
"Setpiece": [
{
"_": "Equipment",
"slot": "0",
"itemtype": "0x2367"
},
@@ -748,76 +688,16 @@
{
"_": "IncrementStat",
"stat": "22",
"amount": "6"
}
]
},
{
- "type": "0x1e51",
- "id": "Raijin Disciple Set",
- "Setpiece": [
- {
- "_": "Equipment",
- "slot": "0",
- "itemtype": "0x1e4d"
- },
- {
- "_": "Equipment",
- "slot": "1",
- "itemtype": "0x1e4e"
- },
- {
- "_": "Equipment",
- "slot": "2",
- "itemtype": "0x1e4f"
- },
- {
- "_": "Equipment",
- "slot": "3",
- "itemtype": "0x1e50"
- }
- ],
- "ActivateOnEquipAll": [
- {
- "_": "ChangeSkin",
- "skinType": "0x4bcb",
- "size": "120",
- "color": "0x1a4a6b",
- "bulletType": "Sadamune Slash"
- },
- {
- "_": "IncrementStat",
- "stat": "0",
- "amount": "75"
- },
- {
- "_": "IncrementStat",
- "stat": "20",
- "amount": "4"
- },
- {
- "_": "IncrementStat",
- "stat": "21",
- "amount": "4"
- },
- {
- "_": "IncrementStat",
- "stat": "28",
- "amount": "4"
- },
- {
- "_": "IncrementStat",
- "stat": "22",
- "amount": "7"
- }
- ]
- },
- {
"type": "0x000f",
"id": "Swarming Huntress Set",
"Setpiece": [
{
"_": "Equipment",
"slot": "0",
"itemtype": "0x08f7"
},
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 2019-02-05 13:30:43.573197523 +0000
+++ ./json/Objects.json 2019-02-14 13:20:45.230211652 +0000
@@ -34983,17 +34983,17 @@
},
"Tex2": "0xffffffff",
"SlotType": "10",
"Description": "Remove Accessory Dye",
"Activate": "Dye",
"Sound": "use_potion",
"Consumable": "",
"Soulbound": "",
- "BagType": "8"
+ "BagType": "2"
},
{
"type": "0x13e",
"id": "Clothing Dye Remover",
"Class": "Dye",
"DisplayId": "Clothing Dye Remover",
"Item": "",
"Texture": {
@@ -35002,17 +35002,17 @@
},
"Tex1": "0xffffffff",
"SlotType": "10",
"Description": "Remove Clothing Dye",
"Activate": "Dye",
"Sound": "use_potion",
"Consumable": "",
"Soulbound": "",
- "BagType": "8"
+ "BagType": "2"
},
{
"type": "0x998",
"id": "Magical Accessory Dye Remover",
"Class": "Dye",
"DisplayId": "Magical Accessory Dye Remover",
"Item": "",
"Texture": {
@@ -35021,17 +35021,17 @@
},
"Tex2": "0xffffffff",
"SlotType": "10",
"Description": "Remove Accessory Dye from your character. Magical properties give the item unlimited use.",
"InvUse": "",
"Activate": "Dye",
"Sound": "use_potion",
"Soulbound": "",
- "BagType": "8"
+ "BagType": "2"
},
{
"type": "0x999",
"id": "Magical Clothing Dye Remover",
"Class": "Dye",
"DisplayId": "Magical Clothing Dye Remover",
"Item": "",
"Texture": {
@@ -35040,17 +35040,17 @@
},
"Tex1": "0xffffffff",
"SlotType": "10",
"Description": "Remove Clothing Dye from your character. Magical properties give the item unlimited use.",
"Activate": "Dye",
"Sound": "use_potion",
"InvUse": "",
"Soulbound": "",
- "BagType": "8"
+ "BagType": "2"
},
{
"type": "0x025c",
"id": "LH Lost Halls Debug Item",
"Class": "Equipment",
"Item": "",
"Texture": {
"File": "lostHallsObjects8x8",
@@ -38858,17 +38858,17 @@
"Wavy": ""
},
"ActivateOnEquip": {
"_": "IncrementStat",
"stat": "22",
"amount": "5"
},
"BagType": "6",
- "FameBonus": "5",
+ "FameBonus": "7",
"NumProjectiles": "1",
"OldSound": "arrowShoot",
"feedPower": "800",
"ArcGap": "0",
"Soulbound": ""
},
{
"type": "0x6407",
@@ -44250,26 +44250,26 @@
"id": "Bella's Key",
"Class": "Equipment",
"Item": "",
"Texture": {
"File": "lofiObj3",
"Index": "0x4B9"
},
"SlotType": "10",
- "Description": "A key which opens an entrance to Belladonna's Garden.\\n\\nKeys can only be used once you have 10 or more stars!",
+ "Description": "A key which opens an entrance to Belladonna's Garden.\\n\\nKeys can only be used once you have 10 or more stars!\\n\\nOnly usable in the Realm, Vault, Guildhall and Belladonna's Garden areas.",
"Sound": "use_key",
"Consumable": "",
"Soulbound": "",
"Activate": {
"_": "CreatePortal",
"onlyInArea": "Vault,Realm of the Mad God,Guild Hall,Guild Hall 2,Guild Hall 3,Guild Hall 4,Belladonna's Garden",
"id": "Belladonna's Garden Portal"
},
- "feedPower": "200",
+ "feedPower": "50",
"BagType": "8",
"Track": ""
},
{
"type": "0x2294",
"id": "Shaitan's Key",
"Class": "Equipment",
"Item": "",
@@ -71807,16 +71807,47 @@
"Damage": "100",
"Speed": "60",
"Size": "60",
"LifetimeMS": "1500",
"MultiHit": ""
}
},
{
+ "type": "0xc51",
+ "id": "Succubus",
+ "Group": "Gods",
+ "Enemy": "",
+ "Class": "Character",
+ "AnimatedTexture": {
+ "File": "chars16x16dEncounters",
+ "Index": "40"
+ },
+ "HitSound": "monster/greater_demons_hit",
+ "DeathSound": "monster/greater_demons_death",
+ "Size": "100",
+ "MaxHitPoints": "8000",
+ "Defense": "12",
+ "Exp": "2000",
+ "Terrain": "Mountains",
+ "SpawnProb": ".4",
+ "God": "",
+ "Flying": "",
+ "Projectile": {
+ "id": "0",
+ "ObjectId": "Succubus Bullet",
+ "Damage": "45",
+ "Speed": "50",
+ "LifetimeMS": "2000",
+ "Size": "60",
+ "ArmorPiercing": "",
+ "MultiHit": ""
+ }
+ },
+ {
"type": "0x01ff",
"id": "Sheep",
"Group": "Sheep",
"Class": "Character",
"AnimatedTexture": {
"File": "chars8x8rBeach",
"Index": "0"
},
@@ -79634,17 +79665,17 @@
"InvUse": "",
"Activate": {
"_": "PermaPet",
"objectId": "Valentine Heart",
"cooldown": "1",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "500"
+ "feedPower": "100"
},
{
"type": "0x16f5",
"id": "Valentine Heart",
"Class": "Character",
"Texture": {
"File": "invisible",
"Index": "0"
@@ -79735,17 +79766,17 @@
"Description": "Show your valentine spirit by presenting your big heart!",
"Sound": "use_potion",
"Activate": {
"_": "Pet",
"hideEffect": "true",
"objectId": "Hearticles"
},
"Consumable": "",
- "BagType": "8",
+ "BagType": "2",
"Soulbound": ""
},
{
"type": "0x222",
"id": "Hearticles",
"Class": "GameObject",
"Effect": {
"_": "Heart",
@@ -96100,16 +96131,66 @@
"skinType": "30089"
},
"Consumable": "",
"Soulbound": "",
"BagType": "8",
"feedPower": "2000"
},
{
+ "id": "Swan",
+ "type": "0x7596",
+ "Pet": "",
+ "Class": "Pet",
+ "Texture": {
+ "File": "lofiObj2",
+ "Index": "0x32"
+ },
+ "Family": "Farm",
+ "Rarity": "Divine",
+ "DefaultSkin": "Swan Pet Skin",
+ "Size": "80",
+ "NoHatchOrFuse": ""
+ },
+ {
+ "type": "0x7597",
+ "id": "Swan Pet Skin",
+ "PetSkin": "",
+ "DisplayId": "Swan",
+ "Class": "PetSkin",
+ "AnimatedTexture": {
+ "File": "petsDivine",
+ "Index": "100"
+ },
+ "Family": "Farm",
+ "Rarity": "Divine"
+ },
+ {
+ "type": "0x7598",
+ "id": "Swan Pet Stone",
+ "DisplayId": "Swan Pet Skin",
+ "Class": "Equipment",
+ "Item": "",
+ "AnimatedTexture": {
+ "File": "petsDivine",
+ "Index": "100"
+ },
+ "ScaleValue": "10",
+ "SlotType": "10",
+ "Description": "Sharp-beaked, long-necked, pearly white-feathered looking for a mate for life.\\n\\nUnlocks Swan Skin of the Farm family. The skin will be added to your Pet Wardrobe in the Pet Yard and can be used to change the appearance of your pet!",
+ "Activate": {
+ "_": "UnlockPetSkin",
+ "skinType": "30103"
+ },
+ "Consumable": "",
+ "Soulbound": "",
+ "BagType": "8",
+ "feedPower": "2000"
+ },
+ {
"type": "0x0927",
"id": "Dreadstump the Pirate King",
"Enemy": "",
"Class": "Character",
"AnimatedTexture": {
"File": "chars16x16dEncounters",
"Index": "4"
},
@@ -99469,27 +99550,37 @@
"AngleCorrection": "1"
},
{
"type": "0x6402",
"id": "Love Bolt",
"Class": "Projectile",
"Texture": {
"File": "d2LofiObjEmbed",
- "Index": "0x6a"
+ "Index": "0x6b"
},
"AngleCorrection": "1"
},
{
"type": "0x6403",
"id": "Love Arrow",
"Class": "Projectile",
"Texture": {
"File": "d2LofiObjEmbed",
- "Index": "0x6b"
+ "Index": "0x6a"
+ },
+ "AngleCorrection": "1"
+ },
+ {
+ "type": "0xc52",
+ "id": "Succubus Bullet",
+ "Class": "Projectile",
+ "Texture": {
+ "File": "d2LofiObjEmbed",
+ "Index": "0x6c"
},
"AngleCorrection": "1"
},
{
"type": "0x209b",
"id": "XMAS Arrow",
"Class": "Projectile",
"Texture": {
@@ -169047,18 +169138,18 @@
"Size": "80",
"LifetimeMS": "4000",
"MultiHit": ""
}
]
},
{
"type": "0x226d",
- "id": "Dimitus",
- "DisplayId": "Dimitus",
+ "id": "Succubus Dungeon",
+ "DisplayId": "Succubus",
"Class": "Character",
"Enemy": "",
"AnimatedTexture": {
"File": "chars16x16dEncounters",
"Index": "40"
},
"HitSound": "weapon/dirk",
"DeathSound": "monster/archdemon_death",
Binary files ../current/sheets/petsDivine.png and ./sheets/petsDivine.png differ
Binary files ../current/sheets/playersSkinsMask.png and ./sheets/playersSkinsMask.png differ