Merge pull request #264 from Buurazu/master

Fix Crown Of Light, English (Detailed) nonexistent items, improve some trinkets

descriptions/rep/en_us.lua

@@ -160,6 +160,7 @@ local repCollectibles={
 	[405] = {"405", "GB Bug", "{{Throwable}} {{ColorOrange}}Throwable{{CR}} (double-tap shoot)#Rerolls enemies and pickups it comes in contact with"}, -- GB Bug
 	[407] = {"407", "Purity", "↑ Boosts one of your stats depending on the color of the aura around you#When you take damage and after you enter a new room, you will get a new aura:#{{ColorRed}}Red{{CR}} = +4 Damage up#{{ColorBlue}}Blue{{CR}} = +2 Fire Rate up#{{ColorYellow}}Yellow{{CR}} = +0.5 Speed up#{{ColorOrange}}Orange{{CR}} = +3 Range up, +1 Tear Height up"},
 	[408] = {"408", "Athame", "When you take damage, a black brimstone ring will appear around Isaac"}, -- Athame
+	[415] = {"415", "Crown Of Light", "+2 Soul Hearts#If you don't have any damaged Red Heart containers:#↑ +100% Damage up#↑ +1.5 Range up#↑ +0.5 Tear Height#↓ -0.3 Shot Speed down#Deactivates for the current room when damaged at all"}, -- Crown Of Light
 	[416] = {"416", "Deep Pockets", "Spawns 1-3 coins if a room didn't yield a reward#Increases coin cap to 999"}, -- Deep Pockets
 	[417] = {"417", "Succubus", "Bounces around the room with a damaging aura, dealing 7.5-10 damage every second#↑ +50% damage while standing in the aura"}, -- Succubus
 	[421] = {"421", "Kidney Bean", "Applies charm effect to any enemies in close range"}, -- Kidney Bean
@@ -483,7 +484,7 @@ local repTrinkets={
 	[15] = {"15", "Lucky Rock", "33% chance to drop a coin when destroying rocks"},-- Lucky Rock
 	[24] = {"24", "Butt Penny", "Fart when picking up coins#Higher chance for coins to spawn from poop#Farts poison and knockback enemies and projectiles"}, -- Butt Penny
 	[26] = {"26", "Hook Worm", "Tears move in angular patterns#↑ +0.4 Tears up#↑ +1.5 Range up#Grants spectral tears"}, -- Hook Worm
-	[32] = {"32", "Liberty Cap", "Random mushroom effect per room"}, -- Liberty Cap
+	[32] = {"32", "Liberty Cap", "25% chance for a random mushroom effect per room"}, -- Liberty Cap
 	[33] = {"33", "Umbilical Cord", "At half a Red Heart or less, you gain#{{Blank}} {{Collectible100}}Little Steven#High chance to spawn Gemini familiars for the room when taking damage"}, -- Umbilical Cord
 	[39] = {"39", "Cancer", "↑ +1 Fire Rate up"},
 	[48] = {"48", "A Missing Page", "When getting hit, chance to damage all enemies in the room#Black Hearts and {{Collectible35}}Necronomicon-like effects deal double damage"}, -- A Missing Page
@@ -563,9 +564,20 @@ local repTrinkets={
 	[187] = {"187", "Broken Glasses", "33% chance of adding an extra blind item in {{TreasureRoom}}Treasure Rooms#Chance to reveal the blind item in alt path"}, -- Broken Glasses
 	[188] = {"188", "Ice Cube", "Adds a chance to petrify an enemy when entering the room#Killing the petrified enemy freezes it"}, -- Ice Cube
 	[189] = {"189", "Sigil of Baphomet", "Activates a 1 second shield upon killing an enemy"}, -- Sigil of Baphomet
-
 }
 EID:updateDescriptionsViaTable(repTrinkets, EID.descriptions["en_us"].trinkets)
+EID.descriptions["en_us"].goldenTrinket = "Effect doubled!"
+EID.descriptions["en_us"].tripledTrinket = "Effect tripled!"
+EID.descriptions["en_us"].quadrupledTrinket = "Effect quadrupled!"
+
+-- Most trinkets that can be doubled or tripled just have the numbers in their description multiplied
+-- A few trinkets have odd edge cases where their effect completely changes, can only be doubled, or is different depending on if it's Mom's Box or Golden
+EID.descriptions["en_us"].momsBoxEffects = {
+}
+EID.descriptions["en_us"].goldenTrinketEffects = {
+}
+EID.descriptions["en_us"].goldenMomsBoxEffects = {
+}
 
 -- Card Buffs caused by Tarot Cloth
 -- Note: "#" will be replaced with "#{{Collectible451}}" automatically, in order to add Tarot Cloth icon infront of each buff-bulletpoint
@@ -598,7 +610,6 @@ EID.descriptions["en_us"].tarotClothBuffs = {
 	[73] = {"73", "", "Removes 2 items and spawns 4"}, -- XVII - The Stars?
 	[76] = {"76", "", "Spawns 2 Restock Machines"}, -- XX - Judgement?
 }
-EID.descriptions["en_us"].goldenTrinket = "GOLD: Effect doubled!"
 
 -- Book of Virtues wisp types
 EID.descriptions["en_us"].bookOfVirtuesWisps = {

descriptions/rep/en_us_detailed.lua

@@ -73,7 +73,7 @@ local repCollectibles={
 	{"56", "" ,"On use, drops a small pool of lemonade under the player. #Enemies on this pool take 22 damage per tick, or 66 damage per second."},
 	{"57", "" ,"Spawns a red attack fly that circles the player at a small distance, dealing 5 damage per tick or 75 damage per second. #Circles further than standard orbitals, but closer than a similar item, Forever Alone."},
 	{"58", "" ,"Shields the player from all damage for 10 seconds. #Does not prevent loss of Health Down pills or Devil Room deals. #When active, the Sacrifice Room will not pay out."},
-	{"59", "" ,"<If you see this, there's a problem.>"},
+	{"59", "" ,"<Judas's Birthright Book of Belial should never be on a pedestal>"},
 	{"60", "" ,"Allows the player to walk over one square gaps by creating a platform between them. #Enemies cannot use this platform."},
 	{"61", "" ,"<If you see this, there's a problem.>"},
 	{"62", "" ,"Heals half a red heart every 13 enemies killed. #+0.3 damage."},
@@ -682,7 +682,7 @@ local repCollectibles={
 	{"665", "" ,"Shows what is in chests and sacks, as well as all fires, before opening or blowing them up. #Includes Mom's chest, but not mega chests. #Does not show the contents of tinted rocks, poops, urns, buckets, mushrooms, skulls, or polyps."},
 	{"666", "" ,"<There is an issue if you are seeing this. Contact somebody!>"},
 	{"667", "" ,"Spawns Keeper as an extra character alongside Isaac, who is controlled exactly like Esau. #Keeper will have his base stats, heal with coins, 3 coin hearts, and is unable to pick up items. #If Keeper dies, he spawns several blue spiders and Strawman is removed from Isaac's inventory."},
-	{"668", "" ,"ASCEND ASCEND ASCEND ASCEND (with or without Gorb, he will know!) "},
+	{"668", "" ,EID.descriptions["en_us"].collectibles[668][3]},
 	{"669", "" ,"Fully heals Isaac's red heart containers#Gives Isaac a heart container. #+0.2 Speed up. #+0.5 Damage up. #+0.5 Tears up. #+1.5 Range up. #+0.2 Shot speed up. #+1.0 Luck up.#+6.9% chance to get a Devil/Angel Room#+6.9% chance to find a {{Planetarium}}Planetarium."},
 	{"670", "" ,"Upon completing a room, if a room clear reward would spawn, another, different reward spawns next to it. If Isaac takes/opens one, the other disappears."},
 	{"671", "" ,"Gives Isaac one of the following stat boosts per half heart healed with red heart pickups: #+0.02 Speed up. #+0.05 Tears up. #+0.10 Damage up. #+0.15 Range up. #+0.02 Shot speed up. #+0.10 Luck up."},
@@ -724,18 +724,18 @@ local repCollectibles={
 	{"707", "" ,"Gives Isaac one red heart container and heals him for one extra heart."},
 	{"708", "" ,"+1.0 Damage up. #Prevents Isaac from firing tears from his left eye, similar to Cain."},
 	{"709", "" ,"Causes Isaac to dash a short distance. #If Isaac runs into an enemy while dashing, he picks them up and a crosshair spawns under him that can be controlled with tear controls. #After one second, Isaac slams down with the enemy, dealing 50 damage to them and any enemies he lands on and creates circular rock waves that damage nearby enemies and destroy obstacles. "},
-	{"710", "" ,"This item is fucked, but thankfully you can only get it on Tainted Cain! #If you're seeing this, you've likely spawned the item in, or maybe used Death Certificate? #Either way, this can be used to craft items. #You should go read the wiki, it's fairly complex to describe."},
-	{"711", "" ,"Switch characters between Tainted Lazarus and Dead Tainted Lazarus. #Does nothing on any other character. #Good thing you can't get it on any other character!"},
+	{"710", "" ,EID.descriptions["en_us"].collectibles[710][3]},
+	{"711", "" ,EID.descriptions["en_us"].collectibles[711][3]},
 	{"712", "" ,"Upon use, grants a random passive item from the current room's item pool. #More than one of these items can be held at once, and you can have more than one of the same item. #A small ghost appears around Isaac for each item he gains, which disappears upon taking enough damage. #Isaac loses the effect of the passive when the item wisp disappears."},
-	{"713", "" ,"I'm not even going to try, if you're seeing this you've spawned the item in or something, go read the wiki."},
-	{"714", "" ,"I'm not even going to try, if you're seeing this you've spawned the item in or something, go read the wiki."},
+	{"713", "" ,EID.descriptions["en_us"].collectibles[713][3]},
+	{"714", "" ,EID.descriptions["en_us"].collectibles[714][3]},
 	{"715", "" ,"Preserves one poop bomb inside and can be used later."},
 	{"716", "" ,"Gives Isaac either: #+0.05 Damage up, #+0.03 Speed up, #or +0.25 Range up each time he buys items or pickups from the shop. #He gains one stat upgrade when he makes a purchase, plus one for every 5 cents spent on the item or pickup. #Spawns 3 coins and a key on pickup."},
 	{"717", "" ,"If Isaac is in a room with enemies, Rocks and props will occasionally spawn blue spiders. #Causes all rocks and props to spawn 0-2 blue spiders when destroyed."},
 	{"718", "" ,"<There is an issue if you are seeing this. Contact somebody!>"},
 	{"719", "" ,"Spawns a random pickup/item, which will be on sale for its normal shop price. #Will always be a shop item. #Will be surrounded by spikes if used in a Devil room."},
 	{"720", "" ,"If the item is not fully charged, it spawns a pickup based on how many charges it had. #If it is fully charged, it has one of many effects. #A full list of pickups and effects can be found on the wiki, as they're too long to list here."},
-	{"721", "" ,"When picked up, all future items become 'Glitched', causing them to become random combinations of 2-3 effects based on other items. #Glitched items can be passive or active, and are completely randomly generated. #Random effects combine effects that exist on other items, and assign them to a random event (e.g. on enemy death, on room clear, on damage taken etc.). #The only item that TMTRAINER will not effect is Knife Piece 2; it CAN effect Knife Piece 1, The Polaroid, Dad's Note and so on. #The player will become completely stuck in the Mausoleum II if they go through the Depths II door."},
+	{"721", "" ,"When picked up, all future items become 'Glitched', causing them to become random combinations of 2-3 effects based on other items. #Glitched items can be passive or active, and are completely randomly generated. #Random effects combine effects that exist on other items, and assign them to a random event (e.g. on enemy death, on room clear, on damage taken etc.)."},
 	{"722", "" ,"Chains down the nearest enemy, completely preventing them from acting for 5 seconds. #Chained enemies can be released manually by reactivating the item again. #As Tainted Jacob, Dark Esau will always become the chained target."},
 	{"723", "" ,"Rerolls all pedestal items in a room by subtracting their internal ID number by one until a valid item is rolled. This effect occurs per item and is independent of any other items in the room. #Unlockable items will be skipped if they are not unlocked. #Hidden items (Damocles and items specific to Tainted characters, generally) will always be skipped. #Certain items are very good to spin down, for example Blood Bag becomes Brimstone and Toothpicks becomes Sacred Heart."},
 	{"724", "" ,"When Isaac gets hit by an enemy, a half or full red heart is launched out of him, which despawns after 1.5 seconds."},
@@ -744,6 +744,7 @@ local repCollectibles={
 	{"727", "" ,"Gives Isaac 5 bombs. #Isaac's bombs create ghosts when they explode, which rapidly chase and deal 2x Isaac's damage per second to enemies. #After 10 seconds, the ghost explodes, dealing 7 damage to nearby enemies up to 3 times. Isaac does not take damage from the explosion. "},
 	{"728", "" ,"Spawns a demon familiar that's attached to Isaac and moves and fires in the direction Isaac shoots, using Isaac's damage, tears, range, shotspeed, and special tear effects. #Deals 0.75x Isaac's damage, of 1.0x if used by Lillith."},
 	{"729", "" ,"Throws Isaac's head while allowing to shoot from the spot it lands, as well as dealing contact damage to nearby enemies. #Meanwhile, Isaac's body can no longer shoot tears. #The head can return by picking it up with the body, or by using the item again without requiring charges. #Both the throwing and retaking of the head can deal damages to enemies passing through."},
+	--Glass Eye, Stye, Mom's Ring go here
 }
 
 EID:updateDescriptionsViaTable(repCollectibles, EID.descriptions["en_us_detailed"].collectibles)
@@ -751,7 +752,7 @@ EID:updateDescriptionsViaTable(repCollectibles, EID.descriptions["en_us_detailed
 ---------- Trinkets ----------
 
 local repTrinkets={
-	{"1", "", "Drops a penny, nickel or dime upon taking damage. #Spawns 0-1 coins as The Keeper."},
+	{"1", "", "Drops 1 penny, nickel or dime upon taking damage. #Spawns 0-1 coins as The Keeper."},
 	{"2", "", "Increases drop rate of pickups from poop to 50%."},
 	{"3", "", "Immediately gives one charge towards an item upon use. #Has no effect on items with only one bar of charge or those with automatic recharges. #Stacks with the 9 Volt, but does not work with The Battery. #Recharging an item by taking damage with the Habit will cause this trinket not to activate."},
 	{"4", "", "Upon using an active item, teleports the player to a random room which can appear on the map."},
@@ -1103,4 +1104,4 @@ local repPills={
 	{"49", "", "Increases one attribute and decreases another randomly, with the same power as standard attribute increase/decrease pills. #If taken with PHD, it will not reduce an attribute."},
 } 
 
-EID:updateDescriptionsViaTable(repPills, EID.descriptions["en_us_detailed"].pills)
+EID:updateDescriptionsViaTable(repPills, EID.descriptions["en_us_detailed"].pills)