hotfix for paintings
This commit is contained in:
parent
57a2c07fe0
commit
4c4f0aea3e
28
main.lua
28
main.lua
|
@ -107,14 +107,14 @@ function generate_museum(x,y,z)
|
||||||
|
|
||||||
-- decorate with paintings
|
-- decorate with paintings
|
||||||
local art_height = 2.5
|
local art_height = 2.5
|
||||||
|
|
||||||
for w = 2, width-2, 4 do
|
for w = 2, width-2, 4 do
|
||||||
random_art(x+w,y-art_height,z,0,math.pi/2,0)
|
random_art(x+w,y-art_height,z+1/16,0,-math.pi/2,0)
|
||||||
random_art(x+w,y-art_height,z+depth,0,-math.pi/2,0)
|
random_art(x+w,y-art_height,z-1/16+depth,0,math.pi/2,0)
|
||||||
end
|
end
|
||||||
for d = 2, depth-2, 4 do
|
for d = 2, depth-2, 4 do
|
||||||
random_art(x,y-art_height,z+d,0,-math.pi,0)
|
random_art(x+1/16,y-art_height,z+d,0,0,0)
|
||||||
random_art(x+width,y-art_height,z+d,0,0,0)
|
random_art(x-1/16+width,y-art_height,z+d,0,-math.pi,0)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- place pillars to support the room in the middle of the room
|
-- place pillars to support the room in the middle of the room
|
||||||
|
@ -142,22 +142,22 @@ function random_art(x,y,z,rotx,roty,rotz)
|
||||||
if art == 0 then
|
if art == 0 then
|
||||||
-- no art :S
|
-- no art :S
|
||||||
elseif art == 1 then
|
elseif art == 1 then
|
||||||
table.insert(obj_list,g3d.newModel("objects/art_9_12.obj","objects/art_9_12/eri_sueños.png",{x,y-(12/16),z},{rotx,roty,rotz},{-1,1,-1}))
|
table.insert(obj_list,g3d.newModel("objects/art_9_12.obj","objects/art_9_12/eri_sueños.png",{x,y-(12/16),z},{rotx,roty,rotz},{1,1,1}))
|
||||||
elseif art == 2 then
|
elseif art == 2 then
|
||||||
table.insert(obj_list,g3d.newModel("objects/art_1_1.obj","objects/art_1_1/yari_walk.png",{x,y-(10/16),z},{rotx,roty,rotz},{-1,1,-1}))
|
table.insert(obj_list,g3d.newModel("objects/art_1_1.obj","objects/art_1_1/yari_walk.png",{x,y-(10/16),z},{rotx,roty,rotz},{1,1,1}))
|
||||||
elseif art == 3 then
|
elseif art == 3 then
|
||||||
table.insert(obj_list,g3d.newModel("objects/art_16_9.obj","objects/art_16_9/clareta_tira.png",{x,y-(9/16),z},{rotx,roty,rotz},{-1,1,-1}))
|
table.insert(obj_list,g3d.newModel("objects/art_16_9.obj","objects/art_16_9/clareta_tira.png",{x,y-(9/16),z},{rotx,roty,rotz},{1,1,1}))
|
||||||
elseif art == 4 then
|
elseif art == 4 then
|
||||||
table.insert(obj_list,g3d.newModel("objects/art_16_12.obj","objects/art_16_12/clareta_garden_throne.png",{x,y-(12/16),z},{rotx,roty,rotz},{-1,1,-1}))
|
table.insert(obj_list,g3d.newModel("objects/art_16_12.obj","objects/art_16_12/clareta_garden_throne.png",{x,y-(12/16),z},{rotx,roty,rotz},{1,1,1}))
|
||||||
elseif art == 5 then
|
elseif art == 5 then
|
||||||
table.insert(obj_list,g3d.newModel("objects/art_24_16.obj","objects/art_24_16/eri_dungeon.png",{x,y-(16/16),z},{rotx,roty,rotz},{-1,1,-1}))
|
table.insert(obj_list,g3d.newModel("objects/art_24_16.obj","objects/art_24_16/eri_dungeon.png",{x,y-(16/16),z},{rotx,roty,rotz},{1,1,1}))
|
||||||
elseif art == 6 then
|
elseif art == 6 then
|
||||||
table.insert(obj_list,g3d.newModel("objects/art_12_9.obj","objects/art_12_9/noe_nerielle.png",{x,y-(9/16),z},{rotx,roty,rotz},{-1,1,-1}))
|
table.insert(obj_list,g3d.newModel("objects/art_12_9.obj","objects/art_12_9/noe_nerielle.png",{x,y-(9/16),z},{rotx,roty,rotz},{1,1,1}))
|
||||||
elseif art == 7 then
|
elseif art == 7 then
|
||||||
table.insert(obj_list,g3d.newModel("objects/art_1_1.obj","objects/art_1_1/yari_pumpum.png",{x,y-(10/16),z},{rotx,roty,rotz},{-1,1,-1}))
|
table.insert(obj_list,g3d.newModel("objects/art_1_1.obj","objects/art_1_1/yari_pumpum.png",{x,y-(10/16),z},{rotx,roty,rotz},{1,1,1}))
|
||||||
elseif art == 8 then
|
elseif art == 8 then
|
||||||
table.insert(obj_list,g3d.newModel("objects/art_12_6.obj","objects/art_12_6/eri_sigils.png",{x,y-(6/16),z},{rotx,roty,rotz},{-1,1,-1}))
|
table.insert(obj_list,g3d.newModel("objects/art_12_6.obj","objects/art_12_6/eri_sigils.png",{x,y-(6/16),z},{rotx,roty,rotz},{1,1,1}))
|
||||||
elseif art == 9 then
|
elseif art == 9 then
|
||||||
table.insert(obj_list,g3d.newModel("objects/art_16_24.obj","objects/art_16_24/eri_ariel_with_overalls.png",{x,y-(24/16),z},{rotx,roty,rotz},{-1,1,-1}))
|
table.insert(obj_list,g3d.newModel("objects/art_16_24.obj","objects/art_16_24/eri_ariel_with_overalls.png",{x,y-(24/16),z},{rotx,roty,rotz},{1,1,1}))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 109 KiB After Width: | Height: | Size: 109 KiB |
Binary file not shown.
Before Width: | Height: | Size: 937 B After Width: | Height: | Size: 952 B |
Loading…
Reference in New Issue