Prevent certain entities from accidentally recieving a SubType -1 description
This commit is contained in:
1 parent
99dacf8f0a
commit
9597058ecc
2 files changed
+38
No files matched your search
@@ -141,6 +141,10 @@ local dynamicSpriteCache = {} -- used to store sprite objects of collectible ico
|
|||||||
function EID:addCollectible(id, description, itemName, language)
|
function EID:addCollectible(id, description, itemName, language)
|
||||||
itemName = itemName or nil
|
itemName = itemName or nil
|
||||||
language = language or "en_us"
|
language = language or "en_us"
|
||||||
|
if id == -1 then
|
||||||
|
print("EID Error: Trying to add collectible description to id = -1, which is not allowed! (Name: "..tostring(itemName).."; Description: "..tostring(description)..")")
|
||||||
|
return
|
||||||
|
end
|
||||||
local modName = EID._currentMod
|
local modName = EID._currentMod
|
||||||
-- Glitched Items exception so they don't have a mod name
|
-- Glitched Items exception so they don't have a mod name
|
||||||
if id > 4294960000 then modName = nil end
|
if id > 4294960000 then modName = nil end
|
||||||
@@ -156,6 +160,10 @@ end
|
|||||||
function EID:addTrinket(id, description, itemName, language)
|
function EID:addTrinket(id, description, itemName, language)
|
||||||
itemName = itemName or nil
|
itemName = itemName or nil
|
||||||
language = language or "en_us"
|
language = language or "en_us"
|
||||||
|
if id == -1 then
|
||||||
|
print("EID Error: Trying to add trinket description to id = -1, which is not allowed! (Name: "..tostring(itemName).."; Description: "..tostring(description)..")")
|
||||||
|
return
|
||||||
|
end
|
||||||
EID:CreateDescriptionTableIfMissing("custom", language)
|
EID:CreateDescriptionTableIfMissing("custom", language)
|
||||||
EID.descriptions[language].custom["5.350." .. id] = {id, itemName, description, EID._currentMod}
|
EID.descriptions[language].custom["5.350." .. id] = {id, itemName, description, EID._currentMod}
|
||||||
end
|
end
|
||||||
@@ -168,6 +176,10 @@ end
|
|||||||
function EID:addCharacterInfo(characterId, description, playerName, language)
|
function EID:addCharacterInfo(characterId, description, playerName, language)
|
||||||
playerName = playerName or "Modded Character"
|
playerName = playerName or "Modded Character"
|
||||||
language = language or "en_us"
|
language = language or "en_us"
|
||||||
|
if characterId == -1 then
|
||||||
|
print("EID Error: Trying to add character description to id = -1, which is not allowed! (Name: "..tostring(playerName).."; Description: "..tostring(description)..")")
|
||||||
|
return
|
||||||
|
end
|
||||||
EID:CreateDescriptionTableIfMissing("CharacterInfo", language)
|
EID:CreateDescriptionTableIfMissing("CharacterInfo", language)
|
||||||
EID.descriptions[language].CharacterInfo[characterId] = {playerName, description}
|
EID.descriptions[language].CharacterInfo[characterId] = {playerName, description}
|
||||||
end
|
end
|
||||||
@@ -216,6 +228,10 @@ end
|
|||||||
function EID:addCard(id, description, itemName, language)
|
function EID:addCard(id, description, itemName, language)
|
||||||
itemName = itemName or nil
|
itemName = itemName or nil
|
||||||
language = language or "en_us"
|
language = language or "en_us"
|
||||||
|
if id == -1 then
|
||||||
|
print("EID Error: Trying to add card description to id = -1, which is not allowed! (Name: "..tostring(itemName).."; Description: "..tostring(description)..")")
|
||||||
|
return
|
||||||
|
end
|
||||||
EID:CreateDescriptionTableIfMissing("custom", language)
|
EID:CreateDescriptionTableIfMissing("custom", language)
|
||||||
EID.descriptions[language].custom["5.300." .. id] = {id, itemName, description, EID._currentMod}
|
EID.descriptions[language].custom["5.300." .. id] = {id, itemName, description, EID._currentMod}
|
||||||
end
|
end
|
||||||
@@ -242,6 +258,10 @@ end
|
|||||||
function EID:addPill(id, description, itemName, language)
|
function EID:addPill(id, description, itemName, language)
|
||||||
itemName = itemName or nil
|
itemName = itemName or nil
|
||||||
language = language or "en_us"
|
language = language or "en_us"
|
||||||
|
if id == -1 then
|
||||||
|
print("EID Error: Trying to add pill description to id = -1, which is not allowed! (Name: "..tostring(itemName).."; Description: "..tostring(description)..")")
|
||||||
|
return
|
||||||
|
end
|
||||||
EID:CreateDescriptionTableIfMissing("pills", language)
|
EID:CreateDescriptionTableIfMissing("pills", language)
|
||||||
EID:CreateDescriptionTableIfMissing("horsepills", language)
|
EID:CreateDescriptionTableIfMissing("horsepills", language)
|
||||||
EID.descriptions[language].pills[id+1] = {id, itemName, description, EID._currentMod}
|
EID.descriptions[language].pills[id+1] = {id, itemName, description, EID._currentMod}
|
||||||
@@ -260,6 +280,10 @@ function EID:addHorsePill(id, description, itemName, language)
|
|||||||
if not EID.isRepentance then return end
|
if not EID.isRepentance then return end
|
||||||
itemName = itemName or nil
|
itemName = itemName or nil
|
||||||
language = language or "en_us"
|
language = language or "en_us"
|
||||||
|
if id == -1 then
|
||||||
|
print("EID Error: Trying to add horsepill description to id = -1, which is not allowed! (Name: "..tostring(itemName).."; Description: "..tostring(description)..")")
|
||||||
|
return
|
||||||
|
end
|
||||||
EID:CreateDescriptionTableIfMissing("horsepills", language)
|
EID:CreateDescriptionTableIfMissing("horsepills", language)
|
||||||
EID.descriptions[language].horsepills[id+1] = {id, itemName, description, EID._currentMod}
|
EID.descriptions[language].horsepills[id+1] = {id, itemName, description, EID._currentMod}
|
||||||
end
|
end
|
||||||
@@ -283,6 +307,10 @@ end
|
|||||||
function EID:addBirthright(characterId, description, playerName, language)
|
function EID:addBirthright(characterId, description, playerName, language)
|
||||||
playerName = playerName or nil
|
playerName = playerName or nil
|
||||||
language = language or "en_us"
|
language = language or "en_us"
|
||||||
|
if characterId == -1 then
|
||||||
|
print("EID Error: Trying to add Birthright description to id = -1, which is not allowed! (Name: "..tostring(characterId).."; Description: "..tostring(description)..")")
|
||||||
|
return
|
||||||
|
end
|
||||||
EID:CreateDescriptionTableIfMissing("birthright", language)
|
EID:CreateDescriptionTableIfMissing("birthright", language)
|
||||||
EID.descriptions[language].birthright[characterId + 1] = {playerName, "", description}
|
EID.descriptions[language].birthright[characterId + 1] = {playerName, "", description}
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -211,6 +211,16 @@ EID:addColor("ColorBlackBlink", nil, function(color)
|
|||||||
-- Test: Pill effect unidentifyable
|
-- Test: Pill effect unidentifyable
|
||||||
EID:SetPillEffectUnidentifyable(24, true) -- set "I can see forever" to always be unidentifyable
|
EID:SetPillEffectUnidentifyable(24, true) -- set "I can see forever" to always be unidentifyable
|
||||||
|
|
||||||
|
-- Test: Write error for id = -1
|
||||||
|
EID:addCollectible(-1, "Desc", "Fail")
|
||||||
|
EID:addTrinket(-1, "Desc", "Fail")
|
||||||
|
EID:addCharacterInfo(-1, "Desc", "Fail")
|
||||||
|
EID:addCard(-1, "Desc", "Fail")
|
||||||
|
EID:addPill(-1, "Desc", "Fail")
|
||||||
|
EID:addHorsePill(-1, "Desc", "Fail")
|
||||||
|
EID:addBirthright(-1, "Desc", "Fail")
|
||||||
|
|
||||||
|
|
||||||
local function onDebugRender()
|
local function onDebugRender()
|
||||||
EID:renderHUDLocationIndicators()
|
EID:renderHUDLocationIndicators()
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user