Skip to content

Commit 150d08c

Browse files
soupbagsoupbag
authored
Zygarde cube math and touchups, 1.2.1 (#122)
* Zygarde cube math and touchups * Update settings.gradle.kts
1 parent 7fc0674 commit 150d08c

3 files changed

Lines changed: 59 additions & 48 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,20 @@
22

33
Bug Fixes
44
- Resolved FPS decay when using smooth models (finally!)
5+
- Fixed Pokemon models sometimes floating way up or appearing invisible
56
- Fixed a Fridge crash
67
- Fixed a client crash that occurred with RKS Machine
78
- Fixed a post battle conditional crash
89
- Fixed Cobblemon profiles and portraits appearing a couple pixels up
910
- Fixed Therian form changes
11+
- Fixed Zygarde Cube dialogue exit
1012
- Adjusted Gible and Clefairy evolution line spawn rates in the End to account for some modded biomes and Ultra Beast rates
1113
- Adjusted sound volumes for Elevator and Meloetta Relic Song
1214

15+
Resource Packs
16+
- Fixed Unown sprites and models
17+
- Reduced file size slightly
18+
- Fixed Hisuian starter sprites
1319

1420
# 1.2.0
1521

‎common/src/main/resources/data/generations_core/dialogues/zygarde_cube.json‎

Lines changed: 52 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"id": "main_menu",
1414
"speaker": "player",
1515
"lines": [
16-
"Zygarde Cube",
16+
"What would you like to do?",
1717
{
1818
"type": "expression",
1919
"expression": "'You currently have ' + q.player.selected_item.damage + ' cells available.'"
@@ -23,19 +23,13 @@
2323
"type": "option",
2424
"options": [
2525
{
26-
"text": "Create New Zygarde",
26+
"text": "Create",
2727
"value": "create",
2828
"isVisible": "q.player.selected_item.damage >= 10",
2929
"action": "q.dialogue.set_page('create_form');"
3030
},
3131
{
32-
"text": "Modify Zygarde",
33-
"value": "modify",
34-
"isVisible": "q.player.has_in_party('cobblemon:zygarde')",
35-
"action": "q.dialogue.set_page('select_zygarde_modify');"
36-
},
37-
{
38-
"text": "Dissolve Zygarde",
32+
"text": "Disassemble",
3933
"value": "dissolve",
4034
"isVisible": "q.player.has_in_party('cobblemon:zygarde')",
4135
"action": "q.dialogue.set_page('select_zygarde_dissolve');"
@@ -350,8 +344,8 @@
350344
"id": "select_zygarde_dissolve",
351345
"speaker": "player",
352346
"lines": [
353-
"Select which Zygarde to dissolve:",
354-
"WARNING: This will remove the Pokémon from your party!"
347+
"Which Zygarde would you like to disassemble?",
348+
"WARNING: This will remove the Zygarde completely!"
355349
],
356350
"input": {
357351
"type": "option",
@@ -364,7 +358,7 @@
364358
"v.slot = 0;",
365359
"v.pokemon = q.player.party.get(0);",
366360
"v.dissolve_form = v.pokemon.get_feature('zygarde_form');",
367-
"v.cells_to_return = v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100);",
361+
"v.cells_to_return = (v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100)) + (v.pokemon.get_ability() == 'powerconstruct' ? 50 : 0);",
368362
"q.dialogue.set_page('confirm_dissolve');"
369363
]
370364
},
@@ -376,7 +370,7 @@
376370
"v.slot = 1;",
377371
"v.pokemon = q.player.party.get(1);",
378372
"v.dissolve_form = v.pokemon.get_feature('zygarde_form');",
379-
"v.cells_to_return = v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100);",
373+
"v.cells_to_return = (v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100)) + (v.pokemon.get_ability() == 'powerconstruct' ? 50 : 0);",
380374
"q.dialogue.set_page('confirm_dissolve');"
381375
]
382376
},
@@ -388,7 +382,7 @@
388382
"v.slot = 2;",
389383
"v.pokemon = q.player.party.get(2);",
390384
"v.dissolve_form = v.pokemon.get_feature('zygarde_form');",
391-
"v.cells_to_return = v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100);",
385+
"v.cells_to_return = (v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100)) + (v.pokemon.get_ability() == 'powerconstruct' ? 50 : 0);",
392386
"q.dialogue.set_page('confirm_dissolve');"
393387
]
394388
},
@@ -400,7 +394,7 @@
400394
"v.slot = 3;",
401395
"v.pokemon = q.player.party.get(3);",
402396
"v.dissolve_form = v.pokemon.get_feature('zygarde_form');",
403-
"v.cells_to_return = v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100);",
397+
"v.cells_to_return = (v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100)) + (v.pokemon.get_ability() == 'powerconstruct' ? 50 : 0);",
404398
"q.dialogue.set_page('confirm_dissolve');"
405399
]
406400
},
@@ -412,7 +406,7 @@
412406
"v.slot = 4;",
413407
"v.pokemon = q.player.party.get(4);",
414408
"v.dissolve_form = v.pokemon.get_feature('zygarde_form');",
415-
"v.cells_to_return = v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100);",
409+
"v.cells_to_return = (v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100)) + (v.pokemon.get_ability() == 'powerconstruct' ? 50 : 0);",
416410
"q.dialogue.set_page('confirm_dissolve');"
417411
]
418412
},
@@ -424,7 +418,7 @@
424418
"v.slot = 5;",
425419
"v.pokemon = q.player.party.get(5);",
426420
"v.dissolve_form = v.pokemon.get_feature('zygarde_form');",
427-
"v.cells_to_return = v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100);",
421+
"v.cells_to_return = (v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100)) + (v.pokemon.get_ability() == 'powerconstruct' ? 50 : 0);",
428422
"q.dialogue.set_page('confirm_dissolve');"
429423
]
430424
},
@@ -442,7 +436,7 @@
442436
"lines": [
443437
{
444438
"type": "expression",
445-
"expression": "'Are you sure you want to dissolve this ' + v.dissolve_form + ' Zygarde?'"
439+
"expression": "'Are you sure you want to disassemble this ' + v.dissolve_form + ' Zygarde?'"
446440
},
447441
{
448442
"type": "expression",
@@ -454,7 +448,7 @@
454448
"type": "option",
455449
"options": [
456450
{
457-
"text": "Yes, dissolve it",
451+
"text": "Yes",
458452
"value": "yes",
459453
"action": [
460454
"q.player.selected_item.damage(v.cells_to_return);",
@@ -463,7 +457,7 @@
463457
]
464458
},
465459
{
466-
"text": "No, cancel",
460+
"text": "No",
467461
"value": "no",
468462
"action": "q.dialogue.close();"
469463
}
@@ -474,10 +468,10 @@
474468
"id": "dissolved",
475469
"speaker": "player",
476470
"lines": [
477-
"Zygarde dissolved successfully!",
471+
"Zygarde disassembled successfully!",
478472
{
479473
"type": "expression",
480-
"expression": "v.cells_to_return + ' cells returned to your Zygarde Cube.'"
474+
"expression": "v.cells_to_return + ' cells have been reassembled into your Zygarde Cube.'"
481475
}
482476
],
483477
"input": {
@@ -501,33 +495,51 @@
501495
"type": "option",
502496
"options": [
503497
{
504-
"text": "10% Form (10 cells)",
498+
"text": "10% Aura Break",
505499
"value": "10",
506500
"isVisible": "q.player.selected_item.damage >= 10",
507501
"action": [
508502
"v.form = '10%';",
509503
"v.cells_needed = 10;",
510-
"q.dialogue.set_page('create_ability');"
504+
"v.ability = 'aurabreak';",
505+
"v.ability_string_cheese = 'Aura Break';",
506+
"q.dialogue.set_page('confirm_create');"
507+
]
508+
},
509+
{
510+
"text": "10% PowerConstruct",
511+
"value": "60",
512+
"isVisible": "q.player.selected_item.damage >= 60",
513+
"action": [
514+
"v.form = '10%';",
515+
"v.cells_needed = 60;",
516+
"v.ability = 'powerconstruct';",
517+
"v.ability_string_cheese = 'Power Construct';",
518+
"q.dialogue.set_page('confirm_create');"
511519
]
512520
},
513521
{
514-
"text": "50% Form (50 cells)",
522+
"text": "50% Aura Break",
515523
"value": "50",
516524
"isVisible": "q.player.selected_item.damage >= 50",
517525
"action": [
518526
"v.form = '50%';",
519527
"v.cells_needed = 50;",
520-
"q.dialogue.set_page('create_ability');"
528+
"v.ability = 'aurabreak';",
529+
"v.ability_string_cheese = 'Aura Break';",
530+
"q.dialogue.set_page('confirm_create');"
521531
]
522532
},
523533
{
524-
"text": "100% Form (Complete) (100 cells)",
534+
"text": "50% PowerConstruct",
525535
"value": "100",
526536
"isVisible": "q.player.selected_item.damage >= 100",
527537
"action": [
528-
"v.form = '100%';",
538+
"v.form = '50%';",
529539
"v.cells_needed = 100;",
530-
"q.dialogue.set_page('create_ability');"
540+
"v.ability = 'powerconstruct';",
541+
"v.ability_string_cheese = 'Power Construct';",
542+
"q.dialogue.set_page('confirm_create');"
531543
]
532544
},
533545
{
@@ -539,38 +551,31 @@
539551
}
540552
},
541553
{
542-
"id": "create_ability",
554+
"id": "confirm_create",
543555
"speaker": "player",
544556
"lines": [
545557
{
546558
"type": "expression",
547-
"expression": "'Creating ' + v.form + ' Zygarde'"
559+
"expression": "'Are you sure you want to create a ' + v.ability_string_cheese + ' ' + v.form + ' Zygarde?'"
548560
},
549-
"Which ability should it have?"
561+
{
562+
"type": "expression",
563+
"expression": "'This will use ' + v.cells_needed + ' cells.'"
564+
}
550565
],
551566
"input": {
552567
"type": "option",
553568
"options": [
554569
{
555-
"text": "Aura Break",
556-
"value": "aurabreak",
557-
"action": [
558-
"v.ability = 'aurabreak';",
559-
"q.dialogue.set_page('create_congrats');"
560-
]
561-
},
562-
{
563-
"text": "Power Construct",
564-
"value": "powerconstruct",
565-
"isVisible": "v.form == '50%' || v.form == '100%'",
570+
"text": "Yes",
571+
"value": "yes",
566572
"action": [
567-
"v.ability = 'powerconstruct';",
568573
"q.dialogue.set_page('create_congrats');"
569574
]
570575
},
571576
{
572-
"text": "Cancel",
573-
"value": "cancel",
577+
"text": "No",
578+
"value": "no",
574579
"action": "q.dialogue.close();"
575580
}
576581
]
@@ -583,7 +588,7 @@
583588
"Congratulations!",
584589
{
585590
"type": "expression",
586-
"expression": "'You have created a ' + v.form + ' Zygarde with ' + v.ability + '!'"
591+
"expression": "'You have created a ' + v.form + ' Zygarde with ' + v.ability_string_cheese + '!'"
587592
},
588593
"It was added to your party."
589594
],

‎settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ develocity.buildScan {
1616
termsOfUseAgree = "yes"
1717
}
1818

19-
include("common", "fabric","neoforge")
19+
include("common", "fabric", "neoforge")
2020

2121
rootProject.name = "Generations-Core"

0 commit comments

Comments
 (0)