Skip to content

Commit d34b2af

Browse files
sedgestripesedgestripe
authored
Merge pull request #367 from jaysoleson/LifeGen-dev
The Rest of our Accessories!
2 parents bc0afb6 + d875233 commit d34b2af

File tree

19 files changed

+242
-3739
lines changed

19 files changed

+242
-3739
lines changed

‎resources/dicts/acc_display.json‎

Lines changed: 0 additions & 1773 deletions
This file was deleted.

‎resources/dicts/accessory_preferences.json‎

Lines changed: 0 additions & 1840 deletions
This file was deleted.

‎resources/lang/en/accessory_preferences.json‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"WESTERN COACHWHIP",
99
"CHERRYPLUMLEAVES",
1010
"CHERRY",
11-
"CHERRY2",
1211
"BATHARNESS",
1312
"LANTERNS",
1413
"RED FEATHERS",
@@ -22,7 +21,6 @@
2221
"ASHY PAWS",
2322
"MUD PAWS",
2423
"BLEEDING HEARTS",
25-
"BLEEDING HEARTS2",
2624
"BLEEDINGHEART",
2725
"LILY",
2826
"CHERRYBLOSSOM",
@@ -327,20 +325,15 @@
327325
"LILYPAD",
328326
"LARGE DEATHBERRY",
329327
"SMALL DEATHBERRY",
330-
"ACORN2",
331328
"PINECONE",
332329
"VINE",
333-
"CHERRY2",
334-
"BLEEDING HEARTS2",
335330
"SHELL PACK",
336331
"FERNS",
337332
"GOLD FERNS",
338333
"WHEAT",
339334
"BLACK WHEAT",
340335
"BERRIES",
341336
"CLOVERS",
342-
"CLOVER2",
343-
"MOSS2",
344337
"FLOWER MOSS",
345338
"MUSHROOMS",
346339
"RED FEATHERS",
@@ -1147,15 +1140,12 @@
11471140
"FLOWER MOSS",
11481141
"CYAN POPPY",
11491142
"WHEAT",
1150-
"CHERRY2",
11511143
"LAVENDER",
11521144
"SHELL PACK",
11531145
"PINK POPPY",
11541146
"POPPY",
1155-
"CLOVER2",
11561147
"DRY NETTLES",
11571148
"RYE STALK",
1158-
"MOSS2",
11591149
"MAPLE SEED",
11601150
"FORGET ME NOTS",
11611151
"PETALS"
@@ -1520,7 +1510,6 @@
15201510
"PURPLE",
15211511
"MULTI",
15221512
"INDIGO",
1523-
"BLEEDING HEARTS2",
15241513
"BLEEDINGHEART",
15251514
"CATNIP FLOWER",
15261515
"GRASS SNAKE",
@@ -1619,7 +1608,7 @@
16191608
"OAK LEAVES"
16201609
],
16211610
"stoic": [
1622-
"ACORN2"
1611+
"ACORN"
16231612
],
16241613
"reserved": [
16251614
"LAUREL"

‎resources/lang/en/cat/accessories.en.json‎

Lines changed: 101 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@
655655
"many": "yellow wisteria",
656656
"one": "yellow wisteria"
657657
},
658-
"HOLLY2": {
658+
"HOLLYLEAVES": {
659659
"zero": "holly leaves",
660660
"many": "holly leaves",
661661
"one": "holly leaves"
@@ -665,6 +665,21 @@
665665
"many": "holly vines",
666666
"one": "holly vines"
667667
},
668+
"LAVENDERHEADPIECE": {
669+
"zero": "lavender headpiece",
670+
"many": "lavender headpiece",
671+
"one": "lavender headpiece"
672+
},
673+
"LAVENDERTAILWRAP": {
674+
"zero": "lavender tail wrap",
675+
"many": "lavender tail wrap",
676+
"one": "lavender tail wrap"
677+
},
678+
"LAVENDERANKLET": {
679+
"zero": "lavender anklet",
680+
"many": "lavender anklet",
681+
"one": "lavender anklet"
682+
},
668683
"WILLOWBARK BAG": {
669684
"zero": "willowbark bag",
670685
"many": "willowbark bag",
@@ -1414,6 +1429,91 @@
14141429
"zero": "sliver dust plant",
14151430
"many": "sliver dust plant",
14161431
"one": "sliver dust plant"
1432+
},
1433+
"LILYPAD": {
1434+
"zero": "lilypad",
1435+
"many": "lilypad",
1436+
"one": "lilypad"
1437+
},
1438+
"LARGE DEATHBERRY": {
1439+
"zero": "large deathberry vine",
1440+
"many": "large vine of deathberries",
1441+
"one": "large deathberry vine"
1442+
},
1443+
"SMALL DEATHBERRY": {
1444+
"zero": "small deathberry vine",
1445+
"many": "small vine of deathberries",
1446+
"one": "small deathberry vine"
1447+
},
1448+
"ACORN": {
1449+
"zero": "acorn",
1450+
"many": "acorn",
1451+
"one": "acorn"
1452+
},
1453+
"PINECONE": {
1454+
"zero": "pinecone",
1455+
"many": "pinecone",
1456+
"one": "pinecone"
1457+
},
1458+
"VINE": {
1459+
"zero": "vine",
1460+
"many": "vines",
1461+
"one": "vine"
1462+
},
1463+
"CHERRY": {
1464+
"zero": "cherries",
1465+
"many": "cherries",
1466+
"one": "cherry bunch"
1467+
},
1468+
"BLEEDING HEART BRANCH": {
1469+
"zero": "bleeding hearts",
1470+
"many": "bleeding hearts",
1471+
"one": "bleeding hearts"
1472+
},
1473+
"SHELL PACK": {
1474+
"zero": "seashells",
1475+
"many": "seashells",
1476+
"one": "seashells"
1477+
},
1478+
"WHEAT": {
1479+
"zero": "wheat stalk",
1480+
"many": "wheat",
1481+
"one": "wheat stalk"
1482+
},
1483+
"BLACK WHEAT": {
1484+
"zero": "black wheat stalk",
1485+
"many": "black wheat",
1486+
"one": "black wheat stalk"
1487+
},
1488+
"GOLD FERNS": {
1489+
"zero": "golden ferns",
1490+
"many": "golden ferns",
1491+
"one": "golden fern"
1492+
},
1493+
"MUD PAWS": {
1494+
"zero": "muddy paws",
1495+
"many": "muddy paws",
1496+
"one": "muddy paws"
1497+
},
1498+
"ASHY PAWS": {
1499+
"zero": "ashy paws",
1500+
"many": "ashy paws",
1501+
"one": "ashy paws"
1502+
},
1503+
"BERRIES": {
1504+
"zero": "berries",
1505+
"many": "berries",
1506+
"one": "berry bunch"
1507+
},
1508+
"FLOWER MOSS": {
1509+
"zero": "flowering moss",
1510+
"many": "flowering moss",
1511+
"one": "flowering mossy pelt"
1512+
},
1513+
"MUSHROOMS": {
1514+
"zero": "mushrooms",
1515+
"many": "mushrooms",
1516+
"one": "mushroom patch"
14171517
}
14181518
}
14191519
}

