Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

Merge branch 'next' into 'next' 

tweaked armour, warmth and durability values; adjusted wear levels



See merge request !43
This commit is contained in:
darkrose 2016-02-20 05:39:50 +00:00
parent 936c87d296 d144b5b422
commit 7300a3d838
4 changed files with 426 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

844
src/content_clothesitem.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/content_clothesitem.h
View File

@ -73,7 +73,7 @@ struct ClothesItemFeatures {
warmth(0.), warmth(0.),
vacuum(0.), vacuum(0.),
suffocate(0.), suffocate(0.),
durability(10), durability(5),
effect(1.) effect(1.)
{} {}
}; };

2
src/environment.cpp
View File

@ -4398,7 +4398,7 @@ void ClientEnvironment::damageLocalPlayer(u8 area, u8 type, u8 damage)
f_damage -= f_damage*effect; f_damage -= f_damage*effect;
ClientEnvEvent event; ClientEnvEvent event;
event.type = CEE_PLAYER_WEARCLOTHES; event.type = CEE_PLAYER_WEARCLOTHES;
event.player_wear.amount = damage*(100*(2.0-effect)); event.player_wear.amount = damage*(10*(2.0-effect));
m_client_event_queue.push_back(event); m_client_event_queue.push_back(event);
if (f_damage < 1.0 && f_damage > 0.0) { if (f_damage < 1.0 && f_damage > 0.0) {
damage = 1.0/f_damage; damage = 1.0/f_damage;

4
src/server.cpp
View File

@ -4230,8 +4230,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
u16 w = wear; u16 w = wear;
if (content_clothesitem_features(i->getContent()).durability > 1) if (content_clothesitem_features(i->getContent()).durability > 1)
w /= content_clothesitem_features(i->getContent()).durability; w /= content_clothesitem_features(i->getContent()).durability;
if (w < 150) if (w < 15)
w = 150; w = 15;
if (bonus > 0.0) { if (bonus > 0.0) {
f32 fw = w; f32 fw = w;
fw /= bonus; fw /= bonus;