Skip to content

Commit eb60995

Browse files
OptimusPiOptimusPi
committed
schema update
1 parent eb496c2 commit eb60995

File tree

12 files changed

+88
-89
lines changed

12 files changed

+88
-89
lines changed

‎Motely.API/Knowledge/jaml-syntax.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ stake: White
3131

3232
defaults:
3333
antes: [1, 2, 3, 4, 5, 6, 7, 8]
34-
packSlots: [0, 1, 2, 3, 4, 5]
35-
shopSlots: [0, 1, 2, 3, 4, 5]
34+
boosterPacks: [0, 1, 2, 3, 4, 5]
35+
shopItems: [0, 1, 2, 3, 4, 5]
3636
score: 1
3737

3838
must:
@@ -293,8 +293,8 @@ Set default values for clauses to avoid repetition:
293293
```yaml
294294
defaults:
295295
antes: [1, 2, 3, 4, 5, 6, 7, 8]
296-
packSlots: [0, 1, 2, 3, 4, 5]
297-
shopSlots: [0, 1, 2, 3, 4, 5]
296+
boosterPacks: [0, 1, 2, 3, 4, 5]
297+
shopItems: [0, 1, 2, 3, 4, 5]
298298
score: 1
299299
300300
must:

‎Motely.TUI/SearchResults/Jerkeo_RedDeck_White_temp.jaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ must:
66
- legendaryJoker: Perkeo
77
antes: [1]
88
sources:
9-
packSlots: [1]
9+
boosterPacks: [1]
1010
- tarotCard: Judgement
1111
antes: [1, 2]
1212
sources:
13-
shopSlots: [0, 1, 2, 3]
13+
shopItems: [0, 1, 2, 3]
1414
should:
1515
- joker: Blueprint
1616
label: "BP from Judg0"
@@ -43,13 +43,13 @@ should:
4343
score: 85
4444
antes: [1]
4545
sources:
46-
shopSlots: [0, 1, 2, 3]
46+
shopItems: [0, 1, 2, 3]
4747

4848
- tarotCard: Judgement
4949
label: "judgeAnte2Shop"
5050
score: 80
5151
antes: [1]
5252
sources:
53-
shopSlots: [0, 1, 2, 3]
53+
shopItems: [0, 1, 2, 3]
5454
deck: Ghost
5555
stake: White

‎Motely.Tests/JamlConfigTests.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ public void ValidJaml_ParsesSuccessfully()
3131
}
3232

3333
[Fact]
34-
public void UnknownSourceKey_ShopSlots_IsIgnored()
34+
public void UnknownSourceKey_shopItems_IsIgnored()
3535
{
36-
// shopSlots is not a recognized key — the parser silently ignores it
37-
// (IgnoreUnmatchedProperties). The clause still parses, but shopSlots
36+
// shopItems is not a recognized key — the parser silently ignores it
37+
// (IgnoreUnmatchedProperties). The clause still parses, but shopItems
3838
// won't map to any source. Users should use shopItems instead.
3939
var jaml = """
4040
name: Test
4141
must:
4242
- joker: Showman
4343
antes: [1]
4444
sources:
45-
shopSlots: [0,1]
45+
shopItems: [0,1]
4646
""";
4747

4848
var success = JamlConfigLoader.TryLoad(jaml, out var config, out var error);
@@ -53,17 +53,17 @@ public void UnknownSourceKey_ShopSlots_IsIgnored()
5353
}
5454

5555
[Fact]
56-
public void UnknownSourceKey_PackSlots_IsIgnored()
56+
public void UnknownSourceKey_boosterPacks_IsIgnored()
5757
{
58-
// packSlots is not a recognized key — silently ignored.
58+
// boosterPacks is not a recognized key — silently ignored.
5959
// Users should use boosterPacks instead.
6060
var jaml = """
6161
name: Test
6262
must:
6363
- joker: Showman
6464
antes: [1]
6565
sources:
66-
packSlots: [0,1]
66+
boosterPacks: [0,1]
6767
""";
6868

6969
var success = JamlConfigLoader.TryLoad(jaml, out var config, out var error);
@@ -164,4 +164,3 @@ public void DeckAndStake_Parse()
164164
Assert.Equal(MotelyStake.Gold, config.Stake);
165165
}
166166
}
167-

‎Motely.npm/jaml.schema.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
],
8585
"description": "Default antes to check if not specified in clause"
8686
},
87-
"packSlots": {
87+
"boosterPacks": {
8888
"type": "array",
8989
"items": {
9090
"type": "integer",
@@ -101,7 +101,7 @@
101101
],
102102
"description": "Default pack slots (ante 1 limited to 0-3, ante 2+ uses 0-5)"
103103
},
104-
"shopSlots": {
104+
"shopItems": {
105105
"type": "array",
106106
"items": {
107107
"type": "integer",
@@ -303,14 +303,14 @@
303303
"sources": {
304304
"type": "object",
305305
"properties": {
306-
"shopSlots": {
306+
"shopItems": {
307307
"type": "array",
308308
"items": {
309309
"type": "integer"
310310
},
311311
"description": "Shop slot indices (0-based). If empty array [], will be populated from minShopSlot/maxShopSlot if provided."
312312
},
313-
"packSlots": {
313+
"boosterPacks": {
314314
"type": "array",
315315
"items": {
316316
"type": "integer"
@@ -321,25 +321,25 @@
321321
"type": "integer",
322322
"minimum": 0,
323323
"maximum": 1023,
324-
"description": "Minimum shop slot index (inclusive). If specified with maxShopSlot, generates shopSlots array [minShopSlot..maxShopSlot]."
324+
"description": "Minimum shop slot index (inclusive). If specified with maxShopSlot, generates shopItems array [minShopSlot..maxShopSlot]."
325325
},
326326
"maxShopSlot": {
327327
"type": "integer",
328328
"minimum": 0,
329329
"maximum": 1023,
330-
"description": "Maximum shop slot index (inclusive). If specified with minShopSlot, generates shopSlots array [minShopSlot..maxShopSlot]."
330+
"description": "Maximum shop slot index (inclusive). If specified with minShopSlot, generates shopItems array [minShopSlot..maxShopSlot]."
331331
},
332332
"minPackSlot": {
333333
"type": "integer",
334334
"minimum": 0,
335335
"maximum": 5,
336-
"description": "Minimum pack slot index (inclusive). If specified with maxPackSlot, generates packSlots array [minPackSlot..maxPackSlot]."
336+
"description": "Minimum pack slot index (inclusive). If specified with maxPackSlot, generates boosterPacks array [minPackSlot..maxPackSlot]."
337337
},
338338
"maxPackSlot": {
339339
"type": "integer",
340340
"minimum": 0,
341341
"maximum": 5,
342-
"description": "Maximum pack slot index (inclusive). If specified with minPackSlot, generates packSlots array [minPackSlot..maxPackSlot]."
342+
"description": "Maximum pack slot index (inclusive). If specified with minPackSlot, generates boosterPacks array [minPackSlot..maxPackSlot]."
343343
},
344344
"tags": {
345345
"type": "boolean",

‎Motely/filters/Native/NegativeCopyJokers.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public readonly VectorMask Filter(ref MotelyVectorSearchContext searchContext)
3030
MotelyJokerStreamFlags.Default
3131
);
3232

33-
int shopSlots = ante switch
33+
int shopItems = ante switch
3434
{
3535
1 => 4,
3636
2 => 12,
@@ -39,7 +39,7 @@ public readonly VectorMask Filter(ref MotelyVectorSearchContext searchContext)
3939
};
4040

4141
// Check ALL shop slots
42-
for (int i = 0; i < shopSlots; i++)
42+
for (int i = 0; i < shopItems; i++)
4343
{
4444
var shopItem = searchContext.GetNextShopItem(ref shopStream);
4545
hasPotential |= VectorEnum256.Equals(shopItem.Type, MotelyItemType.Showman);
@@ -53,8 +53,8 @@ public readonly VectorMask Filter(ref MotelyVectorSearchContext searchContext)
5353
);
5454
var buffoonStream = searchContext.CreateBuffoonPackJokerStream(ante);
5555

56-
int maxPackSlots = ante == 1 ? 4 : 6;
57-
for (int i = 0; i < maxPackSlots; i++)
56+
int maxboosterPacks = ante == 1 ? 4 : 6;
57+
for (int i = 0; i < maxboosterPacks; i++)
5858
{
5959
var pack = searchContext.GetNextBoosterPack(ref boosterPackStream);
6060

@@ -158,7 +158,7 @@ public readonly VectorMask Filter(ref MotelyVectorSearchContext searchContext)
158158
MotelyJokerStreamFlags.Default
159159
);
160160

161-
int shopSlots = ante switch
161+
int shopItems = ante switch
162162
{
163163
1 => 4,
164164
2 => 12,
@@ -171,7 +171,7 @@ public readonly VectorMask Filter(ref MotelyVectorSearchContext searchContext)
171171
_ => 25,
172172
};
173173

174-
for (int i = 0; i < shopSlots; i++)
174+
for (int i = 0; i < shopItems; i++)
175175
{
176176
var shopItem = ctx.GetNextShopItem(ref shopStream);
177177

@@ -204,8 +204,8 @@ public readonly VectorMask Filter(ref MotelyVectorSearchContext searchContext)
204204
var boosterPackStream = ctx.CreateBoosterPackStream(ante, ante > 1, false);
205205
var buffoonStream = ctx.CreateBuffoonPackJokerStream(ante);
206206

207-
int maxPackSlots = ante == 1 ? 4 : 6;
208-
for (int i = 0; i < maxPackSlots; i++)
207+
int maxboosterPacks = ante == 1 ? 4 : 6;
208+
for (int i = 0; i < maxboosterPacks; i++)
209209
{
210210
var pack = ctx.GetNextBoosterPack(ref boosterPackStream);
211211

‎Motely/filters/Native/Trickeoglyph.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public static bool CheckSoulJokerInAnte(
3838
var boosterPackStream = searchContext.CreateBoosterPackStream(ante, ante > 1, false);
3939

4040
// Check pack slots 0-5 for ante 8 (Canio), 0-3 for ante 1 (Perkeo)
41-
int maxPackSlots = ante == 1 ? 4 : 6;
41+
int maxboosterPacks = ante == 1 ? 4 : 6;
4242

43-
for (int i = 0; i < maxPackSlots; i++)
43+
for (int i = 0; i < maxboosterPacks; i++)
4444
{
4545
var pack = searchContext.GetNextBoosterPack(ref boosterPackStream);
4646

‎docs/JAML_NATURAL_LANGUAGE_RAG_IMPLEMENTATION.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,15 @@ Create a new file: `knowledge-base/balatro-knowledge.json`
120120
"sources": {
121121
"definition": "Where items appear",
122122
"types": {
123-
"shopSlots": "Shop positions [0-6]",
124-
"packSlots": "Pack positions [0-4]",
123+
"shopItems": "Shop positions [0-6]",
124+
"boosterPacks": "Pack positions [0-4]",
125125
"buffoonPack": "Joker packs",
126126
"arcana": "Tarot packs",
127127
"celestial": "Planet packs"
128128
},
129129
"jaml_examples": [
130-
"sources:\n shopSlots: [0,1,2]",
131-
"sources:\n packSlots: [0]"
130+
"sources:\n shopItems: [0,1,2]",
131+
"sources:\n boosterPacks: [0]"
132132
]
133133
},
134134
"editions": {
@@ -158,7 +158,7 @@ Create a new file: `knowledge-base/balatro-knowledge.json`
158158
{
159159
"intent": "joker in shop slot",
160160
"natural_language": ["get {joker} in shop slot {slot}", "{joker} in position {slot}"],
161-
"jaml_template": "- joker: {joker}\n sources:\n shopSlots: [{slot}]"
161+
"jaml_template": "- joker: {joker}\n sources:\n shopItems: [{slot}]"
162162
},
163163
{
164164
"intent": "joker with edition",
@@ -339,8 +339,8 @@ must: # Required criteria (AND logic)
339339
antes: [1,2,3] # optional
340340
edition: EditionName # optional (Foil, Holographic, Polychrome, Negative)
341341
sources: # optional
342-
shopSlots: [0,1,2]
343-
packSlots: [0]
342+
shopItems: [0,1,2]
343+
boosterPacks: [0]
344344
345345
- smallBlindTag: TagName
346346
antes: [4]
@@ -379,7 +379,7 @@ must:
379379
antes: [4]
380380
- joker: OopsAll6s
381381
sources:
382-
shopSlots: [0,1,2,3,4,5,6]
382+
shopItems: [0,1,2,3,4,5,6]
383383
\`\`\`
384384
385385
Generate only valid JAML. If unclear, ask for clarification.`;
@@ -817,15 +817,15 @@ must:
817817
edition: Polychrome
818818
antes: [1]
819819
sources:
820-
shopSlots: [0]
820+
shopItems: [0]
821821

