Merge branch 'master' of https://gitlab.com/spark-imagination/speeltuin
timfa wsadhelios · pushed by timfa
Authored 2022-10-21 · 4 years ago
- Hash
1607b3a6b7ba5abf39a1981d07533b76d6ac55c8
2 files changed
+69
−0
@@ -5,9 +5,69 @@ class FruitInventory extends GameObject
5
5
closeBtnY = -140;
6
6
state = 0;
7
7
8
static Instance = null;
9
10
g_inv = null;
11
get inventory ()
12
{
13
if (!this.g_inv)
14
{
15
let inv = CookieManager.getCookie("fruitInventory");
16
inv = inv || "{}";
17
this.g_inv = JSON.parse(inv);
18
}
19
20
return this.g_inv;
21
}
22
8
23
constructor (x, y, sprite, layer)
9
24
{
10
25
super(x, y, sprite, layer);
26
FruitInventory.Instance = this;
27
}
28
29
saveInventory ()
30
{
31
CookieManager.setCookie("fruitInventory", JSON.stringify(this.inventory));
32
}
33
34
getFruitAmountOfType (type)
35
{
36
let count = 0;
37
38
for (let i = 0; i < this.inventory.length; i++)
39
{
40
if (this.inventory[i] == type)
41
count++;
42
}
43
44
return count;
45
}
46
47
takeFromInventory (type)
48
{
49
for (let i = 0; i < this.inventory.length; i++)
50
{
51
if (this.inventory[i] == type)
52
{
53
this.inventory.splice(i, 1);
54
this.saveInventory();
55
56
return new ItemFruit(GameInput.mousePosition.x, GameInput.mousePosition.y, this.scene.game.images.fruit, 0, type);
57
}
58
}
59
60
this.moveToClose();
61
62
return null;
63
}
64
65
addToInventory (type, amount = 1)
66
{
67
for (let i = 0; i < amount; i++)
68
this.inventory.push(type);
69
70
this.saveInventory();
11
71
}
12
72
13
73
addedToScene ()
@@ -21,6 +81,11 @@ class FruitInventory extends GameObject
21
81
{
22
82
this.moveToClose();
23
83
}, this);
84
85
MenuManager.Instance.isOpened.add(function ()
86
{
87
this.moveToClose();
88
}, this);
24
89
}
25
90
26
91
update (deltaTime)
@@ -5,9 +5,69 @@ class FruitInventory extends GameObject5
closeBtnY = -140;5
closeBtnY = -140;6
state = 0;6
state = 0;7
7
8
static Instance = null;9
10
g_inv = null;11
get inventory ()12
{13
if (!this.g_inv)14
{15
let inv = CookieManager.getCookie("fruitInventory");16
inv = inv || "{}";17
this.g_inv = JSON.parse(inv);18
}19
20
return this.g_inv;21
}22
8
constructor (x, y, sprite, layer)23
constructor (x, y, sprite, layer)9
{24
{10
super(x, y, sprite, layer);25
super(x, y, sprite, layer);26
FruitInventory.Instance = this;27
}28
29
saveInventory ()30
{31
CookieManager.setCookie("fruitInventory", JSON.stringify(this.inventory));32
}33
34
getFruitAmountOfType (type)35
{36
let count = 0;37
38
for (let i = 0; i < this.inventory.length; i++)39
{40
if (this.inventory[i] == type)41
count++;42
}43
44
return count;45
}46
47
takeFromInventory (type)48
{49
for (let i = 0; i < this.inventory.length; i++)50
{51
if (this.inventory[i] == type)52
{53
this.inventory.splice(i, 1);54
this.saveInventory();55
56
return new ItemFruit(GameInput.mousePosition.x, GameInput.mousePosition.y, this.scene.game.images.fruit, 0, type);57
}58
}59
60
this.moveToClose();61
62
return null;63
}64
65
addToInventory (type, amount = 1)66
{67
for (let i = 0; i < amount; i++)68
this.inventory.push(type);69
70
this.saveInventory();11
}71
}12
72
13
addedToScene ()73
addedToScene ()@@ -21,6 +81,11 @@ class FruitInventory extends GameObject21
{81
{22
this.moveToClose();82
this.moveToClose();23
}, this);83
}, this);84
85
MenuManager.Instance.isOpened.add(function ()86
{87
this.moveToClose();88
}, this);24
}89
}25
90
26
update (deltaTime)91
update (deltaTime)@@ -16,6 +16,7 @@ class MenuManager extends GameObject
16
16
17
17
tweenTimer = 0;
18
18
timeDiffPercent = 1;
19
isOpened = null;
19
20
20
21
static States = { closed: 0, open: 1, moving: 2 };
21
22
@@ -30,6 +31,8 @@ class MenuManager extends GameObject
30
31
31
32
addedToScene ()
32
33
{
34
this.isOpened = new Signal();
35
33
36
this.moveToOpen(() => this.moveToClose());
34
37
this.buttons =
35
38
[
@@ -49,6 +52,7 @@ class MenuManager extends GameObject
49
52
50
53
moveToOpen (onDone)
51
54
{
55
this.isOpened.dispatch();
52
56
this.prevState = MenuManager.States.closed;
53
57
54
58
if (this.state == MenuManager.States.moving)
@@ -16,6 +16,7 @@ class MenuManager extends GameObject16
16
17
tweenTimer = 0;17
tweenTimer = 0;18
timeDiffPercent = 1;18
timeDiffPercent = 1;19
isOpened = null;19
20
20
static States = { closed: 0, open: 1, moving: 2 };21
static States = { closed: 0, open: 1, moving: 2 };21
22
@@ -30,6 +31,8 @@ class MenuManager extends GameObject30
31
31
addedToScene ()32
addedToScene ()32
{33
{34
this.isOpened = new Signal();35
33
this.moveToOpen(() => this.moveToClose());36
this.moveToOpen(() => this.moveToClose());34
this.buttons =37
this.buttons =35
[38
[@@ -49,6 +52,7 @@ class MenuManager extends GameObject49
52
50
moveToOpen (onDone)53
moveToOpen (onDone)51
{54
{55
this.isOpened.dispatch();52
this.prevState = MenuManager.States.closed;56
this.prevState = MenuManager.States.closed;53
57
54
if (this.state == MenuManager.States.moving)58
if (this.state == MenuManager.States.moving)