rename p2->lifepotion (WdL)

conf/e2/rules.xml

@@ -15,7 +15,7 @@
       <item name="sword" amount="1"/>
       <item name="mallorn" amount="10"/>
       <item name="skillpotion" amount="5"/>
-      <item name="p2" amount="5"/>
+      <item name="lifepotion" amount="5"/>
       <item name="money" amount="20000"/>
       <skill name="perception" level="30"/>
       <skill name="melee" level="1"/>

res/core/common/potions.xml

@@ -34,7 +34,7 @@
     </item>
   </resource>
 
-  <resource name="p2" appearance="vial">
+  <resource name="lifepotion" appearance="vial">
     <item weight="0" score="30" use="yes">
       <potion level="1"/>
       <construction skill="alchemy" minskill="2">

res/core/de/strings.xml

@@ -1863,7 +1863,7 @@
   <string name="goliathwater">
     <text locale="de">Goliathwasser</text>
   </string>
-  <string name="p2">
+  <string name="lifepotion">
     <text locale="de">Wasser des Lebens</text>
   </string>
   <string name="p3">
@@ -3592,7 +3592,7 @@
       <text locale="en">'First roast the Gurgelkraut quickly and add some Fjordwuchs to spice it up. Let it all boil slowly until almost all liquid has evaporated. Leave the mash overnight and finally squeeze it the next morning until a thick fluid drips out.' The liquid thus produced, 'Goliath Water' as we call it, is enough for 10 men and gives each man the carrying capacity of a horse for one week.</text>
       <text locale="de">Zuerst brate man das Gurgelkraut leicht an und würze das Zeug mit ein wenig Fjordwuchs. Man lasse alles so lange kochen, bis fast alle Flüssigkeit verdampft ist. Diesen Brei stelle man über Nacht raus. Am nächsten Morgen presse man den Brei aus. Die so gewonnene Flüssigkeit, Goliathwasser genannt, verleiht bis zu zehn Männern die Tragkraft eines Pferdes.</text>
     </string>
-    <string name="p2">
+    <string name="lifepotion">
       <text locale="en">The "Water of Life" allows living trees to be created from logs. A Knotroot and Elvendear are heated until one can just still keep one's finger in. This is then poured into a jar and allowed to cool slowly. The extract is sufficient for 10 pieces of wood.</text>
       <text locale="de">Das 'Wasser des Lebens' ist in der Lage, aus gefällten Baumstämmen wieder lebende Bäume zu machen. Dazu wird ein knotiger Saugwurz zusammen mit einem Elfenlieb erwärmt, so dass man gerade noch den Finger reinhalten kann. Dies gieße man in ein Gefäß und lasse es langsam abkühlen. Der Extrakt reicht für 10 Holzstämme.</text>
     </string>

res/core/en/strings.xml

@@ -1078,7 +1078,7 @@
   <string name="goliathwater_p">
     <text locale="en">goliath waters</text>
   </string>
-  <string name="p2">
+  <string name="lifepotion">
     <text locale="en">water of life</text>
   </string>
   <string name="p2_p">

res/core/fr/strings.xml

@@ -1085,7 +1085,7 @@
   <string name="p1_p">
     <text locale="fr">breuvage de Goliath</text>
   </string>
-  <string name="p2">
+  <string name="lifepotion">
     <text locale="fr">élixir de vie</text>
   </string>
   <string name="p2_p">

res/core/spells.xml

@@ -39,7 +39,7 @@
   <spell name="create_magicherbbag" ship="true" rank="5" index="165">
     <resource name="aura" amount="30" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
-    <resource name="p2" amount="1" cost="fixed"/>
+    <resource name="lifepotion" amount="1" cost="fixed"/>
   </spell>
 
   <!-- illaun spells -->

res/e3a/items.xml

@@ -66,7 +66,7 @@
     </item>
   </resource>
 
