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 2016-10-11 17:30:26.930407557 +0000
+++ ./json/Objects.json 2016-10-12 18:10:24.529507819 +0000
@@ -17423,16 +17423,17 @@
"Description": "Customize your Warrior with the Olive Gladiator Skin.",
"Activate": {
"_": "UnlockSkin",
"skinType": "1027"
},
"Consumable": "",
"Soulbound": "",
"BagType": "4",
+ "feedPower": "2000",
"DisplayId": "Olive Gladiator Skin"
},
{
"type": "0x1562",
"id": "Ivory Gladiator Skin",
"Class": "Equipment",
"Item": "",
"AnimatedTexture": {
@@ -17443,16 +17444,17 @@
"Description": "Customize your Warrior with the Ivory Gladiator Skin.",
"Activate": {
"_": "UnlockSkin",
"skinType": "1028"
},
"Consumable": "",
"Soulbound": "",
"BagType": "4",
+ "feedPower": "2000",
"DisplayId": "Ivory Gladiator Skin"
},
{
"type": "0x1563",
"id": "Rosen Blade Skin",
"Class": "Equipment",
"Item": "",
"AnimatedTexture": {
@@ -17484,16 +17486,17 @@
"Description": "Customize your Ninja with the Djinja Skin.",
"Activate": {
"_": "UnlockSkin",
"skinType": "1030"
},
"Consumable": "",
"Soulbound": "",
"BagType": "4",
+ "feedPower": "2000",
"DisplayId": "Djinja Skin"
},
{
"type": "0x1580",
"id": "Baby Djinja Skin",
"Class": "Equipment",
"Item": "",
"AnimatedTexture": {
@@ -17504,16 +17507,17 @@
"Description": "Customize your Ninja with the Baby Djinja Skin.",
"Activate": {
"_": "UnlockSkin",
"skinType": "29840"
},
"Consumable": "",
"Soulbound": "",
"BagType": "4",
+ "feedPower": "5000",
"DisplayId": "Baby Djinja Skin"
},
{
"type": "0x2580",
"id": "Mini Rosen Skin",
"Class": "Equipment",
"Item": "",
"AnimatedTexture": {
@@ -46429,17 +46433,17 @@
"Size": "130",
"MaxHitPoints": "850",
"Defense": "2",
"Terrain": "MidPlains",
"Quest": "",
"Level": "8",
"XpMult": "2.3",
"Flying": "",
- "SpawnProb": "0.45",
+ "SpawnProb": "0.50",
"Projectile": {
"id": "0",
"ObjectId": "Yellow Missile",
"Damage": "22",
"Speed": "75",
"Size": "80",
"LifetimeMS": "1200"
},
@@ -46517,17 +46521,17 @@
"MaxHitPoints": "900",
"Defense": "2",
"Terrain": "MidPlains",
"Quest": "",
"Level": "8",
"XpMult": "2.3",
"Z": "0.2",
"Flying": "",
- "SpawnProb": "0.30",
+ "SpawnProb": "0.40",
"Projectile": {
"id": "0",
"ObjectId": "Orange Missile",
"Damage": "20",
"Speed": "75",
"Size": "100",
"LifetimeMS": "1200"
},
@@ -61426,17 +61430,18 @@
"Description": "Customize your pet with the Marid Skin. The appearance change will consume this item and is not reversible.",
"Activate": {
"_": "PetSkin",
"skinId": "24832"
},
"Consumable": "",
"Soulbound": "",
"BagType": "4",
- "DisplayId": "Marid Pet Skin"
+ "DisplayId": "Marid Pet Skin",
+ "feedPower": "5000"
},
{
"id": "Jaco",
"type": "0x6109",
"Pet": "",
"Class": "Pet",
"Texture": {
"File": "lofiObj2",
@@ -61472,17 +61477,18 @@
"Description": "Customize your pet with the Jaco Skin. The appearance change will consume this item and is not reversible.",
"Activate": {
"_": "PetSkin",
"skinId": "24841"
},
"Consumable": "",
"Soulbound": "",
"BagType": "4",
- "DisplayId": "Jaco Pet Skin"
+ "DisplayId": "Jaco Pet Skin",
+ "feedPower": "5000"
},
{
"type": "0x8090",
"id": "Disabled Pet Skin",
"PetSkin": "",
"DisplayId": "Disabled Pet",
"Class": "PetSkin",
"AnimatedTexture": {
@@ -93418,16 +93424,17 @@
"File": "chars8x8rEncounters",
"Index": "125"
},
"HitSound": "monster/goblins_hit",
"DeathSound": "monster/goblins_death",
"Size": "100",
"MaxHitPoints": "900",
"Defense": "10",
+ "XpMult": "0.642",
"Projectile": {
"id": "0",
"ObjectId": "Green Magic",
"Damage": "20",
"Speed": "75",
"LifetimeMS": "470",
"ArmorPiercing": ""
}
@@ -93442,16 +93449,17 @@
"File": "chars8x8rEncounters",
"Index": "126"
},
"HitSound": "monster/goblins_hit",
"DeathSound": "monster/goblins_death",
"Size": "100",
"MaxHitPoints": "1200",
"Defense": "8",
+ "XpMult": "0.642",
"Projectile": [
{
"id": "0",
"ObjectId": "Green Missile",
"Damage": "50",
"Speed": "70",
"LifetimeMS": "1000",
"Amplitude": "0.75",
@@ -93480,16 +93488,17 @@
"File": "chars8x8rEncounters",
"Index": "141"
},
"HitSound": "monster/goblins_hit",
"DeathSound": "monster/goblins_death",
"Size": "100",
"MaxHitPoints": "1200",
"Defense": "8",
+ "XpMult": "0.642",
"Projectile": {
"id": "0",
"ObjectId": "Green Missile",
"Damage": "60",
"Speed": "70",
"LifetimeMS": "1200"
}
},
@@ -93503,16 +93512,17 @@
"File": "chars8x8rEncounters",
"Index": "127"
},
"HitSound": "monster/goblins_hit",
"DeathSound": "monster/goblins_death",
"Size": "100",
"MaxHitPoints": "1750",
"Defense": "12",
+ "XpMult": "0.8",
"Projectile": {
"id": "0",
"ObjectId": "Green Bolt",
"Damage": "90",
"Speed": "120",
"LifetimeMS": "250"
}
},
@@ -93526,16 +93536,17 @@
"File": "chars8x8rEncounters",
"Index": "128"
},
"HitSound": "monster/goblins_hit",
"DeathSound": "monster/goblins_death",
"Size": "100",
"MaxHitPoints": "2450",
"Defense": "18",
+ "XpMult": "0.642",
"Projectile": {
"id": "0",
"ObjectId": "White Bolt",
"Damage": "140",
"Speed": "110",
"LifetimeMS": "370"
}
},
@@ -93549,16 +93560,17 @@
"File": "chars16x16rEncounters",
"Index": "129"
},
"HitSound": "monster/flaming_skulls_hit",
"DeathSound": "monster/flaming_skulls_death",
"Size": "100",
"MaxHitPoints": "1700",
"Defense": "25",
+ "XpMult": "0.8",
"Projectile": {
"id": "0",
"ObjectId": "Z Blast",
"Damage": "40",
"Speed": "80",
"LifetimeMS": "450",
"Size": "80",
"ArmorPiercing": ""
@@ -93571,19 +93583,20 @@
"Enemy": "",
"Class": "Character",
"AnimatedTexture": {
"File": "chars8x8rEncounters",
"Index": "129"
},
"HitSound": "monster/slimes_hit",
"DeathSound": "monster/slimes_death",
- "Size": "100",
+ "Size": "120",
"MaxHitPoints": "2750",
"Defense": "15",
+ "XpMult": "0.8",
"Projectile": {
"id": "0",
"ObjectId": "Brown Magic",
"Damage": "40",
"Speed": "70",
"LifetimeMS": "250",
"Size": "75"
}
@@ -93595,19 +93608,20 @@
"Enemy": "",
"Class": "Character",
"AnimatedTexture": {
"File": "chars8x8rEncounters",
"Index": "130"
},
"HitSound": "monster/slimes_hit",
"DeathSound": "monster/slimes_death",
- "Size": "100",
+ "Size": "120",
"MaxHitPoints": "2500",
"Defense": "5",
+ "XpMult": "0.8",
"Projectile": {
"id": "0",
"ObjectId": "Yellow Magic",
"Damage": "30",
"Speed": "70",
"LifetimeMS": "250",
"Size": "75",
"ArmorPiercing": ""
@@ -93628,17 +93642,17 @@
"Size": "120",
"MaxHitPoints": "25000",
"Defense": "25",
"Quest": "",
"God": "",
"StasisImmune": "",
"NoArticle": "",
"Level": "1",
- "XpMult": "1",
+ "XpMult": "2.5642",
"Projectile": [
{
"id": "0",
"ObjectId": "Poison Fireball",
"Damage": "70",
"Speed": "85",
"LifetimeMS": "1700",
"Size": "100"