Commit Graph
9071 Commits
Author SHA1 Message Date
JazzMcNade a1aff7b457 Merge branch 'main' into LionsFoxesAndWolvesOhMy 2025-08-07 20:28:40 -05:00
JazzMcNade a1d3e4577f Allow pokemon to give up on seeking an unreachable berry bush 2025-08-05 00:57:45 -05:00
Paul 756989b0c0 Fixed storages not saving (OOPS) 2025-08-04 21:26:01 +10:00
Paul 58a4267f42 Added a living entity look_at_position function so we can make funny battle effects 2025-08-04 21:25:54 +10:00
Hiroku e8826a3d0e Merge branch 'trigger-behaviour' into 'main'
EntityCallbacks

See merge request cable-mc/cobblemon!1757
2025-08-04 07:58:43 +00:00
Paul e4f928bce1 Revert "Removed #c:is_cold from #cobblemon:is_cold to prevent pokes in the end that should not be in the end"
This reverts commit 6090fce254.
2025-08-04 15:55:43 +10:00
Paul 6090fce254 Removed #c:is_cold from #cobblemon:is_cold to prevent pokes in the end that should not be in the end 2025-08-04 14:29:20 +10:00
JazzMcNade 82963f273a Refactored PokemonItemSensor 2025-08-03 21:27:13 -05:00
JazzMcNade 88c5c1e224 Removed non null assertions 2025-08-03 20:32:23 -05:00
JazzMcNade d8b661ed0b more licenses 2025-08-03 19:18:00 -05:00
Paul 931c3a7e6c Removed observable use from Pokemon to better secure saving from rollback issues 2025-08-04 10:09:16 +10:00
JazzMcNade 03c1d560bc Clean up and licenses 2025-08-03 16:48:35 -05:00
JazzMcNade 02c347d22f Pokemon that pick up an item in the world are now persistent 2025-08-03 01:58:03 -05:00
Paul d5a6e0dffd Ohhh, THAT's why it was written that way 2025-08-03 15:40:56 +10:00
JazzMcNade d296194cc7 Merge branch 'main' into LionsFoxesAndWolvesOhMy 2025-08-02 17:30:22 -05:00
JazzMcNade 57daf3e860 Pickup items can now be specified with molang, lifted fox pickup list to pokemon_fox.json 2025-08-02 17:29:59 -05:00
dhi_holo 4bfca0da43 Small Asset Updates 2025-08-02 21:16:38 +00:00
Paul 52cff2e99d prepare_{id}, damage_{id} hooks for action effects, q.has_argument for battle messages, added q.hit_count to move action effects 2025-08-02 13:11:20 +10:00
Paul 52f21ffc82 License and registration please 2025-08-01 20:38:14 +10:00
Paul 9c31899f3c Fixed up some missing lang for behaviours 2025-08-01 20:32:17 +10:00
Polymeta 9a5172f1cc fix encoding issue with boat ride style
Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com>
2025-08-01 10:48:23 +01:00
Jackson Bowes 8b48cfaa50 Ride specific sound implementation 2025-08-01 08:12:32 +00:00
Polymeta 50c3ffc774 Merge branch 'bugfix-entity-health' into 'main'
Couple Pokémon HP / Entity health in a more sensible way.

See merge request cable-mc/cobblemon!1750
2025-07-28 08:58:23 +00:00
dhi_holo af4d2077ae Eat your, well, lots of things 2025-07-28 08:56:41 +00:00
JazzMcNade 7232b2cd26 Moved some fox configuration into pokemon_fox.json 2025-07-28 01:37:58 -05:00
Paul 3f090ce691 Merge remote-tracking branch 'origin/main' into trigger-behaviour 2025-07-28 11:34:37 +10:00
Polymeta b1a3cbf29d Merge branch 'cleanup-crew' into 'main'
Small Fixes

Closes #1640 and #1199

See merge request cable-mc/cobblemon!1753
2025-07-27 21:08:36 +00:00
dhi_holo 130c50a2d6 Small Fixes 2025-07-27 21:08:35 +00:00
JazzMcNade bb926e2dc8 Refactoring item detection into a sensor, more refactoring 2025-07-27 15:05:00 -05:00
JazzMcNade e39564667e Merge branch 'main' into LionsFoxesAndWolvesOhMy 2025-07-27 11:36:51 -05:00
Hiroku 0b65259ee7 Merge branch 'let-me-break-it-down-for-you-mark-we-can-bee-bees' into 'main'
Species JSON dictates if something acts like a bee (pollinates flowers and delivers to hive/nest)

See merge request cable-mc/cobblemon!1709
2025-07-27 12:16:12 +00:00
Paul 53897a2613 Removed debug code 2025-07-27 22:04:17 +10:00
Paul 8e6681b3aa Introduced EntityCallbacks 2025-07-27 22:02:30 +10:00
JazzMcNade d5bfaf2331 Changed underlying datastructure to preserve key order when iterating. 2025-07-26 20:47:23 -05:00
JazzMcNade a1790120a1 Added option to filter items via molang 2025-07-26 20:31:51 -05:00
JazzMcNade 0a4b6e08b5 Merge branch 'main' into LionsFoxesAndWolvesOhMy 2025-07-26 15:23:51 -05:00
JazzMcNade 9152ded2cb refactor immuneToSweetBerryBushBlock to BlockInteract, added canStandOnPowderSnow option 2025-07-26 15:20:26 -05:00
JazzMcNade 714666df1c Added configuration support for Pokemon to pickup and consume items 2025-07-26 14:27:44 -05:00
Paul 50427965ab Merge remote-tracking branch 'origin/main' into trigger-behaviour 2025-07-26 21:41:09 +10:00
Hiroku 0b97d139af Edit CobblemonFlows.kt 2025-07-26 10:51:35 +00:00
Paul 3966607373 Tidy up the script actions for adding/removing a Behaviour on an entity 2025-07-26 18:34:40 +10:00
JazzMcNade 1f60d8f413 Merge branch 'main' into LionsFoxesAndWolvesOhMy 2025-07-26 03:20:18 -05:00
Paul b7c5f489fd More cleanup 2025-07-26 14:31:57 +10:00
Paul 39ec6187b5 Various cleanup items and important fixes for wandering caused by bee stuff 2025-07-26 14:29:05 +10:00
Paul b7681b43f9 Merge remote-tracking branch 'origin/main' into let-me-break-it-down-for-you-mark-we-can-bee-bees 2025-07-26 13:26:19 +10:00
Konoha ae594a0790 Merge branch 'main' into extra_flows
# Conflicts:
#	common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt
2025-07-24 08:04:14 -04:00
Konoha 6af299406d Merge remote-tracking branch 'origin/main' 2025-07-24 07:57:51 -04:00
Nadja Reitzenstein 29833df50e Couple Pokémon HP / Entity health in a more sensible way.
Specifically, don't touch Battle HP for wild Pokémon so that you can't hurt a Pokémon down out of battle for an easier catch, and always round entity health up so that only a HP of 0 is a health of 0
2025-07-24 13:09:33 +02:00
Paul 01d42abdb2 look_at_target requires nearest living entities memory and sensor 2025-07-23 23:16:32 +10:00
Paul baa3f47769 Removed unused memory 2025-07-23 19:11:19 +10:00