From efaac6bc92ef8c0b31bfdce66491c4fc0dd48451 Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Sat, 22 Feb 2025 15:30:13 -0600 Subject: [PATCH] Description changes and additions for REP+ V1.9.7.9/V1.9.7.10 (#805) * Description changes and additions for REP+ V1.9.7.9/V1.9.7.10 * Update main.lua --- .github/scripts/lookuptable_generator.py | 8 ++++---- descriptions/rep+/en_us.lua | 11 +++++++++++ features/eid_api.lua | 7 ++++++- features/eid_xmldata_rep+.lua | 2 +- main.lua | 23 ++++++++++++++--------- 5 files changed, 36 insertions(+), 15 deletions(-) diff --git a/.github/scripts/lookuptable_generator.py b/.github/scripts/lookuptable_generator.py index 92553f74..91fdf54f 100644 --- a/.github/scripts/lookuptable_generator.py +++ b/.github/scripts/lookuptable_generator.py @@ -5,12 +5,12 @@ import xml.etree.ElementTree as ET GENERATE_REP_PLUS = True -filePath = "..\\..\\resources-dlc3\\" -writeToFile = "features/eid_xmldata.lua" +filePath = "..\\..\\..\\..\\resources-dlc3\\" +writeToFile = "../../features/eid_xmldata.lua" if GENERATE_REP_PLUS: - filePath = "..\\..\\extracted_resources\\resources\\" - writeToFile = "features/eid_xmldata_rep+.lua" + filePath = "..\\..\\..\\..\\extracted_resources\\resources\\" + writeToFile = "../../features/eid_xmldata_rep+.lua" # take second element for sort def sortByID(elem): diff --git a/descriptions/rep+/en_us.lua b/descriptions/rep+/en_us.lua index f1ab3695..855067a8 100644 --- a/descriptions/rep+/en_us.lua +++ b/descriptions/rep+/en_us.lua @@ -35,6 +35,8 @@ local collectibles = { [594] = {"594", "Jupiter", "↑ {{EmptyHeart}} +2 Empty heart containers#↓ {{Speed}} -0.3 Speed#{{HealingRed}} Heals 2 heart#{{Speed}} Speed builds up to +0.5 while standing still#{{Poison}} Moving releases poison clouds#{{Poison}} Poison immunity"}, -- Jupiter -- Change: Complete rewrite [632] = {"632", "Evil Charm", "↑ {{Luck}} +2 Luck#Immune to {{Burning}} fire damage, {{Confusion}} confusion, {{Fear}} fear, {{Slow}} spider-webs and {{Poison}} poison effects#Grants 1 second immunity to creep"}, -- Evil Charm + -- Change: Added Shop as a new destination + [660] = {"660", "Card Reading", "Spawns two portals in the first room of each floor#Leaving the room despawns the portals#{{Blank}} {{ColorRed}}Red: {{CR}}{{BossRoom}} Boss Room#{{Blank}} {{ColorYellow}}Yellow: {{CR}}{{TreasureRoom}} Item Room#{{Blank}} {{ColorBlue}}Blue: {{CR}}{{SecretRoom}} Secret Room#{{Blank}} {{ColorGreen}}Green: {{CR}}{{Shop}} Shop"}, -- Card Reading -- Change: Complete rewrite [681] = {"681", "Lil Portal", "Double-tapping a fire button launches the portal#Deals contact damage when launched#Consumes pickups in its path#Each pickup consumed increases its size, damage, and spawns a blue fly#Consuming 2-3 pickups spawns a portal to a special room and the familiar disappears for the rest of the floor#The content of the room persists for the rest of the run"}, -- Lil Portal -- Change: Added info about the damage based on item quality @@ -58,6 +60,15 @@ local trinkets = { } EID:updateDescriptionsViaTable(trinkets, EID.descriptions[languageCode].trinkets) +---------- Cards ---------- + +local cards = { + -- Change: Complete rewrite + [38] = {"38", "Berkano", "{{Collectible706}} Summons 3 Abyss locusts for the room"}, -- Berkano +} +EID:updateDescriptionsViaTable(cards, EID.descriptions[languageCode].cards) + + ---------- Conditions ---------- EID.descriptions[languageCode].ConditionalDescs["5.100.566"] = nil -- Dream Catcher (Greed) - In Rep+, the dream preview works in greed mode as well, so no changes needed diff --git a/features/eid_api.lua b/features/eid_api.lua index 4a124af7..0a2168d1 100644 --- a/features/eid_api.lua +++ b/features/eid_api.lua @@ -1005,7 +1005,12 @@ function EID:hasDescription(entity) isAllowed = not entity:GetSprite():IsPlaying("Broken") and not entity:GetSprite():IsPlaying("Prize") and not entity:GetSprite():IsPlaying("OutOfPrizes") and (EID.CraneItemType[entity.InitSeed.."Drop"..entity.DropSeed] or EID.CraneItemType[tostring(entity.InitSeed)]) end if entity.Type == 1000 then - if (entity.Variant == 161 and entity.SubType <= 2) or (entity.Variant == EffectVariant.DICE_FLOOR and EID.Config["DisplayDiceInfo"]) then + if entity.Variant == 161 then + if entity.SubType <= 2 or (EID.isRepentancePlus and entity.SubType == 3) then + isAllowed = true + end + end + if entity.Variant == EffectVariant.DICE_FLOOR and EID.Config["DisplayDiceInfo"] then isAllowed = true end end diff --git a/features/eid_xmldata_rep+.lua b/features/eid_xmldata_rep+.lua index 96ea0f73..fed4f54e 100644 --- a/features/eid_xmldata_rep+.lua +++ b/features/eid_xmldata_rep+.lua @@ -44,7 +44,7 @@ EID.XMLItemPools = {{{1, 1.0}, {2, 1.0}, {3, 1.0}, {4, 1.0}, {5, 1.0}, {6, 1.0}, EID.XMLItemIsInPools = {[1] = {0, 16, 23}, [2] = {0, 16}, [3] = {0, 16, 23}, [4] = {0, 16, 23}, [5] = {0, 16, 23}, [6] = {0, 16}, [7] = {0, 4, 16, 21, 29}, [8] = {0, 3, 16, 28}, [9] = {7}, [10] = {0, 13, 16, 28}, [11] = {5, 18, 22}, [12] = {0, 16, 17, 24}, [13] = {0, 11, 16, 24}, [14] = {0, 2, 11, 17}, [15] = {0, 16, 24}, [16] = {5, 17, 22}, [17] = {0, 5, 13, 16, 22}, [18] = {}, [19] = {0, 16}, [20] = {5, 22}, [21] = {1, 10, 23}, [22] = {2, 10, 17}, [23] = {2, 10, 17}, [24] = {2, 10, 17}, [25] = {2, 10, 17}, [26] = {2, 10, 17, 30}, [27] = {2, 17, 29}, [28] = {2, 8, 17}, [29] = {2, 8, 15, 17, 27}, [30] = {2, 15, 17, 24, 27}, [31] = {2, 15, 17, 24, 27}, [32] = {2, 8, 17, 23}, [33] = {1, 4, 6, 21}, [34] = {3, 6, 16, 20}, [35] = {3, 5, 6, 16, 20, 22}, [36] = {0, 7, 16}, [37] = {0, 16, 25}, [38] = {0, 16, 23}, [39] = {0, 15, 16, 27}, [40] = {0, 16, 24}, [41] = {0, 15, 16, 27}, [42] = {0, 16, 30}, [44] = {0, 23}, [45] = {0, 16, 24}, [46] = {0, 10, 18, 23}, [47] = {0, 16, 23}, [48] = {0, 16, 23}, [49] = {0, 16, 23, 24}, [50] = {16}, [51] = {2, 3, 11, 12, 17, 19, 20, 23, 24}, [52] = {0, 16}, [53] = {0, 24}, [54] = {1, 10}, [55] = {0, 15, 16, 27}, [56] = {0, 16}, [57] = {0, 13, 16, 28}, [58] = {0, 6}, [59] = {}, [60] = {1, 29}, [62] = {0, 16}, [63] = {1, 14, 18, 23}, [64] = {1, 16}, [65] = {0, 6, 16}, [66] = {0, 16, 23}, [67] = {0, 3, 16, 20, 24, 28}, [68] = {0, 16, 20, 23}, [69] = {0, 16}, [70] = {2, 11, 17}, [71] = {0, 17}, [72] = {0, 4, 21, 24}, [73] = {17, 18, 24, 28}, [74] = {3, 8, 20}, [75] = {0, 1, 18}, [76] = {0, 18}, [77] = {0, 16, 23}, [78] = {0, 4, 6, 16, 21}, [79] = {3, 11, 12, 19, 20, 24}, [80] = {3, 11, 12, 19, 20, 24}, [81] = {3, 9, 12, 19, 20}, [82] = {3, 11, 20, 24}, [83] = {3, 11, 20}, [84] = {3, 5, 18, 22}, [85] = {0, 1, 16, 23}, [86] = {0, 16}, [87] = {0, 11, 16}, [88] = {0, 16, 28}, [89] = {0, 16, 23}, [90] = {23}, [91] = {0, 18, 23}, [92] = {0, 2, 16, 17}, [93] = {0, 16, 23}, [94] = {0, 16}, [95] = {0, 16, 23, 28}, [96] = {0, 16, 24, 28}, [97] = {0, 3, 6, 16, 20}, [98] = {0, 4, 16, 21}, [99] = {0, 16, 28}, [100] = {0, 16, 28}, [101] = {0, 4, 16, 17, 21}, [102] = {0, 1, 10, 11, 15, 16, 23, 27}, [103] = {0, 16}, [104] = {0, 16}, [105] = {0, 18, 23, 24}, [106] = {0, 16, 25}, [107] = {0, 16}, [108] = {0, 4, 16, 21}, [109] = {0, 3, 20, 24}, [110] = {0, 15, 16, 24, 27}, [111] = {0, 10, 16}, [112] = {4, 21, 28}, [113] = {0, 3, 16, 20, 28}, [114] = {0, 3, 15, 16, 20, 27}, [115] = {0, 3, 16, 20}, [116] = {1, 14, 18, 23}, [117] = {0, 16, 28}, [118] = {3, 20, 24}, [119] = {24}, [120] = {0, 5, 16, 17, 22}, [121] = {0, 5, 16, 17, 22}, [122] = {3, 11, 20, 24}, [123] = {0, 3, 6, 16, 20}, [124] = {0, 4, 16, 21}, [125] = {0, 16, 25}, [126] = {0, 11, 12, 16, 19}, [127] = {0, 3, 5, 11, 16, 22}, [128] = {0, 13, 16, 28}, [129] = {0, 16}, [130] = {}, [131] = {0, 16}, [132] = {16, 17, 20}, [133] = {3, 9, 12, 19, 20}, [134] = {3, 9, 12, 19, 20}, [135] = {24}, [136] = {0, 16, 23}, [137] = {0, 1, 16, 18, 23, 24, 25}, [138] = {0, 4, 16, 21, 29}, [139] = {1, 15, 18, 27}, [140] = {0, 9, 16, 25, 30}, [141] = {2}, [142] = {0, 4, 16, 21}, [143] = {0, 2, 11, 17}, [144] = {0, 10, 28}, [145] = {3, 9, 12, 19, 20}, [146] = {0, 4, 16, 21}, [147] = {1, 18, 23}, [148] = {0, 16}, [149] = {0, 16}, [150] = {0, 16}, [151] = {0, 16}, [152] = {0, 16, 23}, [153] = {0, 16, 23}, [154] = {0, 16}, [155] = {0, 16, 28}, [156] = {1, 4, 18}, [157] = {0, 3, 16, 20, 24}, [158] = {}, [159] = {3, 11, 20, 24}, [160] = {0, 16}, [161] = {0, 16}, [162] = {0, 4, 16, 21}, [163] = {0, 3, 16, 28}, [164] = {1, 18}, [165] = {2, 17}, [166] = {0, 18, 23, 24}, [167] = {0, 16, 24, 28}, [168] = {0, 5, 16, 22}, [169] = {0, 16}, [170] = {0, 16, 28}, [171] = {0, 16}, [172] = {0, 3, 16, 20}, [173] = {0, 4}, [174] = {0, 16, 28}, [175] = {0, 13, 16, 27}, [176] = {0, 2, 17, 24}, [177] = {24}, [178] = {0, 4, 16, 21}, [179] = {8}, [180] = {0, 10, 16}, [181] = {}, [182] = {4, 21, 24}, [183] = {2, 17, 29}, [184] = {4, 21}, [185] = {4, 21}, [186] = {0, 3, 16}, [187] = {3, 20}, [188] = {0, 16, 28}, [189] = {0, 16, 23}, [190] = {0, 5, 16, 22, 25}, [191] = {0, 16}, [192] = {0, 6, 16}, [193] = {2, 17, 24}, [194] = {2, 8, 17, 23}, [195] = {1, 2, 10, 11, 15, 17, 27}, [196] = {2, 8, 17, 23}, [197] = {2, 4, 17, 21}, [198] = {2, 10, 17}, [199] = {1, 13, 15, 18, 27}, [200] = {0, 15, 16, 27}, [201] = {0, 16}, [202] = {0, 16}, [203] = {1, 16}, [204] = {1, 10, 18}, [205] = {1, 14, 18}, [206] = {0, 16}, [207] = {17, 28}, [208] = {1, 18, 23, 24}, [209] = {0, 7, 16, 25}, [210] = {0, 16}, [211] = {0, 16}, [212] = {3, 9, 12, 19, 20, 23}, [213] = {0, 5, 16, 22}, [214] = {0, 16, 24}, [215] = {3, 12}, [216] = {3, 11, 12, 19, 20}, [217] = {0, 15, 16, 27}, [218] = {2, 17}, [219] = {2, 17}, [220] = {0, 16, 25}, [221] = {0, 16}, [222] = {0, 16}, [223] = {0, 16}, [224] = {0, 16}, [225] = {0, 3, 11, 12, 19, 20}, [226] = {5, 16, 22}, [227] = {0, 1, 23}, [228] = {0, 15, 16, 27}, [229] = {0, 16}, [230] = {3, 11, 20, 24}, [231] = {0, 16}, [232] = {1, 18, 23}, [233] = {0, 16}, [234] = {0, 16}, [236] = {0, 16}, [237] = {0, 3, 16, 20}, [238] = {}, [239] = {}, [240] = {0, 2, 11, 17}, [241] = {3, 11, 12}, [242] = {0, 5, 16, 22}, [243] = {4, 21}, [244] = {0, 16, 23}, [245] = {0, 16}, [246] = {1, 10, 18}, [247] = {1, 18, 24}, [248] = {1, 18}, [249] = {1}, [250] = {1, 16}, [251] = {1, 18, 23}, [252] = {1, 18}, [253] = {2, 17, 24}, [254] = {2, 16, 17, 24}, [255] = {2, 8, 17, 23}, [256] = {0, 16, 25}, [257] = {0, 16}, [258] = {5, 16, 22}, [259] = {3, 11, 20}, [260] = {1, 12, 18, 19}, [261] = {0, 16, 24}, [262] = {3, 5, 11, 20, 22}, [263] = {5, 22, 23}, [264] = {0, 13, 16, 28}, [265] = {0, 16, 28}, [266] = {0, 16, 28}, [267] = {0, 16, 23, 28}, [268] = {0, 3, 16, 20, 28, 30}, [269] = {0, 3, 16, 20, 28}, [270] = {0, 16, 20, 28}, [271] = {0, 5, 10, 16, 22}, [272] = {0, 13, 16, 28}, [273] = {0, 16, 28, 30}, [274] = {0, 13, 16, 28}, [275] = {0, 3, 16, 20, 28}, [276] = {0, 16, 24}, [277] = {0, 16, 28}, [278] = {0, 3, 11, 28}, [279] = {0, 13, 16, 28}, [280] = {0, 16, 28}, [281] = {0, 16, 28}, [282] = {0, 6}, [283] = {0, 18, 23}, [284] = {0, 18, 23}, [285] = {0, 18, 23}, [286] = {1, 5, 18, 22}, [287] = {0, 5, 6}, [288] = {0, 16}, [289] = {1, 18, 24}, [290] = {1, 18}, [291] = {0, 16}, [292] = {0, 3, 6, 20}, [293] = {}, [294] = {0, 10, 16}, [295] = {0, 1, 16}, [296] = {1, 18}, [297] = {1, 9, 18}, [298] = {0}, [299] = {0, 16}, [300] = {0, 16}, [301] = {0, 16}, [302] = {0, 16}, [303] = {0, 16}, [304] = {0, 16}, [305] = {0, 16}, [306] = {0, 16}, [307] = {0, 16}, [308] = {0, 16}, [309] = {0, 16}, [310] = {0, 16}, [311] = {3, 20}, [312] = {0, 16}, [313] = {0, 4, 21}, [314] = {0, 16}, [315] = {0, 16}, [316] = {0, 5, 9, 16, 22}, [317] = {0, 16}, [318] = {0, 16, 28}, [319] = {0, 16}, [320] = {0, 13, 16, 28}, [321] = {0, 5, 16, 22}, [322] = {0, 16, 28}, [323] = {0, 16}, [324] = {0}, [325] = {0, 16}, [326] = {4, 21}, [327] = {}, [328] = {}, [329] = {0, 16}, [330] = {0, 16}, [331] = {4, 21}, [332] = {0, 4, 16, 21}, [333] = {0, 4, 16, 21}, [334] = {0, 4, 16, 21, 24}, [335] = {0, 4, 16, 21}, [336] = {0, 16, 30}, [337] = {1, 23}, [338] = {1, 18, 23}, [339] = {2, 17}, [340] = {2, 11, 17}, [341] = {2, 8, 17, 27}, [342] = {2, 17}, [343] = {2, 8, 13, 17}, [344] = {2, 8, 17}, [345] = {2, 11, 17}, [346] = {2, 17}, [347] = {1, 18}, [348] = {1, 5, 18, 22}, [349] = {1, 16, 29}, [350] = {0}, [351] = {0, 16}, [352] = {0, 16, 23}, [353] = {0, 16, 25}, [354] = {2, 8, 17}, [355] = {2, 8, 15, 17, 27}, [356] = {1, 14, 18}, [357] = {1, 16, 23}, [358] = {0, 16}, [359] = {0, 16}, [360] = {3, 20, 28}, [361] = {0, 16, 28}, [362] = {0, 10, 16, 23, 29}, [363] = {4, 21, 28}, [364] = {0, 13, 16, 28}, [365] = {0, 13, 16, 28}, [366] = {0, 16, 25}, [367] = {0, 16, 25}, [368] = {0, 16}, [369] = {0, 16}, [370] = {2, 8, 17, 23}, [371] = {0, 9, 12, 16, 19}, [372] = {1, 14, 18, 28}, [373] = {0, 16, 24}, [374] = {0, 4, 16, 21}, [375] = {0, 16}, [376] = {1, 10}, [377] = {0, 16}, [378] = {0, 7, 16}, [379] = {0, 16}, [380] = {1, 16, 18}, [381] = {0, 16}, [382] = {0, 16, 23}, [383] = {1, 16, 23}, [384] = {0, 16, 28}, [385] = {0, 10, 28}, [386] = {0, 18, 23}, [387] = {4, 21}, [388] = {0, 5, 13, 28}, [389] = {0, 5, 16, 22}, [390] = {0, 4, 16, 21, 28}, [391] = {0, 3, 16, 20}, [392] = {0, 16}, [393] = {0, 16}, [394] = {0, 16, 24}, [395] = {0, 16, 23}, [396] = {1}, [397] = {0, 16, 23}, [398] = {0, 16}, [399] = {3, 20, 24}, [400] = {4, 21}, [401] = {0, 16}, [402] = {1, 5, 18, 22}, [403] = {1, 18, 23, 28}, [404] = {0, 16, 28}, [405] = {0, 5, 18, 22}, [406] = {0, 18, 23}, [407] = {0, 4, 16, 21}, [408] = {3, 12, 19, 20}, [409] = {3, 11, 20}, [410] = {0, 16}, [411] = {0, 3, 16, 20, 24}, [412] = {3, 20, 24}, [413] = {4, 21}, [414] = {1, 18}, [415] = {4, 21}, [416] = {1, 18}, [417] = {3, 20, 28}, [418] = {0, 16}, [419] = {0, 23}, [420] = {3, 11, 20}, [421] = {0, 16, 24}, [422] = {0, 1, 16, 23}, [423] = {4, 21}, [424] = {1, 5, 22}, [425] = {1, 16, 23}, [426] = {0, 13, 16, 28}, [427] = {0, 16, 23}, [428] = {2, 8, 17}, [429] = {}, [430] = {0, 13, 16, 28}, [431] = {0, 3, 16, 20, 28}, [432] = {0, 16, 25}, [433] = {3, 20}, [434] = {1, 16, 18}, [435] = {0, 16, 24, 28}, [436] = {0, 16}, [437] = {0, 23}, [438] = {2, 8, 17, 23}, [439] = {1, 15, 18, 23, 27, 29}, [440] = {0, 16}, [441] = {3, 20}, [442] = {3, 12, 19, 20}, [443] = {0, 16, 24}, [444] = {0, 8, 16, 23}, [445] = {0, 16}, [446] = {0, 16}, [447] = {0, 10, 16}, [448] = {0, 16}, [449] = {0, 16}, [450] = {5, 16, 22}, [451] = {1, 12, 18, 19, 23}, [452] = {0, 16, 24}, [453] = {0, 16}, [454] = {0, 16}, [455] = {2, 8, 10, 17, 27}, [456] = {2, 8, 10, 17}, [457] = {0, 16}, [458] = {0, 16}, [459] = {0, 16}, [460] = {0, 16}, [461] = {0, 16}, [462] = {3, 20, 24}, [463] = {0, 16}, [464] = {4}, [465] = {0, 16, 23}, [466] = {0, 16, 24}, [467] = {0, 16}, [468] = {3, 12, 19, 20, 28}, [469] = {0, 16}, [470] = {0, 16, 28}, [471] = {0, 16, 28}, [472] = {1, 18, 28}, [473] = {0, 16, 28}, [474] = {}, [475] = {1, 3, 9, 11, 12, 18, 19, 24}, [476] = {0, 18, 23}, [477] = {3, 4, 18}, [478] = {0, 18, 23}, [479] = {1, 18}, [480] = {1, 30}, [481] = {0, 18, 24}, [482] = {0, 18}, [483] = {1, 18, 25}, [484] = {}, [485] = {0, 1, 10, 18}, [486] = {1, 18}, [487] = {1, 11, 18}, [488] = {0, 18, 23, 29}, [489] = {5, 18, 22}, [490] = {4, 21}, [491] = {0, 16, 28}, [492] = {0, 13, 16, 28}, [493] = {0, 11, 16}, [494] = {0, 14, 16, 23}, [495] = {0, 16}, [496] = {0, 11, 12, 16, 19}, [497] = {0, 16}, [498] = {3, 4}, [499] = {4, 21}, [500] = {5, 18, 22}, [501] = {5, 22}, [502] = {0, 16}, [503] = {3, 11, 12, 16, 19, 20}, [504] = {0, 7, 16}, [505] = {1, 23}, [506] = {0, 3, 16, 20, 24}, [507] = {0, 16}, [508] = {0, 15, 16, 27}, [509] = {0, 16, 28}, [510] = {4, 21}, [511] = {0, 13, 16, 24, 28}, [512] = {0, 16, 18}, [513] = {0, 16}, [514] = {1, 16}, [515] = {1, 16, 18, 23}, [516] = {0, 16, 18, 23}, [517] = {0, 16, 25}, [518] = {1, 16, 18, 23, 28}, [519] = {3, 4, 20, 21, 28}, [520] = {1, 14, 16}, [521] = {1, 18}, [522] = {0, 16}, [523] = {1}, [524] = {0, 16, 23}, [525] = {0, 16}, [526] = {3, 4, 20, 21}, [527] = {1, 13, 18, 23, 29}, [528] = {4, 21}, [529] = {0, 16}, [530] = {3}, [531] = {0, 16, 24}, [532] = {0, 16}, [533] = {4, 21}, [534] = {1, 8, 18}, [535] = {1, 18}, [536] = {3, 12, 19, 20}, [537] = {0, 16, 28}, [538] = {2, 17, 23}, [539] = {0, 16, 28}, [540] = {0, 16}, [541] = {2, 17, 24}, [542] = {0, 16}, [543] = {0, 4, 16, 21}, [544] = {0, 16}, [545] = {0, 3, 6, 16, 20}, [546] = {5, 22, 27}, [547] = {2, 17, 27}, [548] = {0, 16}, [549] = {0, 16}, [550] = {}, [551] = {}, [552] = {}, [553] = {0, 16}, [554] = {3, 20, 24}, [555] = {0, 16}, [556] = {3, 20, 24}, [557] = {0, 16}, [558] = {0, 16}, [559] = {0, 14, 16}, [560] = {0, 16}, [561] = {0, 16}, [562] = {5, 22}, [563] = {0, 16, 25}, [564] = {2, 17}, [565] = {0, 9, 12, 16, 19, 24, 28}, [566] = {1, 18}, [567] = {4, 21}, [568] = {4, 21}, [569] = {3, 12, 19, 20}, [570] = {0, 16}, [571] = {5, 8, 22}, [572] = {3, 20, 24}, [573] = {4, 21, 24}, [574] = {4, 21}, [575] = {0, 16, 28}, [576] = {0, 7, 16}, [577] = {3, 20}, [578] = {0, 16}, [579] = {4, 21}, [580] = {5, 9, 12, 13, 15, 24}, [581] = {0, 13, 16, 28}, [582] = {5, 22}, [583] = {0, 16, 25}, [584] = {4, 6, 21}, [585] = {1, 18}, [586] = {4, 21}, [588] = {26}, [589] = {26}, [590] = {26}, [591] = {26}, [592] = {26}, [593] = {26}, [594] = {26}, [595] = {26}, [596] = {26}, [597] = {26}, [598] = {26}, [599] = {1, 23}, [600] = {2, 17}, [601] = {4, 21}, [602] = {1, 16}, [603] = {1, 14, 18}, [604] = {1, 18, 23, 27}, [605] = {0, 16}, [606] = {3, 20, 24}, [607] = {0, 16, 24, 28}, [608] = {0, 16, 28}, [609] = {0, 5, 18, 22, 23}, [610] = {0, 16, 28}, [611] = {0, 16}, [612] = {0, 5, 16, 22, 28}, [614] = {0, 16, 24, 25}, [615] = {0, 16, 28}, [616] = {0, 16, 24}, [617] = {0, 16, 23}, [618] = {0, 16, 24, 30}, [619] = {1, 18}, [621] = {1, 18, 24}, [622] = {4, 21}, [623] = {1, 13, 18}, [624] = {1, 2, 17, 18, 23}, [625] = {0, 5, 16, 22}, [626] = {}, [627] = {}, [628] = {5, 22}, [629] = {0, 13, 16, 23, 28}, [631] = {0, 16}, [632] = {5, 22}, [633] = {}, [634] = {3, 4, 20, 21}, [635] = {0, 16, 28}, [636] = {5, 18, 22}, [637] = {0, 16, 24}, [638] = {1, 18, 23}, [639] = {0, 16, 30}, [640] = {4, 21}, [641] = {0, 16}, [642] = {1, 9, 12, 19}, [643] = {4, 21}, [644] = {2, 8, 17, 23}, [645] = {0, 16, 28}, [646] = {3, 20, 25}, [647] = {1, 14, 18}, [649] = {0, 13, 16, 23, 28}, [650] = {0, 16, 24}, [651] = {4, 21}, [652] = {0, 16, 28}, [653] = {4, 21}, [654] = {3, 9, 12, 19, 20, 24}, [655] = {0, 16, 23}, [656] = {}, [657] = {0, 16, 24}, [658] = {0, 16}, [659] = {2, 17}, [660] = {1}, [661] = {0, 16, 28}, [663] = {0, 16}, [664] = {5, 22}, [665] = {3, 9, 12, 19, 20}, [667] = {5, 16, 18, 22}, [668] = {}, [669] = {5, 22}, [670] = {1}, [671] = {0, 16, 24}, [672] = {3, 11}, [673] = {}, [674] = {5, 18, 22}, [675] = {0, 5, 16}, [676] = {0, 11, 16}, [677] = {0, 5, 16, 22}, [678] = {0, 16, 24}, [679] = {3, 20, 28}, [680] = {0, 16}, [681] = {0, 16}, [682] = {0, 16, 24, 28}, [683] = {0, 16}, [684] = {3, 20, 24}, [685] = {4, 21}, [686] = {4, 21}, [687] = {0, 16, 23}, [688] = {5, 18, 22}, [689] = {5, 18, 22}, [690] = {0, 16}, [691] = {4, 5, 18, 21, 22}, [692] = {3, 12, 18, 19, 20, 24}, [693] = {0, 13, 16}, [694] = {3, 12, 19, 20, 24}, [695] = {0, 3, 16, 20, 24}, [696] = {4, 21}, [697] = {5, 12, 28}, [698] = {3, 20, 28}, [699] = {3, 20}, [700] = {5, 18, 22, 24}, [701] = {5, 18, 22}, [702] = {3, 12, 19, 20, 24}, [703] = {0, 5, 16, 18, 22, 24}, [704] = {3, 20, 24}, [705] = {3, 20, 24}, [706] = {3, 20, 24}, [707] = {2, 10, 17}, [708] = {2, 8, 17}, [709] = {0, 16, 23}, [710] = {0, 16}, [711] = {5, 12, 18, 19, 22, 24}, [712] = {3, 6, 20}, [713] = {0, 16}, [714] = {}, [715] = {}, [716] = {1, 5, 16, 22}, [717] = {0, 5, 16, 22}, [719] = {1, 5, 16, 22, 29}, [720] = {0, 16, 23}, [721] = {5, 16, 18, 22}, [722] = {0, 16, 18}, [723] = {0, 5, 18, 22, 23}, [724] = {0, 16, 24}, [725] = {0, 16}, [726] = {0, 16, 24}, [727] = {0, 16, 25}, [728] = {0, 3, 16, 20, 24, 28}, [729] = {0, 16}, [730] = {2, 8, 17, 23}, [731] = {2, 17}, [732] = {8, 15, 18, 27}, } --Metadata found in Pocketitems.xml -EID.cardMetadata = {[0] = {mimiccharge=0}, [1] = {mimiccharge=2}, [10] = {mimiccharge=2}, [11] = {mimiccharge=4}, [12] = {mimiccharge=3}, [13] = {mimiccharge=3}, [14] = {mimiccharge=3}, [15] = {mimiccharge=6}, [16] = {mimiccharge=3}, [17] = {mimiccharge=3}, [18] = {mimiccharge=2}, [19] = {mimiccharge=2}, [2] = {mimiccharge=2}, [20] = {mimiccharge=12}, [21] = {mimiccharge=6}, [22] = {mimiccharge=3}, [23] = {mimiccharge=12}, [24] = {mimiccharge=12}, [25] = {mimiccharge=12}, [26] = {mimiccharge=12}, [27] = {mimiccharge=6}, [28] = {mimiccharge=6}, [29] = {mimiccharge=6}, [3] = {mimiccharge=2}, [30] = {mimiccharge=6}, [31] = {mimiccharge=2}, [32] = {mimiccharge=2}, [33] = {mimiccharge=12}, [34] = {mimiccharge=4}, [35] = {mimiccharge=6}, [36] = {mimiccharge=2}, [37] = {mimiccharge=4}, [38] = {mimiccharge=2}, [39] = {mimiccharge=4}, [4] = {mimiccharge=3}, [40] = {mimiccharge=3}, [41] = {mimiccharge=4}, [42] = {mimiccharge=6}, [43] = {mimiccharge=6}, [44] = {mimiccharge=1}, [45] = {mimiccharge=6}, [46] = {mimiccharge=1}, [47] = {mimiccharge=2}, [48] = {mimiccharge=1}, [49] = {mimiccharge=4}, [5] = {mimiccharge=4}, [50] = {mimiccharge=3}, [51] = {mimiccharge=4}, [52] = {mimiccharge=3}, [53] = {mimiccharge=12}, [54] = {mimiccharge=3}, [55] = {mimiccharge=1}, [56] = {mimiccharge=12}, [57] = {mimiccharge=4}, [58] = {mimiccharge=4}, [59] = {mimiccharge=4}, [6] = {mimiccharge=12}, [60] = {mimiccharge=2}, [61] = {mimiccharge=12}, [62] = {mimiccharge=4}, [63] = {mimiccharge=2}, [64] = {mimiccharge=12}, [65] = {mimiccharge=2}, [66] = {mimiccharge=4}, [67] = {mimiccharge=3}, [68] = {mimiccharge=6}, [69] = {mimiccharge=4}, [7] = {mimiccharge=6}, [70] = {mimiccharge=6}, [71] = {mimiccharge=4}, [72] = {mimiccharge=4}, [73] = {mimiccharge=12}, [74] = {mimiccharge=2}, [75] = {mimiccharge=6}, [76] = {mimiccharge=12}, [77] = {mimiccharge=2}, [78] = {mimiccharge=4}, [79] = {mimiccharge=12}, [8] = {mimiccharge=3}, [80] = {mimiccharge=6}, [81] = {mimiccharge=4}, [82] = {mimiccharge=3}, [83] = {mimiccharge=6}, [84] = {mimiccharge=2}, [85] = {mimiccharge=3}, [86] = {mimiccharge=4}, [87] = {mimiccharge=6}, [88] = {mimiccharge=6}, [89] = {mimiccharge=1}, [9] = {mimiccharge=6}, [90] = {mimiccharge=4}, [91] = {mimiccharge=3}, [92] = {mimiccharge=12}, [93] = {mimiccharge=12}, [94] = {mimiccharge=6}, [95] = {mimiccharge=4}, [96] = {mimiccharge=6}, [97] = {mimiccharge=4}, } +EID.cardMetadata = {[0] = {mimiccharge=0}, [1] = {mimiccharge=2}, [10] = {mimiccharge=2}, [11] = {mimiccharge=4}, [12] = {mimiccharge=3}, [13] = {mimiccharge=3}, [14] = {mimiccharge=3}, [15] = {mimiccharge=6}, [16] = {mimiccharge=3}, [17] = {mimiccharge=3}, [18] = {mimiccharge=2}, [19] = {mimiccharge=2}, [2] = {mimiccharge=2}, [20] = {mimiccharge=12}, [21] = {mimiccharge=6}, [22] = {mimiccharge=3}, [23] = {mimiccharge=12}, [24] = {mimiccharge=12}, [25] = {mimiccharge=12}, [26] = {mimiccharge=12}, [27] = {mimiccharge=6}, [28] = {mimiccharge=6}, [29] = {mimiccharge=6}, [3] = {mimiccharge=2}, [30] = {mimiccharge=6}, [31] = {mimiccharge=2}, [32] = {mimiccharge=2}, [33] = {mimiccharge=12}, [34] = {mimiccharge=4}, [35] = {mimiccharge=6}, [36] = {mimiccharge=2}, [37] = {mimiccharge=4}, [38] = {mimiccharge=4}, [39] = {mimiccharge=4}, [4] = {mimiccharge=3}, [40] = {mimiccharge=3}, [41] = {mimiccharge=4}, [42] = {mimiccharge=6}, [43] = {mimiccharge=6}, [44] = {mimiccharge=1}, [45] = {mimiccharge=6}, [46] = {mimiccharge=1}, [47] = {mimiccharge=2}, [48] = {mimiccharge=1}, [49] = {mimiccharge=4}, [5] = {mimiccharge=4}, [50] = {mimiccharge=3}, [51] = {mimiccharge=4}, [52] = {mimiccharge=3}, [53] = {mimiccharge=12}, [54] = {mimiccharge=3}, [55] = {mimiccharge=1}, [56] = {mimiccharge=12}, [57] = {mimiccharge=4}, [58] = {mimiccharge=4}, [59] = {mimiccharge=4}, [6] = {mimiccharge=12}, [60] = {mimiccharge=2}, [61] = {mimiccharge=12}, [62] = {mimiccharge=4}, [63] = {mimiccharge=2}, [64] = {mimiccharge=12}, [65] = {mimiccharge=2}, [66] = {mimiccharge=4}, [67] = {mimiccharge=3}, [68] = {mimiccharge=6}, [69] = {mimiccharge=4}, [7] = {mimiccharge=6}, [70] = {mimiccharge=6}, [71] = {mimiccharge=4}, [72] = {mimiccharge=4}, [73] = {mimiccharge=12}, [74] = {mimiccharge=2}, [75] = {mimiccharge=6}, [76] = {mimiccharge=12}, [77] = {mimiccharge=2}, [78] = {mimiccharge=4}, [79] = {mimiccharge=12}, [8] = {mimiccharge=3}, [80] = {mimiccharge=6}, [81] = {mimiccharge=4}, [82] = {mimiccharge=3}, [83] = {mimiccharge=6}, [84] = {mimiccharge=2}, [85] = {mimiccharge=3}, [86] = {mimiccharge=4}, [87] = {mimiccharge=6}, [88] = {mimiccharge=6}, [89] = {mimiccharge=1}, [9] = {mimiccharge=6}, [90] = {mimiccharge=4}, [91] = {mimiccharge=3}, [92] = {mimiccharge=12}, [93] = {mimiccharge=12}, [94] = {mimiccharge=6}, [95] = {mimiccharge=4}, [96] = {mimiccharge=6}, [97] = {mimiccharge=4}, } EID.pillMetadata = {[0] = {mimiccharge=1, class="1+"}, [1] = {mimiccharge=2, class="2-"}, [10] = {mimiccharge=6, class="2+"}, [11] = {mimiccharge=4, class="3-"}, [12] = {mimiccharge=6, class="3+"}, [13] = {mimiccharge=4, class="3-"}, [14] = {mimiccharge=6, class="3+"}, [15] = {mimiccharge=4, class="3-"}, [16] = {mimiccharge=6, class="3+"}, [17] = {mimiccharge=4, class="3-"}, [18] = {mimiccharge=6, class="3+"}, [19] = {mimiccharge=1, class="1"}, [2] = {mimiccharge=12, class="2+"}, [20] = {mimiccharge=12, class="2+"}, [21] = {mimiccharge=4, class="2"}, [22] = {mimiccharge=6, class="1-"}, [23] = {mimiccharge=4, class="2+"}, [24] = {mimiccharge=2, class="1+"}, [25] = {mimiccharge=6, class="2-"}, [26] = {mimiccharge=3, class="1+"}, [27] = {mimiccharge=6, class="1-"}, [28] = {mimiccharge=2, class="1+"}, [29] = {mimiccharge=6, class="1-"}, [3] = {mimiccharge=1, class="2"}, [30] = {mimiccharge=2, class="0"}, [31] = {mimiccharge=6, class="1-"}, [32] = {mimiccharge=6, class="1"}, [33] = {mimiccharge=6, class="1"}, [34] = {mimiccharge=2, class="1+"}, [35] = {mimiccharge=2, class="1+"}, [36] = {mimiccharge=3, class="1+"}, [37] = {mimiccharge=6, class="1-"}, [38] = {mimiccharge=1, class="1+"}, [39] = {mimiccharge=1, class="0-"}, [4] = {mimiccharge=3, class="1"}, [40] = {mimiccharge=1, class="0+"}, [41] = {mimiccharge=3, class="1"}, [42] = {mimiccharge=6, class="1"}, [43] = {mimiccharge=4, class="2+"}, [44] = {mimiccharge=1, class="0"}, [45] = {mimiccharge=1, class="1+"}, [46] = {mimiccharge=6, class="2+"}, [47] = {mimiccharge=4, class="1-"}, [48] = {mimiccharge=6, class="1+"}, [49] = {mimiccharge=3, class="3"}, [5] = {mimiccharge=12, class="2+"}, [6] = {mimiccharge=4, class="3-"}, [7] = {mimiccharge=6, class="3+"}, [8] = {mimiccharge=1, class="0"}, [9] = {mimiccharge=1, class="0"}, } diff --git a/main.lua b/main.lua index 6079d8a6..2b16f75f 100644 --- a/main.lua +++ b/main.lua @@ -1496,15 +1496,20 @@ function EID:OnRender() elseif closest.Type == 1000 and closest.Variant == 76 then EID:addDescriptionToPrint(EID:getDescriptionObj(closest.Type, closest.Variant, closest.SubType+1, closest)) -- Handle Card Reading Portals - elseif closest.Type == 1000 and closest.Variant == 161 and closest.SubType <= 2 then - local subtypeToCard = {18, 5, 19} - -- Reuse the descriptions of The Emperor/Stars/Moon, so no localization needed - local descriptionObj = EID:getDescriptionObj(5, 300, subtypeToCard[closest.SubType+1], closest) - -- Card Reading's name - descriptionObj.Name = EID:getObjectName(5, 100, 660) - -- Only keep the first line of the description (to avoid Tarot Cloth effects or Planetarium mention on The Stars) - descriptionObj.Description = string.sub(descriptionObj.Description, 1, string.find(descriptionObj.Description, "#")) - EID:addDescriptionToPrint(descriptionObj) + elseif closest.Type == 1000 and closest.Variant == 161 then + if closest.SubType <= 2 or (EID.isRepentancePlus and closest.SubType == 3) then + local subtypeToCard = {18, 5, 19} + if EID.isRepentancePlus then + subtypeToCard = {18, 5, 19, 10} + end + -- Reuse the descriptions of The Emperor/Stars/Moon/Hermit, so no localization needed + local descriptionObj = EID:getDescriptionObj(5, 300, subtypeToCard[closest.SubType+1], closest) + -- Card Reading's name + descriptionObj.Name = EID:getObjectName(5, 100, 660) + -- Only keep the first line of the description (to avoid Tarot Cloth effects or Planetarium mention on The Stars) + descriptionObj.Description = string.sub(descriptionObj.Description, 1, string.find(descriptionObj.Description, "#")) + EID:addDescriptionToPrint(descriptionObj) + end -- Handle Crane Game elseif closest.Type == 6 and closest.Variant == 16 then if EID.CraneItemType[tostring(closest.InitSeed)] or EID.CraneItemType[closest.InitSeed.."Drop"..closest.DropSeed] then