-  <resource name="p2" appearance="vial">
+  <resource name="lifepotion" appearance="vial">
     <!-- Wasser des Lebens -->
     <item weight="0" score="30" use="yes">
       <potion level="1"/>

res/e3a/strings.xml

@@ -284,7 +284,7 @@
   </namespace>
 
   <namespace name="potion">
-    <string name="p2">
+    <string name="lifepotion">
       <text locale="en">The "Water of Life" allows living trees to be created from logs. A Knotroot and Elvendear are heated until one can just still keep one's finger in. This is then poured into a jar and allowed to cool slowly. The extract is sufficient for five trees to be grown from logs.</text>
       <text locale="de">Das 'Wasser des Lebens' ist in der Lage, aus gefällten Baumstämmen wieder lebende Bäume zu machen. Dazu wird ein knotiger Saugwurz zusammen mit einem Elfenlieb erwärmt, so dass man gerade noch den Finger reinhalten kann. Dies gieße man in ein Gefäß und lasse es langsam abkühlen. Der Extrakt reicht um aus fünf Holzstämmen neue Bäume wachsen zu lassen.</text>
     </string>

res/eressea/spells.xml

@@ -32,7 +32,7 @@
   <spell name="treegrow" rank="5" index="8" far="true" variable="true">
     <resource name="aura" amount="4" cost="level"/>
     <resource name="log" amount="1" cost="level"/>
-    <resource name="p2" amount="1" cost="fixed"/>
+    <resource name="lifepotion" amount="1" cost="fixed"/>
   </spell>
   <spell name="healing" rank="5" index="9" variable="true" combat="3">
     <resource name="aura" amount="1" cost="level"/>
@@ -101,12 +101,12 @@
   <spell name="stonegolem" rank="4" index="32" variable="true">
     <resource name="aura" amount="2" cost="level"/>
     <resource name="stone" amount="1" cost="level"/>
-    <resource name="p2" amount="1" cost="fixed"/>
+    <resource name="lifepotion" amount="1" cost="fixed"/>
   </spell>
   <spell name="irongolem" rank="4" index="33" variable="true">
     <resource name="aura" amount="2" cost="level"/>
     <resource name="iron" amount="1" cost="level"/>
-    <resource name="p2" amount="1" cost="fixed"/>
+    <resource name="lifepotion" amount="1" cost="fixed"/>
   </spell>
   <spell name="summonshadow" rank="5" index="34" variable="true">
     <resource name="aura" amount="3" cost="level"/>
@@ -433,7 +433,7 @@
   </spell>
   <spell name="puttorest" rank="5" index="168" variable="true">
     <resource name="aura" amount="3" cost="level"/>
-    <resource name="p2" amount="1" cost="fixed"/>
+    <resource name="lifepotion" amount="1" cost="fixed"/>
   </spell>
   <spell name="unholypower" rank="5" index="169" parameters="u+" los="true" variable="true">
     <resource name="aura" amount="10" cost="level"/>
@@ -455,7 +455,7 @@
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="20" cost="fixed"/>
     <resource name="dragonblood" amount="5" cost="fixed"/>
-    <resource name="p2" amount="5" cost="fixed"/>
+    <resource name="lifepotion" amount="5" cost="fixed"/>
   </spell>
   <spell name="drain_skills" rank="5" index="174" combat="2">
     <resource name="aura" amount="4" cost="fixed"/>
@@ -466,7 +466,7 @@
   <spell name="mallorntreegrow" rank="5" index="177" far="true" variable="true">
     <resource name="aura" amount="6" cost="level"/>
     <resource name="mallorn" amount="1" cost="level"/>
-    <resource name="p2" amount="1" cost="fixed"/>
+    <resource name="lifepotion" amount="1" cost="fixed"/>
   </spell>
   <spell name="big_recruit" rank="5" index="179" variable="true">
     <resource name="aura" amount="20" cost="level"/>
