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

Fix punching of oerkkis

master
Perttu Ahola 2011-10-17 01:58:38 +03:00
parent b0481b9db1
commit cfd19dcdb5
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/content_sao.cpp
View File

@ -684,11 +684,25 @@ std::string Oerkki1SAO::getStaticData()
return os.str(); return os.str();
} }
u16 Oerkki1SAO::punch(const std::string &toolname, v3f dir) u16 Oerkki1SAO::punch(const std::string &toolname, v3f dir,
const std::string &playername)
{ {
m_speed_f += dir*12*BS; m_speed_f += dir*12*BS;
u16 amount = 20; u16 amount = 5;
/* See tool names in inventory.h */
if(toolname == "WSword")
amount = 10;
if(toolname == "STSword")
amount = 12;
if(toolname == "SteelSword")
amount = 16;
if(toolname == "STAxe")
amount = 7;
if(toolname == "SteelAxe")
amount = 9;
if(toolname == "SteelPick")
amount = 7;
doDamage(amount); doDamage(amount);
return 65536/100; return 65536/100;
} }

3
src/content_sao.h
View File

@ -96,7 +96,8 @@ public:
std::string getClientInitializationData(); std::string getClientInitializationData();
std::string getStaticData(); std::string getStaticData();
InventoryItem* createPickedUpItem(){return NULL;} InventoryItem* createPickedUpItem(){return NULL;}
u16 punch(const std::string &toolname, v3f dir); u16 punch(const std::string &toolname, v3f dir,
const std::string &playername);
bool isPeaceful(){return false;} bool isPeaceful(){return false;}
private: private:
void doDamage(u16 d); void doDamage(u16 d);