Skip to content

Commit 2d58d7e

Browse files
JevonnissocoolmanJevonnissocoolman
authored
Kidnapping change
1 parent a273e74 commit 2d58d7e

File tree

10 files changed

+75
-46
lines changed

10 files changed

+75
-46
lines changed

‎items/joker_display.lua‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,34 @@ if JokerDisplay then
223223
JokerDisplay.Definitions["j_cry_kidnap"] = {
224224
text = {
225225
{ text = "+$" },
226-
{ ref_table = "card.ability.extra", ref_value = "money" },
226+
{ ref_table = "card.joker_display_values", ref_value = "extra" },
227227
},
228228
text_config = { colour = G.C.GOLD },
229229
reminder_text = {
230230
{ ref_table = "card.joker_display_values", ref_value = "localized_text" },
231231
},
232232
calc_function = function(card)
233+
local abc = 0
234+
if G.GAME and G.GAME.jokers_sold then
235+
for _, v in ipairs(G.GAME.jokers_sold) do
236+
if
237+
G.P_CENTERS[v].effect == "Type Mult"
238+
or G.P_CENTERS[v].effect == "Cry Type Mult"
239+
or G.P_CENTERS[v].effect == "Cry Type Chips"
240+
or G.P_CENTERS[v].effect == "Boost Kidnapping"
241+
or (
242+
G.P_CENTERS[v].name == "Sly Joker"
243+
or G.P_CENTERS[v].name == "Wily Joker"
244+
or G.P_CENTERS[v].name == "Clever Joker"
245+
or G.P_CENTERS[v].name == "Devious Joker"
246+
or G.P_CENTERS[v].name == "Crafty Joker"
247+
)
248+
then
249+
abc = abc + 1
250+
end
251+
end
252+
end
253+
card.joker_display_values.extra = card.ability.extra * abc
233254
card.joker_display_values.localized_text = "(" .. localize("k_round") .. ")"
234255
end,
235256
}

