Merge pull request #380 from Buurazu/master
Greed's Gullet improvement + misc
This commit is contained in:
6 files changed
+30
-19
No files matched your search
@@ -520,7 +520,7 @@ EID.descriptions[languageCode].collectibles={
|
||||
{"498", "Duality", "Spawns {{DevilRoom}}Devil AND {{AngelRoom}}Angel Room doors#When entering one, the other disappears"},
|
||||
{"499", "Eucharist", "100% chance to find an {{AngelRoom}}Angel Room"},
|
||||
{"500", "Sack of Sacks", "Spawns a sack every 5-6 rooms"},
|
||||
{"501", "Greed's Gullet", "Gives you 1 heart container for every 25 coins#The Keeper will gain additional Coin Hearts"},
|
||||
{"501", "Greed's Gullet", "Gain 1 Heart Container for every 25 coins you gain after picking up Greed's Gullet#{{Player14}}Keeper can gain additional Coin Hearts"},
|
||||
{"502", "Large Zit", "While firing, occasionally shoot a white creep tear that deals double damage#Shoot a white creep tear when damaged"},
|
||||
{"503", "Little Horn", "5% chance to shoot tears that instantly kill enemies#Running into enemies will deal 3.5 damage to them"},
|
||||
{"504", "Brown Nugget", "Spawns a fly turret that shoots at enemies#Each shot deals 2 damage"},
|
||||
|
||||
@@ -195,6 +195,7 @@ local repCollectibles={
|
||||
[494] = {"494", "Jacob's Ladder", "Tears spawn a spark of electricity on impact#Sparks deal half your damage#Sparks can jump between enemies"}, -- Jacobs Ladder
|
||||
[495] = {"495", "Ghost Pepper", "8% chance to shoot a blue fire that blocks enemy shots and deals contact damage#50% chance at 10 Luck#The flame disappears after 2 seconds"}, -- Ghost Pepper
|
||||
[496] = {"496", "Euthanasia", "3.33% chance to shoot needles#50% chance at 15 Luck#Needles kill normal enemies instantly, bursting them into 10 tears#Needles deal 3x damage against bosses"}, -- Euthanasia
|
||||
[501] = {"501", "Greed's Gullet", "Gain 1 Heart Container for every 25 coins you have#{{Player14}}/{{Player33}}Keeper can gain additional Coin Hearts#{{Collectible416}} Gain 1 Heart Container for every 100 coins you have past 99"}, -- Greed's Gullet
|
||||
[503] = {"503", "Little Horn", "5% chance to shoot tears that summon a Big Horn hand#The hand kills enemies instantly and deals damage to bosses#Running into enemies deals 3.5 damage to them"}, -- Little Horn
|
||||
[504] = {"504", "Brown Nugget", "Spawns a fly turret that shoots at enemies#Each shot deals 3.5 damage"}, -- Brown Nugget
|
||||
[509] = {"509", "Bloodshot Eye", "Orbital that shoots a tear every 1/3rd second when enemy is nearby#Deals 3.5 damage per tear#Deals 30 contact damage per second"}, -- Bloodshot Eye
|
||||
@@ -252,7 +253,7 @@ local repCollectibles={
|
||||
[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
|
||||
[598] = {"598", "Pluto", "↑ +0.7 Tears up#Significantly shrinks Isaac, allowing him to squeeze between objects#Projectiles can pass over him"}, -- Pluto
|
||||
[599] = {"599", "Voodoo Head", "Spawns an additional {{CursedRoom}}Curse Room each floor"}, -- Voodoo Head
|
||||
[600] = {"600", "Eye Drops", "!!! Applies only for the left eye#↑ +28% Fire Rate up#First shot in a while is always a double shot"}, -- Eye Drops
|
||||
[600] = {"600", "Eye Drops", "↑ +30% Fire Rate up for the left eye only#First shot in a while is always a double shot#+20% Fire Rate up for non-tear attacks"}, -- Eye Drops
|
||||
[601] = {"601", "Act of Contrition", "↑ +0.7 Tears up#+1 Eternal Heart#Allows both Devil and Angel deals to be taken#Taking Red Heart damage doesn't reduce Devil/Angel Room chance as much"}, -- Act of Contrition
|
||||
[602] = {"602", "Member Card", "Adds a trapdoor to every shop that leads to a second shop with a unique stock"}, -- Member Card
|
||||
[603] = {"603", "Battery Pack", "Spawns 2-4 batteries#Fully recharges your active item"}, -- Battery Pack
|
||||
@@ -361,7 +362,7 @@ local repCollectibles={
|
||||
[706] = {"706", "Abyss", "Destroys all items in the room and spawns an attack fly familiar for each#Effects of fly depends on the items"}, -- Abyss
|
||||
[707] = {"707", "Supper", "↑ +1 Health up#Heals 1 Red Heart"}, -- Supper
|
||||
[708] = {"708", "Stapler", "↑ +1 Damage up#Prevents Isaac from firing tears from one eye"}, -- Stapler
|
||||
[709] = {"709", "Suplex!", "Allows you to dash into and pick up enemies or bosses, then slam them into the ground#Slam can be controlled#Slam deals 50 damage and spawns rock waves#Scales in damage and area of effect with the player's size"}, -- Suplex!
|
||||
[709] = {"709", "Suplex!", "Allows you to dash into and pick up enemies or bosses, then slam them into the ground#Slam location can be controlled#Slam deals 50 damage and spawns rock waves#Scales in damage and area of effect with the player's size"}, -- Suplex!
|
||||
[710] = {"710", "Bag of Crafting", "Collects and holds up to 8 pickups which cannot be dropped#Once 8 pickups are in the bag, using it will craft an item#Quality of the item is dependent on the quality of the pickups"}, -- Bag of Crafting
|
||||
[711] = {"711", "Flip", "When entering a room with an item pedestal, a second ghostly item will be shown#Upon use, flips the real and ghostly item#Both can be taken if Flip is used after taking the first item#!!! The ghostly item disappears if you take the first item and leave the room"}, -- Flip
|
||||
[712] = {"712", "Lemegeton", "Spawns an orbital wisp familiar that grants an item's effect but can be destroyed#The items have a 25% chance to be from the current room's item pool, or from the Treasure/Boss/Shop pools otherwise"}, -- Lemegeton
|
||||
@@ -371,14 +372,14 @@ local repCollectibles={
|
||||
[716] = {"716", "Keeper's Sack", "Gives range, speed, or damage up when buying things from shops#Spawns 3 coins and 1 key on pickup"}, -- Keeper's Sack
|
||||
[717] = {"717", "Keeper's Kin", "Rocks and props spawn 2 blue spiders when destroyed#Rocks can occasionally spawn blue spiders when in a hostile room"}, -- Keeper's Kin
|
||||
[718] = {"718", "Keeper's Robe (Cut item)", "<Item does not exist>"}, -- Keepers Robe (Cut item)
|
||||
[719] = {"719", "Keeper's Box", "Spawns a random shop item/pickup"}, -- Keeper's Box
|
||||
[719] = {"719", "Keeper's Box", "Spawns a random shop item/pickup for purchase"}, -- Keeper's Box
|
||||
[720] = {"720", "Everything Jar", "Spawns certain pickups based on how many charges it has#If fully charged, it has a strong random effect#Charge Rewards:#{{Blank}} 1:{{PoopPickup}} 2:{{Coin}} 3:{{Bomb}} 4:{{Key}}#{{Blank}} 5:{{Heart}} 6:{{Pill}} 7:{{Card}} 8:{{SoulHeart}}#{{Blank}} 9:{{GoldenHeart}} 10:{{GoldenKey}} 11:{{GoldenBomb}}"}, -- Everything Jar
|
||||
[721] = {"721", "TMTRAINER", "Causes all future items to be 'glitched'#Grants them completely random effects"}, -- TMTRAINER
|
||||
[722] = {"722", "Anima Sola", "Chains down the nearest enemy for 5 seconds, preventing them from acting"}, -- Anima Sola
|
||||
[723] = {"723", "Spindown Dice", "Transforms all items in the room by decreasing their internal ID number by one"}, -- Spindown Dice
|
||||
[724] = {"724", "Hypercoagulation", "Upon taking enemy damage, drop a half or full Red Heart#Spawned hearts launch out and despawn after 1.5 seconds"}, -- Hypercoagulation
|
||||
[725] = {"725", "IBS", "After dealing enough damage:#Throw poop#Create buffing creep#Fart#Drop 5 live bombs"}, -- IBS
|
||||
[726] = {"726", "Hemoptysis", "Double-tap a fire button to sneeze blood#Deals 150% your damage to enemies in front of you#1 second cooldown#Affected enemies take extra damage from Brimstone beams"}, -- Hemoptysis
|
||||
[725] = {"725", "IBS", "After dealing enough damage, stop attacking to trigger a random {{Player25}}Tainted ??? effect:#Throw a random poop#Create buffing creep#Poison fart cloud#Drop 5 live bombs"}, -- IBS
|
||||
[726] = {"726", "Hemoptysis", "Double-tap a fire button to sneeze blood#Deals 150% your damage to enemies in front of you#1 second cooldown#{{BrimstoneCurse}} Affected enemies take extra damage from Brimstone beams"}, -- Hemoptysis
|
||||
[727] = {"727", "Ghost Bombs", "+5 bombs#Bombs spawn ghosts that deal contact damage and explode after 10 seconds"}, -- Ghost Bombs
|
||||
[728] = {"728", "Gello", "Spawns a demon familiar that's attached to Isaac#Mimics Isaac's tears, stats and effects"}, -- Gello
|
||||
[729] = {"729", "Decap Attack", "Throws Isaac's head, dealing contact damage and shooting tears from where it lands#Reactivating the item or stepping on the head reattaches it"}, -- Decap Attack
|
||||
|
||||
+14
-7
@@ -743,7 +743,14 @@ function EID:filterColorMarkup(text, baseKColor)
|
||||
end
|
||||
|
||||
-- A simple function to replace all markup {{ }} with placeholder strings, to use in fitTextToWidth
|
||||
function EID:replaceAllMarkupWithSpaces(text)
|
||||
function EID:replaceAllMarkupWithSpaces(text, checkBulletpoint)
|
||||
if checkBulletpoint then
|
||||
-- Check for the text to just be a bulletpoint icon, which should be considered as zero width
|
||||
-- (fixTextToWidth uses this function one word at a time)
|
||||
if EID:getIcon(text) ~= EID.InlineIcons["ERROR"] and string.find(text, "{{.-}}")~=nil then
|
||||
return ""
|
||||
end
|
||||
end
|
||||
for word in string.gmatch(text, "{{.-}}") do
|
||||
local lookup = EID:getIcon(word)
|
||||
if lookup[1] ~= "ERROR" then
|
||||
@@ -758,7 +765,7 @@ end
|
||||
-- Fits a given string to a specific width
|
||||
-- returns the string as a table of lines
|
||||
function EID:fitTextToWidth(str, textboxWidth, breakUtf8Chars)
|
||||
local formatedLines = {}
|
||||
local formattedLines = {}
|
||||
local curLength = 0
|
||||
local text = {}
|
||||
|
||||
@@ -828,14 +835,14 @@ function EID:fitTextToWidth(str, textboxWidth, breakUtf8Chars)
|
||||
|
||||
-- we can break after str[cursor]
|
||||
local word = sub(str, word_begin_index, cursor)
|
||||
local wordFiltered = EID:replaceAllMarkupWithSpaces(word)
|
||||
local wordFiltered = EID:replaceAllMarkupWithSpaces(word, curLength == 0)
|
||||
local wordLength = EID:getStrWidth(wordFiltered)
|
||||
|
||||
if curLength + wordLength <= textboxWidth or curLength < 17 then
|
||||
table.insert(text, word)
|
||||
curLength = curLength + wordLength
|
||||
else
|
||||
table.insert(formatedLines, table.concat(text))
|
||||
table.insert(formattedLines, table.concat(text))
|
||||
text = { word }
|
||||
curLength = wordLength
|
||||
end
|
||||
@@ -846,8 +853,8 @@ function EID:fitTextToWidth(str, textboxWidth, breakUtf8Chars)
|
||||
cursor = cursor + 1
|
||||
end
|
||||
|
||||
table.insert(formatedLines, table.concat(text))
|
||||
return formatedLines
|
||||
table.insert(formattedLines, table.concat(text))
|
||||
return formattedLines
|
||||
end
|
||||
|
||||
-- Renders a given string using the EID Custom font. This will also apply any markup and render icons
|
||||
@@ -1327,4 +1334,4 @@ function EID:getLanguage()
|
||||
return Options and EID.LanguageMap[Options.Language] or "en_us"
|
||||
end
|
||||
return lang
|
||||
end
|
||||
end
|
||||
+7
-4
@@ -301,8 +301,8 @@ EID.InlineIcons = {
|
||||
["AngelChance"] = {"Stats", 6, 16, 16, 7, 6},
|
||||
["DevilChance"] = {"Stats", 7, 16, 16, 7, 6},
|
||||
["AngelDevilChance"] = {"Stats", 8, 16, 16, 7, 6},
|
||||
["PlanetariumChance"] = {"Stats", 9, 16, 16, 7, 6},
|
||||
["Crone"] = {"Stats", 10, 16, 16, 7, 6},
|
||||
["PlanetariumChance"] = {"Stats", 9, 16, 16, 7, 6}, --unused
|
||||
["TreasureRoomChance"] = {"Stats", 10, 16, 16, 7, 6}, --unused, assuming that's what it means
|
||||
["Tearsize"] = {"Stats", 11, 16, 16, 7, 6},
|
||||
["DamageAB"] = {"Stats", 12, 16, 16, 7, 6},
|
||||
["SpeedAB"] = {"Stats", 13, 16, 16, 7, 6},
|
||||
@@ -517,9 +517,12 @@ EID.BreakUtf8CharsLanguage = {
|
||||
['zh_cn'] = true
|
||||
}
|
||||
|
||||
-- Map the game's built-in language option strings to EID's
|
||||
EID.LanguageMap = {
|
||||
["ru"] = "ru",
|
||||
--["jp"] = no japanese localization yet
|
||||
["es"] = "spa",
|
||||
["de"] = "de",
|
||||
["ru"] = "ru",
|
||||
["kr"] = "ko_kr",
|
||||
["zh"] = "zh_cn",
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -66,7 +66,7 @@ local charsToDebug = {
|
||||
"roomtypes: |{{DevilRoom}}|{{AngelRoom}}|{{ChallengeRoom}}|{{IsaacsRoom}}|{{TreasureRoom}}|{{ArcadeRoom}}|{{BossRushRoom}}|{{Shop}}|{{SuperSecretRoom}}|{{BarrenRoom}}|{{MiniBoss}}|{{DiceRoom}}|{{GreedTreasureRoom}}|{{SecretRoom}}|{{Library}}|{{ChestRoom}}|{{BossRoom}}|{{CursedRoom}}|{{SacrificeRoom}}|",
|
||||
"roomshapes: |{{Room}}|{{RoomLongHorizontal}}|{{RoomLongThinHorizontal}}|{{RoomSmallHorizontal}}|{{RoomLBottomRight}}|{{RoomSmallVertical}}|{{RoomLBottomLeft}}|{{RoomLTopLeft}}|{{RoomL}}|{{RoomLongVertical}}|{{RoomXL}}|{{RoomLongThinVertical}}|",
|
||||
"transformations: |{{CustomTransformation}}|{{Guppy}}|{{FunGuy}}|{{LordoftheFlies}}|{{Conjoined}}|{{Spun}}|{{Mom}}|{{OhCrap}}|{{Bob}}|{{Leviathan}}|{{Seraphim}}|{{SuperBum}}|{{Bookworm}}|{{SpiderBaby}}|{{Adult}}|{{Stompy}}|",
|
||||
"Stats: |{{Damage}}|{{Speed}}|{{Tears}}|{{Range}}|{{Shotspeed}}|{{Luck}}|{{AngelChance}}|{{DevilChance}}|{{AngelDevilChance}}|{{PlanetariumChance}}|{{Crone}}|",
|
||||
"Stats: |{{Damage}}|{{Speed}}|{{Tears}}|{{Range}}|{{Shotspeed}}|{{Luck}}|{{AngelChance}}|{{DevilChance}}|{{AngelDevilChance}}|{{PlanetariumChance}}|{{TreasureRoomChance}}|",
|
||||
"Stats up: |{{Charm}}|{{Burning}}|{{Crown}}|{{Fear}}|{{Poison}}|{{Slow}}|{{Magnetize}}|{{BrimstoneCurse}}|{{BleedingOut}}|{{Weakness}}|{{Bait}}|{{DeathMark}}|",
|
||||
"Main Colors: {{ColorText}}Text {{ColorTransform}}Transform {{ColorError}}Error {{ColorObjName}}ObjName {{ColorBlack}}Black {{ColorWhite}}White {{ColorRed}}Red {{ColorLime}}Lime {{ColorBlue}}Blue",
|
||||
"Colors: {{ColorYellow}}Yellow {{ColorCyan}}Cyan {{ColorPink}}Pink {{ColorSilver}}Silver {{ColorGray}}Gray {{ColorMaroon}}Maroon {{ColorOlive}}Olive {{ColorGreen}}Green {{ColorPurple}}Purple {{ColorTeal}}Teal {{ColorNavy}}Navy {{ColorOrange}}Orange ",
|
||||
|
||||
+1
-1
@@ -290,7 +290,7 @@ if MCMLoaded then
|
||||
Display = function()
|
||||
EID.MCMCompat_isDisplayingEIDTab = "Visuals"
|
||||
if EID.Config["Language"] == "auto" then
|
||||
return "Language: auto(" .. displayLanguage[AnIndexOf(EID.Languages, EID:getLanguage())] .. ")"
|
||||
return "Language: Auto (" .. displayLanguage[AnIndexOf(EID.Languages, EID:getLanguage())] .. ")"
|
||||
else
|
||||
return "Language: " .. displayLanguage[AnIndexOf(EID.Languages, EID.Config["Language"])]
|
||||
end
|
||||
|
||||
Reference in new issue
Block a user