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-07-02 12:00:42.662653989 +0000
+++ ./json/Objects.json 2019-07-04 13:20:50.746280629 +0000
@@ -30,17 +30,17 @@
"DeathSound": "monster/demons_death",
"Size": "100",
"MaxHitPoints": "2000",
"Defense": "30",
"Exp": "9",
"Projectile": {
"id": "0",
"ObjectId": "Red Fire",
- "Damage": "75",
+ "Damage": "100",
"Speed": "80",
"LifetimeMS": "2400",
"ArmorPiercing": "",
"MultiHit": ""
}
},
{
"type": "0x20a0",
@@ -57,21 +57,20 @@
"ObjectId": "Red Star",
"Speed": "66",
"Damage": "120",
"Size": "100",
"LifetimeMS": "6500",
"ArmorPiercing": "",
"MultiHit": ""
},
- "MaxHitPoints": "5000",
+ "MaxHitPoints": "8000",
"Size": "140",
"Defense": "30",
- "Exp": "0",
- "StasisImmune": ""
+ "Exp": "0"
},
{
"type": "0x20a1",
"id": "Heroic Archdemon Malphas",
"Group": "Demons",
"Enemy": "",
"Class": "Character",
"Flying": "",
@@ -84,17 +83,17 @@
"File": "d1chars16x16r",
"Index": "2"
},
"HitSound": "monster/demons_hit",
"DeathSound": "monster/demons_death",
"MaxHitPoints": "50000",
"Size": "100",
"Defense": "40",
- "Exp": "20000",
+ "Exp": "2000",
"EventChestBoss": "",
"Projectile": [
{
"id": "0",
"ObjectId": "White Bullet",
"Speed": "75",
"Damage": "80",
"Size": "60",
@@ -80486,16 +80485,17 @@
"Class": "GameObject",
"Texture": {
"File": "d3LofiObjEmbed16",
"Index": "0x46"
},
"Size": "140",
"Terrain": "Mountains",
"PerRealmMax": "1",
+ "Encounter": "",
"Enemy": "",
"NoMiniMap": "",
"Invincible": ""
},
{
"type": "0x1fee",
"id": "FR Boss",
"DisplayId": "Permafrost Lord",
@@ -80509,16 +80509,17 @@
"DontFaceMovement": "",
"HitSound": "monster/golems_hit",
"DeathSound": "monster/rocks_death",
"Size": "140",
"MaxHitPoints": "120000",
"Defense": "40",
"Exp": "2000",
"God": "",
+ "TrackLoot": "",
"Quest": "",
"Level": "20",
"StasisImmune": "",
"StunImmune": "",
"ParalyzeImmune": "",
"Projectile": [
{
"id": "0",
@@ -82632,17 +82633,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "20",
"Quantity": "1"
},
{
"type": "0xbeb",
"id": "Snowball x 2",
"DisplayId": "Snowball",
"Class": "Equipment",
"Item": "",
@@ -82662,17 +82662,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "40",
"SuccessorId": "Snowball x 1",
"Quantity": "2"
},
{
"type": "0xbec",
"id": "Snowball x 3",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -82693,17 +82692,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "60",
"SuccessorId": "Snowball x 2",
"Quantity": "3"
},
{
"type": "0xbed",
"id": "Snowball x 4",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -82724,17 +82722,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "80",
"SuccessorId": "Snowball x 3",
"Quantity": "4"
},
{
"type": "0xbee",
"id": "Snowball x 5",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -82755,17 +82752,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "100",
"SuccessorId": "Snowball x 4",
"Quantity": "5"
},
{
"type": "0xbef",
"id": "Snowball x 6",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -82786,17 +82782,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "120",
"SuccessorId": "Snowball x 5",
"Quantity": "6"
},
{
"type": "0xbf0",
"id": "Snowball x 7",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -82817,17 +82812,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "140",
"SuccessorId": "Snowball x 6",
"Quantity": "7"
},
{
"type": "0xbf1",
"id": "Snowball x 8",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -82848,17 +82842,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "160",
"SuccessorId": "Snowball x 7",
"Quantity": "8"
},
{
"type": "0xbf2",
"id": "Snowball x 9",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -82879,17 +82872,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "180",
"SuccessorId": "Snowball x 8",
"Quantity": "9"
},
{
"type": "0xbf3",
"id": "Snowball x 10",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -82910,17 +82902,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "200",
"SuccessorId": "Snowball x 9",
"Quantity": "10"
},
{
"type": "0xbf4",
"id": "Snowball x 11",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -82941,17 +82932,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "220",
"SuccessorId": "Snowball x 10",
"Quantity": "11"
},
{
"type": "0xbf5",
"id": "Snowball x 12",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -82972,17 +82962,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "240",
"SuccessorId": "Snowball x 11",
"Quantity": "12"
},
{
"type": "0xbf6",
"id": "Snowball x 13",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -83003,17 +82992,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "260",
"SuccessorId": "Snowball x 12",
"Quantity": "13"
},
{
"type": "0xbf7",
"id": "Snowball x 14",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -83034,17 +83022,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "280",
"SuccessorId": "Snowball x 13",
"Quantity": "14"
},
{
"type": "0xbf8",
"id": "Snowball x 15",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -83065,17 +83052,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "300",
"SuccessorId": "Snowball x 14",
"Quantity": "15"
},
{
"type": "0xbf9",
"id": "Snowball x 16",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -83096,17 +83082,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "320",
"SuccessorId": "Snowball x 15",
"Quantity": "16"
},
{
"type": "0xbfa",
"id": "Snowball x 17",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -83127,17 +83112,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "340",
"SuccessorId": "Snowball x 16",
"Quantity": "17"
},
{
"type": "0xbfb",
"id": "Snowball x 18",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -83158,17 +83142,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "360",
"SuccessorId": "Snowball x 17",
"Quantity": "18"
},
{
"type": "0xbfc",
"id": "Snowball x 19",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -83189,17 +83172,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "380",
"SuccessorId": "Snowball x 18",
"Quantity": "19"
},
{
"type": "0xbfd",
"id": "Snowball x 20",
"DisplayId": "Snowball",
"Class": "Equipment",
@@ -83220,17 +83202,16 @@
"Consumable": "",
"Activate": {
"_": "PermaPet",
"objectId": "Snowball Throw",
"cooldown": "0.2",
"hideEffect": "true"
},
"Soulbound": "",
- "feedPower": "400",
"SuccessorId": "Snowball x 19",
"Quantity": "20"
},
{
"type": "0xbfe",
"id": "Heart Decoy Particles",
"Class": "GameObject",
"Effect": {
@@ -99209,16 +99190,66 @@
"skinType": "30124"
},
"Consumable": "",
"Soulbound": "",
"BagType": "8",
"feedPower": "1000"
},
{
+ "id": "Infested Bagston",
+ "type": "0x75ae",
+ "Pet": "",
+ "Class": "Pet",
+ "Texture": {
+ "File": "lofiObj2",
+ "Index": "0x32"
+ },
+ "Family": "? ? ? ?",
+ "Rarity": "Divine",
+ "DefaultSkin": "Infested Bagston Pet Skin",
+ "Size": "80",
+ "NoHatchOrFuse": ""
+ },
+ {
+ "type": "0x75af",
+ "id": "Infested Bagston Pet Skin",
+ "PetSkin": "",
+ "DisplayId": "Infested Bagston",
+ "Class": "PetSkin",
+ "AnimatedTexture": {
+ "File": "petsDivine",
+ "Index": "106"
+ },
+ "Family": "? ? ? ?",
+ "Rarity": "Divine"
+ },
+ {
+ "type": "0x75b0",
+ "id": "Infested Bagston Pet Stone",
+ "DisplayId": "Infested Bagston Pet Skin",
+ "Class": "Equipment",
+ "Item": "",
+ "AnimatedTexture": {
+ "File": "petsDivine",
+ "Index": "106"
+ },
+ "ScaleValue": "10",
+ "SlotType": "10",
+ "Description": "Unlocks Infested Bagston Skin of the ? ? ? ? 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": "30127"
+ },
+ "Consumable": "",
+ "Soulbound": "",
+ "BagType": "8",
+ "feedPower": "500"
+ },
+ {
"type": "0x0927",
"id": "Dreadstump the Pirate King",
"Enemy": "",
"Class": "Character",
"AnimatedTexture": {
"File": "chars16x16dEncounters",
"Index": "4"
},
@@ -142662,17 +142693,17 @@
"Defense": "48",
"Flying": "",
"Quest": "",
"God": "",
"StasisImmune": "",
"StunImmune": "",
"ParalyzeImmune": "",
"Level": "20",
- "Exp": "20000",
+ "Exp": "40000",
"NoArticle": "",
"EventChestBoss": "",
"TrackLoot": "",
"Projectile": [
{
"id": "0",
"ObjectId": "White Bullet",
"Speed": "80",
@@ -177991,16 +178022,34 @@
"MaxHitPoints": "60000",
"Defense": "0",
"Size": "160",
"ShadowSize": "0",
"Exp": "1000",
"StasisImmune": ""
},
{
+ "type": "0x1843",
+ "id": "Alien Event Chest",
+ "DisplayId": "Event Chest",
+ "Class": "Character",
+ "Enemy": "",
+ "KeepDamageRecord": "",
+ "TrackLoot": "",
+ "Texture": {
+ "File": "battleOryxObjects16x16",
+ "Index": "0x30"
+ },
+ "MaxHitPoints": "60000",
+ "Defense": "0",
+ "Size": "160",
+ "Exp": "1000",
+ "StasisImmune": ""
+ },
+ {
"type": "0xfa0",
"id": "Sakura Tree Mid",
"Class": "GameObject",
"RandomTexture": {
"Texture": [
{
"File": "SakuraEnvironment16x16",
"Index": "0x00"
Binary files ../current/sheets/battleOryxObjects16x16.png and ./sheets/battleOryxObjects16x16.png differ
Binary files ../current/sheets/petsDivine.png and ./sheets/petsDivine.png differ
diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/strings.json ./strings.json
--- ../current/strings.json 2019-04-24 15:00:34.603733191 +0000
+++ ./strings.json 2019-07-04 13:20:36.622003615 +0000
@@ -1890,16 +1890,22 @@
"stringlist.Ent_Ancient.everySoOften.3": "You chop and you burn... you deserve no mercy!",
"stringlist.Ent_Ancient.everySoOften.4": "The last man-thing I crushed looked just like you, {PLAYER}!",
"stringlist.Ent_Ancient.everySoOften.5": "You will find no wood for your fires here... only death!",
"stringlist.Ent_Ancient.everySoOften.6": "You fell ancient trees without remorse; it ends now!",
"stringlist.Ent_Ancient.many.0": "Mortal scum! My {COUNT} Ent Ancients will defend me forever!",
"stringlist.Ent_Ancient.many.1": "My forest of {COUNT} Ent Ancients is all the protection I need!",
"stringlist.Ent_Ancient.one.0": "My final Ent Ancient will destroy you all!",
"stringlist.Ent_Ancient.one.1": "My final Ent Ancient shall crush you!",
+ "stringlist.FR_Boss.death.0": "No! How will I get my special ice cubes for my cocktails?!",
+ "stringlist.FR_Boss.killed.0": "{KILLER} has killed the Permafrost Lord.",
+ "stringlist.FR_Boss.killed.1": "Global warming is not a joke {KILLER}. Thanks to you the Realm has gotten warmer.",
+ "stringlist.FR_Boss.new.0": "Permafrost Lord has appeared!",
+ "stringlist.FR_Boss.new.1": "Nothing can melt the Permafrost Lord.",
+ "stringlist.FR_Boss.one.0": "The Permafrost Lord's body is made of magical ice that doesn't melt.",
"stringlist.Ghost_King.everySoOften.0": "I do not fear the corporeal",
"stringlist.Ghost_King.everySoOften.1": "Do you think your weapons can hurt me, {PLAYER}?",
"stringlist.Ghost_King.everySoOften.2": "My kingdom is long dead, but our spirits drag on.",
"stringlist.Ghost_King.everySoOften.3": "Do not defile our memory of this place!",
"stringlist.Ghost_King.everySoOften.4": "My kingdom was burned to ashes... you can do no worse.",
"stringlist.Ghost_King.everySoOften.5": "There was joy here, once.",
"stringlist.Ghost_King.everySoOften.6": "We have grown lonely over the millenia. Join us, {PLAYER}.",
"stringlist.Ghost_King.many.0": "My {COUNT} Ghost Kings give me more than enough protection!",