summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2019-10-14 13:05:07 -0400
committerhuderlem <huderlem@gmail.com>2019-10-16 20:09:49 -0500
commit0bc41d1fd304e205e0db23bf502dfcbc7f1142bc (patch)
tree7b5ec6be2b95565dd2046f2f13a7d0bc3d7c1d4b /src
parentfc2926aa469de176403d0ccaba3ad503c65ff98e (diff)
remove empty groups from wild encounter fields json objects
Diffstat (limited to 'src')
-rw-r--r--src/data/wild_encounters.json9
-rw-r--r--src/data/wild_encounters.json.txt2
2 files changed, 4 insertions, 7 deletions
diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json
index 37cffbca9..46d6feea4 100644
--- a/src/data/wild_encounters.json
+++ b/src/data/wild_encounters.json
@@ -8,22 +8,19 @@
"type": "land_mons",
"encounter_rates": [
20, 20, 10, 10, 10, 10, 5, 5, 4, 4, 1, 1
- ],
- "groups": {}
+ ]
},
{
"type": "water_mons",
"encounter_rates": [
60, 30, 5, 4, 1
- ],
- "groups": {}
+ ]
},
{
"type": "rock_smash_mons",
"encounter_rates": [
60, 30, 5, 4, 1
- ],
- "groups": {}
+ ]
},
{
"type": "fishing_mons",
diff --git a/src/data/wild_encounters.json.txt b/src/data/wild_encounters.json.txt
index 5e0286b61..c6bbdd34e 100644
--- a/src/data/wild_encounters.json.txt
+++ b/src/data/wild_encounters.json.txt
@@ -3,7 +3,7 @@
## for wild_encounter_group in wild_encounter_groups
{% if wild_encounter_group.for_maps %}
## for wild_encounter_field in wild_encounter_group.fields
-{% if isEmpty(wild_encounter_field.groups) %}
+{% if not existsIn(wild_encounter_field, "groups") %}
## for encounter_rate in wild_encounter_field.encounter_rates
{% if loop.index == 0 %}
#define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_SLOT_{{ loop.index }} {{ encounter_rate }} {% else %}#define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_SLOT_{{ loop.index }} ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_SLOT_{{ subtract(loop.index, 1) }} + {{ encounter_rate }}{% endif %} {{ setVarInt(wild_encounter_field.type, loop.index) }}