nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: Mock Github API tests
[nit.git]
/
contrib
/
nitrpg
/
src
/
achievements.nit
diff --git
a/contrib/nitrpg/src/achievements.nit
b/contrib/nitrpg/src/achievements.nit
index
c1a8036
..
2097ec3
100644
(file)
--- a/
contrib/nitrpg/src/achievements.nit
+++ b/
contrib/nitrpg/src/achievements.nit
@@
-113,16
+113,21
@@
class Achievement
#
# Used to load achievements from storage.
init from_json(game: Game, json: JsonObject) do
#
# Used to load achievements from storage.
init from_json(game: Game, json: JsonObject) do
- init(game, json["id"].to_s, json["name"].to_s, json["desc"].to_s, json["reward"].as(Int))
+ init(game,
+ json["id"].as(String),
+ json["name"].as(String),
+ json["desc"].as(String),
+ json["reward"].as(Int))
end
end
- redef fun to_json do
+ redef fun to_json_object do
var json = super
json["id"] = id
json["name"] = name
json["desc"] = desc
json["reward"] = reward
json["game"] = game.key
var json = super
json["id"] = id
json["name"] = name
json["desc"] = desc
json["reward"] = reward
json["game"] = game.key
+ var owner = self.owner
if owner != null then json["owner"] = owner.key
return json
end
if owner != null then json["owner"] = owner.key
return json
end
@@
-151,7
+156,7
@@
redef class Player
obj["player"] = name
obj["reward"] = achievement.reward
obj["achievement"] = achievement.id
obj["player"] = name
obj["reward"] = achievement.reward
obj["achievement"] = achievement.id
- obj["github_event"] = event.json
+ obj["github_event"] = event
var ge = new GameEvent(game, "achievement_unlocked", obj)
add_event(ge)
game.add_event(ge)
var ge = new GameEvent(game, "achievement_unlocked", obj)
add_event(ge)
game.add_event(ge)