Skip to content

Commit 7031b27

Browse files
JevonnissocoolmanJevonnissocoolman
authored
Probability API final
had to do a bunch of cahnges to blurred to make the probability stuff work properly so it is back to being hardcoded for now... TODO? idk
1 parent 8a7380e commit 7031b27

File tree

11 files changed

+44
-40
lines changed

11 files changed

+44
-40
lines changed

‎items/misc.lua‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,10 +1253,15 @@ local blurred = {
12531253
end,
12541254
config = { retrigger_chance = 2, retriggers = 1, extra_retriggers = 1 },
12551255
loc_vars = function(self, info_queue, center)
1256-
local chance = center and center.edition and center.edition.retrigger_chance or self.config.retrigger_chance
1256+
local aaa, bbb = SMODS.get_probability_vars(
1257+
self,
1258+
1,
1259+
self.config.retrigger_chance,
1260+
"Blurred Edition"
1261+
)
12571262
local retriggers = center and center.edition and center.edition.retriggers or self.config.retriggers
12581263

1259-
return { vars = { G.GAME.probabilities.normal, chance, retriggers } }
1264+
return { vars = { aaa, bbb, retriggers } }
12601265
end,
12611266
--Note: This doesn't always play the animations properly for Jokers
12621267
calculate = function(self, card, context)
@@ -1267,17 +1272,16 @@ local blurred = {
12671272
or (context.retrigger_joker_check and not context.retrigger_joker)
12681273
)
12691274
then
1270-
local extra_retrigger = pseudorandom("cry_blurred")
1271-
<= G.GAME.probabilities.normal
1272-
/ (card and card.edition and card.edition.retrigger_chance or self.config.retrigger_chance)
12731275
return {
12741276
message = localize("cry_again_q"),
1275-
repetitions = (card and card.edition and card.edition.retriggers or self.config.retriggers)
1276-
+ (
1277-
extra_retrigger and card and card.edition and card.edition.extra_retriggers
1278-
or self.config.extra_retriggers
1279-
or 0
1280-
),
1277+
repetitions = self.config.retriggers
1278+
+ (SMODS.pseudorandom_probability(
1279+
self,
1280+
"cry_blurred",
1281+
1,
1282+
self.config.retrigger_chance,
1283+
"Blurred Edition"
1284+
) and self.config.extra_retriggers or 0),
12811285
card = card,
12821286
}
12831287
end

‎localization/de.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ return {
9191
name = "Kritisches Deck",
9292
text = {
9393
"Nach jeder gespielten Hand,",
94-
"Chance von {C:green}#1# zu 4{} für {X:dark_edition,C:white} ^2 {} Mult",
95-
"Chance von {C:green}#1# zu 8{} für {X:dark_edition,C:white} ^0.5 {} Mult",
94+
"Chance von {C:green}#1# zu #2#{} für {X:dark_edition,C:white} ^2 {} Mult",
95+
"Chance von {C:green}#1# zu #3#{} für {X:dark_edition,C:white} ^0.5 {} Mult",
9696
},
9797
unlock = {
9898
"Erhalte einen {C:attention}Manipulierten Joker",
@@ -265,7 +265,7 @@ return {
265265
name = "Legendäres Deck",
266266
text = {
267267
"Beginne mit einem {C:legendary}Legendären{C:legendary} Joker",
268-
"Chance von {C:green}1 in 5{}, einen Weiteren zu erstellen",
268+
"Chance von {C:green}#1# in #2#{}, einen Weiteren zu erstellen",
269269
"wenn Boss Blind besiegt wurde",
270270
"{C:inactive}(Muss Platz haben){}",
271271
},

‎localization/en-us.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ return {
8989
name = "Critical Deck",
9090
text = {
9191
"After each hand played,",
92-
"{C:green}#1# in 4{} chance for {X:dark_edition,C:white} ^2 {} Mult",
93-
"{C:green}#1# in 8{} chance for {X:dark_edition,C:white} ^0.5 {} Mult",
92+
"{C:green}#1# in #2#{} chance for {X:dark_edition,C:white} ^2 {} Mult",
93+
"{C:green}#1# in #3#{} chance for {X:dark_edition,C:white} ^0.5 {} Mult",
9494
},
9595
unlock = {
9696
"Obtain a {C:attention}Rigged Joker",
@@ -263,7 +263,7 @@ return {
263263
name = "Legendary Deck",
264264
text = {
265265
"Start with a {C:legendary}Legendary{C:legendary} Joker",
266-
"{C:green}1 in 5{} chance to create another",
266+
"{C:green}#1# in #2#{} chance to create another",
267267
"when Boss Blind is defeated {C:inactive}(must have room){}",
268268
},
269269
unlock = {

‎localization/es_419.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ return {
5252
name = "Baraja crítica",
5353
text = {
5454
"Después de cada mano jugada,",
55-
"{C:green}#1# en 4{} probabilidades para {X:dark_edition,C:white} ^2 {} multi",
56-
"{C:green}#1# en 8{} probabilidades para {X:dark_edition,C:white} ^0.5 {} multi",
55+
"{C:green}#1# en #2#{} probabilidades para {X:dark_edition,C:white} ^2 {} multi",
56+
"{C:green}#1# en #3#{} probabilidades para {X:dark_edition,C:white} ^0.5 {} multi",
5757
},
5858
},
5959
b_cry_encoded = {
@@ -136,7 +136,7 @@ return {
136136
name = "Baraja legendaria",
137137
text = {
138138
"Comienza con un comodín {C:legendary}legendario{C:legendary}",
139-
"{C:green}1 en 5{} probabilidades para crear otro",
139+
"{C:green}#1# en #2#{} probabilidades para crear otro",
140140
"cuando se derrota a la ciega jefe",
141141
"{C:inactive}(debe haber espacio){}",
142142
},

‎localization/es_ES.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ return {
6565
name = "Baraja crítica",
6666
text = {
6767
"Después de cada mano jugada,",
68-
"{C:green}#1# en 4{} probabilidades para {X:dark_edition,C:white} ^2 {} multi",
69-
"{C:green}#1# en 8{} probabilidades para {X:dark_edition,C:white} ^0.5 {} multi",
68+
"{C:green}#1# en #2#{} probabilidades para {X:dark_edition,C:white} ^2 {} multi",
69+
"{C:green}#1# en #3#{} probabilidades para {X:dark_edition,C:white} ^0.5 {} multi",
7070
},
7171
},
7272
b_cry_e_deck = {
@@ -188,7 +188,7 @@ return {
188188
name = "Baraja legendaria",
189189
text = {
190190
"Comienza con un comodín {C:legendary}legendario{C:legendary}",
191-
"{C:green}1 en 5{} probabilidades para crear otro",
191+
"{C:green}#1# en #2#{} probabilidades para crear otro",
192192
"cuando se derrota a la ciega jefe",
193193
"{C:inactive}(debe haber espacio){}",
194194
},

‎localization/fr.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ return {
111111
name = "Jeu Critique",
112112
text = {
113113
"Après chaque main jouée,",
114-
"{C:green}#1# chance#<s>1# sur 4{} d'obtenir {X:dark_edition,C:white} ^2 {} Multi",
115-
"{C:green}#1# chance#<s>1# sur 8{} d'obtenir {X:dark_edition,C:white} ^0.5 {} Multi",
114+
"{C:green}#1# chance#<s>1# sur #2#{} d'obtenir {X:dark_edition,C:white} ^2 {} Multi",
115+
"{C:green}#1# chance#<s>1# sur #3#{} d'obtenir {X:dark_edition,C:white} ^0.5 {} Multi",
116116
},
117117
unlock = {
118118
"Obtenir un {C:attention}Joker Truqué",
@@ -285,7 +285,7 @@ return {
285285
name = "Jeu Légendaire",
286286
text = {
287287
"Démarre avec un Joker {C:legendary}Légendaire{C:legendary}",
288-
"{C:green}1 chance sur 5{} d'en créer un autre",
288+
"{C:green}#1# chance sur #2#{} d'en créer un autre",
289289
"lorsque la Blinde de Boss est battue",
290290
"{C:inactive}(selon la place disponible)",
291291
},

‎localization/pl.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ return {
5252
name = "Krytyczna Talia",
5353
text = {
5454
"Po każdej zagranej ręce,",
55-
"{C:green}#1# na 4{} szans na mnożnik {X:dark_edition,C:white} ^2 {}",
56-
"{C:green}#1# na 8{} szans na mnożnik {X:dark_edition,C:white} ^0.5 {}",
55+
"{C:green}#1# na #2#{} szans na mnożnik {X:dark_edition,C:white} ^2 {}",
56+
"{C:green}#1# na #3#{} szans na mnożnik {X:dark_edition,C:white} ^0.5 {}",
5757
},
5858
},
5959
b_cry_encoded = {
@@ -136,7 +136,7 @@ return {
136136
name = "Legendarna Talia",
137137
text = {
138138
"Rozpoczynasz podejście z {C:legendary}legendarnym{C:legendary} jokerem",
139-
"{C:green}1 in 5{} szans na dodanie kolejnego",
139+
"{C:green}#1# in #2#{} szans na dodanie kolejnego",
140140
"po pokonaniu przeszkadzajki bossa",
141141
"{C:inactive}(wymaga miejsca){}",
142142
},

‎localization/pt_BR.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ return {
6565
name = "Baralho Crítico",
6666
text = {
6767
"Após cada mão jogada,",
68-
"{C:green}#1# em 4{} de chance para {X:dark_edition,C:white} ^2 {} Mult",
69-
"{C:green}#1# em 8{} de chance para {X:dark_edition,C:white} ^0.5 {} Mult",
68+
"{C:green}#1# em #2#{} de chance para {X:dark_edition,C:white} ^2 {} Mult",
69+
"{C:green}#1# em #3#{} de chance para {X:dark_edition,C:white} ^0.5 {} Mult",
7070
},
7171
},
7272
b_cry_e_deck = {
@@ -188,7 +188,7 @@ return {
188188
name = "Baralho Lendário",
189189
text = {
190190
"Começe com um Curinga {C:legendary}Lendário{C:legendary}",
191-
"{C:green}1 em 5{} de chance para criar outro",
191+
"{C:green}#1# em #2#{} de chance para criar outro",
192192
"quando o Blind Chefe é derrotado",
193193
"{C:inactive}(precisa ter espaço){}",
194194
},

‎localization/ru.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ return {
8585
name = "Критическая колода",
8686
text = {
8787
"После каждой сыгранной руки,",
88-
"{C:green}#1# к 4{} шанс для {X:dark_edition,C:white} ^2 {} Множ",
89-
"{C:green}#1# к 8{} шанс для {X:dark_edition,C:white} ^0.5 {} Множ",
88+
"{C:green}#1# к #2#{} шанс для {X:dark_edition,C:white} ^2 {} Множ",
89+
"{C:green}#1# к #3#{} шанс для {X:dark_edition,C:white} ^0.5 {} Множ",
9090
},
9191
},
9292
b_cry_encoded = {

‎localization/vi.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ return {
5959
name = "Bộ Bài Chí Mạng",
6060
text = {
6161
"Sau mỗi tay bài đã chơi,",
62-
"Xác suất {C:green}#1# trên 4{} cho {X:dark_edition,C:white} ^2 {} Nhân",
63-
"Xác suất {C:green}#1# trên 8{} cho {X:dark_edition,C:white} ^0.5 {} Nhân",
62+
"Xác suất {C:green}#1# trên #2#{} cho {X:dark_edition,C:white} ^2 {} Nhân",
63+
"Xác suất {C:green}#1# trên #3#{} cho {X:dark_edition,C:white} ^0.5 {} Nhân",
6464
},
6565
},
6666
b_cry_e_deck = {
@@ -181,7 +181,7 @@ return {
181181
name = "Bộ Bài Huyền Thoại",
182182
text = {
183183
"Bắt đầu với một Joker {C:legendary}Huyền Thoại",
184-
"Xác suất {C:green}1 trên 5{} tạo ra thêm một lá nữa",
184+
"Xác suất {C:green}#1# trên #2#{} tạo ra thêm một lá nữa",
185185
"khi Boss Blind bị đánh bại {C:inactive}(Phải có ô trống)",
186186
},
187187
},

0 commit comments

Comments
 (0)