‎items/misc_joker.lua‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6687,62 +6687,63 @@ local kittyprinter = {
66876687
}
66886688
local kidnap = {
66896689
object_type = "Joker",
6690-
dependencies = {
6691-
items = {
6692-
"set_cry_misc_joker",
6693-
},
6694-
},
66956690
name = "cry-kidnap",
66966691
key = "kidnap",
66976692
order = 23,
66986693
pos = { x = 1, y = 2 },
66996694
config = {
6700-
extra = { money = 1, money_mod = 3 },
6695+
extra = 4,
67016696
},
67026697
rarity = 1,
67036698
cost = 4,
67046699
blueprint_compat = false,
67056700
loc_vars = function(self, info_queue, center)
6706-
return { vars = { center.ability.extra.money_mod, center.ability.extra.money } }
6701+
local value = 0
6702+
if G.GAME and G.GAME.jokers_sold then
6703+
for _, v in ipairs(G.GAME.jokers_sold) do
6704+
if
6705+
G.P_CENTERS[v].effect == "Type Mult"
6706+
or G.P_CENTERS[v].effect == "Cry Type Mult"
6707+
or G.P_CENTERS[v].effect == "Cry Type Chips"
6708+
or G.P_CENTERS[v].effect == "Boost Kidnapping"
6709+
or (
6710+
G.P_CENTERS[v].name == "Sly Joker"
6711+
or G.P_CENTERS[v].name == "Wily Joker"
6712+
or G.P_CENTERS[v].name == "Clever Joker"
6713+
or G.P_CENTERS[v].name == "Devious Joker"
6714+
or G.P_CENTERS[v].name == "Crafty Joker"
6715+
)
6716+
then
6717+
value = value + 1
6718+
end
6719+
end
6720+
end
6721+
return { vars = { center.ability.extra, center.ability.extra * value } }
67076722
end,
67086723
atlas = "atlasone",
6709-
calculate = function(self, card, context)
6710-
if
6711-
context.selling_card
6712-
and (
6713-
(
6714-
context.card.ability.name == "Sly Joker"
6715-
or context.card.ability.name == "Wily Joker"
6716-
or context.card.ability.name == "Clever Joker"
6717-
or context.card.ability.name == "Devious Joker"
6718-
or context.card.ability.name == "Crafty Joker"
6724+
calc_dollar_bonus = function(self, card)
6725+
local value = 0
6726+
for _, v in ipairs(G.GAME.jokers_sold) do
6727+
if
6728+
G.P_CENTERS[v].effect == "Type Mult"
6729+
or G.P_CENTERS[v].effect == "Cry Type Mult"
6730+
or G.P_CENTERS[v].effect == "Cry Type Chips"
6731+
or G.P_CENTERS[v].effect == "Boost Kidnapping"
6732+
or (
6733+
G.P_CENTERS[v].name == "Sly Joker"
6734+
or G.P_CENTERS[v].name == "Wily Joker"
6735+
or G.P_CENTERS[v].name == "Clever Joker"
6736+
or G.P_CENTERS[v].name == "Devious Joker"
6737+
or G.P_CENTERS[v].name == "Crafty Joker"
67196738
)
6720-
or context.card.ability.effect == "Type Mult"
6721-
or context.card.ability.effect == "Cry Type Mult"
6722-
or context.card.ability.effect == "Cry Type Chips"
6723-
--[[
6724-
Other developers can add effect == "Boost Kidnapping"
6725-
to their joker config if they want it to boost kidnapping when sold
6726-
]]
6727-
--
6728-
or context.card.ability.effect == "Boost Kidnapping"
6729-
or context.card:is_jolly()
6730-
)
6731-
and not context.blueprint
6732-
then
6733-
card.ability.extra.money = card.ability.extra.money + card.ability.extra.money_mod
6734-
return {
6735-
card_eval_status_text(card, "extra", nil, nil, nil, {
6736-
message = localize("k_upgrade_ex"),
6737-
colour = G.C.MONEY,
6738-
}),
6739-
}
6739+
then
6740+
value = value + 1
6741+
end
67406742
end
6741-
end,
6742-
calc_dollar_bonus = function(self, card)
6743-
if card.ability.extra.money > 0 then
6744-
return card.ability.extra.money
6743+
if value == 0 then
6744+
return
67456745
end
6746+
return card.ability.extra * value
67466747
end,
67476748
cry_credits = {
67486749
idea = {

‎localization/de.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,6 +1304,7 @@ return {
13041304
j_cry_kidnap = {
13051305
name = "Entführung",
13061306
text = {
1307+
"{C:red}Outdated Description{}",
13071308
"Verdiene {C:money}$#2#{} am Ende der Runde",
13081309
"Erhöhe Auszahlung um {C:money}$#1#{}",
13091310
"wenn ein {C:attention}Mult Typ{} oder",

‎localization/en-us.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1720,10 +1720,10 @@ return {
17201720
j_cry_kidnap = {
17211721
name = "Kidnapping",
17221722
text = {
1723-
"Earn {C:money}$#2#{} at end of round",
1724-
"Increase payout by {C:money}$#1#{}",
1725-
"when a {C:attention}Type Mult{} or",
1726-
"{C:attention}Type Chips{} Joker is sold",
1723+
"Earn {C:money}$#1#{} at end of round",
1724+
"per unique {C:attention}Type Mult{} or",
1725+
"{C:attention}Type Chips{} Joker sold this run",
1726+
"{C:inactive}(Currently {C:money}$#2#{C:inactive})",
17271727
},
17281728
},
17291729
j_cry_kittyprinter = {

‎localization/es_419.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,6 +1278,7 @@ return {
12781278
j_cry_kidnap = {
12791279
name = "Secuestro",
12801280
text = {
1281+
"{C:red}Outdated Description{}",
12811282
"Gana {C:money}$#2#{} al final de la ronda",
12821283
"Aumenta el pago por {C:money}$#1#{}",
12831284
"cuando un comodín de {C:attention}tipo multi{}",

‎localization/es_ES.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1701,6 +1701,7 @@ return {
17011701
j_cry_kidnap = {
17021702
name = "Secuestro",
17031703
text = {
1704+
"{C:red}Outdated Description{}",
17041705
"Gana {C:money}$#2#{} al final de la ronda",
17051706
"Aumenta el pago por {C:money}$#1#{}",
17061707
"cuando un comodín de {C:attention}tipo multi{}",

‎localization/fr.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,6 +1589,7 @@ return {
15891589
j_cry_kidnap = {
15901590
name = "Kidnapping",
15911591
text = {
1592+
"{C:red}Outdated Description{}",
15921593
"Gagne {C:money}$#2#{} à la fin de la manche",
15931594
"Augmente le gain de {C:money}$#1#{}",
15941595
"lorsqu'un Joker {C:attention}type {C:mult}multi{} ou",

‎localization/pl.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,6 +1278,7 @@ return {
12781278
j_cry_kidnap = {
12791279
name = "Porwanie",
12801280
text = {
1281+
"{C:red}Outdated Description{}",
12811282
"Zyskujesz {C:money}$#2#{} na końcu rundy",
12821283
"Wypłata rośnie o {C:money}$#1#{}",
12831284
"kiedy Joker {C:attention}mnożnikowy{} lub",

‎localization/vi.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1610,6 +1610,7 @@ return {
16101610
j_cry_kidnap = {
16111611
name = "Bắt Cóc",
16121612
text = {
1613+
"{C:red}Outdated Description{}",
16131614
"Nhận {C:money}$#2#{} ở cuối ván",
16141615
"Tiền thưởng tăng thêm {C:money}$#1#{}",
16151616
"khi một Joker {C:attention}+Nhân Tay Bài{} hoặc",

‎localization/zh_CN.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,6 +1588,7 @@ return {
15881588
j_cry_kidnap = {
15891589
name = "绑架",
15901590
text = {
1591+
"{C:red}Outdated Description{}",
15911592
"每回合结尾获得{C:money}$#2#{}",
15921593
"每卖掉一张{C:attention}倍率{}或者{C:attention}筹码{}小丑时",
15931594
"增加{C:money}$#1#{}",

0 commit comments

Comments
 (0)