diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' '--unified=8' -b -B ../current/constants.json ./constants.json --- ../current/constants.json 2014-10-31 21:50:37.676974333 +0000 +++ ./constants.json 2014-11-06 20:10:39.843277676 +0000 @@ -1,8 +1,8 @@ { "BUILD_VERSION": "25.0", - "MINOR_VERSION": "2", + "MINOR_VERSION": "3", "PORT": 2050, "RANDOM1": "311f80691451c71b09a13a2a6e", "RANDOM2": "72c5583cafb6818995cbd74b80", "RSA_PUBLIC_KEY": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCKFctVrhfF3m2Kes0FBL/JFeOcmNg9eJz8k/hQy1kadD+XFUpluRqa//Uxp2s9W2qE0EoUCu59ugcf/p7lGuL99UoSGmQEynkBvZct+/M40L0E0rZ4BVgzLOJmIbXMp0J4PnPcb6VLZvxazGcmSfjauC7F3yWYqUbZd/HCBtawwIDAQAB\n-----END PUBLIC KEY-----" } \ No newline at end of file diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' '--unified=8' -b -B ../current/json/EquipmentSets.json ./json/EquipmentSets.json --- ../current/json/EquipmentSets.json 2014-10-16 21:20:22.095387437 +0000 +++ ./json/EquipmentSets.json 2014-11-06 20:10:24.179301402 +0000 @@ -57,17 +57,18 @@ "itemtype": "0x235D" } ], "ActivateOnEquipAll": [ { "_": "ChangeSkin", "skinType": "0x745A", "size": "70", - "color": "0x92A9BA" + "color": "0x92A9BA", + "bulletType": "Great Geb Shot" }, { "_": "IncrementStat", "stat": "0", "amount": "50" }, { "_": "IncrementStat", @@ -111,17 +112,18 @@ "itemtype": "0x2365" } ], "ActivateOnEquipAll": [ { "_": "ChangeSkin", "skinType": "0x745C", "size": "70", - "color": "0x92A9BA" + "color": "0x92A9BA", + "bulletType": "Fairy Bolt" }, { "_": "IncrementStat", "stat": "0", "amount": "50" }, { "_": "IncrementStat", @@ -170,17 +172,18 @@ "itemtype": "0x2361" } ], "ActivateOnEquipAll": [ { "_": "ChangeSkin", "skinType": "0x745B", "size": "70", - "color": "0x92A9BA" + "color": "0x92A9BA", + "bulletType": "Soul Vortex" }, { "_": "IncrementStat", "stat": "0", "amount": "25" }, { "_": "IncrementStat", diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' '--unified=8' -b -B ../current/json/GroundTypes.json ./json/GroundTypes.json --- ../current/json/GroundTypes.json 2014-10-16 21:20:22.243387523 +0000 +++ ./json/GroundTypes.json 2014-11-06 20:10:24.343301154 +0000 @@ -51,16 +51,25 @@ "type": "0x1a", "id": "Wood Panel Floor", "Texture": { "File": "lofiEnvironment2", "Index": "0x0d" } }, { + "type": "0x7463", + "id": "Wood Panel Floor Speedy", + "Texture": { + "File": "lofiEnvironment2", + "Index": "0x0d" + }, + "Speed": "1.4" + }, + { "type": "0x1b", "id": "Wood Plank Floor", "RandomTexture": { "Texture": [ { "File": "lofiEnvironment2", "Index": "0x12" }, diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' '--unified=8' -b -B ../current/json/Objects.json ./json/Objects.json --- ../current/json/Objects.json 2014-10-31 21:50:25.336972303 +0000 +++ ./json/Objects.json 2014-11-06 20:10:26.347298116 +0000 @@ -30564,70 +30564,70 @@ "Consumable": "", "BagType": "6", "DisplayId": "Jester Skin" }, { "type": "0x2337", "id": "Almandine Armor of Anger", "setType": "0x0001", + "setName": "Oryx Awesome Set", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", "Index": "0x00" }, "SlotType": "7", - "Tier": "13", "Description": "A piece of heavy plate mail forged in the dungeons of Oryx's castle, it is decorated with dark red Almandine stones.", "ActivateOnEquip": { "_": "IncrementStat", "stat": "21", "amount": "24" }, "BagType": "4", "FameBonus": "4", "feedPower": "435", "DisplayId": "Almandine Armor of Anger" }, { "type": "0x2338", "id": "Almandine Ring of Wrath", "setType": "0x0001", + "setName": "Oryx Awesome Set", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", "Index": "0x01" }, "SlotType": "9", - "Tier": "5", "Description": "Set with stones as red as Oryx's favorite Cabernet Sauvignon.", "ActivateOnEquip": { "_": "IncrementStat", "stat": "0", "amount": "140" }, "BagType": "4", "FameBonus": "4", "feedPower": "300", "DisplayId": "Almandine Ring of Wrath" }, { "type": "0x2339", "id": "Onyx Shield of the Mad God", "setType": "0x0001", + "setName": "Oryx Awesome Set", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", "Index": "0x02" }, "SlotType": "5", - "Tier": "6", "Description": "A pitch-black shield looted from the depths of Oryx's Castle.", "Sound": "spell/fire_spray", "Projectile": { "ObjectId": "Silver Shield", "Speed": "160", "MinDamage": "300", "MaxDamage": "360", "LifetimeMS": "200", @@ -30669,24 +30669,24 @@ "NumProjectiles": "5", "feedPower": "380", "DisplayId": "Onyx Shield of the Mad God" }, { "type": "0x2302", "id": "Sword of the Mad God", "setType": "0x0001", + "setName": "Oryx Awesome Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x4CD" }, "SlotType": "1", - "Tier": "12", "Description": "A detailed sword crafted out of blackened metal and precious bloodstone by Oryx's minions as a tribute to their overlord.", "RateOfFire": "1", "Sound": "weapon/mithril_sword", "Projectile": { "ObjectId": "Oryx Sword Attack", "Speed": "100", "MinDamage": "220", "MaxDamage": "275", @@ -30698,16 +30698,17 @@ "OldSound": "bladeSwing", "feedPower": "450", "DisplayId": "Sword of the Mad God" }, { "type": "0x235C", "id": "Shendyt of Geb", "setType": "0x0002", + "setName": "Priest of Geb Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x50D" }, "SlotType": "14", "Description": "A ceremonial garment worn by those who whorship the god Geb.", @@ -30742,16 +30743,17 @@ "FameBonus": "4", "feedPower": "435", "DisplayId": "Shendyt of Geb" }, { "type": "0x235D", "id": "Geb's Ring of Wisdom", "setType": "0x0002", + "setName": "Priest of Geb Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x511" }, "SlotType": "9", "Description": "It is said that the ring attunes it's wearer to the earth and it's life force.", @@ -30781,16 +30783,17 @@ "FameBonus": "5", "feedPower": "500", "DisplayId": "Geb's Ring of Wisdom" }, { "type": "0x235E", "id": "Book of Geb", "setType": "0x0002", + "setName": "Priest of Geb Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x510" }, "SlotType": "4", "Description": "Within, the priests of the past have catalogued the story and knowledge of Geb.", @@ -30860,16 +30863,17 @@ ], "feedPower": "380", "DisplayId": "Book of Geb" }, { "type": "0x235F", "id": "Scepter of Geb", "setType": "0x0002", + "setName": "Priest of Geb Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x50F" }, "SlotType": "8", "Description": "Despite their normal pacificity, priests of Geb were able to protect themselves from aggressors.", @@ -30896,16 +30900,17 @@ "OldSound": "bladeSwing", "feedPower": "800", "DisplayId": "Scepter of Geb" }, { "type": "0x2360", "id": "Soulless Robe", "setType": "0x0004", + "setName": "Phylactery Mystic Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x50C" }, "SlotType": "14", "Description": "...finally, I cornered and killed the beast. When I awoke in a cold sweat...I felt youthful, powerful.", @@ -30930,16 +30935,17 @@ "FameBonus": "4", "feedPower": "435", "DisplayId": "Soulless Robe" }, { "type": "0x2361", "id": "Ring of the Covetous Heart", "setType": "0x0004", + "setName": "Phylactery Mystic Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x516" }, "SlotType": "9", "Description": "As I lifted the stone from it's resting place it became readily apparent there was more to it than met the eye...", @@ -30964,16 +30970,17 @@ "FameBonus": "5", "feedPower": "500", "DisplayId": "Ring of the Covetous Heart" }, { "type": "0x2362", "id": "Soul of the Bearer", "setType": "0x0004", + "setName": "Phylactery Mystic Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x515" }, "SlotType": "21", "Description": "All shall know my power. Not even the Mad God can stop me.", @@ -31018,16 +31025,17 @@ "MpCost": "100", "feedPower": "380", "DisplayId": "Soul of the Bearer" }, { "type": "0x2363", "id": "The Phylactery", "setType": "0x0004", + "setName": "Phylactery Mystic Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x514" }, "SlotType": "17", "Description": "I was a fool before, but now everything is so clear. The phylactery speaks to me, knows me, protects me.", @@ -31058,16 +31066,17 @@ "OldSound": "bladeSwing", "feedPower": "450", "DisplayId": "The Phylactery" }, { "type": "0x2364", "id": "Fairy Plate", "setType": "0x0003", + "setName": "Swoll Paladin Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x50E" }, "SlotType": "7", "Description": "This colorful platemail is enchanted with special protections, a gift from the kind fairies that dwell in the Realm.", @@ -31085,23 +31094,24 @@ { "_": "IncrementStat", "stat": "21", "amount": "20" } ], "BagType": "4", "FameBonus": "4", - "feedPower": "435", + "feedPower": "500", "DisplayId": "Fairy Plate" }, { "type": "0x2365", "id": "Ring of Pure Wishes", "setType": "0x0003", + "setName": "Swoll Paladin Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x51B" }, "SlotType": "9", "Description": "Many do not realize how powerful a kind wish is.", @@ -31126,24 +31136,25 @@ "FameBonus": "5", "feedPower": "500", "DisplayId": "Ring of Pure Wishes" }, { "type": "0x2366", "id": "Seal of the Enchanted Forest", "setType": "0x0003", + "setName": "Swoll Paladin Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x51A" }, "SlotType": "12", - "Description": "Protect the helpless, embolden the heroic, dispense justice to the unjust. - Inscription, in Fae.", + "Description": "Protect the helpless, embolden the heroic, slow the progress of evil. - Inscription, in Fae.", "Sound": "spell/fire_spray", "ActivateOnEquip": [ { "_": "IncrementStat", "stat": "20", "amount": "2" }, { @@ -31156,56 +31167,52 @@ "stat": "27", "amount": "5" } ], "Activate": [ { "_": "StatBoostAura", "stat": "0", - "amount": "75", + "amount": "60", "duration": "4", "range": "4.5", "noStack": "true", "useWisMod": "true" }, { "_": "GenericActivate", "effect": "Slowed", - "duration": "4", + "duration": "2", "range": "4.5", "color": "0xff0080", "target": "enemy", "center": "player", "visualEffect": "0", "useWisMod": "true" }, { - "_": "GenericActivate", + "_": "ConditionEffectSelf", "effect": "Hallucinating", "duration": "1", - "range": "4.5", - "color": "0x808080", - "target": "player", - "center": "player", - "visualEffect": "0", "useWisMod": "false" } ], "Usable": "", "BagType": "4", "FameBonus": "4", "MpCost": "100", - "feedPower": "380", + "feedPower": "500", "DisplayId": "Seal of the Enchanted Forest" }, { "type": "0x2367", "id": "Pixie-Enchanted Sword", "setType": "0x0003", + "setName": "Swoll Paladin Set", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x519" }, "SlotType": "1", "Description": "Pixies are often a more aggressive fae. It makes great sense that they would provide heroes with swords as fine as this.", @@ -31224,17 +31231,17 @@ "ActivateOnEquip": { "_": "IncrementStat", "stat": "20", "amount": "1" }, "BagType": "4", "FameBonus": "4", "OldSound": "bladeSwing", - "feedPower": "800", + "feedPower": "500", "DisplayId": "Pixie-Enchanted Sword" }, { "type": "0xf10", "id": "Wand of Ancient Terror", "Class": "Equipment", "Item": "", "Texture": { @@ -31896,31 +31903,16 @@ "_": "UnlockSkin", "skinType": "29815" }, "Consumable": "", "BagType": "1", "DisplayId": "Poltergeist Skin" }, { - "type": "0x744D", - "id": "Event Chest", - "DisplayId": "Event Chest", - "Class": "Character", - "Enemy": "", - "Texture": { - "File": "lofiObj3", - "Index": "0x466" - }, - "MaxHitPoints": "120000", - "Defense": "0", - "Size": "160", - "XpMult": "0.0" - }, - { "type": "0x2375", "id": "Candy Corn", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", "Index": "0x16" }, @@ -50046,16 +50038,31 @@ "NoMiniMap": "", "Size": "0", "XpMult": "0.0", "StasisImmune": "", "StunImmune": "", "DisplayId": "Puppet Theatre Boss Spawn" }, { + "type": "0x744D", + "id": "Event Chest", + "DisplayId": "Event Chest", + "Class": "Character", + "Enemy": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x466" + }, + "MaxHitPoints": "120000", + "Defense": "0", + "Size": "160", + "XpMult": "0.0" + }, + { "type": "0x1700", "id": "Fishman Warrior", "Group": "Ocean Trench", "Enemy": "", "Class": "Character", "AnimatedTexture": { "File": "chars16x16rEncounters", "Index": "10" @@ -90003,17 +90010,17 @@ "ShadowSize": "80", "Projectile": { "id": "0", "ObjectId": "Invisible", "Damage": "15", "Speed": "0", "Size": "80", "ConditionEffect": { - "_": "Stunned", + "_": "Stasis", "duration": "5", "target": "1" }, "LifetimeMS": "100" } }, { "type": "0x0e59", Binary files ../current/sheets/lofiInterfaceBig.png and ./sheets/lofiInterfaceBig.png differ Binary files ../current/sheets/playersSkins16Mask.png and ./sheets/playersSkins16Mask.png differ diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' '--unified=8' -b -B ../current/strings.json ./strings.json --- ../current/strings.json 2014-10-30 21:20:22.567250290 +0000 +++ ./strings.json 2014-11-06 20:10:23.835301924 +0000 @@ -2627,16 +2627,17 @@ "equip.Power_Pizza": "Power Pizza", "equip.Power_Wand": "Power Wand", "equip.Precisely_Calibrated_Stringstick": "Precisely Calibrated Stringstick", "equip.Prism_of_Apparitions": "Prism of Apparitions", "equip.Prism_of_Dancing_Swords": "Prism of Dancing Swords", "equip.Prism_of_Figments": "Prism of Figments", "equip.Prism_of_Phantoms": "Prism of Phantoms", "equip.Protect_the_helpless,_embolden_the_heroic,_dispense_justice": "Protect the helpless, embolden the heroic, dispense justice to the unjust. - Inscription, in Fae.", + "equip.Protect_the_helpless,_embolden_the_heroic,_slow_the_progres": "Protect the helpless, embolden the heroic, slow the progress of evil. - Inscription, in Fae.", "equip.Puppet_Master_Skin": "Puppet Master Skin", "equip.Purple_Drake_Egg": "Purple Drake Egg", "equip.Purple_Gumball": "Purple Gumball", "equip.Pyramid_Revenant_Skin": "Pyramid Revenant Skin", "equip.Quiver_of_Elvish_Mastery": "Quiver of Elvish Mastery", "equip.Quiver_of_Thunder": "Quiver of Thunder", "equip.Ragetalon_Dagger": "Ragetalon Dagger", "equip.Ranger_Skin": "Ranger Skin", @@ -3644,16 +3645,17 @@ "objects.Cube": "Cube", "objects.Daily_Quest_Portal": "Daily Quest Portal", "objects.Davy_JonesAPOS_Locker_Portal": "Davy Jones' Locker", "objects.Davy_JonesAPOSs_Locker_Portal": "Davy Jones's Locker", "objects.Decoy": "Decoy", "objects.Dodec": "Dodec", "objects.Dreamscape_Labyrinth_Portal": "Dreamscape Labyrinth Portal", "objects.Dungeon_Portal": "Dungeon Portal", + "objects.Event_Chest": "Event Chest", "objects.Forbidden_Jungle_Portal": "Forbidden Jungle Portal", "objects.Fortune_Ground_Object": "Fortune Ground Object", "objects.G_Door_Opener": "G Door Opener", "objects.Gift_Chest": "Gift Chest", "objects.Gift_Chest_Closed": "Gift Chest Closed", "objects.Glowing_Portal": "Glowing Portal", "objects.Glowing_Portal_of_Cowardice": "Glowing Portal of Cowardice", "objects.Glowing_Realm_Portal": "Glowing Realm Portal",