Merge branch 'test' of https://github.com/Rasseki-Studios/rasseki.game …

…into test
Rasseki-Studios · Jun 21, 2018 · a662de4 · a662de4
2 parents 0d92149 + 91c61b0
commit a662de4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/adapter/libAdapter.cpp b/adapter/libAdapter.cpp
@@ -77,12 +77,12 @@ int Go(int x, int y) {  //перемещение героя
     gameData.tdWorking = true;
     gameData.writer = gameData.hero.GetName();
     if (gameData.hero.Move({x, y})) {
-        gameData.diaryString = say_go;
+        // gameData.diaryString = say_go;
         Moving();
     }
-    else {
-        gameData.diaryString = say_cant_go;
-    }
+    // else {
+    //     gameData.diaryString = say_cant_go;
+    // }
     return 0;
 }
 

diff --git a/resources/default_location/events/event.json b/resources/default_location/events/event.json
@@ -22,8 +22,8 @@
         ]
     },
     {
-        "id": "between_mountains_1",
-        "name": "Between mountains_1",
+        "id": "between_hills",
+        "name": "Between hills",
         "level": 1,
         "coord": {
             "x": 636,