Commit Graph
1294 Commits
Author SHA1 Message Date
Deltric 159a3b88ca Remove sendServerMessage extension 2022-08-15 08:56:14 -05:00
Deltric 15d790fdd5 Remove send server message import 2022-08-15 08:52:59 -05:00
Deltric ea3c9ea641 Fixed item interact evolutions in species 2022-08-15 08:48:52 -05:00
Deltric 9150b5df7d Merge branch 'main' into #88-update-to-119 2022-08-15 08:36:40 -05:00
Paul a374f848b4 Merge remote-tracking branch 'origin/main' 2022-08-15 21:48:13 +10:00
Paul 5d40a38b90 Added spawn files, added stat JSONs for generation 1 2022-08-15 21:48:03 +10:00
Hiroku 09d70a1c47 Update tr_tr.json 2022-08-15 10:46:48 +00:00
Paul 5e4d94c597 Moved Gyarados to aspect system, fixed starter screen issue of displaying starters 2022-08-15 15:40:25 +10:00
Deltric 4d02fbdca6 Ported new classes from main 2022-08-14 22:45:20 -05:00
Deltric 7819970ac6 Commands ported, more arguments, and apricorn fixes. 2022-08-14 22:42:31 -05:00
Deltric 685da31b70 Port resources, Game rules, and extension 2022-08-14 22:42:31 -05:00
Deltric 96d2064d73 Fixed command argument registration 2022-08-14 22:42:31 -05:00
Deltric 7bd4449215 More classes ported with 73 errors remaining 2022-08-14 22:42:31 -05:00
Deltric c230e93afb Initial update stuff 2022-08-14 22:42:02 -05:00
Hiroku 1316df57e2 Merge branch 'batucagdas-main-patch-69431' into 'main'
Translated the mod for Turkish language.

See merge request cable-mc/pokemon-cobbled!128
2022-08-15 01:53:31 +00:00
Hiroku 4a031f24b3 Merge branch 'more-stat-json-work' into 'main'
Updated learnset format in species, upgraded various evolution configuration...

See merge request cable-mc/pokemon-cobbled!126
2022-08-15 01:53:13 +00:00
Paul a870fcb1a2 Renamed RESTING behaviour flag to SLEEPING 2022-08-15 10:43:16 +10:00
Hiroku ebe9d1d57e Merge branch '#19-pc-gui' into 'main'
Initial version of the PC

See merge request cable-mc/pokemon-cobbled!127
2022-08-15 00:25:11 +00:00
Batuhan 30429cfff2 Translated the mod for Turkish language. I start translating dex entries from the beginning because of one mistake. 2022-08-14 23:37:26 +00:00
Deltric e329423265 Rest of PC movement 2022-08-14 14:39:48 -05:00
Deltric 0bac7ca19f Implemented party render, logic coming next 2022-08-14 14:39:48 -05:00
Deltric 8d28f47b7e Correctly placed navigation buttons 2022-08-14 14:39:48 -05:00
Deltric 8414133496 Implement PC GUI pages 2022-08-14 14:39:48 -05:00
Deltric 79ca620216 Fix PC not saving 2022-08-14 14:39:47 -05:00
Deltric 6c965e70b4 progress from other night 2022-08-14 14:39:47 -05:00
Deltric 87015a030d Start to PC 2022-08-14 14:39:47 -05:00
Paul ee38e691ad Merge branch 'main' of gitlab.com:cable-mc/pokemon-cobbled into more-stat-json-work
 Conflicts:
	common/src/main/kotlin/com/cablemc/pokemoncobbled/common/pokemon/Pokemon.kt
2022-08-13 19:49:16 +10:00
Paul b4e184fb5b Updated learnset format in species, upgraded various evolution configuration bits, added updated stat JSONs for in-game pokemon, update pokemon lang 2022-08-13 19:47:56 +10:00
Hiroku 3fc0bdb3fa Merge branch 'species-changes-support' into 'main'
Species identifier support

See merge request cable-mc/pokemon-cobbled!125
2022-08-11 12:39:52 +00:00
Licious a2d6c2b14d Add support for identifiers on remaining species references using the old name system. 2022-08-11 12:25:53 +01:00
Licious 5c205c62c6 Add support for identifiers on PokemonProperties, fixed PokemonPropertiesArgumentType not consuming the remaining reader. 2022-08-10 20:49:53 +01:00
Hiroku 16ec76f6ac Merge branch 'label-rename' into 'main'
Renamed Pokémon tags to labels.

See merge request cable-mc/pokemon-cobbled!124
2022-08-10 11:52:45 +00:00
Licious 5840a796d5 Renamed Pokémon tags to labels. 2022-08-10 12:29:29 +01:00
Hiroku 7180199a60 Merge branch 'species-data-pack-support' into 'main'
Species data pack support

See merge request cable-mc/pokemon-cobbled!123
2022-08-10 10:52:29 +00:00
Hiroku 118cabf85d Merge branch 'main' into 'main'
Custom Cobbled Capture Calculator and Busy Lock Fix

See merge request cable-mc/pokemon-cobbled!121
2022-08-10 10:51:54 +00:00
Hiroku baab35c2ea Merge branch 'BulbasaurUpdatedModel' into 'main'
Updated Bulbasaur Model

See merge request cable-mc/pokemon-cobbled!117
2022-08-10 10:50:10 +00:00
Licious d9f3a89959 Merge remote-tracking branch 'origin/species-data-pack-support' into species-data-pack-support 2022-08-10 11:40:07 +01:00
Licious 74a6d07ec6 Changed Pokémon tags to be just strings, cleaned up CobbledDataProvider 2022-08-10 11:39:54 +01:00
Paul 9de29420d5 Merge branch 'species-data-pack-support' of gitlab.com:cable-mc/pokemon-cobbled into species-data-pack-support 2022-08-10 16:15:34 +10:00
Paul 03f0aa198b Added texture layers to pokemon models 2022-08-10 16:15:23 +10:00
Licious b8ee7ff7b0 Fix compile error and remove unused import. 2022-08-09 17:04:08 +01:00
Licious 94a0d7c373 Merge remote-tracking branch 'origin/species-data-pack-support' into species-data-pack-support 2022-08-09 17:02:44 +01:00
Licious a11ee9b8f1 Polished flags system, added flag PokemonProperty. 2022-08-09 17:02:32 +01:00
Paul 86bcd06253 Reload spawn pools when PokemonSpecies reloads 2022-08-09 20:28:23 +10:00
Paul 99c16e3151 Converted abilities to data packs 2022-08-09 20:17:26 +10:00
Paul d0c728bfaf Fix lang for /teach and /healpokemon 2022-08-09 19:46:36 +10:00
Paul 8630c0046e Updated Moves to be a DataRegistry 2022-08-09 19:38:43 +10:00
Paul eec2d94722 Prevent reloading Cobbled registries once in-game 2022-08-09 19:02:31 +10:00
Nick DeGruccio 5caafa9ccf Simplify calculation, 3x maximum difficulty increase, unit test 2022-08-09 01:09:15 -07:00
Nick DeGruccio a3ffa90e38 Implement custom Cobbled catch rate calculator, fix busy locks on pokemon being captured lingering 2022-08-08 21:22:11 -07:00