From 2bb7cae632517ef32593e7e97472ce505aa6ed2a Mon Sep 17 00:00:00 2001
From: "anton.gurov" <anton.gurov@corp.mail.ru>
Date: Thu, 31 Oct 2019 16:38:29 +0300
Subject: [PATCH] fix tile colors, mem constant

---
 cmd/game/main.go       |  3 ++-
 engine/gamemap/tile.go | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cmd/game/main.go b/cmd/game/main.go
index ee09d44..db550ff 100644
--- a/cmd/game/main.go
+++ b/cmd/game/main.go
@@ -47,10 +47,11 @@ func (*GameState) Do(f func()) {
 // func doSomething(State main.GameState, args...) {
 // 		...
 // 			State.Do(func() {
-//				...do stuff in main thread
+//				...do stuff in main thread, ie render something
 //			})
 // 		...
 // }
+// Use this trick CAREFULLY, cause closures may cause memleaks
 
 var State = GameState{
 	mainfunc: make(chan func()),
diff --git a/engine/gamemap/tile.go b/engine/gamemap/tile.go
index 4294dc6..32f3bce 100644
--- a/engine/gamemap/tile.go
+++ b/engine/gamemap/tile.go
@@ -82,7 +82,7 @@ func (t *Tile) GetChar() string {
 }
 
 func (t *Tile) GetRawColor() uint32 {
-	if t.Visible {
+	if !t.Visible {
 		return t.Appearance.ColorSet.Fg.GetColor()
 	} else {
 		return t.Appearance.ColorSet.DarkFg.GetColor()
@@ -90,7 +90,7 @@ func (t *Tile) GetRawColor() uint32 {
 }
 
 func (t *Tile) GetRawBgColor() uint32 {
-	if t.Visible {
+	if !t.Visible {
 		return t.Appearance.ColorSet.Bg.GetColor()
 	} else {
 		return t.Appearance.ColorSet.DarkBg.GetColor()
@@ -182,11 +182,11 @@ func NewWaterTile() *Tile {
 				Bg: &DanceColorHolder{
 					255,
 					singleColorRing(19),
-					fillColorRing(19, 0, 15, 2),
-					fillColorRing(70, 120, 220, 12),
+					fillColorRing(22, 2, 42, 4),
+					fillColorRing(204, 180, 229, 12),
 				},
 				DarkFg: &PlainColorHolder{255, 30, 20, 50 },
-				DarkBg: &PlainColorHolder{255, 7, 7, 30},
+				DarkBg: &PlainColorHolder{255, 7, 7, 80},
 			},
 		},
 	}
@@ -209,11 +209,11 @@ func NewDeepWaterTile() *Tile {
 				Bg: &DanceColorHolder{
 					255,
 					singleColorRing(5),
-					fillColorRing(2,2,42,4),
-					fillColorRing(154, 150, 229, 12),
+					fillColorRing(2,0,15,2),
+					fillColorRing(154, 120, 180, 5),
 				},
 				DarkFg: &PlainColorHolder{255, 30, 20, 50},
-				DarkBg: &PlainColorHolder{255, 7, 7, 30},
+				DarkBg: &PlainColorHolder{255, 7, 7, 80},
 			},
 		},
 	}