From ada0e9c545dd77072635c4b6fe28fb0110cc28e8 Mon Sep 17 00:00:00 2001
From: Andrew Ekstedt <andrew.ekstedt@gmail.com>
Date: Sat, 27 Oct 2018 14:44:55 -0700
Subject: [PATCH] Set rarity for gift encounter slots

---
 pokedex/data/csv/encounter_slots.csv | 48 ++++++++++++++--------------
 scripts/add-gift-encounters.py       |  5 +--
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/pokedex/data/csv/encounter_slots.csv b/pokedex/data/csv/encounter_slots.csv
index 9534534..2cbae57 100644
--- a/pokedex/data/csv/encounter_slots.csv
+++ b/pokedex/data/csv/encounter_slots.csv
@@ -488,27 +488,27 @@ id,version_group_id,encounter_method_id,slot,rarity
 487,15,4,0,60
 488,15,4,1,35
 489,15,4,2,5
-490,1,18,,
-491,15,18,,
-492,3,18,,
-493,4,18,,
-494,5,18,,
-495,6,18,,
-496,7,18,,
-497,8,18,,
-498,9,18,,
-499,10,18,,
-500,11,18,,
-501,14,18,,
-502,16,18,,
-503,3,19,,
-504,4,19,,
-505,5,19,,
-506,6,19,,
-507,7,19,,
-508,8,19,,
-509,9,19,,
-510,10,19,,
-511,11,19,,
-512,14,19,,
-513,16,19,,
+490,1,18,,100
+491,15,18,,100
+492,3,18,,100
+493,4,18,,100
+494,5,18,,100
+495,6,18,,100
+496,7,18,,100
+497,8,18,,100
+498,9,18,,100
+499,10,18,,100
+500,11,18,,100
+501,14,18,,100
+502,16,18,,100
+503,3,19,,100
+504,4,19,,100
+505,5,19,,100
+506,6,19,,100
+507,7,19,,100
+508,8,19,,100
+509,9,19,,100
+510,10,19,,100
+511,11,19,,100
+512,14,19,,100
+513,16,19,,100
diff --git a/scripts/add-gift-encounters.py b/scripts/add-gift-encounters.py
index 7f7ba0a..47556be 100644
--- a/scripts/add-gift-encounters.py
+++ b/scripts/add-gift-encounters.py
@@ -275,8 +275,9 @@ def record_method_and_gifts(gift_method, gift_data):
                     encounter_method_id = gift_method.id,
                     # No priority over or under other events/conditions
                     slot                = None,
-                    # Rarity is meaningless for gifts
-                    rarity              = None,
+                    # Rarity is meaningless for gifts, but say that it's
+                    # 100% to help out code that expects rarity to be defined.
+                    rarity              = 100,
                 )
                 session.add(encounter_slot)
                 session.commit()