Skip to content

Commit f06cc33

Browse files
cryhammgerhardy
cryham
authored and
mgerhardy
committed
fix jungle window and geyser bugs
1 parent 2ed508d commit f06cc33

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

‎base/caveexpress/maps/letter-02.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ function initMap()
5757
map:addTile("tile-background-03", 4.000000, 7.000000)
5858
map:addTile("tile-ground-jungle-03", 4.000000, 8.000000)
5959
map:addTile("tile-background-04", 4.000000, 9.000000)
60-
map:addTile("tile-background-window-jungle-01", 5.000000, 0.000000)
60+
map:addTile("tile-background-jungle-window-01", 5.000000, 0.000000)
6161
map:addTile("tile-ground-jungle-04", 5.000000, 1.000000)
6262
map:addTile("tile-background-jungle-03", 5.000000, 2.000000)
6363
map:addTile("tile-background-01", 5.000000, 3.000000)
6464
map:addTile("tile-background-04", 5.000000, 4.000000)
6565
map:addTile("tile-background-03", 5.000000, 5.000000)
6666
map:addTile("tile-background-04", 5.000000, 6.000000)
67-
map:addTile("tile-background-window-jungle-02", 5.000000, 7.000000)
67+
map:addTile("tile-background-jungle-window-02", 5.000000, 7.000000)
6868
map:addTile("tile-ground-jungle-01", 5.000000, 8.000000)
6969
map:addTile("tile-background-04", 5.000000, 9.000000)
7070
map:addTile("tile-ground-jungle-04", 6.000000, 0.000000)
@@ -117,7 +117,7 @@ function initMap()
117117
map:addTile("tile-background-01", 10.000000, 6.000000)
118118
map:addTile("tile-ground-jungle-06", 10.000000, 8.000000)
119119
map:addTile("tile-background-04", 10.000000, 9.000000)
120-
map:addTile("tile-background-window-jungle-01", 11.000000, 0.000000)
120+
map:addTile("tile-background-jungle-window-01", 11.000000, 0.000000)
121121
map:addTile("tile-ground-ledge-jungle-left-01", 11.000000, 1.000000)
122122
map:addTile("tile-background-jungle-03", 11.000000, 2.000000)
123123
map:addTile("tile-background-03", 11.000000, 3.000000)