822822
# Query 4
823823
name: ShowmanPack
824824
must:
825825
- joker: Showman
826826
antes: [1]
827827
sources:
828-
packSlots: [0]
828+
boosterPacks: [0]
829829

830830
# Query 5
831831
name: OopsBlueInvis

‎docs/JAML_TEMPLATE_SYSTEM_PROPOSAL.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ description: OopsAll6s jokers in shop slot clusters [2,3,4], [4,5,6], [6,7,8]
5757
# Template content (clause structure)
5858
- Or:
5959
- joker: OopsAll6s
60-
ShopSlots: [2,3,4]
60+
shopItems: [2,3,4]
6161
score: 100
6262
- joker: OopsAll6s
63-
ShopSlots: [4,5,6]
63+
shopItems: [4,5,6]
6464
score: 100
6565
- joker: OopsAll6s
66-
ShopSlots: [6,7,8]
66+
shopItems: [6,7,8]
6767
score: 100
6868
```
6969
@@ -183,7 +183,7 @@ Allow templates to accept parameters:
183183
# Template with parameter placeholder
184184
- Or:
185185
- joker: OopsAll6s
186-
ShopSlots: [2,3,4]
186+
shopItems: [2,3,4]
187187
score: 100
188188
Antes: ${ANTES} # Parameter placeholder
189189

@@ -213,7 +213,7 @@ parameters:
213213
# Template content
214214
- Or:
215215
- joker: OopsAll6s
216-
ShopSlots: [2,3,4]
216+
shopItems: [2,3,4]
217217
score: 100
218218
Antes: ${antes}
219219
# ... etc
@@ -228,13 +228,13 @@ description: OopsAll6s jokers in shop slot clusters
228228

229229
- Or:
230230
- joker: OopsAll6s
231-
ShopSlots: [2,3,4]
231+
shopItems: [2,3,4]
232232
score: 100
233233
- joker: OopsAll6s
234-
ShopSlots: [4,5,6]
234+
shopItems: [4,5,6]
235235
score: 100
236236
- joker: OopsAll6s
237-
ShopSlots: [6,7,8]
237+
shopItems: [6,7,8]
238238
score: 100
239239
```
240240
@@ -249,15 +249,15 @@ description: NegativeTag skip reward + joker cluster pattern
249249
Antes: ${antes}
250250
- Or:
251251
- joker: OopsAll6s
252-
ShopSlots: [2,3,4]
252+
shopItems: [2,3,4]
253253
score: 100
254254
Antes: ${antes}
255255
- joker: OopsAll6s
256-
ShopSlots: [4,5,6]
256+
shopItems: [4,5,6]
257257
score: 100
258258
Antes: ${antes}
259259
- joker: OopsAll6s
260-
ShopSlots: [6,7,8]
260+
shopItems: [6,7,8]
261261
score: 100
262262
Antes: ${antes}
263263
```

0 commit comments

Comments
 (0)