@@ -515,7 +515,7 @@
   <spell name="create_magicherbbag" ship="true" rank="5" index="165">
     <resource name="aura" amount="30" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
-    <resource name="p2" amount="1" cost="fixed"/>
+    <resource name="lifepotion" amount="1" cost="fixed"/>
   </spell>
 
   <!-- illaun spells -->

scripts/eressea/spells.lua

@@ -26,7 +26,7 @@ end
 
 -- Wasser des Lebens
 function create_potion_p2(r, mage, level, force)
-  return create_potion(mage, level, "p2", force)
+  return create_potion(mage, level, "lifepotion", force)
 end
 
 -- Siebenmeilentee

scripts/tests/e3/rules.lua

@@ -783,12 +783,12 @@ function test_p2()
     r:set_resource("tree", 0)
     u:clear_orders()
     u:add_order("BENUTZE 'Wasser des Lebens'")
-    u:add_item("p2", 1)
+    u:add_item("lifepotion", 1)
     u:add_item("log", 10)
     u:add_item("mallorn", 10)
     process_orders()
     assert_equal(5, r:get_resource("tree"))
-    assert_equal(0, u:get_item("p2"))
+    assert_equal(0, u:get_item("lifepotion"))
     assert_equal(15, u:get_item("log") + u:get_item("mallorn"))
 end
 
@@ -803,7 +803,7 @@ function test_p2_move()
     u:add_order("BENUTZE 'Wasser des Lebens'")
     u:add_order("NACH OST")
     u:add_item("horse", 1)
-    u:add_item("p2", 1)
+    u:add_item("lifepotion", 1)
     u:add_item("log", 1)
     u:add_item("mallorn", 1)
     process_orders()

src/items.c

@@ -416,7 +416,7 @@ static int use_water_of_life(unit *u, const item_type *itype,
 void register_itemfunctions(void)
 {
     /* have tests: */
-    register_item_use(use_water_of_life, "use_p2");
+    register_item_use(use_water_of_life, "use_lifepotion");
     register_item_use(use_mistletoe, "use_mistletoe");
     register_item_use(use_tacticcrystal, "use_dreameye");
     register_item_use(use_studypotion, "use_studypotion");
@@ -430,6 +430,4 @@ void register_itemfunctions(void)
     register_item_use(use_potion, "use_ointment");
     register_item_use(use_potion, "use_p14");
     register_item_use(use_warmthpotion, "use_nestwarmth");
-    /* p2 = P_LIFE = Wasser des Lebens */
-    register_item_use(use_potion, "use_p2");
 }

src/kernel/item.c

@@ -208,6 +208,7 @@ static const char *it_aliases[][2] = {
     { "Runenschwert", "runesword" },
     { "p12", "truthpotion" },
     { "p1", "goliathwater" },
+    { "p2", "lifepotion" },
     { "p4", "ointment" },
     { "p5", "peasantblood" },
     { "p8", "nestwarmth" },
@@ -555,7 +556,7 @@ static const char *resourcenames[MAX_RESOURCES] = {
     "laen", "fairyboot", "aoc", "pegasus",
     "elvenhorse", "charger", "dolphin", "roqf", "trollbelt",
     "aurafocus", "sphereofinv", "magicbag",
-    "magicherbbag", "dreameye", "p2"
+    "magicherbbag", "dreameye", "lifepotion"
 };
 
 const resource_type *get_resourcetype(resource_t type) {
@@ -636,7 +637,7 @@ struct order *), const char *name)
 static void init_oldpotions(void)
 {
     const char *potionnames[MAX_POTIONS] = {
-        "p0", "goliathwater", "p2", "p3", "ointment", "peasantblood", "p6",
+        "p0", "goliathwater", "lifepotion", "p3", "ointment", "peasantblood", "p6",
         "p7", "nestwarmth", "p9", "p10", "p11", "truthpotion", "p13", "p14"
     };
     int p;