Merge pull request #334 from Buurazu/master

#333 en_us desc updates + misc.

descriptions/ab+/en_us.lua

@@ -451,7 +451,7 @@ EID.descriptions[languageCode].collectibles={
 	{"429", "Head of the Keeper", "Enemies have a 5% chance to drop a Penny when hit with your tears"},
 	{"430", "Papa Fly", "Follows your movement pattern on a 1 second delay#Fires tears at nearby enemies that deal damage equal to your damage"},
 	{"431", "Multidimensional Baby", "Follows your movement pattern on a 2 second delay#Tears that pass through it will split up and gain a speed boost"},
-	{"432", "Glitter Bombs", "+5 bombs#Bombs have a chance to drop random pickups when they explode"},
+	{"432", "Glitter Bombs", "+5 bombs#Bombs have a chance to drop random pickups or charm enemies when they explode#"},
 	{"433", "My Shadow", "Each time you take damage, it will apply a fear effect to all enemies and spawn a friendly black charger#The charger deals 5 damage per second"},
 	{"434", "Jar of Flies", "Every time you kill an enemy a blue fly will be added to the Jar#Up to 20 flies#Using the item will release all the flies"},
 	{"435", "Lil Loki", "Shoots 4 tears in a cross pattern#Deals 3.5 damage per shot"},
@@ -502,7 +502,7 @@ EID.descriptions[languageCode].collectibles={
 	{"480", "Compost", "Converts pickups into blue flies or spiders#Doubles your current blue flies/spiders#Spawns 1 blue fly or spider when you don't have any"},
 	{"481", "Dataminer", "When used, ↑/↓ small amount on random stat#Random tear effect for current room#Fucks up all sprites"},
 	{"482", "Clicker", "Transforms you into a different character#Removes the last item you collected"},
-	{"483", "Mama Mega!", "!!! SINGLE USE !!!#Affects whole floor#Explodes all objects#Deals 200 damage to all enemies#Opens the door to Boss Rush, Hush and all secret rooms"},
+	{"483", "Mama Mega!", "!!! SINGLE USE !!!#Affects whole floor#Explodes all objects#Deals 200 damage to all enemies#Opens the door to Boss Rush, Hush and all secret rooms#!!! If you have a Golden Bomb, consumes it on use instead of Mama Mega"},
 	{"484", "Wait What?", "Upon use, pushes enemies away and spawn a wave of rocks#Can open rooms and break rocks"},
 	{"485", "Crooked Penny", "50% chance to double all items, consumables and chests in room#50% chance to remove items / pickups in room and spawn 1 coin"},
 	{"486", "Dull Razor", "Hurts you without damaging you#Can trigger item effects"},
@@ -874,4 +874,4 @@ EID.descriptions[languageCode].MCM = {
 	DemoObjectName = "Demo Object Name",
 	DemoObjectTransformation = "Demo Transformation",
 	DemoObjectText = "This text is in english#A very cool and long description to simulate linebreaks caused by EID textbox width!#\1 This is also a cool line#This line loves you {{Heart}}",
-}
+}

descriptions/rep/en_us.lua

@@ -167,6 +167,7 @@ local repCollectibles={
 	[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.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
+	[419] = {"419", "Teleport 2.0", "Teleports you to another random room that has not been explored yet#Hierarchy: {{Room}}>{{BossRoom}}>{{SuperSecretRoom}}>{{Shop}}>{{TreasureRoom}}>{{SacrificeRoom}}> {{DiceRoom}}>{{Library}}>{{CursedRoom}}>{{MiniBoss}}>{{ChallengeRoom}}>{{IsaacsRoom}}> {{ArcadeRoom}}>{{ChestRoom}}>{{Planetarium}}>{{SecretRoom}}>{{DevilRoom}}{{AngelRoom}}> Error-Room"}, -- Teleport 2.0
 	[421] = {"421", "Kidney Bean", "Applies charm effect to any enemies in close range"}, -- Kidney Bean
 	[426] = {"426", "Obsessed Fan", "Follows your exact movement on a 0.66 second delay#Deals 30 contact damage per second"}, -- Obsessed Fan
 	[430] = {"430", "Papa Fly", "Follows your movement pattern on a 0.66 second delay#Fires tears at nearby enemies that deal damage equal to your damage"}, -- Papa Fly
@@ -243,7 +244,7 @@ local repCollectibles={
 	[591] = {"591", "Venus", "↑ +1 Health up#Heals 1 Red Heart#Close enemies become charmed"}, -- Venus
 	[592] = {"592", "Terra", "↑ +1 Damage up#Replaces tears with rocks#They deal variable damage#Can destroy obstacles#Increased knockback"}, -- Terra
 	[593] = {"593", "Mars", "Dash by double-tapping a movement key, becoming invincible and dealing 4x your damage#3 seconds cooldown"}, -- Mars
-	[594] = {"594", "Jupiter", "↑ +2 Health up#Heals half a Red Heart#↓ -0.3 Speed down#Build up to +0.5 Speed while standing still#Moving releases poison fart clouds behind you"}, -- Jupiter
+	[594] = {"594", "Jupiter", "↑ +2 Health up#Heals half a Red Heart#↓ -0.3 Speed down#Makes you immune to poison damage#Build up to +0.5 Speed while standing still#Moving releases poison fart clouds behind you"}, -- Jupiter
 	[595] = {"595", "Saturnus", "A circle surrounds you#Upon entering a room, 7 tears will orbit in it#Chance to catch enemy projectiles in orbit"}, -- Saturnus
 	[596] = {"596", "Uranus", "Shoot ice tears, which slow enemies and freeze monsters they kill#Touching frozen enemies slide away and explode into 6 ice shards"}, -- Uranus
 	[597] = {"597", "Neptunus", "Builds a massive tears bonus over 3 seconds while not firing#Shooting again will release stored tears#The tear bonus falls off as you fire"}, -- Neptunus
@@ -316,7 +317,7 @@ local repCollectibles={
 	[664] = {"664", "Binge Eater", "↑ +1 Health up#Full health#Item pedestals periodically switch between food items and the item they would hold otherwise#Picking up a food item grants temporary +3.6 damage boost, 2 small permanent stat ups and a permanent -0.03 speed down#Food items heal 3 Red Hearts"}, -- Binge Eater
 	[665] = {"665", "Guppy's Eye", "Shows the contents of Chests, Sacks, Shopkeepers, and Fire Places before they're opened"}, -- Guppy's Eye
 	[666] = {"666", "", "<Item does not exist>"},
-	[667] = {"667", "Strawman", "Spawns Keeper as a second character#If he dies, he spawns blue spiders#Item gets removed afterwards#Devil deals cost coins while he's alive#!!! He can pick up items, including Story items, removing them permanently on death"}, -- Strawman
+	[667] = {"667", "Strawman", "+1 Bomb#Spawns Keeper as a second character#If he dies, he spawns blue spiders#Item gets removed afterwards#Devil deals cost coins while he's alive#!!! He can pick up items, including Story items, removing them permanently on death"}, -- Strawman
 	[668] = {"668", "Dad's Note", "Begins the sequence to access the Home floor#Trinkets left in previous {{TreasureRoom}}Treasure or {{BossRoom}}Boss Rooms turn into {{Card78}}Cracked Key"}, -- Dad's Note
 	[669] = {"669", "Sausage", "↑ +1 Health up#Full health#↑ +0.5 Damage up#↑ +0.2 Speed up#↑ +1.2 Shot Speed up#↑ +0.16 Range up#↑ +1 Luck up#↑ +6.9% {{DevilRoom}}Devil or {{AngelRoom}}Angel Room chance#↑ +6.9% {{Planetarium}}Planetarium chance"}, -- Sausage
 	[670] = {"670", "Options?", "If a room grants a clear reward, there will be two different rewards to choose from#Taking one causes the other to disappear"}, -- Options?
@@ -973,13 +974,13 @@ EID.descriptions[languageCode].GlitchedItemText = {
 	-- Attribute triggers
 	chain = "Then:{{CR}} ",
 	active = "On use:#",
-	pickup_collected = "When you collect a pickup:#", --chance to?
+	pickup_collected = "When you collect a pickup:#",
 	enemy_kill = "On kill, chance to:#",
-	damage_taken = "When you take damage:#", --chance to?
+	damage_taken = "When you take damage:#",
 	entity_spawned = "When a {T1} is spawned:#",
 	tear_fire = "When you fire a tear, chance to:#",
 	enemy_hit = "On hitting an enemy, chance to:#",
-	room_clear = "On room clear:#", --chance to?
+	room_clear = "On room clear:#",
 	
 	-- Attribute effects
 	area_damage = "Deal {1} damage in an area around you", 

eid_api.lua

@@ -903,8 +903,9 @@ function EID:CheckGlitchedItemConfig(id)
 				if string.find(v, "Hearts") then val = val / 2 end
 				-- the g flag removes .0 in numbers like 1.0 (caused by the hearts division)
 				local s = string.format("%.4g",val)
-				if val > 0 then s = "+" .. s end
-				attributes = attributes .. string.gsub(localizedNames[v], "{1}", s)
+				local prefix = "↑ "
+				if val > 0 then s = "+" .. s else prefix = "↓ " end
+				attributes = attributes .. prefix .. string.gsub(localizedNames[v], "{1}", s)
 				if val ~= 1 and val ~= -1 then attributes = attributes .. localizedNames["pluralize"] end
 				attributes = attributes .. "#"
 			end

eid_tmtrainer.lua

@@ -43,7 +43,7 @@ local function entityToName(e, plural)
 	if name == e then Isaac.DebugString("No name found for " .. e .. " (could be modded)")
 	elseif plural then name = name .. localizedNames["pluralize"] end
 	
-	return "{{ColorGray}}" .. name .. "{{CR}}"
+	return name
 end
 
 local function parseEffectLine(raw)
@@ -58,7 +58,7 @@ local function parseEffectLine(raw)
 	local effectTrigger = words[3]
 	if (string.find(effectTrigger, "entity_spawned")) then
 		effectTrigger = "entity_spawned"
-		triggerReplacements[1] = entityToName(string.sub(words[3], 16, -2))
+		triggerReplacements[1] = "{{ColorEIDObjName}}" .. entityToName(string.sub(words[3], 16, -2)) .. "{{CR}}"
 	end
 	-- words[4] = "->"
 	local effectType = words[5]
@@ -75,10 +75,10 @@ local function parseEffectLine(raw)
 		
 		replacements[1] = "{{Collectible" .. Isaac.GetItemIdByName(name) .. "}} " .. name
 	elseif effectType == "convert_entities" then
-		replacements[1] = entityToName(words[6], true)
-		replacements[2] = entityToName(words[8])
+		replacements[1] = "{{ColorGray}}" .. entityToName(words[6], true) .. "{{CR}}"
+		replacements[2] = "{{ColorGray}}" .. entityToName(words[8])
 	elseif effectType == "spawn_entity" then
-		replacements[1] = entityToName(words[6])
+		replacements[1] = "{{ColorGray}}" .. entityToName(words[6])
 	elseif effectType == "fart" then
 		replacements[1] = words[6]
 	elseif effectType == "area_damage" then

mod_config_menu.lua

@@ -346,7 +346,7 @@ if MCMLoaded then
 			OnChange = function(currentNum)
 				EID.Config["TextboxWidth"] = currentNum
 			end,
-			Info = {"Default = 100","Width of the EID textbox, in pixels"}
+			Info = {"Default = 115, varies per language","Width of the EID textbox, in pixels"}
 		}
 	)