‎resources/lang/en/patrols/lifegen/warrior.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,7 @@
279279
"p_l"
280280
],
281281
"accessory": [
282-
"ACORN",
283-
"ACORN2"
282+
"ACORN"
284283
]
285284
}
286285
],

‎scripts/cat/cats.py‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2286,16 +2286,7 @@ def get_permanent_condition(self, name, born_with=False, event_triggered=False):
22862286
self.pelt.accessory = [
22872287
acc
22882288
for acc in self.pelt.accessory
2289-
if acc not in [
2290-
"VINE",
2291-
"ASHY PAWS",
2292-
"MUD PAWS",
2293-
"MUD",
2294-
"STARFLOWERS",
2295-
"LAVENDERANKLET",
2296-
"HOLLY2",
2297-
"HOLLYVINES"
2298-
]
2289+
if acc not in Pelt.paw_accessories
22992290
]
23002291

23012292
condition = PERMANENT[name]

‎scripts/cat/pelts.py‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ class Pelt:
158158
body_accessories = []
159159
head_accessories = []
160160

161+
# LG
162+
paw_accessories = []
163+
161164
# here we create the master lists of each accessory type
162165
plant_accessories = []
163166
for sprite_list in sprites.PLANT_DATA["sprite_list"]:
@@ -204,6 +207,8 @@ class Pelt:
204207
body_accessories.append(sprite)
205208
elif sprite_list[sprite] == "head":
206209
body_accessories.append(sprite)
210+
elif sprite_list[sprite] == "paws":
211+
paw_accessories.append(sprite)
207212

208213
deadInsect_accessories = []
209214
for sprite_list in sprites.DEADINSECT_DATA["sprite_list"]:
@@ -215,6 +220,8 @@ class Pelt:
215220
body_accessories.append(sprite)
216221
elif sprite_list[sprite] == "head":
217222
body_accessories.append(sprite)
223+
elif sprite_list[sprite] == "paws":
224+
paw_accessories.append(sprite)
218225

219226
plant2_accessories = []
220227
for sprite_list in sprites.PLANT2_DATA["sprite_list"]:
@@ -226,6 +233,8 @@ class Pelt:
226233
body_accessories.append(sprite)
227234
elif sprite_list[sprite] == "head":
228235
body_accessories.append(sprite)
236+
elif sprite_list[sprite] == "paws":
237+
paw_accessories.append(sprite)
229238

230239
sophisticated_accessories = []
231240
for sprite_list in sprites.SOPHISTICATED_DATA["sprite_list"]:
@@ -237,6 +246,8 @@ class Pelt:
237246
body_accessories.append(sprite)
238247
elif sprite_list[sprite] == "head":
239248
body_accessories.append(sprite)
249+
elif sprite_list[sprite] == "paws":
250+
paw_accessories.append(sprite)
240251

