voxelands
/
voxelands
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

give grass its own walk sound, add new dirt walk sound

master
darkrose 2015-04-14 00:18:28 +10:00
parent 6e721c797c
commit d15697038b
10 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/sounds/step_dirt.1.ogg
View File

Binary file not shown.

BIN
data/sounds/step_dirt.2.ogg
View File

Binary file not shown.

BIN
data/sounds/step_grass.1.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/step_grass.2.ogg Normal file
View File

Binary file not shown.

BIN
data/sounds/step_plant.1.ogg
View File

Binary file not shown.

BIN
data/sounds/step_plant.2.ogg
View File

Binary file not shown.

2
src/camera.cpp
View File

@ -307,7 +307,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
) {
// Start animation
m_view_bobbing_state = 1;
m_view_bobbing_speed = MYMIN(speed.getLength(), 60);
m_view_bobbing_speed = MYMIN(speed.getLength(), 60)*1.2;
}else if (m_view_bobbing_state == 1) {
// Stop animation
m_view_bobbing_state = 2;

2
src/content_mapnode.cpp
View File

@ -335,6 +335,7 @@ void content_mapnode_init(bool repeat)
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MUD)+" 1";
f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_WILDGRASS_SHORT)+" 1";
f->extra_dug_item_rarity = 10;
f->sound_step = "grass-step";
f->type = CMT_DIRT;
f->hardness = 1.0;
lists::add("decrafting",i);
@ -348,6 +349,7 @@ void content_mapnode_init(bool repeat)
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MUD)+" 1";
f->sound_step = "grass-step";
f->type = CMT_DIRT;
f->hardness = 1.0;

18
src/content_mapnode_plants.cpp
View File

@ -685,7 +685,7 @@ void content_mapnode_plants(bool repeat)
f->walkable = false;
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/32;
f->type = CMT_WOOD;
f->type = CMT_PLANT;
f->hardness = 0.25;
f->pressure_type = CST_CRUSHABLE;
f->suffocation_per_second = 0;
@ -821,7 +821,7 @@ void content_mapnode_plants(bool repeat)
f->fuel_time = 30/32;
//f->pointable = false;
f->buildable_to = true;
f->type = CMT_WOOD;
f->type = CMT_PLANT;
f->hardness = 0.10;
f->pressure_type = CST_CRUSHABLE;
f->suffocation_per_second = 0;
@ -844,8 +844,8 @@ void content_mapnode_plants(bool repeat)
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/32;
f->buildable_to = true;
f->type = CMT_WOOD;
f->hardness = 0.10;
f->type = CMT_PLANT;
f->hardness = 0.15;
f->pressure_type = CST_CRUSHABLE;
f->suffocation_per_second = 0;
@ -867,7 +867,7 @@ void content_mapnode_plants(bool repeat)
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/32;
f->buildable_to = true;
f->type = CMT_WOOD;
f->type = CMT_PLANT;
f->hardness = 0.10;
f->pressure_type = CST_CRUSHABLE;
f->suffocation_per_second = 0;
@ -890,7 +890,7 @@ void content_mapnode_plants(bool repeat)
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/32;
f->buildable_to = true;
f->type = CMT_WOOD;
f->type = CMT_PLANT;
f->hardness = 0.10;
f->pressure_type = CST_CRUSHABLE;
f->suffocation_per_second = 0;
@ -913,7 +913,7 @@ void content_mapnode_plants(bool repeat)
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/32;
f->buildable_to = true;
f->type = CMT_WOOD;
f->type = CMT_PLANT;
f->hardness = 0.10;
f->pressure_type = CST_CRUSHABLE;
f->suffocation_per_second = 0;
@ -937,7 +937,7 @@ void content_mapnode_plants(bool repeat)
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/32;
f->buildable_to = true;
f->type = CMT_WOOD;
f->type = CMT_PLANT;
f->hardness = 0.10;
f->pressure_type = CST_CRUSHABLE;
f->suffocation_per_second = 0;
@ -961,7 +961,7 @@ void content_mapnode_plants(bool repeat)
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/32;
f->buildable_to = true;
f->type = CMT_WOOD;
f->type = CMT_PLANT;
f->hardness = 0.10;
f->pressure_type = CST_CRUSHABLE;
f->suffocation_per_second = 0;

11
src/sound.cpp
View File

@ -39,16 +39,16 @@ void init_sounds(ISoundManager *sound)
// exceptions: background music
// walking
// CMT_DIRT
sound->loadSound("dirt-step-left","step_dirt.1.ogg");
sound->loadSound("dirt-step-right","step_dirt.2.ogg");
sound->loadSound("dirt-step-left","step_dirt.1.ogg",0.3);
sound->loadSound("dirt-step-right","step_dirt.2.ogg",0.3);
// CMT_STONE
sound->loadSound("stone-step-left","step_stone.1.ogg");
sound->loadSound("stone-step-right","step_stone.2.ogg");
sound->loadSound("stone-step-left","step_stone.3.ogg");
sound->loadSound("stone-step-right","step_stone.4.ogg");
// CMT_PLANT
sound->loadSound("plant-step-left","step_plant.1.ogg");
sound->loadSound("plant-step-right","step_plant.2.ogg");
sound->loadSound("plant-step-left","step_plant.1.ogg",0.3);
sound->loadSound("plant-step-right","step_plant.2.ogg",0.3);
// CMT_LIQUID
sound->loadSound("liquid-step-left","step_liquid.1.ogg",0.5);
sound->loadSound("liquid-step-right","step_liquid.2.ogg",0.5);
@ -60,6 +60,9 @@ void init_sounds(ISoundManager *sound)
// CMT_GLASS
sound->loadSound("glass-step-left","step_glass.1.ogg",0.3);
sound->loadSound("glass-step-right","step_glass.1.ogg",0.3);
// special for grass
sound->loadSound("grass-step-left","step_grass.1.ogg");
sound->loadSound("grass-step-right","step_grass.2.ogg");
// digging
// CMT_DIRT