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-01-16 19:01:25.377925518 +0000
+++ ./json/Objects.json 2018-01-25 18:01:17.866579917 +0000
@@ -11758,17 +11758,17 @@
"Speed": "100",
"Damage": "60",
"LifetimeMS": "2400"
}
},
{
"type": "0x0d59",
"id": "Cube God",
- "DisplayId": "Ice Cube God",
+ "DisplayId": "Cube God",
"Class": "Character",
"Texture": {
"File": "lofiChar216x16",
"Index": "0x37"
},
"HitSound": "monster/cubes_hit",
"DeathSound": "monster/cubes_death",
"Size": "120",
@@ -21829,17 +21829,17 @@
"SlotType": "9",
"Tier": "6",
"Description": "An immaculately perfect amethyst embedded in an exquisite gold ring.",
"ActivateOnEquip": {
"_": "IncrementStat",
"stat": "3",
"amount": "180"
},
- "BagType": "4",
+ "BagType": "9",
"FameBonus": "5",
"feedPower": "325"
},
{
"type": "0xbab",
"id": "The Forgotten Crown",
"Class": "Equipment",
"Item": "",
@@ -30939,16 +30939,32 @@
},
"Description": "The nectar of the gods which holds great power!",
"BagType": "8",
"feedPower": "5000",
"PetFood": "",
"Soulbound": ""
},
{
+ "type": "0x6074",
+ "id": "Energy Potato",
+ "Class": "Equipment",
+ "Item": "",
+ "SlotType": "10",
+ "Texture": {
+ "File": "lofiObj2",
+ "Index": "0x14e"
+ },
+ "Description": "Rich in nutrient, can also be used to power electrical devices. Like servers...",
+ "BagType": "8",
+ "feedPower": "10000",
+ "PetFood": "",
+ "Soulbound": ""
+ },
+ {
"type": "0xcd0",
"id": "Cranberries",
"Class": "Equipment",
"Item": "",
"SlotType": "10",
"Texture": {
"File": "lofiObj2",
"Index": "0x15e"
@@ -80937,16 +80953,62 @@
"skinId": "24666"
},
"Consumable": "",
"Soulbound": "",
"BagType": "8",
"feedPower": "2000"
},
{
+ "id": "Guiding Spirit",
+ "type": "0x6071",
+ "Pet": "",
+ "Class": "Pet",
+ "Texture": {
+ "File": "lofiObj2",
+ "Index": "0x32"
+ },
+ "Family": "? ? ? ?",
+ "Rarity": "Rare",
+ "DefaultSkin": "Guiding Spirit Skin",
+ "Size": "60"
+ },
+ {
+ "type": "0x6072",
+ "id": "Guiding Spirit Skin",
+ "PetSkin": "",
+ "DisplayId": "Guiding Spirit",
+ "Class": "PetSkin",
+ "AnimatedTexture": {
+ "File": "chars8x8rPets1",
+ "Index": "176"
+ }
+ },
+ {
+ "type": "0x6073",
+ "id": "Guiding Spirit Pet Stone",
+ "DisplayId": "Guiding Spirit Pet Skin",
+ "Class": "Equipment",
+ "Item": "",
+ "AnimatedTexture": {
+ "File": "chars8x8rPets1",
+ "Index": "176"
+ },
+ "SlotType": "10",
+ "Description": "Anything for my queen.\\n\\nSprite Credits: Smoothos\\n\\nTransform your pet into Guiding Spirit of the ? ? ? ? family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.",
+ "Activate": {
+ "_": "PetSkin",
+ "skinId": "24689"
+ },
+ "Consumable": "",
+ "Soulbound": "",
+ "BagType": "8",
+ "feedPower": "2000"
+ },
+ {
"type": "0x0927",
"id": "Dreadstump the Pirate King",
"Enemy": "",
"Class": "Character",
"AnimatedTexture": {
"File": "chars16x16dEncounters",
"Index": "4"
},
Binary files ../current/sheets/chars8x8rPets1.png and ./sheets/chars8x8rPets1.png differ
Binary files ../current/sheets/lofiObj2.png and ./sheets/lofiObj2.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 2018-01-16 19:01:09.605920632 +0000
+++ ./strings.json 2018-01-25 18:00:59.386578979 +0000
@@ -1593,17 +1593,17 @@
"stringlist.Cube_God.killed.1": "{KILLER}, you wretched dog! You killed my Cube God!",
"stringlist.Cube_God.killed.2": "{KILLER}, you may have destroyed my Cube God but you will never defeat me!",
"stringlist.Cube_God.killed.3": "I have many more Cube Gods, {KILLER}!",
"stringlist.Cube_God.many.0": "You piteous cretins! {COUNT} Cube Gods still guard me!",
"stringlist.Cube_God.many.1": "Your pathetic rabble will never survive against my {COUNT} Cube Gods!",
"stringlist.Cube_God.many.2": "Filthy vermin! My {COUNT} Cube Gods will exterminate you!",
"stringlist.Cube_God.many.3": "You feeble creatures have no hope against my {COUNT} Cube Gods!",
"stringlist.Cube_God.many.4": "Loathsome slugs! My {COUNT} Cube Gods will defeat you!",
- "stringlist.Cube_God.new.0": "Your meager abilities cannot possibly challenge an Cube God!",
+ "stringlist.Cube_God.new.0": "Your meager abilities cannot possibly challenge a Cube God!",
"stringlist.Cube_God.one.0": "Worthless mortals! A mighty Cube God defends me!",
"stringlist.Cube_God.one.1": "Wretched mongrels! An unconquerable Cube God is my bulwark!",
"stringlist.Cyclops_God.everySoOften.0": "Leave my castle!",
"stringlist.Cyclops_God.everySoOften.1": "You will be my food, {PLAYER}!",
"stringlist.Cyclops_God.everySoOften.2": "I will suck the marrow from your bones!",
"stringlist.Cyclops_God.everySoOften.3": "More wine!",
"stringlist.Cyclops_God.everySoOften.4": "Blargh!!",
"stringlist.Cyclops_God.everySoOften.5": "I will floss with your tendons!",
@@ -1926,23 +1926,23 @@
"stringlist.Grand_Sphinx.many.1": "My {COUNT} Grand Sphinxes protect my Chamber with their lives!",
"stringlist.Grand_Sphinx.many.2": "Regret your choices, blasphemers! My {COUNT} Grand Sphinxes will teach you respect!",
"stringlist.Grand_Sphinx.many.3": "You dull-spirited apes! You shall pose no challenge for {COUNT} Grand Sphinxes!",
"stringlist.Grand_Sphinx.new.0": "At last, a Grand Sphinx will teach you to respect!",
"stringlist.Grand_Sphinx.one.0": "A Grand Sphinx is more than a match for this rabble.",
"stringlist.Grand_Sphinx.one.1": "Gaze upon the beauty of the Grand Sphinx and feel your last hopes drain away.",
"stringlist.Grand_Sphinx.one.2": "You festering rat-catchers! A Grand Sphinx will make you doubt your purpose!",
"stringlist.Hermit_God.death.0": "This is preposterous! There is no way you could have defeated my Hermit God!",
- "stringlist.Hermit_God.killed.0": "You were lucky this time, {KILLER}! You will rue this day tHermit you killed my Hermit God!",
+ "stringlist.Hermit_God.killed.0": "You were lucky this time, {KILLER}! You will rue the day you killed my Hermit God!",
"stringlist.Hermit_God.killed.1": "You naive imbecile, {KILLER}! Without my Hermit God, Dreadstump is free to roam the seas without fear!",
"stringlist.Hermit_God.killed.2": "My Hermit God was more than you'll ever be, {KILLER}. I will kill you myself!",
"stringlist.Hermit_God.many.0": "You will make a tasty snack for my Hermit Gods!",
"stringlist.Hermit_God.many.1": "I will enjoy watching my {COUNT} Hermit Gods fight over your corpse!",
"stringlist.Hermit_God.new.0": "My Hermit God's thousand tentacles shall drag you to a watery grave!",
- "stringlist.Hermit_God.one.0": "You will be pulled to the bottom of the sea by my mighty God.",
+ "stringlist.Hermit_God.one.0": "You will be pulled to the bottom of the sea by my mighty Hermit God.",
"stringlist.Hermit_God.one.1": "Flee from my Hermit God, unless you desire a watery grave!",
"stringlist.Hermit_God.one.2": "My Hermit God awaits more sacrifices for the majestic Thessal.",
"stringlist.Hermit_God.one.3": "My Hermit God will pull you beneath the waves!",
"stringlist.Hermit_God.one.4": "You will make a tasty snack for my Hermit God!",
"stringlist.Inactive_Sarcophagus.everySoOften.0": "Those who damage me may find great treasure, {PLAYER}, but the gods will not forget this insult!",
"stringlist.LH_Lost_Sentry.death.0": "The Spectral Sentry has been repressed... for now.",
"stringlist.LH_Lost_Sentry.death.1": "The Lost Sentry has crumbled!",
"stringlist.LH_Lost_Sentry.death.2": "Do not enter those vile halls! You cannot possibly comprehend the wicked acts that once took place within them!",