241252
fruit_accessories = []
242253
for sprite_list in sprites.FRUIT_DATA["sprite_list"]:
@@ -248,6 +259,8 @@ class Pelt:
248259
body_accessories.append(sprite)
249260
elif sprite_list[sprite] == "head":
250261
body_accessories.append(sprite)
262+
elif sprite_list[sprite] == "paws":
263+
paw_accessories.append(sprite)
251264

252265
flower_crown_accessories = []
253266
for sprite_list in sprites.FLOWERCROWNS_DATA["sprite_list"]:
@@ -259,6 +272,8 @@ class Pelt:
259272
body_accessories.append(sprite)
260273
elif sprite_list[sprite] == "head":
261274
body_accessories.append(sprite)
275+
elif sprite_list[sprite] == "paws":
276+
paw_accessories.append(sprite)
262277

263278
misc_accessories = []
264279
for sprite_list in sprites.MISC_ACCS_DATA["sprite_list"]:
@@ -270,6 +285,8 @@ class Pelt:
270285
body_accessories.append(sprite)
271286
elif sprite_list[sprite] == "head":
272287
body_accessories.append(sprite)
288+
elif sprite_list[sprite] == "paws":
289+
paw_accessories.append(sprite)
273290

274291
misc2_accessories = []
275292
for sprite_list in sprites.MISC2_ACCS_DATA["sprite_list"]:
@@ -281,6 +298,8 @@ class Pelt:
281298
body_accessories.append(sprite)
282299
elif sprite_list[sprite] == "head":
283300
body_accessories.append(sprite)
301+
elif sprite_list[sprite] == "paws":
302+
paw_accessories.append(sprite)
284303

285304
harness_accessories = []
286305
for sprite_list in sprites.HARNESS_DATA["sprite_list"]:
@@ -292,6 +311,8 @@ class Pelt:
292311
body_accessories.append(sprite)
293312
elif sprite_list[sprite] == "head":
294313
body_accessories.append(sprite)
314+
elif sprite_list[sprite] == "paws":
315+
paw_accessories.append(sprite)
295316

296317
smallanimals_accessories = []
297318
for sprite_list in sprites.SMALLANIMALS_DATA["sprite_list"]:
@@ -303,6 +324,21 @@ class Pelt:
303324
body_accessories.append(sprite)
304325
elif sprite_list[sprite] == "head":
305326
body_accessories.append(sprite)
327+
elif sprite_list[sprite] == "paws":
328+
paw_accessories.append(sprite)
329+
330+
wild2_accessories = []
331+
for sprite_list in sprites.WILD2_DATA["sprite_list"]:
332+
wild2_accessories.extend(sprite_list)
333+
for sprite in sprite_list:
334+
if sprite_list[sprite] == "tail":
335+
tail_accessories.append(sprite)
336+
elif sprite_list[sprite] == "body":
337+
body_accessories.append(sprite)
338+
elif sprite_list[sprite] == "head":
339+
body_accessories.append(sprite)
340+
elif sprite_list[sprite] == "paws":
341+
paw_accessories.append(sprite)
306342

307343
# this is used for acc-giving events, only change if you're adding a new category tag to the event filter
308344
# adding a category here will automatically update the event editor's options
@@ -326,6 +362,7 @@ class Pelt:
326362
"MISC2": misc2_accessories,
327363
"HARNESS": harness_accessories,
328364
"SMALLANIMALS": smallanimals_accessories,
365+
"WILD2": wild2_accessories
329366
}
330367

331368
# LIFEGEN
@@ -343,7 +380,8 @@ class Pelt:
343380
misc_accessories +
344381
misc2_accessories +
345382
harness_accessories +
346-
smallanimals_accessories
383+
smallanimals_accessories +
384+
wild2_accessories
347385
)
348386

349387
all_clangen_accessories = (
@@ -367,6 +405,7 @@ class Pelt:
367405
misc2_accessories,
368406
harness_accessories,
369407
smallanimals_accessories,
408+
wild2_accessories
370409
]
371410
acc_data_list = [
372411
sprites.ALIVEINSECT_DATA,
@@ -379,6 +418,7 @@ class Pelt:
379418
sprites.MISC2_ACCS_DATA,
380419
sprites.HARNESS_DATA,
381420
sprites.SMALLANIMALS_DATA,
421+
sprites.WILD2_DATA
382422
]
383423
# ---
384424

‎scripts/cat/sprites.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ class Sprites:
8080
"sprites/dicts/smallanimals_data.json", "r", encoding="utf-8"
8181
) as read_file:
8282
SMALLANIMALS_DATA = ujson.loads(read_file.read())
83+
with open(
84+
"sprites/dicts/wild2_sprite_data.json", "r", encoding="utf-8"
85+
) as read_file:
86+
WILD2_DATA = ujson.loads(read_file.read())
8387

8488
# SCARS
8589
with open(
@@ -309,6 +313,7 @@ def load_all(self):
309313
self.MISC2_ACCS_DATA,
310314
self.HARNESS_DATA,
311315
self.SMALLANIMALS_DATA,
316+
self.WILD2_DATA,
312317
)
313318

314319
# data jsons that have multiple associated spritesheets

0 commit comments

Comments
 (0)