From 5331555708ce3bfc4417b2f7c788fff98e81a858 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Thu, 24 Oct 2013 16:45:13 +0200 Subject: Renamed cMonster::GetSpawnRate() to GetSpawnDelay(). --- source/Mobs/Monster.cpp | 2 +- source/Mobs/Monster.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/Mobs') diff --git a/source/Mobs/Monster.cpp b/source/Mobs/Monster.cpp index 7e35b97f1..9b1f2fc4c 100644 --- a/source/Mobs/Monster.cpp +++ b/source/Mobs/Monster.cpp @@ -605,7 +605,7 @@ cMonster::eFamily cMonster::FamilyFromType(eType a_Type) -int cMonster::GetSpawnRate(cMonster::eFamily a_MobFamily) +int cMonster::GetSpawnDelay(cMonster::eFamily a_MobFamily) { switch (a_MobFamily) { diff --git a/source/Mobs/Monster.h b/source/Mobs/Monster.h index 14c72ed73..39fa716ed 100644 --- a/source/Mobs/Monster.h +++ b/source/Mobs/Monster.h @@ -146,8 +146,8 @@ public: /// Returns the mob family based on the type static eFamily FamilyFromType(eType a_MobType); - /// Returns the spawn rate (number of game ticks between spawn attempts) for the given mob family - static int GetSpawnRate(cMonster::eFamily a_MobFamily); + /// Returns the spawn delay (number of game ticks between spawn attempts) for the given mob family + static int GetSpawnDelay(cMonster::eFamily a_MobFamily); // tolua_end -- cgit v1.2.3 From 86bec4c57c72bb2d58c6dd91a447987f45cc7b32 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Fri, 25 Oct 2013 10:41:19 +0200 Subject: cMonster: Improved doxycomments. --- source/Mobs/Monster.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/Mobs') diff --git a/source/Mobs/Monster.h b/source/Mobs/Monster.h index 39fa716ed..a0002bf4f 100644 --- a/source/Mobs/Monster.h +++ b/source/Mobs/Monster.h @@ -137,10 +137,10 @@ public: // tolua_begin - /// Translates MobType enum to a string + /// Translates MobType enum to a string, empty string if unknown static AString MobTypeToString(eType a_MobType); - /// Translates MobType string to the enum + /// Translates MobType string to the enum, mtInvalidType if not recognized static eType StringToMobType(const AString & a_MobTypeName); /// Returns the mob family based on the type -- cgit v1.2.3 From a42561cf5a2e8cf86848cb1925097173787de808 Mon Sep 17 00:00:00 2001 From: tonibm19 Date: Sun, 27 Oct 2013 10:41:25 +0100 Subject: Sheep fixes. Now amount of wool you get when shearing a sheep is random. Sheeps only spawn in white color (I will add sheep dying soon). --- source/Mobs/Sheep.cpp | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'source/Mobs') diff --git a/source/Mobs/Sheep.cpp b/source/Mobs/Sheep.cpp index 0d7d43e27..54cce9cbe 100644 --- a/source/Mobs/Sheep.cpp +++ b/source/Mobs/Sheep.cpp @@ -1,4 +1,3 @@ - #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Sheep.h" @@ -13,7 +12,7 @@ cSheep::cSheep(int a_Color) : super("Sheep", mtSheep, "mob.sheep.say", "mob.sheep.say", 0.6, 1.3), m_IsSheared(false), - m_WoolColor(a_Color) + m_WoolColor(0) { } @@ -33,6 +32,7 @@ void cSheep::GetDrops(cItems & a_Drops, cEntity * a_Killer) + void cSheep::OnRightClicked(cPlayer & a_Player) { if ((a_Player.GetEquippedItem().m_ItemType == E_ITEM_SHEARS) && (!m_IsSheared)) @@ -46,11 +46,26 @@ void cSheep::OnRightClicked(cPlayer & a_Player) } cItems Drops; - Drops.push_back(cItem(E_BLOCK_WOOL, 4, m_WoolColor)); - m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + int wooldrops = m_World->GetTickRandomNumber(2); + if (wooldrops == 0) + { + Drops.push_back(cItem(E_BLOCK_WOOL, 1, m_WoolColor)); + m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + } + if (wooldrops == 1) + { + Drops.push_back(cItem(E_BLOCK_WOOL, 2, m_WoolColor)); + m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + } + if (wooldrops == 2) + { + Drops.push_back(cItem(E_BLOCK_WOOL, 3, m_WoolColor)); + m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + } } } + -- cgit v1.2.3 From 144b528257140710856d6150e854b08f0e5368b9 Mon Sep 17 00:00:00 2001 From: tonibm19 Date: Sun, 27 Oct 2013 10:42:16 +0100 Subject: Extra line --- source/Mobs/Sheep.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'source/Mobs') diff --git a/source/Mobs/Sheep.cpp b/source/Mobs/Sheep.cpp index 54cce9cbe..2a92cf5b2 100644 --- a/source/Mobs/Sheep.cpp +++ b/source/Mobs/Sheep.cpp @@ -1,3 +1,4 @@ + #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Sheep.h" -- cgit v1.2.3 From 6e554c3b5256c43feb4be66f46b08e9d6440f7b3 Mon Sep 17 00:00:00 2001 From: tonibm19 Date: Mon, 28 Oct 2013 19:42:02 +0100 Subject: Use STR_Warrior code and changed variable name --- source/Mobs/Sheep.cpp | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'source/Mobs') diff --git a/source/Mobs/Sheep.cpp b/source/Mobs/Sheep.cpp index 2a92cf5b2..46749d967 100644 --- a/source/Mobs/Sheep.cpp +++ b/source/Mobs/Sheep.cpp @@ -13,7 +13,7 @@ cSheep::cSheep(int a_Color) : super("Sheep", mtSheep, "mob.sheep.say", "mob.sheep.say", 0.6, 1.3), m_IsSheared(false), - m_WoolColor(0) + m_WoolColor(a_Color) { } @@ -47,22 +47,9 @@ void cSheep::OnRightClicked(cPlayer & a_Player) } cItems Drops; - int wooldrops = m_World->GetTickRandomNumber(2); - if (wooldrops == 0) - { - Drops.push_back(cItem(E_BLOCK_WOOL, 1, m_WoolColor)); - m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); - } - if (wooldrops == 1) - { - Drops.push_back(cItem(E_BLOCK_WOOL, 2, m_WoolColor)); - m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); - } - if (wooldrops == 2) - { - Drops.push_back(cItem(E_BLOCK_WOOL, 3, m_WoolColor)); - m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); - } + int NumDrops = m_World->GetTickRandomumber(2) + 1 + Drops.push_back(cItem(E_BLOCK_WOOL, NumDrops, m_WoolColor)); + m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); } } -- cgit v1.2.3 From 984277f65e6781ffffc89b7bd382879eda8c8fe6 Mon Sep 17 00:00:00 2001 From: tonibm19 Date: Mon, 28 Oct 2013 19:47:38 +0100 Subject: Fixed compilation STR_Warrior code had an error (I copied&pasted it before) --- source/Mobs/Sheep.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/Mobs') diff --git a/source/Mobs/Sheep.cpp b/source/Mobs/Sheep.cpp index 46749d967..5a3b2d015 100644 --- a/source/Mobs/Sheep.cpp +++ b/source/Mobs/Sheep.cpp @@ -47,7 +47,7 @@ void cSheep::OnRightClicked(cPlayer & a_Player) } cItems Drops; - int NumDrops = m_World->GetTickRandomumber(2) + 1 + int NumDrops = m_World->GetTickRandomNumber(2) + 1; Drops.push_back(cItem(E_BLOCK_WOOL, NumDrops, m_WoolColor)); m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); } -- cgit v1.2.3 From 1eac38f3d7c70295bf986ee02c849d50b3c4f7eb Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Mon, 28 Oct 2013 19:54:03 +0100 Subject: Fixed indentation in tonibm19's code. --- source/Mobs/Sheep.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/Mobs') diff --git a/source/Mobs/Sheep.cpp b/source/Mobs/Sheep.cpp index 5a3b2d015..703482ddb 100644 --- a/source/Mobs/Sheep.cpp +++ b/source/Mobs/Sheep.cpp @@ -47,9 +47,9 @@ void cSheep::OnRightClicked(cPlayer & a_Player) } cItems Drops; - int NumDrops = m_World->GetTickRandomNumber(2) + 1; - Drops.push_back(cItem(E_BLOCK_WOOL, NumDrops, m_WoolColor)); - m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); + int NumDrops = m_World->GetTickRandomNumber(2) + 1; + Drops.push_back(cItem(E_BLOCK_WOOL, NumDrops, m_WoolColor)); + m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ(), 10); } } -- cgit v1.2.3