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 2020-02-18 17:21:41.879986852 +0000 +++ ./json/Objects.json 2020-02-19 13:51:31.550530070 +0000 @@ -2830,16 +2830,18 @@ "Index": "160" }, "HitSound": "monster/orcs_hit", "DeathSound": "monster/orcs_death", "MaxHitPoints": "7500", "Size": "130", "Defense": "15", "Exp": "500", + "StasisImmune": "", + "StunImmune": "", "ParalyzeImmune": "", "Projectile": [ { "id": "0", "ObjectId": "BellaShot New", "Speed": "25", "Damage": "80", "LifetimeMS": "3000", @@ -2879,16 +2881,19 @@ "Index": "160" }, "HitSound": "monster/orcs_hit", "DeathSound": "monster/orcs_death", "MaxHitPoints": "7500", "Size": "130", "Defense": "15", "Exp": "500", + "StasisImmune": "", + "StunImmune": "", + "ParalyzeImmune": "", "Projectile": [ { "id": "0", "ObjectId": "BellaShot New", "Speed": "25", "Damage": "80", "LifetimeMS": "3000", "Size": "100", @@ -2927,16 +2932,19 @@ "Index": "160" }, "HitSound": "monster/orcs_hit", "DeathSound": "monster/orcs_death", "MaxHitPoints": "7500", "Size": "130", "Defense": "15", "Exp": "500", + "StasisImmune": "", + "StunImmune": "", + "ParalyzeImmune": "", "Projectile": [ { "id": "0", "ObjectId": "BellaShot New", "Speed": "25", "Damage": "80", "LifetimeMS": "3000", "Size": "100", @@ -2975,16 +2983,19 @@ "Index": "160" }, "HitSound": "monster/orcs_hit", "DeathSound": "monster/orcs_death", "MaxHitPoints": "7500", "Size": "130", "Defense": "15", "Exp": "500", + "StasisImmune": "", + "StunImmune": "", + "ParalyzeImmune": "", "Projectile": [ { "id": "0", "ObjectId": "BellaShot New", "Speed": "25", "Damage": "80", "LifetimeMS": "3000", "Size": "100", @@ -52972,16 +52983,128 @@ "id": "Hearts Transformer 2", "onlyIn": "realm" }, "Consumable": "", "Soulbound": "", "BagType": "7" }, { + "type": "0xfda", + "id": "Mask of Anubis", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x21d" + }, + "SlotType": "9", + "Description": "A relic of the Tomb of the Ancients, once used by holy worshipers in ceremonies. It turns your character into the Anubis Necromancer upon equip!\\n\\nSprite Credits: Beige", + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "0", + "amount": "180" + }, + { + "_": "ChangeSkin", + "skinType": "0x4ae7", + "size": "100" + } + ], + "BagType": "9", + "FameBonus": "5", + "feedPower": "325", + "Soulbound": "" + }, + { + "type": "0xfdb", + "id": "Mask of Lightning", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x200" + }, + "SlotType": "9", + "Description": "A gilded artifact discovered in the temple of El Dorado, presumably belonging to none other than Xolotl himself. It turns your character into the Bolt Caster Wizard upon equip!\\n\\nSprite Credits: Aurum", + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "3", + "amount": "180" + }, + { + "_": "ChangeSkin", + "skinType": "0x4ae8", + "size": "100" + } + ], + "BagType": "9", + "FameBonus": "5", + "feedPower": "325", + "Soulbound": "" + }, + { + "type": "0xfdc", + "id": "Mask of Cnidaria", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x201" + }, + "SlotType": "9", + "Description": "An uncomfortably squishy piece of headgear that the Royal Cnidarian probably wants back. It turns your character into the Jellyhead Trickster upon equip!\\n\\nSprite Credits: Aurum", + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "3", + "amount": "180" + }, + { + "_": "ChangeSkin", + "skinType": "0x4ae9", + "size": "100" + } + ], + "BagType": "9", + "FameBonus": "5", + "feedPower": "325", + "Soulbound": "" + }, + { + "type": "0xfdd", + "id": "Mask of Mucus", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x202" + }, + "SlotType": "9", + "Description": "An ordinary mask covered in copious amounts of sludge from the Toxic Sewers. It turns your character into the Slurp Knight upon equip!\\n\\nSprite Credits: Aurum", + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "0", + "amount": "180" + }, + { + "_": "ChangeSkin", + "skinType": "0x4aea", + "size": "100" + } + ], + "BagType": "9", + "FameBonus": "5", + "feedPower": "325", + "Soulbound": "" + }, + { "type": "0xc85", "id": "Common Feline Egg", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj2", "Index": "0x100" }, @@ -68159,16 +68282,36 @@ "skinType": "10175" }, "Consumable": "", "Soulbound": "", "BagType": "7", "feedPower": "1000" }, { + "type": "0x27c2", + "id": "Cronus Entity Assassin Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "playerskins", + "Index": "504" + }, + "SlotType": "10", + "Description": "Ancient creature that has absorbed the power of Cronus.\\n\\nSkin Class: Assassin\\nSprite Credits: Aurusenth", + "Activate": { + "_": "UnlockSkin", + "skinType": "10177" + }, + "Consumable": "", + "Soulbound": "", + "BagType": "7", + "feedPower": "1000" + }, + { "type": "0x190", "id": "Apple", "DisplayId": "Apple of Extreme Maxening", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj", "Index": "0x0f" @@ -139753,16 +139896,60 @@ "Class": "Skin", "AnimatedTexture": { "File": "playerskins", "Index": "75" }, "PlayerClassType": "0xffff" }, { + "type": "0x4ae7", + "id": "Anubis Transform", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "305" + }, + "PlayerClassType": "0xffff" + }, + { + "type": "0x4ae8", + "id": "Lightning Transform", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "431" + }, + "PlayerClassType": "0xffff" + }, + { + "type": "0x4ae9", + "id": "Cnidaria Transform", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "351" + }, + "PlayerClassType": "0xffff" + }, + { + "type": "0x4aea", + "id": "Slurp Transform", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "107" + }, + "PlayerClassType": "0xffff" + }, + { "type": "0x5eec", "id": "Lazy Skeleton Assassin", "Skin": "", "Class": "Skin", "AnimatedTexture": { "File": "playerskins", "Index": "465" }, @@ -140221,16 +140408,28 @@ "AnimatedTexture": { "File": "playerskins", "Index": "503" }, "PlayerClassType": "0x031d", "NoSkinSelect": "" }, { + "type": "0x27c1", + "id": "Cronus Entity Assassin", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "504" + }, + "PlayerClassType": "0x0320", + "NoSkinSelect": "" + }, + { "type": "0x1731", "id": "Stheno Summoner", "Class": "GameObject", "Texture": { "File": "invisible", "Index": "0" }, "Size": "0" @@ -171995,16 +172194,236 @@ }, "Soulbound": "", "BagType": "7", "Consumable": "", "Treasure": "", "Track": "" }, { + "type": "0x296b", + "id": "Carnival Token x 1", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x21e" + }, + "SlotType": "10", + "Description": "A token granted to the royal court members of Carnival festivities. Even the Mad God respects a good, reckless party!", + "Quantity": "1", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Stack limit", + "description": "10" + } + }, + "Soulbound": "", + "BagType": "7", + "Treasure": "" + }, + { + "type": "0x296c", + "id": "Carnival Token x 2", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x21e" + }, + "SlotType": "10", + "Description": "A token granted to the royal court members of Carnival festivities. Even the Mad God respects a good, reckless party!", + "Quantity": "2", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Stack limit", + "description": "10" + } + }, + "Soulbound": "", + "BagType": "7", + "Treasure": "" + }, + { + "type": "0x296d", + "id": "Carnival Token x 3", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x21e" + }, + "SlotType": "10", + "Description": "A token granted to the royal court members of Carnival festivities. Even the Mad God respects a good, reckless party!", + "Quantity": "3", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Stack limit", + "description": "10" + } + }, + "Soulbound": "", + "BagType": "7", + "Treasure": "" + }, + { + "type": "0x296e", + "id": "Carnival Token x 4", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x21e" + }, + "SlotType": "10", + "Description": "A token granted to the royal court members of Carnival festivities. Even the Mad God respects a good, reckless party!", + "Quantity": "4", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Stack limit", + "description": "10" + } + }, + "Soulbound": "", + "BagType": "7", + "Treasure": "" + }, + { + "type": "0x296f", + "id": "Carnival Token x 5", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x21e" + }, + "SlotType": "10", + "Description": "A token granted to the royal court members of Carnival festivities. Even the Mad God respects a good, reckless party!", + "Quantity": "5", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Stack limit", + "description": "10" + } + }, + "Soulbound": "", + "BagType": "7", + "Treasure": "" + }, + { + "type": "0x2970", + "id": "Carnival Token x 6", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x21e" + }, + "SlotType": "10", + "Description": "A token granted to the royal court members of Carnival festivities. Even the Mad God respects a good, reckless party!", + "Quantity": "6", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Stack limit", + "description": "10" + } + }, + "Soulbound": "", + "BagType": "7", + "Treasure": "" + }, + { + "type": "0x2971", + "id": "Carnival Token x 7", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x21e" + }, + "SlotType": "10", + "Description": "A token granted to the royal court members of Carnival festivities. Even the Mad God respects a good, reckless party!", + "Quantity": "7", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Stack limit", + "description": "10" + } + }, + "Soulbound": "", + "BagType": "7", + "Treasure": "" + }, + { + "type": "0x2972", + "id": "Carnival Token x 8", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x21e" + }, + "SlotType": "10", + "Description": "A token granted to the royal court members of Carnival festivities. Even the Mad God respects a good, reckless party!", + "Quantity": "8", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Stack limit", + "description": "10" + } + }, + "Soulbound": "", + "BagType": "7", + "Treasure": "" + }, + { + "type": "0x2973", + "id": "Carnival Token x 9", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x21e" + }, + "SlotType": "10", + "Description": "A token granted to the royal court members of Carnival festivities. Even the Mad God respects a good, reckless party!", + "Quantity": "9", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Stack limit", + "description": "10" + } + }, + "Soulbound": "", + "BagType": "7", + "Treasure": "" + }, + { + "type": "0x2974", + "id": "Carnival Token x 10", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0x21e" + }, + "SlotType": "10", + "Description": "A token granted to the royal court members of Carnival festivities. Even the Mad God respects a good, reckless party!", + "Quantity": "10", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Stack limit", + "description": "10" + } + }, + "Soulbound": "", + "BagType": "7", + "Treasure": "" + }, + { "type": "0x0d40", "id": "Tomb Portal of Cowardice", "DisplayId": "Portal of Cowardice", "Class": "Portal", "IntergamePortal": "", "Texture": { "File": "lofiEnvironment", "Index": "0x7c" @@ -219324,22 +219743,22 @@ "LifetimeMS": "4000", "MultiHit": "" } ] }, { "type": "0x226d", "id": "Dimitus", - "DisplayId": "Dungeon Succubus", + "DisplayId": "Dimitus", "Class": "Character", "Enemy": "", "AnimatedTexture": { "File": "chars16x16dEncounters", - "Index": "40" + "Index": "38" }, "HitSound": "weapon/dirk", "DeathSound": "monster/archdemon_death", "MaxHitPoints": "40000", "Defense": "20", "Size": "100", "Exp": "2000", "StasisImmune": "", @@ -224230,38 +224649,32 @@ "Texture": { "File": "invisible", "Index": "0" }, "ShadowSize": "0", "Size": "100", "Exp": "0", "Invincible": "", - "NoMiniMap": "", - "Terrain": "HighPlains", - "SpawnProb": "1", - "PerRealmMax": "1" + "NoMiniMap": "" }, { "type": "0x1b15", "id": "BellaEncMap2", "Enemy": "", "Class": "Character", "Texture": { "File": "invisible", "Index": "0" }, "Size": "100", "ShadowSize": "0", "Exp": "0", "Invincible": "", - "NoMiniMap": "", - "Terrain": "Mountains", - "SpawnProb": "1", - "PerRealmMax": "1" + "NoMiniMap": "" }, { "type": "0x1b16", "id": "Hearts Transformer 2", "Enemy": "", "Class": "Character", "Texture": { "File": "d2LofiObjEmbed", Binary files ../current/sheets/d2LofiObj.png and ./sheets/d2LofiObj.png differ Binary files ../current/sheets/playersSkinsMask.png and ./sheets/playersSkinsMask.png differ Binary files ../current/sheets/playersSkins.png and ./sheets/playersSkins.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 2020-01-08 13:21:22.965779632 +0000 +++ ./strings.json 2020-02-19 13:51:18.878248686 +0000 @@ -1366,17 +1366,18 @@ "hallwayEnd.End": "End", "hallwayStart.Start": "Start", "helpCommand": "Help: \\n[/pause]: pause the game (until you [/pause] again) \\n[/who]: list players online \\n[/tutorial]: enter the tutorial \\n[/yell ]: send message to all players in Nexus \\n[/tell ]: send a private message to a player \\n[/guild ]: send a message to your guild \\n[/block ]: don't show chat messages from player \\n[/unignore ]: stop ignoring a player \\n[/teleport ]: teleport to a player \\n[/trade ]: request a trade with a player \\n[/invite ]: invite a player to your guild \\n[/join ]: join a guild (invite necessary) \\n[/lock ]: lock a player to the player grid \\n[/unlock ]: unlock a player from the player grid \\n[/help]: this message \\n", "item.emptySlot": "Empty {itemType} Slot", "item.toolTip": "item", "kitchen.Break_through_the_wall|and_show_them_what|youAPOSre_made_": "Break through the wall|and show them what|you're made of!", "kitchen.It_is_time_to_take_on|your_first_true_minion_of_Oryx": "It is time to take on|your first true minion of Oryx", "kitchen.Start_on_the_beachBANG|Forests_are_dangerous|for_the_inex": "Start on the beach!|Forests are dangerous|for the inexperienced!", - "kitchen.This_portal_leads|to_OryxAPOSs_RealmBANG": "This portal leads|to Oryx's Realm!", + "kitchen.This_portal_leads|to_the_NexusBANG": "This portal leads|to the Nexus!", + "kitchen.To_take_on_OryxAPOSs_forces_in_a_Realm,|head_to_the_upper": "To take on Oryx's forces in a Realm,|head to the upper section|of the Nexus building.", "kitchen.You_have_defeated|your_first_minion_of_OryxBANG": "You have defeated|your first minion of Oryx!", "kitchen.Your_progress_is|saved_automatically": "Your progress is|saved automatically", "kitchen_original.He_wants_to_use|you_as_food_for|his_vile_minions": "He wants to use|you as food for|his vile minions!", "kitchen_original.Oh_noBANG_YouAPOSve_been|captured_by_OryxBANG": "Oh no! You've been|captured by Oryx!", "kitchen_original.Start_on_the_beachBANG|Forests_are_dangerous|for": "Start on the beach!|Forests are dangerous|for the inexperienced!", "kitchen_original.This_portal_leads|to_OryxAPOSs_RealmBANG": "This portal leads|to Oryx's Realm!", "kitchen_original.You_have_escaped|OryxAPOSs_kitchensBANG": "You have escaped|Oryx's kitchens!", "kitchen_original.You_must_find|a_way_to_escapeBANG": "You must find|a way to escape!",