add some tags

konfraria-developers · Dec 28, 2015 · 662c1f5 · 662c1f5
1 parent 518e237
commit 662c1f5
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 20 deletions.
diff --git a/bell_tower.py b/bell_tower.py
@@ -75,21 +75,21 @@ def get_random_token(self, tokens, date):
         # get day/month key
         key_day = '%s/%s' % (date.day, date.month)
 
-        if key_day in tokens['day_month'][key_day]:
+        if key_day in tokens['day_month']:
 
             keys_list = ['day_month'] * 50 +          \
-                        ['other'] * 25 +              \
-                        ['month'] * 15 +              \
-                        ['day_week'] * 7 +            \
-                        ['hours_interval'] * 2 +      \
-                        ['calendar_interval'] * 1
+                        ['other'] * 10 +              \
+                        ['month'] * 10 +              \
+                        ['day_week'] * 10 +           \
+                        ['hours_interval'] * 10 +     \
+                        ['season'] * 10
         else:
 
-            keys_list = ['other'] * 50 +              \
-                        ['month'] * 25 +              \
-                        ['day_week'] * 15 +           \
-                        ['hours_interval'] * 7 +      \
-                        ['calendar_interval'] * 3
+            keys_list = ['other'] * 20 +              \
+                        ['month'] * 20 +              \
+                        ['day_week'] * 20 +           \
+                        ['hours_interval'] * 20 +     \
+                        ['season'] * 20
 
         # choode weighted random keys
         key = str(random.choice(keys_list))
@@ -100,14 +100,17 @@ def get_random_token(self, tokens, date):
         elif key == 'month':
             key_ = str(date.month)
 
-        elif key == 'calendar_interval':
-            key_ = 'interval_1'
+        elif key == 'season':
+            key_ = 'winter'
 
         elif key == 'day_week':
             key_ = str(date.weekday() + 1)
 
         elif key == 'hours_interval':
-            key_ = 'morning'
+            if date.hour < 12:
+                key_ = 'morning'
+            else:
+                key_ = 'night'
 
         # get a random tokens
         if key == 'other':

diff --git a/data/sayings.json b/data/sayings.json
@@ -238,7 +238,10 @@
 
     "hours_interval": {
         "morning": [
-            "«Qui matina, fa farina»"
+            "«Cada dia pel matí, canta el gall qui-qui-ri-qui»"
+        ],
+        "night": [
+            "«Bona nit bons germans, bona nit»"
         ]
     },
 
@@ -257,7 +260,7 @@
             "«L'hivern té mal govern»",
             "«Mal hivern, primavera d'infern»",
             "«Orenetes tardanes, hi ha hivern per setmanes»",
-            "«Pluja d'hivern, dia d'infern»",
+            "«Pluja d'hivern, dia d'infern»"
         ],
         "spring": [
             "«En el llit, tot l'any és primavera»",
@@ -303,7 +306,7 @@
             "«Tardor i hivern, per al vell, temps d'infern»",
             "«Tardor serena, hivernventós; tardor ventosa, hivernserè»",
             "«Tardorada dolenta, millor tardana que primerenca»",
-            "«Verdura per la tardor, per a tu i per a mi, no»",
+            "«Verdura per la tardor, per a tu i per a mi, no»"
         ]
     },
 

diff --git a/data/tags.json b/data/tags.json
@@ -122,19 +122,37 @@
             "Novembre"
         ],
         "12": [
-            "Desembre"
+            "Desembre",
+            "DesembreCongelat",
+            "FumFumFum",
+            "ChristmasIsComming"
         ]
     },
 
     "hours_interval": {
         "morning": [
             "BonDiaLaVilaDelPingüí"
+        ],
+        "night": [
+            "DePetAlLlit"
         ]
     },
 
-    "calendar_interval": {
-        "interval_1": [
+    "season": {
+        "winter": [
+            "HivernGlaçat",
+            "FaFred!",
+            "LaMarEstaFresquibiris",
+            "AmbElCulALaire"
+        ],
+        "summer": [
+            "HivernGlaçat"
+        ],
+        "spring": [
             "HivernGlaçat"
+        ],
+        "autumn": [
+            "WinterIsComming"
         ]
     },