From 0e7972ec83a77b4501ff6a7171155460b67d9640 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Mon, 14 Sep 2015 21:35:05 -0400 Subject: [PATCH] friendz: rename `par` as `gold` as is it more clear that it higer is better Signed-off-by: Jean Privat --- contrib/friendz/src/friendz.nit | 12 ++++++------ contrib/friendz/src/level.nit | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/friendz/src/friendz.nit b/contrib/friendz/src/friendz.nit index 9425abe..07156aa 100644 --- a/contrib/friendz/src/friendz.nit +++ b/contrib/friendz/src/friendz.nit @@ -217,9 +217,9 @@ class LevelButton self.over = self.level.fullname if self.level.get_state >= l.l_won then - if game.levels[9].get_state >= l.l_won then self.over += " --- {self.level.score}/{self.level.par}" + if game.levels[9].get_state >= l.l_won then self.over += " --- {self.level.score}/{self.level.gold}" else if self.level.get_state >= l.l_open then - if game.levels[9].get_state >= l.l_open then self.over += " --- ?/{self.level.par}" + if game.levels[9].get_state >= l.l_open then self.over += " --- ?/{self.level.gold}" end #self.enabled = l.get_state >= l.l_open end @@ -242,7 +242,7 @@ class LevelButton end ctx.blit(game.img[ix,iy], self.x, self.y) - if s == l.l_par then + if s == l.l_gold then ctx.blit(game.img2[7,0], self.x + bw*5/8, self.y-bh*1/8) end ctx.textx(self.level.name, self.x+5, self.y+5, 24, null, null) @@ -730,9 +730,9 @@ class Score end if game.levels[9].get_state >= level.l_won then if level.is_challenge then - ctx.textx("GOAL: {level.par}",self.x,self.y+44,21,"yellow",null) + ctx.textx("GOAL: {level.gold}",self.x,self.y+44,21,"yellow",null) else - ctx.textx("PAR: {level.par}",self.x,self.y+44,21,"yellow",null) + ctx.textx("GOLD: {level.gold}",self.x,self.y+44,21,"yellow",null) end end end @@ -1094,7 +1094,7 @@ redef class Game end t = new Achievement(self, 0, "Training") entities.push(t) - t = new Achievement(self, 1, "Par") + t = new Achievement(self, 1, "Gold") entities.push(t) t = new Achievement(self, 2, "Editor") entities.push(t) diff --git a/contrib/friendz/src/level.nit b/contrib/friendz/src/level.nit index 9d8029e..353302a 100644 --- a/contrib/friendz/src/level.nit +++ b/contrib/friendz/src/level.nit @@ -23,7 +23,7 @@ class Level var ls = code.split(";") self.number = i self.str = ls[0] - self.par = ls[1].to_i + self.gold = ls[1].to_i if ls.length >= 3 then self.status = ls[2] end @@ -47,8 +47,8 @@ class Level # initial grid position var str: String - # top score - var par: Int + # top score to get gold + var gold: Int # Help message if any var status: String = "" @@ -72,22 +72,22 @@ class Level var l_disabled = 1 var l_open = 2 var l_won = 3 - var l_par = 4 + var l_gold = 4 fun get_state: Int do if self.score == 0 then if self.number == 0 or game.levels[self.number-1].score > 0 then return l_open if self.number == 25 and game.levels[19].score > 0 then return l_open else return l_disabled - else if self.score < self.par or not game.levels[9].score > 0 then + else if self.score < self.gold or not game.levels[9].score > 0 then return l_won - else return l_par + else return l_gold end # Returns true if g is a wining condition for the level. fun check_won(g: Grid): Bool do - var w = g.won and (not self.is_challenge or g.number >= self.par) + var w = g.won and (not self.is_challenge or g.number >= self.gold) if not w then return false if g.number > self.score then self.score = g.number -- 1.7.9.5