From 88dc8c694ed0e182b4d5ace4fcd94a0a82946c31 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Mon, 12 Sep 2011 20:10:17 +0200
Subject: [PATCH] Added Iron Apple which heals 4 Hearts
---
data/apple_iron.png | Bin 0 -> 207 bytes
src/content_craft.cpp | 14 ++++++++++++++
src/content_inventory.cpp | 6 ++++++
3 files changed, 20 insertions(+)
create mode 100644 data/apple_iron.png
diff --git a/data/apple_iron.png b/data/apple_iron.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dffdf014384dc17d0b646c294c15ce0436692d4
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%K$t-4F{@<m2h$
z7-Hd{oFKt^*plVSE6IP#iEf+za2Yk|^al7UoINo^W%B{4ei=)qV;*dRxg0UZvlN#|
w7QDN&^S?sR6D})hhGIKQJqF9ED<T*e%FV+bwkfXwx{QIr)78&qol`;+0PWd3UH||9
literal 0
HcmV?d00001
diff --git a/src/content_craft.cpp b/src/content_craft.cpp
index 20ab5f069..8e8b17a9b 100644
--- a/src/content_craft.cpp
+++ b/src/content_craft.cpp
@@ -428,6 +428,20 @@ InventoryItem *craft_get_result(InventoryItem **items)
return new MaterialItem(CONTENT_LADDER, 1);
}
}
+
+ // Iron Apple
+ {
+ ItemSpec specs[9];
+ specs[1] = ItemSpec(ITEM_CRAFT, "steel_ingot");
+ specs[3] = ItemSpec(ITEM_CRAFT, "steel_ingot");
+ specs[4] = ItemSpec(ITEM_CRAFT, "apple");
+ specs[5] = ItemSpec(ITEM_CRAFT, "steel_ingot");
+ specs[7] = ItemSpec(ITEM_CRAFT, "steel_ingot");
+ if(checkItemCombination(items, specs))
+ {
+ return new CraftItem("apple_iron", 1);
+ }
+ }
return NULL;
}
diff --git a/src/content_inventory.cpp b/src/content_inventory.cpp
index e0c9d8b86..59997ee4b 100644
--- a/src/content_inventory.cpp
+++ b/src/content_inventory.cpp
@@ -73,6 +73,8 @@ std::string item_craft_get_image_name(const std::string &subname)
return "firefly.png";
else if(subname == "apple")
return "apple.png";
+ else if(subname == "apple_iron")
+ return "apple_iron.png";
else
return "cloud.png"; // just something
}
@@ -130,6 +132,8 @@ bool item_craft_is_eatable(const std::string &subname)
return true;
else if(subname == "apple")
return true;
+ else if(subname == "apple_iron")
+ return true;
return false;
}
@@ -139,6 +143,8 @@ s16 item_craft_eat_hp_change(const std::string &subname)
return 6; // 3 hearts
else if(subname == "apple")
return 4; // 2 hearts
+ else if(subname == "apple_iron")
+ return 8; // 4 hearts
return 0;
}
--
GitLab