mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-10-20 14:16:26 -04:00
Merge branch 'drained' into 'main'
Mega Doinked See merge request cable-mc/cobblemon!2447
This commit is contained in:
@@ -101,6 +101,7 @@
|
||||
- Made regional and Vivillon split-evo locations now mutually exclusive
|
||||
- Item evolutions now unlock **all** locked evolutions whose requirements are met instead of stopping after the first.
|
||||
- Exceptions being "forced" evolutions which will continue to stop after the first one
|
||||
- Removed Mega Drain as a TM
|
||||
|
||||
### Fixes
|
||||
- Correctly grants "They're Minerals!" advancement when planting a type gem
|
||||
|
||||
@@ -162,7 +162,6 @@
|
||||
"tm:infestation",
|
||||
"tm:leechlife",
|
||||
"tm:lunge",
|
||||
"tm:megadrain",
|
||||
"tm:nightshade",
|
||||
"tm:ominouswind",
|
||||
"tm:pounce",
|
||||
@@ -231,6 +230,7 @@
|
||||
"legacy:frustration",
|
||||
"legacy:headbutt",
|
||||
"legacy:hiddenpower",
|
||||
"legacy:megadrain",
|
||||
"legacy:mimic",
|
||||
"legacy:naturalgift",
|
||||
"legacy:psywave",
|
||||
|
||||
@@ -133,7 +133,6 @@
|
||||
"tm:infestation",
|
||||
"tm:leechlife",
|
||||
"tm:lunge",
|
||||
"tm:megadrain",
|
||||
"tm:nightshade",
|
||||
"tm:pounce",
|
||||
"tm:protect",
|
||||
@@ -187,6 +186,7 @@
|
||||
"legacy:frustration",
|
||||
"legacy:headbutt",
|
||||
"legacy:hiddenpower",
|
||||
"legacy:megadrain",
|
||||
"legacy:mimic",
|
||||
"legacy:naturalgift",
|
||||
"legacy:psywave",
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"moveName": "megadrain",
|
||||
"obtainMethods": [
|
||||
{
|
||||
"variant": "cobblemon:advancement",
|
||||
"advancement": "cobblemon:craft_remedy"
|
||||
}
|
||||
],
|
||||
"type": "grass",
|
||||
"recipe": [
|
||||
{
|
||||
"item": "cobblemon:grass_gem",
|
||||
"count": 2
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user