diff --git a/main.lua b/main.lua index af6434e..7cde1aa 100644 --- a/main.lua +++ b/main.lua @@ -107,14 +107,14 @@ function generate_museum(x,y,z) -- decorate with paintings local art_height = 2.5 - + 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+depth,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-1/16+depth,0,math.pi/2,0) end for d = 2, depth-2, 4 do - random_art(x,y-art_height,z+d,0,-math.pi,0) - random_art(x+width,y-art_height,z+d,0,0,0) + random_art(x+1/16,y-art_height,z+d,0,0,0) + random_art(x-1/16+width,y-art_height,z+d,0,-math.pi,0) end -- 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 -- no art :S 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 diff --git a/objects/art_1_1/yari_pumpum.png b/objects/art_1_1/yari_pumpum.png index 621830a..74f9ed7 100644 Binary files a/objects/art_1_1/yari_pumpum.png and b/objects/art_1_1/yari_pumpum.png differ diff --git a/objects/art_1_1/yari_walk.png b/objects/art_1_1/yari_walk.png index ed71e0b..60e4cba 100644 Binary files a/objects/art_1_1/yari_walk.png and b/objects/art_1_1/yari_walk.png differ