Skip to content

Commit

Permalink
Gems near water/lava show the reflection (#2815)
Browse files Browse the repository at this point in the history
- Old maps will not automatically be updated
- Most bundled maps are updated (see PR)
- N-map multiplayer level rebalanced
  • Loading branch information
Loobinex authored Aug 16, 2024
1 parent ce0c625 commit 4ee50d6
Show file tree
Hide file tree
Showing 5 changed files with 164 additions and 15 deletions.
56 changes: 56 additions & 0 deletions config/fxdata/columnset.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10109,3 +10109,59 @@ SolidMask = 1
FloorTexture = 29
Orientation = 0
Cubes = [43, 0, 0, 0, 0, 0, 0, 0]

[column1264]
Lintel = 0
Height = 5
SolidMask = 31
FloorTexture = 27
Orientation = 0
Cubes = [38, 441, 441, 441, 441, 0, 0, 0]

[column1265]
Lintel = 0
Height = 5
SolidMask = 31
FloorTexture = 27
Orientation = 0
Cubes = [42, 471, 472, 471, 470, 0, 0, 0]

[column1266]
Lintel = 0
Height = 5
SolidMask = 31
FloorTexture = 27
Orientation = 0
Cubes = [42, 472, 471, 472, 472, 0, 0, 0]

[column1267]
Lintel = 0
Height = 5
SolidMask = 31
FloorTexture = 27
Orientation = 0
Cubes = [42, 471, 472, 470, 470, 0, 0, 0]

[column1268]
Lintel = 0
Height = 5
SolidMask = 31
FloorTexture = 27
Orientation = 0
Cubes = [42, 471, 471, 472, 471, 0, 0, 0]

[column1269]
Lintel = 0
Height = 5
SolidMask = 31
FloorTexture = 27
Orientation = 0
Cubes = [42, 470, 470, 472, 471, 0, 0, 0]

[column1270]
Lintel = 0
Height = 5
SolidMask = 31
FloorTexture = 27
Orientation = 0
Cubes = [42, 472, 472, 472, 471, 0, 0, 0]
14 changes: 13 additions & 1 deletion config/fxdata/cubes.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2039,4 +2039,16 @@ Owner = ORANGE
Name = claimed_floor_marker_orange
Textures = 188 188 188 188 1020 0
OwnershipGroup = 7
Owner = ORANGE
Owner = ORANGE

[cube470]
Name = GEMS_NEAR_LAVA1
Textures = 586 586 586 586 582 586

[cube471]
Name = GEMS_NEAR_LAVA2
Textures = 587 587 587 587 583 587

[cube472]
Name = GEMS_NEAR_LAVA3
Textures = 588 588 588 588 584 588
95 changes: 88 additions & 7 deletions config/fxdata/slabset.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7720,31 +7720,111 @@ Columns = [1148, 1153, 1154, 1152, 1155, 1150, 1149, 1135, 1151]
Objects = []

[slab52.W]
Columns = [365, 365, 365, 365, 365, 365, 365, 365, 365]
Columns = [1148, 1153, 1154, 1152, 1155, 1150, 1149, 1135, 1151]
Objects = []

[slab52.N]
Columns = [365, 365, 365, 365, 365, 365, 365, 365, 365]
Columns = [1148, 1153, 1154, 1152, 1155, 1150, 1149, 1135, 1151]
Objects = []

[slab52.E]
Columns = [365, 365, 365, 365, 365, 365, 365, 365, 365]
Columns = [1148, 1153, 1154, 1152, 1155, 1150, 1149, 1135, 1151]
Objects = []

[slab52.SW]
Columns = [365, 365, 365, 365, 365, 365, 365, 365, 365]
Columns = [1148, 1153, 1154, 1152, 1155, 1150, 1149, 1135, 1151]
Objects = []

[slab52.NW]
Columns = [365, 365, 365, 365, 365, 365, 365, 365, 365]
Columns = [1148, 1153, 1154, 1152, 1155, 1150, 1149, 1135, 1151]
Objects = []

[slab52.NE]
Columns = [365, 365, 365, 365, 365, 365, 365, 365, 365]
Columns = [1149, 1152, 1148, 1135, 1155, 1153, 1151, 1150, 1154]
Objects = []

[slab52.SE]
Columns = [365, 365, 365, 365, 365, 365, 365, 365, 365]
Columns = [1148, 1153, 1154, 1152, 1155, 1150, 1149, 1135, 1151]
Objects = []

[slab52.ALL]
Columns = [1148, 1153, 1154, 1152, 1155, 1150, 1149, 1135, 1151]
Objects = []

[slab52.S_LAVA]
Columns = [1154, 1150, 1151, 1153, 1155, 1135, 1268, 1269, 1270]
Objects = []

[slab52.W_LAVA]
Columns = [1268, 1153, 1154, 1269, 1155, 1150, 1270, 1135, 1151]
Objects = []

[slab52.N_LAVA]
Columns = [1270, 1269, 1268, 1135, 1155, 1153, 1151, 1150, 1154]
Objects = []

[slab52.E_LAVA]
Columns = [1151, 1135, 1270, 1150, 1155, 1269, 1154, 1153, 1268]
Objects = []

[slab52.SW_LAVA]
Columns = [1268, 1153, 1154, 1269, 1155, 1150, 1270, 1265, 1268]
Objects = []

[slab52.NW_LAVA]
Columns = [1270, 1269, 1268, 1265, 1155, 1153, 1268, 1150, 1154]
Objects = []

[slab52.NE_LAVA]
Columns = [1268, 1265, 1270, 1150, 1155, 1269, 1154, 1153, 1268]
Objects = []

[slab52.SE_LAVA]
Columns = [1154, 1150, 1268, 1153, 1155, 1265, 1268, 1269, 1270]
Objects = []

[slab52.ALL_LAVA]
Columns = [1268, 1266, 1267, 1269, 1265, 1265, 1270, 1265, 1268]
Objects = []

[slab52.S_WATER]
Columns = [1148, 1153, 1154, 1152, 1155, 1150, 1264, 1264, 1264]
Objects = []

[slab52.W_WATER]
Columns = [1264, 1152, 1148, 1264, 1155, 1153, 1264, 1150, 1154]
Objects = []

[slab52.N_WATER]
Columns = [1264, 1264, 1264, 1150, 1155, 1152, 1154, 1153, 1148]
Objects = []

[slab52.E_WATER]
Columns = [1154, 1150, 1264, 1153, 1155, 1264, 1148, 1152, 1264]
Objects = []

[slab52.SW_WATER]
Columns = [1264, 1153, 1148, 1264, 1155, 1150, 1264, 1264, 1264]
Objects = []

[slab52.NW_WATER]
Columns = [1264, 1264, 1264, 1264, 1155, 1153, 1264, 1150, 1148]
Objects = []

[slab52.NE_WATER]
Columns = [1264, 1264, 1264, 1150, 1155, 1264, 1148, 1153, 1264]
Objects = []

[slab52.SE_WATER]
Columns = [1148, 1150, 1264, 1153, 1155, 1264, 1264, 1264, 1264]
Objects = []

[slab52.ALL_WATER]
Columns = [1264, 1264, 1264, 1264, 1155, 1264, 1264, 1264, 1264]
Objects = []

[slab52.CENTER]
Columns = [1148, 1153, 1154, 1152, 1155, 1150, 1149, 1135, 1151]
Objects = []

[slab53]
Expand Down Expand Up @@ -7998,3 +8078,4 @@ Objects = []
[slab57.CENTER]
Columns = [1263, 1263, 1263, 1263, 1263, 1263, 1263, 1263, 1263]
Objects = []

2 changes: 1 addition & 1 deletion config/fxdata/terrain.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ Category = 0
SlbID = 0
Indestructible = 1
Wibble = 1
Animated = 1
Animated = 0
IsSafeLand = 0
IsDiggable = 1
IsOwnable = 0
Expand Down
12 changes: 6 additions & 6 deletions config/fxdata/textureanim.toml
Original file line number Diff line number Diff line change
Expand Up @@ -174,16 +174,16 @@ name = "gems4"
frames = [277,277,503,503,543,543,276,276]

[texture586]
name = ""
frames = [0,0,0,0,0,0,0,0]
name = "gems_near_lava"
frames = [1021,1022,1022,1023,1023,1024,1024,1021]

[texture587]
name = ""
frames = [0,0,0,0,0,0,0,0]
name = "gems_near_lava2"
frames = [1023,1024,1024,1021,1021,1022,1022,1023]

[texture588]
name = ""
frames = [0,0,0,0,0,0,0,0]
name = "gems_near_lava3"
frames = [1022,1022,1023,1023,1024,1024,1021,1021]

[texture589]
name = ""
Expand Down

0 comments on commit 4ee50d6

Please sign in to comment.