X Tutup
Skip to content

Commit d515851

Browse files
haydn-smithhaydn-smith
committed
Begin Assets and polish for "Summer".
1 parent 620b56a commit d515851

File tree

16 files changed

+593
-326
lines changed

16 files changed

+593
-326
lines changed

‎files/summer_ice_cube_area.tmx‎

Lines changed: 77 additions & 52 deletions
Large diffs are not rendered by default.

‎files/summer_jetty_area.tmx‎

Lines changed: 65 additions & 64 deletions
Large diffs are not rendered by default.

‎files/waves.tiled-session‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@
135135
"expandedObjectLayers": [
136136
2
137137
],
138-
"scale": 4,
138+
"scale": 2,
139139
"selectedLayer": 1,
140140
"viewCenter": {
141-
"x": 233.25,
142-
"y": 246.5
141+
"x": 283,
142+
"y": 192
143143
}
144144
},
145145
"spring_ice_cube_area.tmx#snow": {
@@ -150,11 +150,11 @@
150150
"expandedObjectLayers": [
151151
2
152152
],
153-
"scale": 5.5,
153+
"scale": 1.5,
154154
"selectedLayer": 1,
155155
"viewCenter": {
156-
"x": 254.72727272727272,
157-
"y": 252.72727272727275
156+
"x": 213.33333333333331,
157+
"y": 274.66666666666663
158158
}
159159
},
160160
"spring_jetty_area.tmx#snow": {
@@ -172,22 +172,28 @@
172172
"scaleInDock": 1
173173
},
174174
"summer_ice_cube_area.tmx": {
175-
"scale": 5.5,
176-
"selectedLayer": 1,
175+
"expandedObjectLayers": [
176+
2
177+
],
178+
"scale": 1.5,
179+
"selectedLayer": 0,
177180
"viewCenter": {
178-
"x": 242.72727272727272,
179-
"y": 196.72727272727272
181+
"x": 139.33333333333331,
182+
"y": 269.99999999999994
180183
}
181184
},
182185
"summer_ice_cube_area.tmx#snow": {
183186
"scaleInDock": 1
184187
},
185188
"summer_jetty_area.tmx": {
186-
"scale": 5.5,
189+
"expandedObjectLayers": [
190+
2
191+
],
192+
"scale": 4,
187193
"selectedLayer": 1,
188194
"viewCenter": {
189-
"x": 252.9090909090909,
190-
"y": 268.54545454545456
195+
"x": 269.25,
196+
"y": 314.75
191197
}
192198
},
193199
"summer_jetty_area.tmx#snow": {
@@ -247,18 +253,18 @@
247253
"project": "waves.tiled-project",
248254
"property.type": "bool",
249255
"recentFiles": [
256+
"spring_flower_area.tmx",
257+
"spring_ice_cube_area.tmx",
250258
"autumn_ice_cube_area.tmx",
251259
"summer_ice_cube_area.tmx",
252260
"spring_again_jetty_area.tmx",
253261
"spring_jetty_area.tmx",
254262
"autumn_ice_cube_with_snowman_area.tmx",
255263
"autumn_flower_area.tmx",
256-
"spring_flower_area.tmx",
257264
"summer_flower_area.tmx",
258265
"winter_ice_cube_area.tmx",
259266
"winter_flower_area.tmx",
260-
"spring_again_flower_area.tmx",
261-
"test.tmx"
267+
"spring_again_flower_area.tmx"
262268
],
263269
"tileset.lastUsedFormat": "tsx",
264270
"tileset.margin": 16,

‎public/assets/sprites/puddles/puddle_1.aseprite‎

441 Bytes
Binary file not shown.

‎public/assets/sprites/puddles/puddle_1.png‎

253 Bytes
Loading

‎public/assets/sprites/puddles/puddle_2.aseprite‎

449 Bytes
Binary file not shown.

‎public/assets/sprites/puddles/puddle_2.png‎

247 Bytes
Loading

‎public/assets/tilemaps/summer_ice_cube_area.json‎

Lines changed: 156 additions & 50 deletions
Large diffs are not rendered by default.

‎public/assets/tilemaps/summer_jetty_area.json‎

Lines changed: 80 additions & 70 deletions
Large diffs are not rendered by default.

‎src/common/conversations/summer.ts‎

Lines changed: 62 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,156 @@
11
import { Dialog } from 'common/objects/dialog_box';
2-
import { Sprite } from 'constants';
2+
import { Animation, Sprite } from 'constants';
33

44
export const meltedSnow1_1: Dialog = [
55
{
6-
image: Sprite.PlayerIdle,
6+
image: Animation.ThinkingDialog,
77
line1: ['This snow has already melted.'],
88
line2: ['Summer is well underway.'],
9+
autoPlaySecondLine: true,
910
},
1011
{
11-
image: Sprite.PlayerIdle,
12+
image: Animation.ThinkingDialog,
1213
line1: ['Perhaps other snow masses have'],
1314
line2: ['melted away also.'],
15+
autoPlaySecondLine: true,
1416
},
1517
];
1618

1719
export const meltedSnow1_2: Dialog = [
1820
{
19-
image: Sprite.PlayerIdle,
21+
image: Animation.ThinkingDialog,
2022
line1: ['Oh boy...'],
2123
line2: ['...you sure do like looking at melted snow.'],
2224
},
2325
];
2426

2527
export const meltedSnow1_3: Dialog = [
2628
{
27-
image: Sprite.PlayerIdle,
29+
image: Animation.ThinkingDialog,
2830
line1: ['Such melt.'],
2931
line2: ['Very wow.'],
3032
},
3133
];
3234

3335
export const meltedSnow2_1: Dialog = [
3436
{
35-
image: Sprite.PlayerIdle,
37+
image: Animation.ThinkingDialog,
3638
line1: ['This snow has already melted.'],
3739
line2: ['...'],
3840
},
3941
{
40-
image: Sprite.PlayerIdle,
41-
line1: ['If you were an ice cube...'],
42-
line2: ["...You'd be really worried about melting right now."],
42+
image: Animation.ThinkingDialog,
43+
line1: ["If you were an ice cube you'd be really"],
44+
line2: ['worried about melting right now.'],
45+
autoPlaySecondLine: true,
4346
},
4447
];
4548

4649
export const meltedSnow2_2: Dialog = [
4750
{
48-
image: Sprite.PlayerIdle,
51+
image: Animation.ThinkingDialog,
4952
line1: ['This is snow is so...'],
5053
line2: ['...So...'],
5154
},
5255
{
53-
image: Sprite.PlayerIdle,
56+
image: Animation.ThinkingDialog,
5457
line1: ['...Soooooo...'],
5558
line2: ['Wet.'],
5659
},
5760
];
5861

5962
export const iceCubeIntro: Dialog = [
6063
{
61-
image: Sprite.Unknown,
64+
image: Animation.IceCubeDialog,
6265
line1: ['!!!'],
6366
line2: ['Help!'],
6467
},
6568
{
66-
image: Sprite.Unknown,
69+
image: Animation.IceCubeDialog,
6770
line1: ["I'm melting awaaaaayyyyy!"],
6871
line2: ['This summer is super hot!'],
6972
},
7073
{
71-
image: Sprite.Unknown,
72-
line1: ['... ', '(well...'],
73-
line2: ['hot for the antarctic, anyway).'],
74+
image: Animation.IceCubeDialog,
75+
line1: ['... ', 'Well...'],
76+
line2: ['hot for the antarctic, anyway.'],
7477
},
7578
{
76-
image: Sprite.Unknown,
79+
image: Animation.IceCubeDialog,
7780
line1: ["There's gotta be a way to cool"],
7881
line2: ['down in this heat!'],
82+
autoPlaySecondLine: true,
7983
},
8084
];
8185

8286
export const iceCubeNoFans: Dialog = [
8387
{
84-
image: Sprite.Unknown,
88+
image: Animation.IceCubeDialog,
8589
line1: ['...!'],
8690
line2: ['Help me cool down!'],
8791
},
8892
];
8993

9094
export const iceCubeOnOneFan: Dialog = [
9195
{
92-
image: Sprite.Unknown,
96+
image: Animation.IceCubeDialog,
9397
line1: ['...Whoa!'],
9498
line2: ["That's s much cooler!"],
9599
},
96100
{
97-
image: Sprite.Unknown,
101+
image: Animation.IceCubeDialog,
98102
line1: ['...!'],
99103
line2: ['I need to be colder though!'],
100104
},
101105
];
102106

103107
export const iceCubeOnTwoFans: Dialog = [
104108
{
105-
image: Sprite.Unknown,
109+
image: Animation.IceCubeDialog,
106110
line1: ['...Whoa!'],
107111
line2: ["That's s much cooler!"],
108112
},
109113
{
110-
image: Sprite.Unknown,
114+
image: Animation.IceCubeDialog,
111115
line1: ['...!'],
112116
line2: ['Almost cold enough!'],
113117
},
114118
];
115119

116120
export const iceCubeOnThreeFans: Dialog = [
117121
{
118-
image: Sprite.Unknown,
122+
image: Animation.IceCubeDialog,
119123
line1: ['...Whoa!'],
120124
line2: ['...Yesssssssss!'],
121125
},
122126
{
123-
image: Sprite.Unknown,
127+
image: Animation.IceCubeDialog,
124128
line1: ['...!'],
125129
line2: ["That's an amazing cool breeze!"],
126130
},
127131
{
128-
image: Sprite.Unknown,
132+
image: Animation.IceCubeDialog,
129133
line1: ['...!'],
130134
line2: ['Uh oh'],
131135
},
132136
{
133-
image: Sprite.Unknown,
137+
image: Animation.IceCubeDialog,
134138
line1: ['...!'],
135139
line2: ["Too much breeze! I'm blowing away!"],
136140
},
137141
];
138142

139143
export const youHopeIceCubeIsOkay: Dialog = [
140144
{
141-
image: Sprite.Unknown,
145+
image: Animation.ThinkingDialog,
142146
line1: ['...'],
143147
line2: ['That was unexpected.'],
144148
},
145149
{
146-
image: Sprite.Unknown,
147-
line1: ['... ', '(You wonder if the ice cube'],
148-
line2: ['is sill nice and chilly).'],
150+
image: Animation.ThinkingDialog,
151+
line1: ['...', 'You wonder if the ice cube'],
152+
line2: ['is sill nice and chilly.'],
153+
autoPlaySecondLine: true,
149154
},
150155
];
151156

@@ -169,42 +174,60 @@ export const iceCubeAfterPuzzle1: Dialog = [
169174

170175
export const iceCubeAfterPuzzle2: Dialog = [
171176
{
172-
image: Sprite.Unknown,
177+
image: Animation.ThinkingDialog,
173178
line1: ['...'],
174-
line2: ['(The ice cube seems sufficiently cool.)'],
179+
line2: ['The ice cube seems sufficiently cool.'],
175180
},
176181
];
177182

178-
export const iceCubeWall1 = [
183+
export const iceCubeWall2 = [
179184
{
180-
image: Sprite.Unknown,
185+
image: Animation.ThinkingDialog,
181186
line1: ['This ice cube wall is in the way.'],
182187
line2: ['Somehow, these ice cubes seem...'],
183188
},
184189
{
185-
image: Sprite.Unknown,
190+
image: Animation.ThinkingDialog,
186191
line1: ['less fiendly than the other one.'],
187192
line2: ['...'],
188193
},
189194
];
190195

191-
export const iceCubeWall2 = [
196+
export const iceCubeWall1 = [
192197
{
193-
image: Sprite.Unknown,
198+
image: Animation.ThinkingDialog,
194199
line1: ['This barrier stands between you...'],
195200
line2: ['And giving the plant some water.'],
196201
},
197202
];
198203

199204
export const summerFlower = [
200205
{
201-
image: Sprite.Unknown,
206+
image: Animation.ThinkingDialog,
202207
line1: ['...'],
203208
line2: ['The little plant is hanging in there...'],
204209
},
205210
{
206-
image: Sprite.Unknown,
211+
image: Animation.ThinkingDialog,
207212
line1: ['...even through summer.'],
208213
line2: ['It looks a little thirsty though!'],
209214
},
210215
];
216+
217+
export const snowCaveIn1 = [
218+
{
219+
image: Animation.ThinkingDialog,
220+
line1: ["Summer hasn't been present long"],
221+
line2: ['enough to melt this barrier.'],
222+
autoPlaySecondLine: true,
223+
},
224+
];
225+
226+
export const snowCaveIn2 = [
227+
{
228+
image: Animation.ThinkingDialog,
229+
line1: ['Who knows what adventure could lie'],
230+
line2: ['down this path.'],
231+
autoPlaySecondLine: true,
232+
},
233+
];

0 commit comments

Comments
 (0)
X Tutup