‎base/caveexpress/sprites.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,21 +1358,21 @@ sprites = {
13581358
["tile-background-jungle-04"] = { type = "background", theme = "jungle", },
13591359
["tile-background-cave-art-jungle-01"] = { type = "background", theme = "jungle", },
13601360
["tile-background-big-jungle-01"] = { type = "background", width = 2, height = 2, theme = "jungle", },
1361-
["tile-background-window-jungle-01"] = {
1361+
["tile-background-jungle-window-01"] = {
13621362
type = "window",
13631363
theme = "jungle",
13641364
frames = {
1365-
{ "tile-background-window-jungle-01-on", "tile-background-window-jungle-01-off", }, --back
1365+
{ "tile-background-jungle-window-01-on", "tile-background-jungle-window-01-off", }, --back
13661366
{}, --middle
13671367
{}, --front
13681368
},
13691369
fps = 0,
13701370
},
1371-
["tile-background-window-jungle-02"] = {
1371+
["tile-background-jungle-window-02"] = {
13721372
type = "window",
13731373
theme = "jungle",
13741374
frames = {
1375-
{ "tile-background-window-jungle-02-on", "tile-background-window-jungle-02-off", }, --back
1375+
{ "tile-background-jungle-window-02-on", "tile-background-jungle-window-02-off", }, --back
13761376
{}, --middle
13771377
{}, --front
13781378
},
@@ -1570,7 +1570,7 @@ sprites = {
15701570

15711571
["tile-geyser-jungle-01-idle"] = {
15721572
fps = 6,
1573-
type = "geyser-rock",
1573+
type = "geyser-jungle",
15741574
theme = "jungle",
15751575
polygons = {
15761576
{
@@ -1582,7 +1582,7 @@ sprites = {
15821582

15831583
["tile-geyser-jungle-01-active"] = {
15841584
fps = 8,
1585-
type = "geyser-rock",
1585+
type = "geyser-jungle",
15861586
theme = "jungle",
15871587
polygons = {
15881588
{

‎contrib/assets/png-packed/caveexpress-environment-jungle-big.lua‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ textures = {
7777
untrimmedwidth = 128,
7878
untrimmedheight = 128,
7979
},
80-
["tile-background-window-01-off"] = {
80+
["tile-background-jungle-window-01-off"] = {
8181
image = "caveexpress-environment-jungle-big",
8282
x0 = 0.75,
8383
y0 = 0.4375,
@@ -90,7 +90,7 @@ textures = {
9090
untrimmedwidth = 128,
9191
untrimmedheight = 128,
9292
},
93-
["tile-background-window-jungle-01-on"] = {
93+
["tile-background-jungle-window-01-on"] = {
9494
image = "caveexpress-environment-jungle-big",
9595
x0 = 0.625,
9696
y0 = 0.4375,
@@ -103,7 +103,7 @@ textures = {
103103
untrimmedwidth = 128,
104104
untrimmedheight = 128,
105105
},
106-
["tile-background-window-02-off"] = {
106+
["tile-background-jungle-window-02-off"] = {
107107
image = "caveexpress-environment-jungle-big",
108108
x0 = 0.5,
109109
y0 = 0.4375,
@@ -116,7 +116,7 @@ textures = {
116116
untrimmedwidth = 128,
117117
untrimmedheight = 128,
118118
},
119-
["tile-background-window-jungle-02-on"] = {
119+
["tile-background-jungle-window-02-on"] = {
120120
image = "caveexpress-environment-jungle-big",
121121
x0 = 0.375,
122122
y0 = 0.4375,
@@ -181,7 +181,7 @@ textures = {
181181
untrimmedwidth = 128,
182182
untrimmedheight = 128,
183183
},
184-
["tile-geyser-rock-jungle-01-active-back-01"] = {
184+
["tile-geyser-jungle-01-active-back-01"] = {
185185
image = "caveexpress-environment-jungle-big",
186186
x0 = 0.25,
187187
y0 = 0.25,
@@ -194,7 +194,7 @@ textures = {
194194
untrimmedwidth = 128,
195195
untrimmedheight = 256,
196196
},
197-
["tile-geyser-rock-01-active-back-02"] = {
197+
["tile-geyser-jungle-01-active-back-02"] = {
198198
image = "caveexpress-environment-jungle-big",
199199
x0 = 0.125,
200200
y0 = 0.25,
@@ -207,7 +207,7 @@ textures = {
207207
untrimmedwidth = 128,
208208
untrimmedheight = 256,
209209
},
210-
["tile-geyser-rock-jungle-01-active-back-03"] = {
210+
["tile-geyser-jungle-01-active-back-03"] = {
211211
image = "caveexpress-environment-jungle-big",
212212
x0 = 0,
213213
y0 = 0.25,
@@ -220,7 +220,7 @@ textures = {
220220
untrimmedwidth = 128,
221221
untrimmedheight = 256,
222222
},
223-
["tile-geyser-rock-jungle-01-active-back-04"] = {
223+
["tile-geyser-jungle-01-active-back-04"] = {
224224
image = "caveexpress-environment-jungle-big",
225225
x0 = 0.875,
226226
y0 = 0.125,
@@ -233,7 +233,7 @@ textures = {
233233
untrimmedwidth = 128,
234234
untrimmedheight = 256,
235235
},
236-
["tile-geyser-rock-jungle-01-active-back-05"] = {
236+
["tile-geyser-jungle-01-active-back-05"] = {
237237
image = "caveexpress-environment-jungle-big",
238238
x0 = 0.75,
239239
y0 = 0.125,
@@ -246,7 +246,7 @@ textures = {
246246
untrimmedwidth = 128,
247247
untrimmedheight = 256,
248248
},
249-
["tile-geyser-rock-jungle-01-active-back-06"] = {
249+
["tile-geyser-jungle-01-active-back-06"] = {
250250
image = "caveexpress-environment-jungle-big",
251251
x0 = 0.625,
252252
y0 = 0.125,
@@ -259,7 +259,7 @@ textures = {
259259
untrimmedwidth = 128,
260260
untrimmedheight = 256,
261261
},
262-
["tile-geyser-rock-jungle-01-idle-back-01"] = {
262+
["tile-geyser-jungle-01-idle-back-01"] = {
263263
image = "caveexpress-environment-jungle-big",
264264
x0 = 0.5,
265265
y0 = 0.125,
@@ -272,7 +272,7 @@ textures = {
272272
untrimmedwidth = 128,
273273
untrimmedheight = 256,
274274
},
275-
["tile-geyser-rock-jungle-01-idle-back-02"] = {
275+
["tile-geyser-jungle-01-idle-back-02"] = {
276276
image = "caveexpress-environment-jungle-big",
277277
x0 = 0.375,
278278
y0 = 0.125,
@@ -285,7 +285,7 @@ textures = {
285285
untrimmedwidth = 128,
286286
untrimmedheight = 256,
287287
},
288-
["tile-geyser-rock-jungle-01-idle-back-03"] = {
288+
["tile-geyser-jungle-01-idle-back-03"] = {
289289
image = "caveexpress-environment-jungle-big",
290290
x0 = 0.25,
291291
y0 = 0.125,
@@ -298,7 +298,7 @@ textures = {
298298
untrimmedwidth = 128,
299299
untrimmedheight = 256,
300300
},
301-
["tile-geyser-rock-jungle-01-idle-back-04"] = {
301+
["tile-geyser-jungle-01-idle-back-04"] = {
302302
image = "caveexpress-environment-jungle-big",
303303
x0 = 0.375,
304304
y0 = 0.125,

‎contrib/assets/png-packed/caveexpress-environment-jungle-small.lua‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ textures = {
7777
untrimmedwidth = 64,
7878
untrimmedheight = 64,
7979
},
80-
["tile-background-window-01-off"] = {
80+
["tile-background-jungle-window-01-off"] = {
8181
image = "caveexpress-environment-jungle-small",
8282
x0 = 0.75,
8383
y0 = 0.4375,
@@ -90,7 +90,7 @@ textures = {
9090
untrimmedwidth = 64,
9191
untrimmedheight = 64,
9292
},
93-
["tile-background-window-jungle-01-on"] = {
93+
["tile-background-jungle-window-01-on"] = {
9494
image = "caveexpress-environment-jungle-small",
9595
x0 = 0.625,
9696
y0 = 0.4375,
@@ -103,7 +103,7 @@ textures = {
103103
untrimmedwidth = 64,
104104
untrimmedheight = 64,
105105
},
106-
["tile-background-window-02-off"] = {
106+
["tile-background-jungle-window-02-off"] = {
107107
image = "caveexpress-environment-jungle-small",
108108
x0 = 0.5,
109109
y0 = 0.4375,
@@ -116,7 +116,7 @@ textures = {
116116
untrimmedwidth = 64,
117117
untrimmedheight = 64,
118118
},
119-
["tile-background-window-jungle-02-on"] = {
119+
["tile-background-jungle-window-02-on"] = {
120120
image = "caveexpress-environment-jungle-small",
121121
x0 = 0.375,
122122
y0 = 0.4375,
@@ -181,7 +181,7 @@ textures = {
181181
untrimmedwidth = 64,
182182
untrimmedheight = 64,
183183
},
184-
["tile-geyser-rock-jungle-01-active-back-01"] = {
184+
["tile-geyser-jungle-01-active-back-01"] = {
185185
image = "caveexpress-environment-jungle-small",
186186
x0 = 0.25,
187187
y0 = 0.25,
@@ -194,7 +194,7 @@ textures = {
194194
untrimmedwidth = 64,
195195
untrimmedheight = 128,
196196
},
197-
["tile-geyser-rock-01-active-back-02"] = {
197+
["tile-geyser-jungle-01-active-back-02"] = {
198198
image = "caveexpress-environment-jungle-small",
199199
x0 = 0.125,
200200
y0 = 0.25,
@@ -207,7 +207,7 @@ textures = {
207207
untrimmedwidth = 64,
208208
untrimmedheight = 128,
209209
},
210-
["tile-geyser-rock-jungle-01-active-back-03"] = {
210+
["tile-geyser-jungle-01-active-back-03"] = {
211211
image = "caveexpress-environment-jungle-small",
212212
x0 = 0,
213213
y0 = 0.25,
@@ -220,7 +220,7 @@ textures = {
220220
untrimmedwidth = 64,
221221
untrimmedheight = 128,
222222
},
223-
["tile-geyser-rock-jungle-01-active-back-04"] = {
223+
["tile-geyser-jungle-01-active-back-04"] = {
224224
image = "caveexpress-environment-jungle-small",
225225
x0 = 0.875,
226226
y0 = 0.125,
@@ -233,7 +233,7 @@ textures = {
233233
untrimmedwidth = 64,
234234
untrimmedheight = 128,
235235
},
236-
["tile-geyser-rock-jungle-01-active-back-05"] = {
236+
["tile-geyser-jungle-01-active-back-05"] = {
237237
image = "caveexpress-environment-jungle-small",
238238
x0 = 0.75,
239239
y0 = 0.125,
@@ -246,7 +246,7 @@ textures = {
246246
untrimmedwidth = 64,
247247
untrimmedheight = 128,
248248
},
249-
["tile-geyser-rock-jungle-01-active-back-06"] = {
249+
["tile-geyser-jungle-01-active-back-06"] = {
250250
image = "caveexpress-environment-jungle-small",
251251
x0 = 0.625,
252252
y0 = 0.125,
@@ -259,7 +259,7 @@ textures = {
259259
untrimmedwidth = 64,
260260
untrimmedheight = 128,
261261
},
262-
["tile-geyser-rock-jungle-01-idle-back-01"] = {
262+
["tile-geyser-jungle-01-idle-back-01"] = {
263263
image = "caveexpress-environment-jungle-small",
264264
x0 = 0.5,
265265
y0 = 0.125,
@@ -272,7 +272,7 @@ textures = {
272272
untrimmedwidth = 64,
273273
untrimmedheight = 128,
274274
},
275-
["tile-geyser-rock-jungle-01-idle-back-02"] = {
275+
["tile-geyser-jungle-01-idle-back-02"] = {
276276
image = "caveexpress-environment-jungle-small",
277277
x0 = 0.375,
278278
y0 = 0.125,
@@ -285,7 +285,7 @@ textures = {
285285
untrimmedwidth = 64,
286286
untrimmedheight = 128,
287287
},
288-
["tile-geyser-rock-jungle-01-idle-back-03"] = {
288+
["tile-geyser-jungle-01-idle-back-03"] = {
289289
image = "caveexpress-environment-jungle-small",
290290
x0 = 0.25,
291291
y0 = 0.125,
@@ -298,7 +298,7 @@ textures = {
298298
untrimmedwidth = 64,
299299
untrimmedheight = 128,
300300
},
301-
["tile-geyser-rock-jungle-01-idle-back-04"] = {
301+
["tile-geyser-jungle-01-idle-back-04"] = {
302302
image = "caveexpress-environment-jungle-small",
303303
x0 = 0.375,
304304
y0 = 0.125,

0 commit comments

Comments
 (0)