Skip to content

Commit d00718d

Browse files
Merge pull request #485 from AutoWatto/main
Added correct sprite for Eye of Hagane; Fixed spelling error in localization for Eye of Hagane; added fixes for RNJoker (helped by Mr. Smods)
2 parents ebe915a + 7d8c849 commit d00718d

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

assets/1x/atlastwo.png

-3.16 KB
Loading

assets/2x/atlastwo.png

6 KB
Loading

items/misc_joker.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3754,6 +3754,7 @@ local rnjoker = {
37543754
G.hand:change_size(-hand_size)
37553755
end,
37563756
generate_ui = function(self, info_queue, card, desc_nodes, specific_vars, full_UI_table)
3757+
card = card or self:create_fake_card()
37573758
local len = (
37583759
card.ability
37593760
and card.ability.abilities
@@ -3784,6 +3785,7 @@ local rnjoker = {
37843785
end
37853786
new_loc.text_parsed = card.ability.abilities[1].text_parsed
37863787
end
3788+
new_loc.text_parsed = new_loc.text_parsed or {}
37873789
if not full_UI_table.name then
37883790
full_UI_table.name =
37893791
localize({ type = "name", set = self.set, key = target.key or self.key, nodes = full_UI_table.name })
@@ -7821,12 +7823,12 @@ local eyeofhagane = {
78217823
name = "cry-eyeofhagane",
78227824
key = "eyeofhagane",
78237825
order = 136,
7824-
pos = { x = 4, y = 1 },
7826+
pos = { x = 5, y = 6 },
78257827
rarity = 2,
78267828
cost = 6,
78277829
blueprint_compat = false,
78287830
immutable = true,
7829-
atlas = "placeholders", -- https://discord.com/channels/1264429948970733782/1274103559113150629/1351479917367263312
7831+
atlas = "atlastwo", -- https://discord.com/channels/1264429948970733782/1274103559113150629/1351479917367263312
78307832
calculate = function(self, card, context)
78317833
if context.before then
78327834
for i = 1, #context.full_hand do

localization/en-us.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1465,7 +1465,7 @@ return {
14651465
},
14661466
},
14671467
j_cry_eyeofhagane = {
1468-
name = "Eye of Hagene",
1468+
name = "Eye of Hagane",
14691469
text = {
14701470
"All played {C:attention}face{} cards become {C:attention}Steel{}",
14711471
},

0 commit comments

Comments
 (0)