From 3d4475f54d06c94ced4d14e0c26f62803b08525d Mon Sep 17 00:00:00 2001 From: DeltaJordan Date: Mon, 2 Jan 2023 13:47:20 +0000 Subject: [PATCH] [Feature] Add Starter Pool (#108) * [Feature] Added Starter Pool. * Added constant for default Pokemon pools. * Made get_allowed_md_starter_ids use Roster.STARTERS by default. * Added copy and paste to both pokemon pools. * Reworked copying pools to be more clear to an end user. * Added "Reset to Default" button to each Pokemon pool. --- skytemple_randomizer/config.py | 10 +- skytemple_randomizer/data/default.json | 1 + skytemple_randomizer/frontend/gtk/config.py | 4 + skytemple_randomizer/frontend/gtk/main.py | 24 ++ .../frontend/gtk/skytemple_randomizer.glade | 304 +++++++++++++++++- skytemple_randomizer/lists.py | 2 + skytemple_randomizer/randomizer/starter.py | 6 +- skytemple_randomizer/randomizer/util/util.py | 14 + 8 files changed, 348 insertions(+), 17 deletions(-) diff --git a/skytemple_randomizer/config.py b/skytemple_randomizer/config.py index 8e30cb34b..c9e5d5cff 100644 --- a/skytemple_randomizer/config.py +++ b/skytemple_randomizer/config.py @@ -33,8 +33,9 @@ from skytemple_files.patch.handler.move_shortcuts import MoveShortcutsPatch from skytemple_files.patch.handler.unused_dungeon_chance import UnusedDungeonChancePatch -CLASSREF = '__classref' +from skytemple_randomizer.lists import DEFAULTMONSTERPOOL +CLASSREF = '__classref' class Global: main_builder = None @@ -271,6 +272,7 @@ class MonsterConfig(TypedDict): tms_hms: bool abilities_enabled: List[int] monsters_enabled: List[u16] + starters_enabled: List[u16] moves_enabled: List[u16] @@ -291,6 +293,8 @@ class MonsterConfigDoc: """Only these abilities will be chosen, if abilities are randomized.""" monsters_enabled = \ """Only these Pokémon will be used for ANY randomization options in this randomizer.""" + starters_enabled = \ + """Only these Pokémon will be used for starter randomization options in this randomizer.""" moves_enabled = \ """Only these moves will be chosen, if moves are randomized.""" @@ -496,7 +500,9 @@ def _handle(cls, target, typ: type): elif field == 'moves_enabled': target[field] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 360, 394, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541] elif field == 'monsters_enabled': - target[field] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536] + target[field] = DEFAULTMONSTERPOOL + elif field == 'starters_enabled': + target[field] = DEFAULTMONSTERPOOL elif field == 'quiz' and field_type == QuizConfig: target[field] = {'mode': 1, 'randomize': False, 'questions': []} elif field == 'native_file_handlers': diff --git a/skytemple_randomizer/data/default.json b/skytemple_randomizer/data/default.json index 25930b81d..99341a7c8 100644 --- a/skytemple_randomizer/data/default.json +++ b/skytemple_randomizer/data/default.json @@ -216,6 +216,7 @@ "ban_unowns": true, "abilities_enabled": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 107, 108, 109, 110, 111, 112, 113, 114, 115, 117, 118, 119, 120, 121, 122, 123], "monsters_enabled": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536], + "starters_enabled": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536], "moves_enabled": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 360, 394, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541] }, "locations": { diff --git a/skytemple_randomizer/frontend/gtk/config.py b/skytemple_randomizer/frontend/gtk/config.py index 7d552f6f3..e94fd0c3b 100644 --- a/skytemple_randomizer/frontend/gtk/config.py +++ b/skytemple_randomizer/frontend/gtk/config.py @@ -61,6 +61,7 @@ def apply(self, config: RandomizerConfig): self.builder.get_object('store_tree_monsters_moves').clear() self.builder.get_object('store_tree_dungeons_items').clear() self.builder.get_object('store_tree_item_weights').clear() + self.builder.get_object('store_tree_monsters_starters').clear() self._handle(config) def _handle(self, config, field_name=None): @@ -133,6 +134,9 @@ def _handle(self, config, field_name=None): elif field_name == 'pokemon_monsters_enabled': for a, name in MONSTERS.items(): s.append([a, name, a in config]) + elif field_name == 'pokemon_starters_enabled': + for a, name in MONSTERS.items(): + s.append([a, name, a in config]) else: raise TypeError(f"Unknown type for {self.__class__.__name__}: {typ}") diff --git a/skytemple_randomizer/frontend/gtk/main.py b/skytemple_randomizer/frontend/gtk/main.py index d7f1f178f..772356a1f 100644 --- a/skytemple_randomizer/frontend/gtk/main.py +++ b/skytemple_randomizer/frontend/gtk/main.py @@ -52,6 +52,7 @@ from skytemple_randomizer.frontend.gtk.config import ConfigUIApplier, ConfigUIReader, ConfigDocApplier from skytemple_randomizer.randomizer_thread import RandomizerThread from skytemple_randomizer.status import Status +from skytemple_randomizer.lists import DEFAULTMONSTERPOOL from gi.repository import Gtk, GLib, Gdk, GtkSource from gi.repository.Gtk import Window @@ -166,6 +167,10 @@ def on_cr_pokemon_monsters_enabled_use_toggled(self, widget, path): store: Gtk.Store = self.builder.get_object('store_tree_monsters_monsters') store[path][2] = not widget.get_active() + def on_cr_pokemon_starters_enabled_use_toggled(self, widget, path): + store: Gtk.Store = self.builder.get_object('store_tree_monsters_starters') + store[path][2] = not widget.get_active() + def on_cr_pokemon_moves_enabled_use_toggled(self, widget, path): store: Gtk.Store = self.builder.get_object('store_tree_monsters_moves') store[path][2] = not widget.get_active() @@ -186,6 +191,25 @@ def on_cr_item_weights_multiplier_edited(self, _widget, path, text): store: Gtk.ListStore = self.builder.get_object('store_tree_item_weights') store[path][2] = text + def on_btn_pokemon_copy_for_starters(self, source): + destination: Gtk.ListStore = self.builder.get_object('store_tree_monsters_starters') + values = [x[2] for x in source] + for idx, x in enumerate(destination): + x[2] = values[idx] + + def on_btn_pokemon_copy_for_monsters(self, source): + destination: Gtk.ListStore = self.builder.get_object('store_tree_monsters_monsters') + values = [x[2] for x in source] + for idx, x in enumerate(destination): + x[2] = values[idx] + + def on_btn_pokemon_reset(self, pool): + for x in pool: + x[2] = x[0] in DEFAULTMONSTERPOOL + + def on_btn_pokemon_select_none(self, pool): + for x in pool: + x[2] = False def on_btn_rom_clicked(self, *args): dialog: Gtk.FileChooserNative = Gtk.FileChooserNative.new( diff --git a/skytemple_randomizer/frontend/gtk/skytemple_randomizer.glade b/skytemple_randomizer/frontend/gtk/skytemple_randomizer.glade index 29b4987e9..dac6e5437 100644 --- a/skytemple_randomizer/frontend/gtk/skytemple_randomizer.glade +++ b/skytemple_randomizer/frontend/gtk/skytemple_randomizer.glade @@ -328,6 +328,16 @@ + + + + + + + + + + @@ -348,6 +358,16 @@ + + + + + + + + + + False skytemple @@ -3280,21 +3300,94 @@ Try pressing A+B+X+Y if you get stuck in a cutscene. vertical 10 - + + True - True - True - start - center - 10 - 10 - 10 + False + 10 - + + True + True + True + start + center + 10 + 10 + 10 + + + True + False + skytemple-help-about-symbolic + + + + + 0 + 0 + + + + + Copy from Starter Pool + True + True + True + end + center + + + + 1 + 0 + + + + True False - skytemple-help-about-symbolic + end + 10 + + + Reset to Default + True + True + True + + + + False + True + 0 + + + + + Select None + True + True + True + end + center + True + + + + False + True + 1 + + + + 1 + 1 + + + + @@ -3381,6 +3474,193 @@ Try pressing A+B+X+Y if you get stuck in a cutscene. False + + + True + False + vertical + 10 + + + + + + + True + False + 10 + + + True + True + True + start + center + 10 + 10 + 10 + + + True + False + skytemple-help-about-symbolic + + + + + 0 + 0 + + + + + Copy from Pokémon Pool + True + True + True + end + center + + + + 1 + 0 + + + + + True + False + end + 10 + + + Reset to Default + True + True + True + + + + False + True + 0 + + + + + Select None + True + True + True + start + end + True + + + + False + True + 1 + + + + + 1 + 1 + + + + + + + + False + True + 1 + + + + + True + True + never + in + + + True + True + 5 + True + True + store_tree_monsters_starters + 0 + + + + + + ID + + + + 0 + + + + + + + Use? + + + + + + 2 + + + + + + + Pokémon + + + + 1 + + + + + + + + + True + True + 2 + + + + + + + + 3 + + + + + True + False + Starter Pool + + + 3 + False + + True @@ -3475,7 +3755,7 @@ Try pressing A+B+X+Y if you get stuck in a cutscene. - 3 + 4 @@ -3485,7 +3765,7 @@ Try pressing A+B+X+Y if you get stuck in a cutscene. Move Pool - 3 + 4 False diff --git a/skytemple_randomizer/lists.py b/skytemple_randomizer/lists.py index 493e6c671..9db64ece4 100644 --- a/skytemple_randomizer/lists.py +++ b/skytemple_randomizer/lists.py @@ -14,6 +14,8 @@ # # You should have received a copy of the GNU General Public License # along with SkyTemple. If not, see . +DEFAULTMONSTERPOOL = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536] + MONSTERS = { 0: '??????????', 1: 'Bulbasaur', diff --git a/skytemple_randomizer/randomizer/starter.py b/skytemple_randomizer/randomizer/starter.py index 91cd14bbc..fc5a30922 100644 --- a/skytemple_randomizer/randomizer/starter.py +++ b/skytemple_randomizer/randomizer/starter.py @@ -26,7 +26,7 @@ from skytemple_files.data.str.model import Str from skytemple_files.hardcoded.personality_test_starters import HardcodedPersonalityTestStarters from skytemple_randomizer.randomizer.abstract import AbstractRandomizer -from skytemple_randomizer.randomizer.util.util import get_main_string_file, get_allowed_md_ids, clone_missing_portraits, \ +from skytemple_randomizer.randomizer.util.util import get_main_string_file, get_allowed_md_starter_ids, clone_missing_portraits, \ replace_strings, get_all_string_files, Roster from skytemple_randomizer.status import Status @@ -49,7 +49,7 @@ def run(self, status: Status): orig_partner_ids = HardcodedPersonalityTestStarters.get_partner_md_ids(overlay13, self.static_data) new_partner_ids = [ - self._random_gender(choice(get_allowed_md_ids(self.config, roster=Roster.STARTERS))) + self._random_gender(choice(get_allowed_md_starter_ids(self.config, roster=Roster.STARTERS))) for _ in range(0, len(orig_partner_ids)) ] HardcodedPersonalityTestStarters.set_partner_md_ids(new_partner_ids, overlay13, self.static_data) @@ -61,7 +61,7 @@ def run(self, status: Status): new_id: u16 k = 0 # Index of text for "Will be..." for i in range(0, len(orig_player_ids)): - new_id = choice(get_allowed_md_ids(self.config, roster=Roster.STARTERS)) + new_id = choice(get_allowed_md_starter_ids(self.config, roster=Roster.STARTERS)) if k % 3 == 0: k += 1 # todo: refactor, this isn't really efficient. diff --git a/skytemple_randomizer/randomizer/util/util.py b/skytemple_randomizer/randomizer/util/util.py index 609f07710..63a37b6bf 100644 --- a/skytemple_randomizer/randomizer/util/util.py +++ b/skytemple_randomizer/randomizer/util/util.py @@ -121,6 +121,20 @@ def get_allowed_md_ids(conf: RandomizerConfig, with_plus_600=False, *, roster=Ro return fun.get_allowed_md_ids(ents, roster) return list(ents) +def get_allowed_md_starter_ids(conf: RandomizerConfig, with_plus_600=False, *, roster=Roster.STARTERS) -> List[u16]: + from skytemple_randomizer.randomizer.special import fun + num_entities = FileType.MD.properties().num_entities + ents = set(conf['pokemon']['starters_enabled']) + if with_plus_600: + to_add = set() + for ent in ents: + if ent + num_entities <= 1154: + to_add.add(u16(ent + num_entities)) + ents.update(to_add) + if fun.is_fun_allowed(): + return fun.get_allowed_md_ids(ents, roster) + return list(ents) + def get_allowed_item_ids(conf: RandomizerConfig) -> List[int]: return conf['dungeons']['items_enabled']