Merge branch 'master' into release

salotor · Jan 15, 2019 · 66c9f7b · 66c9f7b
2 parents 71b907f + 8065798
commit 66c9f7b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 1 deletion.
diff --git a/Config/res/7dl_sprites.rpy b/Config/res/7dl_sprites.rpy
@@ -26,6 +26,9 @@ init 9999 python:
                     'el':{'1':['body'],
                           '2':['body'],
                           '3':['body']},
+                    'ka':{'1':['body'],
+                          '2':['body'],
+                          '3':['body']},
                     'ln':{'1':['body'],
                           '2':['body'],
                           '3':['body']},
@@ -77,6 +80,9 @@ init 9999 python:
                     'el':{'1':['pioneer'],
                           '2':['pioneer'],
                           '3':['pioneer']},
+                    'ka':{'1':['casual','dress','pioneer','swim','body'],
+                          '2':['casual','dress','pioneer','swim','body'],
+                          '3':['casual','dress','pioneer','swim','body']},
                     'ln':{'1':['dress','pioneer','body'],
                           '2':['dress','pioneer','body'],
                           '3':['dress','pioneer','body']},
@@ -128,7 +134,10 @@ init 9999 python:
                     'el':{'1':['grin','normal','smile'],
                           '2':['fingal','sad','scared','shocked','surprise','upset'],
                           '3':['angry','laugh','serious']},
-                    'ln':{'1':['angry','normal','sad'],
+                    'ka':{'1':['normal','sad','smile'],
+                          '2':['grin','guilty','shy','surprise'],
+                          '3':['angry','dontlike','laugh','serious']}
+                    ,'ln':{'1':['angry','normal','sad'],
                           '2':['dontlike','grin','guilty'],
                           '3':['serious','smile','surprise']},
                     'mi':{'1':['cry','dontlike','laugh','scared','shocked','shy','surprise'],
@@ -179,6 +188,9 @@ init 9999 python:
                     'el':{'1':[''],
                           '2':[''],
                           '3':['']},
+                    'ka':{'1':[''], #смена цвета глаз в потенциале
+                          '2':[''],
+                          '3':['']},
                     'ln':{'1':[''],
                           '2':[''],
                           '3':['']},

diff --git a/Pics/sprites/normal/ka/normal/ka_1_body.png b/Pics/sprites/normal/ka/normal/ka_1_body.png
diff --git a/Pics/sprites/normal/ka/normal/ka_1_pioneer.png b/Pics/sprites/normal/ka/normal/ka_1_pioneer.png
diff --git a/Pics/sprites/normal/ka/normal/ka_2_body.png b/Pics/sprites/normal/ka/normal/ka_2_body.png
diff --git a/Pics/sprites/normal/ka/normal/ka_2_pioneer.png b/Pics/sprites/normal/ka/normal/ka_2_pioneer.png
diff --git a/Pics/sprites/normal/ka/normal/ka_3_body.png b/Pics/sprites/normal/ka/normal/ka_3_body.png
diff --git a/Pics/sprites/normal/ka/normal/ka_3_pioneer.png b/Pics/sprites/normal/ka/normal/ka_3_pioneer.png