BlueGit

blue-star speeltuin

Automatic saving and loading of za warudo

timfa Tim · pushed by timfa

Authored 2022-10-22 · 4 years ago

Hash
27adc14b69eff698a0285362c50a0993f1d8c64f
Parent
65325845
11 files changed +207 −18
build/framework.js +3 −0
@@ -73,6 +73,7 @@ class Game
73 73 {
74 74
75 75 var finalImage = new image(img, imageContext.subImgTotal, imageContext.perRow);
76 finalImage.name = imageContext.name;
76 77
77 78 context.images[imageContext.name] = finalImage;
78 79
@@ -167,6 +168,7 @@ class GameObject
167 168 renderer = null;
168 169 collider = null;
169 170 scene = null;
171 layer = 0;
170 172
171 173 destroyed = false;
172 174
@@ -175,6 +177,7 @@ class GameObject
175 177 this.transform = new Transform(this, x, y, 1, 1, 0);
176 178 this.renderer = new Renderer(this, sprite);
177 179 this.collider = new Collider(this);
180 this.layer = layer;
178 181 }
179 182
180 183 update (deltaTime)
@@ -73,6 +73,7 @@ class Game
73 {
73 {
74
74
75 var finalImage = new image(img, imageContext.subImgTotal, imageContext.perRow);
75 var finalImage = new image(img, imageContext.subImgTotal, imageContext.perRow);
76 finalImage.name = imageContext.name;
76
77
77 context.images[imageContext.name] = finalImage;
78 context.images[imageContext.name] = finalImage;
78
79
@@ -167,6 +168,7 @@ class GameObject
167 renderer = null;
168 renderer = null;
168 collider = null;
169 collider = null;
169 scene = null;
170 scene = null;
171 layer = 0;
170
172
171 destroyed = false;
173 destroyed = false;
172
174
@@ -175,6 +177,7 @@ class GameObject
175 this.transform = new Transform(this, x, y, 1, 1, 0);
177 this.transform = new Transform(this, x, y, 1, 1, 0);
176 this.renderer = new Renderer(this, sprite);
178 this.renderer = new Renderer(this, sprite);
177 this.collider = new Collider(this);
179 this.collider = new Collider(this);
180 this.layer = layer;
178 }
181 }
179
182
180 update (deltaTime)
183 update (deltaTime)
src/game.js +5 −4
@@ -117,8 +117,8 @@ function setupChaoAnimations (image)
117 117
118 118 createMainScene = function (game)
119 119 {
120 var background = new BackgroundScene(0, 0, 1, 1, Scene.DisplayModes.relativeToParent);
121 var scene = new Scene(0, 0, 1, 1, Scene.DisplayModes.relativeToParent);
120 var background = new BackgroundScene(0, 0, 704, 640, Scene.DisplayModes.absolute);
121 var scene = new Scene(0, 0, 704, 640, Scene.DisplayModes.absolute);
122 122 scene.renderBackground = false;
123 123
124 124 game.loadScene(background);
@@ -128,9 +128,10 @@ createMainScene = function (game)
128 128 chao = new Chao(60, 60, game.images.chao_default, 0);
129 129 scene.addObject(chao);
130 130
131 scene.addObject(new MenuManager(0, 150, game.images.menuButton, 0));
131 scene.addObject(new MenuManager(0, 50, game.images.menuButton, 0));
132 132
133 createSubScene(scene);
133 WorldObjectTracker.Load(scene);
134 //createSubScene(scene);
134 135 };
135 136
136 137 createSubScene = function (scene)
@@ -117,8 +117,8 @@ function setupChaoAnimations (image)
117
117
118createMainScene = function (game)
118createMainScene = function (game)
119{
119{
120 var background = new BackgroundScene(0, 0, 1, 1, Scene.DisplayModes.relativeToParent);
120 var background = new BackgroundScene(0, 0, 704, 640, Scene.DisplayModes.absolute);
121 var scene = new Scene(0, 0, 1, 1, Scene.DisplayModes.relativeToParent);
121 var scene = new Scene(0, 0, 704, 640, Scene.DisplayModes.absolute);
122 scene.renderBackground = false;
122 scene.renderBackground = false;
123
123
124 game.loadScene(background);
124 game.loadScene(background);
@@ -128,9 +128,10 @@ createMainScene = function (game)
128 chao = new Chao(60, 60, game.images.chao_default, 0);
128 chao = new Chao(60, 60, game.images.chao_default, 0);
129 scene.addObject(chao);
129 scene.addObject(chao);
130
130
131 scene.addObject(new MenuManager(0, 150, game.images.menuButton, 0));
131 scene.addObject(new MenuManager(0, 50, game.images.menuButton, 0));
132
132
133 createSubScene(scene);
133 WorldObjectTracker.Load(scene);
134 //createSubScene(scene);
134};
135};
135
136
136createSubScene = function (scene)
137createSubScene = function (scene)
src/objects/grasstiler.js +1 −1
@@ -20,7 +20,7 @@ class GrassTiler extends GameObject
20 20 for (let y = 0; y < height; y += size)
21 21 {
22 22 count++;
23 ((count) % 2 == 1 ? this.ground_dark : this.ground_light).draw(this.scene, x - (size / 2), y, size, size, 0, 0, 0, 1, 0);
23 ((count) % 2 == 1 ? this.ground_dark : this.ground_light).draw(this.scene, x - (size / 2), y - (size / 2), size, size, 0, 0, 0, 1, 0);
24 24 }
25 25
26 26 count = x / size % 2;
@@ -20,7 +20,7 @@ class GrassTiler extends GameObject
20 for (let y = 0; y < height; y += size)
20 for (let y = 0; y < height; y += size)
21 {
21 {
22 count++;
22 count++;
23 ((count) % 2 == 1 ? this.ground_dark : this.ground_light).draw(this.scene, x - (size / 2), y, size, size, 0, 0, 0, 1, 0);
23 ((count) % 2 == 1 ? this.ground_dark : this.ground_light).draw(this.scene, x - (size / 2), y - (size / 2), size, size, 0, 0, 0, 1, 0);
24 }
24 }
25
25
26 count = x / size % 2;
26 count = x / size % 2;
src/objects/menus/subBtn.js src/objects/menus/1-subBtn.js renamed +0 −0
src/objects/menus/btnFruit.js +1 −1
@@ -4,7 +4,7 @@ class BtnFruit extends GameObject
4 4
5 5 addedToScene ()
6 6 {
7 this.fruitInventory = this.scene.addObject(new FruitInventory(400, -500, this.scene.game.images.fruitInventory));
7 this.fruitInventory = this.scene.addObject(new FruitInventory(352, -500, this.scene.game.images.fruitInventory));
8 8 }
9 9
10 10 onClick (btns)
@@ -4,7 +4,7 @@ class BtnFruit extends GameObject
4
4
5 addedToScene ()
5 addedToScene ()
6 {
6 {
7 this.fruitInventory = this.scene.addObject(new FruitInventory(400, -500, this.scene.game.images.fruitInventory));
7 this.fruitInventory = this.scene.addObject(new FruitInventory(352, -500, this.scene.game.images.fruitInventory));
8 }
8 }
9
9
10 onClick (btns)
10 onClick (btns)
src/objects/menus/fruitInventory.js +61 −4
@@ -5,8 +5,14 @@ class FruitInventory extends GameObject
5 5 closeBtnY = -140;
6 6 state = 0;
7 7
8 hBounds = 100;
9 vBounds = 110;
10 vOffset = 30;
11
8 12 static Instance = null;
9 13
14 fruitInventoryButtons = [];
15
10 16 g_inv = null;
11 17 get inventory ()
12 18 {
@@ -56,7 +62,9 @@ class FruitInventory extends GameObject
56 62 this.inventory.splice(i, 1);
57 63 this.saveInventory();
58 64
59 return new ItemFruit(GameInput.mousePosition.x, GameInput.mousePosition.y, this.scene.game.images.fruit, 0, type);
65 let newFruit = new ItemFruit(GameInput.mousePosition.x, GameInput.mousePosition.y, this.scene.game.images.fruit, 0);
66 newFruit.setType(type);
67 return newFruit;
60 68 }
61 69 }
62 70
@@ -98,6 +106,26 @@ class FruitInventory extends GameObject
98 106 this.closeButton.transform.position = pos;
99 107 }
100 108
109 updateFruitsPositions ()
110 {
111 let xp = -this.hBounds;
112 let yp = -this.vBounds;
113
114 for (let i = 0; i < this.fruitInventoryButtons.length; i++)
115 {
116 this.fruitInventoryButtons[i].transform.position.x = this.transform.position.x + xp;
117 this.fruitInventoryButtons[i].transform.position.y = this.transform.position.y + yp + this.vOffset;
118
119 yp += this.scene.game.images.fruit.height;
120
121 if (yp > this.vBounds)
122 {
123 yp = -this.vBounds;
124 xp += this.scene.game.images.fruit.width;
125 }
126 }
127 }
128
101 129 moveToOpen (onDone)
102 130 {
103 131 let context = this;
@@ -105,16 +133,45 @@ class FruitInventory extends GameObject
105 133 .to({ y: 250 }, 1500)
106 134 .easing(TWEEN.Easing.Elastic.Out)
107 135 .onComplete(() => { this.state = MenuManager.States.open; onDone && onDone.call(context); })
136 .onUpdate(() => { FruitInventory.Instance.updateFruitsPositions(); })
108 137 .start();
138
139 this.clearFruitButtons();
140
141 for (let t = 0; t < this.scene.game.images.fruit.subImages; t++)
142 {
143 let amount = Math.min(10, this.getFruitAmountOfType(t));
144
145 for (let i = 0; i < amount; i++)
146 {
147 this.fruitInventoryButtons.push(this.scene.addObject(new FruitInventoryButton(-50, -50, this.scene.game.images.fruit, 0, t)));
148 }
149 }
109 150 }
110 151
111 152 moveToClose (onDone)
112 153 {
113 154 let context = this;
114 155 new TWEEN.Tween(this.transform.position)
115 .to({ y: -500 }, 1500)
116 .easing(TWEEN.Easing.Elastic.Out)
117 .onComplete(() => { this.state = MenuManager.States.closed; onDone && onDone.call(context); })
156 .to({ y: -500 }, 500)
157 .easing(TWEEN.Easing.Back.In)
158 .onComplete(() =>
159 {
160 this.state = MenuManager.States.closed;
161
162 this.clearFruitButtons();
163
164 onDone && onDone.call(context);
165 })
166 .onUpdate(() => { FruitInventory.Instance.updateFruitsPositions(); })
118 167 .start();
119 168 }
169
170 clearFruitButtons ()
171 {
172 for (let i = 0; i < this.fruitInventoryButtons.length; i++)
173 this.fruitInventoryButtons[i].destroy();
174
175 this.fruitInventoryButtons = [];
176 }
120 177 }
@@ -5,8 +5,14 @@ class FruitInventory extends GameObject
5 closeBtnY = -140;
5 closeBtnY = -140;
6 state = 0;
6 state = 0;
7
7
8 hBounds = 100;
9 vBounds = 110;
10 vOffset = 30;
11
8 static Instance = null;
12 static Instance = null;
9
13
14 fruitInventoryButtons = [];
15
10 g_inv = null;
16 g_inv = null;
11 get inventory ()
17 get inventory ()
12 {
18 {
@@ -56,7 +62,9 @@ class FruitInventory extends GameObject
56 this.inventory.splice(i, 1);
62 this.inventory.splice(i, 1);
57 this.saveInventory();
63 this.saveInventory();
58
64
59 return new ItemFruit(GameInput.mousePosition.x, GameInput.mousePosition.y, this.scene.game.images.fruit, 0, type);
65 let newFruit = new ItemFruit(GameInput.mousePosition.x, GameInput.mousePosition.y, this.scene.game.images.fruit, 0);
66 newFruit.setType(type);
67 return newFruit;
60 }
68 }
61 }
69 }
62
70
@@ -98,6 +106,26 @@ class FruitInventory extends GameObject
98 this.closeButton.transform.position = pos;
106 this.closeButton.transform.position = pos;
99 }
107 }
100
108
109 updateFruitsPositions ()
110 {
111 let xp = -this.hBounds;
112 let yp = -this.vBounds;
113
114 for (let i = 0; i < this.fruitInventoryButtons.length; i++)
115 {
116 this.fruitInventoryButtons[i].transform.position.x = this.transform.position.x + xp;
117 this.fruitInventoryButtons[i].transform.position.y = this.transform.position.y + yp + this.vOffset;
118
119 yp += this.scene.game.images.fruit.height;
120
121 if (yp > this.vBounds)
122 {
123 yp = -this.vBounds;
124 xp += this.scene.game.images.fruit.width;
125 }
126 }
127 }
128
101 moveToOpen (onDone)
129 moveToOpen (onDone)
102 {
130 {
103 let context = this;
131 let context = this;
@@ -105,16 +133,45 @@ class FruitInventory extends GameObject
105 .to({ y: 250 }, 1500)
133 .to({ y: 250 }, 1500)
106 .easing(TWEEN.Easing.Elastic.Out)
134 .easing(TWEEN.Easing.Elastic.Out)
107 .onComplete(() => { this.state = MenuManager.States.open; onDone && onDone.call(context); })
135 .onComplete(() => { this.state = MenuManager.States.open; onDone && onDone.call(context); })
136 .onUpdate(() => { FruitInventory.Instance.updateFruitsPositions(); })
108 .start();
137 .start();
138
139 this.clearFruitButtons();
140
141 for (let t = 0; t < this.scene.game.images.fruit.subImages; t++)
142 {
143 let amount = Math.min(10, this.getFruitAmountOfType(t));
144
145 for (let i = 0; i < amount; i++)
146 {
147 this.fruitInventoryButtons.push(this.scene.addObject(new FruitInventoryButton(-50, -50, this.scene.game.images.fruit, 0, t)));
148 }
149 }
109 }
150 }
110
151
111 moveToClose (onDone)
152 moveToClose (onDone)
112 {
153 {
113 let context = this;
154 let context = this;
114 new TWEEN.Tween(this.transform.position)
155 new TWEEN.Tween(this.transform.position)
115 .to({ y: -500 }, 1500)
156 .to({ y: -500 }, 500)
116 .easing(TWEEN.Easing.Elastic.Out)
157 .easing(TWEEN.Easing.Back.In)
117 .onComplete(() => { this.state = MenuManager.States.closed; onDone && onDone.call(context); })
158 .onComplete(() =>
159 {
160 this.state = MenuManager.States.closed;
161
162 this.clearFruitButtons();
163
164 onDone && onDone.call(context);
165 })
166 .onUpdate(() => { FruitInventory.Instance.updateFruitsPositions(); })
118 .start();
167 .start();
119 }
168 }
169
170 clearFruitButtons ()
171 {
172 for (let i = 0; i < this.fruitInventoryButtons.length; i++)
173 this.fruitInventoryButtons[i].destroy();
174
175 this.fruitInventoryButtons = [];
176 }
120}
177}
src/objects/menus/fruitInventoryButton.js added +18 −0
@@ -0,0 +1,18 @@
1 class FruitInventoryButton extends SubBtn
2 {
3 type = -1;
4
5 constructor (x, y, sprite, layer, type)
6 {
7 super(x, y, sprite, layer);
8 this.type = type;
9 this.renderer.subImage = type;
10 }
11
12 onClick (btns)
13 {
14 this.scene.addObject(FruitInventory.Instance.takeFromInventory(this.type));
15 this.destroy();
16 FruitInventory.Instance.moveToClose();
17 }
18 }
@@ -0,0 +1,18 @@
1class FruitInventoryButton extends SubBtn
2{
3 type = -1;
4
5 constructor (x, y, sprite, layer, type)
6 {
7 super(x, y, sprite, layer);
8 this.type = type;
9 this.renderer.subImage = type;
10 }
11
12 onClick (btns)
13 {
14 this.scene.addObject(FruitInventory.Instance.takeFromInventory(this.type));
15 this.destroy();
16 FruitInventory.Instance.moveToClose();
17 }
18}
src/objects/worldItems/base/1-worldItem.js added +43 −0
@@ -0,0 +1,43 @@
1 class WorldItem extends GameObject
2 {
3 wi_wasHeld = false;
4 wi_isHeld = false;
5 grabbable = true;
6 data = {};
7
8 /**
9 * IMPORTANT: Any extra parameters AFTER layer in extending classes MUST be optional!
10 */
11 constructor (x, y, sprite, layer)
12 {
13 super(x, y, sprite, layer);
14 WorldObjectTracker.Track(this);
15 }
16
17 onMouseHeld (btn)
18 {
19 this.wi_isHeld = true;
20
21 if (this.grabbable)
22 this.transform.position = GameInput.mousePosition;
23 }
24
25 update (dt)
26 {
27 super.update(dt);
28
29 if (this.wi_wasHeld && !this.wi_isHeld)
30 {
31 WorldObjectTracker.Save();
32 this.wi_wasHeld = false;
33 }
34
35 this.wi_wasHeld = this.wi_isHeld;
36 this.wi_isHeld = false;
37 }
38
39 onSaveRestored ()
40 {
41
42 }
43 }
@@ -0,0 +1,43 @@
1class WorldItem extends GameObject
2{
3 wi_wasHeld = false;
4 wi_isHeld = false;
5 grabbable = true;
6 data = {};
7
8 /**
9 * IMPORTANT: Any extra parameters AFTER layer in extending classes MUST be optional!
10 */
11 constructor (x, y, sprite, layer)
12 {
13 super(x, y, sprite, layer);
14 WorldObjectTracker.Track(this);
15 }
16
17 onMouseHeld (btn)
18 {
19 this.wi_isHeld = true;
20
21 if (this.grabbable)
22 this.transform.position = GameInput.mousePosition;
23 }
24
25 update (dt)
26 {
27 super.update(dt);
28
29 if (this.wi_wasHeld && !this.wi_isHeld)
30 {
31 WorldObjectTracker.Save();
32 this.wi_wasHeld = false;
33 }
34
35 this.wi_wasHeld = this.wi_isHeld;
36 this.wi_isHeld = false;
37 }
38
39 onSaveRestored ()
40 {
41
42 }
43}
src/objects/worldItems/base/aworldItem.js deleted +0 −4
@@ -1,4 +0,0 @@
1 class WorldItem extends GameObject
2 {
3
4 }
@@ -1,4 +0,0 @@
1class WorldItem extends GameObject
2{
3
4}
src/objects/worldItems/item_fruit.js +10 −4
@@ -1,12 +1,18 @@
1 1 class ItemFruit extends WorldItem
2 2 {
3 fruitType = -1;
4
5 constructor (x, y, sprite, layer, fruitType)
3 constructor (x, y, sprite, layer)
6 4 {
7 5 super(x, y, sprite, layer);
6 }
8 7
8 setType (fruitType)
9 {
9 10 this.renderer.subImage = fruitType;
10 this.fruitType = fruitType;
11 this.data.fruitType = fruitType;
12 }
13
14 onSaveRestored ()
15 {
16 this.renderer.subImage = this.data.fruitType;
11 17 }
12 18 }
@@ -1,12 +1,18 @@
1class ItemFruit extends WorldItem
1class ItemFruit extends WorldItem
2{
2{
3 fruitType = -1;
3 constructor (x, y, sprite, layer)
4
5 constructor (x, y, sprite, layer, fruitType)
6 {
4 {
7 super(x, y, sprite, layer);
5 super(x, y, sprite, layer);
6 }
8
7
8 setType (fruitType)
9 {
9 this.renderer.subImage = fruitType;
10 this.renderer.subImage = fruitType;
10 this.fruitType = fruitType;
11 this.data.fruitType = fruitType;
12 }
13
14 onSaveRestored ()
15 {
16 this.renderer.subImage = this.data.fruitType;
11 }
17 }
12}
18}
src/worldObjectTracker.js added +65 −0
@@ -0,0 +1,65 @@
1 class WorldObjectTracker
2 {
3 static trackedObjects = [];
4
5 static Track (obj)
6 {
7 WorldObjectTracker.trackedObjects.push(obj);
8 }
9
10 static Save ()
11 {
12 let items = [];
13 for (let i = 0; i < WorldObjectTracker.trackedObjects.length; i++)
14 {
15 if (WorldObjectTracker.trackedObjects[i] && !WorldObjectTracker.trackedObjects[i].destroyed)
16 {
17 items.push(
18 {
19 type: WorldObjectTracker.trackedObjects[i].constructor.name,
20 x: WorldObjectTracker.trackedObjects[i].transform.position.x,
21 y: WorldObjectTracker.trackedObjects[i].transform.position.y,
22 rotation: WorldObjectTracker.trackedObjects[i].transform.rotation,
23 spriteName: WorldObjectTracker.trackedObjects[i].renderer.sprite.name,
24 layer: WorldObjectTracker.trackedObjects[i].layer,
25 data: WorldObjectTracker.trackedObjects[i].data
26 });
27 }
28 }
29
30 let toSave = JSON.stringify(items);
31
32 CookieManager.setCookie("worldItems", toSave);
33
34 console.log("saved world objects", toSave);
35 }
36
37 static Load (targetScene)
38 {
39 let json = CookieManager.getCookie("worldItems");
40 if (json.length <= 0)
41 json = "[]";
42
43 let list = JSON.parse(json);
44
45
46 console.log("Start load!", list);
47
48 for (let i = 0; i < list.length; i++)
49 {
50 console.log("LOADING WORLD OBJECT", list[i].type);
51 let obj = WorldObjectTracker.instantiate(list[i].type, list[i].x, list[i].y, game.images[list[i].spriteName], list[i].layer);
52 obj.data = list[i].data;
53 obj.onSaveRestored();
54 targetScene.addObject(obj);
55 }
56 }
57
58 static instantiate (className, x, y, sprite, layer)
59 {
60 var o, f, c;
61 c = eval(className);
62 o = new c(x, y, sprite, layer);
63 return o;
64 }
65 }
@@ -0,0 +1,65 @@
1class WorldObjectTracker
2{
3 static trackedObjects = [];
4
5 static Track (obj)
6 {
7 WorldObjectTracker.trackedObjects.push(obj);
8 }
9
10 static Save ()
11 {
12 let items = [];
13 for (let i = 0; i < WorldObjectTracker.trackedObjects.length; i++)
14 {
15 if (WorldObjectTracker.trackedObjects[i] && !WorldObjectTracker.trackedObjects[i].destroyed)
16 {
17 items.push(
18 {
19 type: WorldObjectTracker.trackedObjects[i].constructor.name,
20 x: WorldObjectTracker.trackedObjects[i].transform.position.x,
21 y: WorldObjectTracker.trackedObjects[i].transform.position.y,
22 rotation: WorldObjectTracker.trackedObjects[i].transform.rotation,
23 spriteName: WorldObjectTracker.trackedObjects[i].renderer.sprite.name,
24 layer: WorldObjectTracker.trackedObjects[i].layer,
25 data: WorldObjectTracker.trackedObjects[i].data
26 });
27 }
28 }
29
30 let toSave = JSON.stringify(items);
31
32 CookieManager.setCookie("worldItems", toSave);
33
34 console.log("saved world objects", toSave);
35 }
36
37 static Load (targetScene)
38 {
39 let json = CookieManager.getCookie("worldItems");
40 if (json.length <= 0)
41 json = "[]";
42
43 let list = JSON.parse(json);
44
45
46 console.log("Start load!", list);
47
48 for (let i = 0; i < list.length; i++)
49 {
50 console.log("LOADING WORLD OBJECT", list[i].type);
51 let obj = WorldObjectTracker.instantiate(list[i].type, list[i].x, list[i].y, game.images[list[i].spriteName], list[i].layer);
52 obj.data = list[i].data;
53 obj.onSaveRestored();
54 targetScene.addObject(obj);
55 }
56 }
57
58 static instantiate (className, x, y, sprite, layer)
59 {
60 var o, f, c;
61 c = eval(className);
62 o = new c(x, y, sprite, layer);
63 return o;
64 }
65}