rusty platemail

https://bugs.eressea.de/view.php?id=2981
eressea · Jan 18, 2024 · 9bce6d0 · 9bce6d0
1 parent 7b48283
commit 9bce6d0
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 8 deletions.
diff --git a/conf/e2/items.json b/conf/e2/items.json
@@ -10,6 +10,7 @@
         "config://res/core/armor/laenshield.xml",
         "config://res/core/armor/plate.xml",
         "config://res/core/armor/rustychainmail.xml",
+        "config://res/core/armor/rustyplate.xml",
         "config://res/core/armor/rustyshield.xml",
         "config://res/core/armor/shield.xml",
         "config://res/core/resources/cart.xml",

diff --git a/res/core/armor/rustychainmail.xml b/res/core/armor/rustychainmail.xml
@@ -2,9 +2,6 @@
 <eressea><resources>
 <resource name="rustychainmail">
   <item weight="200" score="30">
-    <construction skill="armorer" minskill="3">
-      <requirement type="iron" quantity="3"/>
-    </construction>
     <armor ac="2" penalty="0.30" magres="0.0"/>
   </item>
 </resource>

diff --git a/res/core/armor/rustyplate.xml b/res/core/armor/rustyplate.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<eressea>
+  <resources>
+    <resource name="rustyplate">
+      <item weight="400" score="150" deny="cat">
+        <armor ac="3" penalty="0.45" magres="0.0"/>
+      </item>
+    </resource>
+  </resources>
+</eressea>
diff --git a/res/core/armor/rustyshield.xml b/res/core/armor/rustyshield.xml
@@ -2,9 +2,6 @@
 <eressea><resources>
 <resource name="rustyshield">
   <item weight="100" score="10">
-    <construction skill="armorer" minskill="2">
-      <requirement type="iron" quantity="1"/>
-    </construction>
     <armor ac="1" penalty="0.0" magres="0.0" shield="yes"/>
   </item>
 </resource>

diff --git a/res/translations/strings.de.po b/res/translations/strings.de.po
@@ -14,6 +14,12 @@ msgstr ""
 msgid "rustychainmail"
 msgstr "Rostiges Kettenhemd"
 
+msgid "rustyplate"
+msgstr "Rostiger Plattenpanzer"
+
+msgid "rustyplate_p"
+msgstr "Rostige Plattenpanzer"
+
 msgctxt "spellinfo"
 msgid "destroy_magic"
 msgstr ""

diff --git a/res/translations/strings.en.po b/res/translations/strings.en.po
@@ -12,7 +12,13 @@ msgstr ""
 "X-Generator: Poedit 2.0.7\n"
 
 msgid "rustychainmail"
-msgstr "rustychainmail"
+msgstr "rusty chainmail"
+
+msgid "rustyplate"
+msgstr "rusty platemail"
+
+msgid "rustyplate_p"
+msgstr "rusty platemails"
 
 msgctxt "spellinfo"
 msgid "destroy_magic"
@@ -2435,7 +2441,7 @@ msgid "magicherbbag"
 msgstr "bag of conservation"
 
 msgid "rustychainmail_p"
-msgstr "rustychainmails"
+msgstr "rusty chainmails"
 
 msgctxt "spellpar"
 msgid "direction"

diff --git a/scripts/tests/e2/spells.lua b/scripts/tests/e2/spells.lua
@@ -427,16 +427,22 @@ function test_cast_rostregen()
     u:set_skill("magic", 20)
     u2:add_item("sword", 1)
     u2:add_item("axe", 1)
+    u2:add_item("halberd", 2)
     u2:add_item("shield", 2)
     u2:add_item("chainmail", 5)
+    u2:add_item("plate", 5)
     u:add_order('ZAUBERE STUFE 10 Rostregen ' .. itoa36(u2.id))
     process_orders()
     assert_equal(0, u2:get_item("sword"))
     assert_equal(1, u2:get_item("rustysword"))
     assert_equal(0, u2:get_item("axe"))
     assert_equal(1, u2:get_item("rustyaxe"))
+    assert_equal(1, u2:get_item("halberd"))
+    assert_equal(1, u2:get_item("rustyhalberd"))
     assert_equal(1, u2:get_item("shield"))
     assert_equal(1, u2:get_item("rustyshield"))
     assert_equal(4, u2:get_item("chainmail"))
     assert_equal(1, u2:get_item("rustychainmail"))
+    assert_equal(4, u2:get_item("plate"))
+    assert_equal(1, u2:get_item("rustyplate"))
 end
diff --git a/src/spells.c b/src/spells.c
@@ -1323,6 +1323,7 @@ static struct iron_weapon {
     { 0.5f, {.name = "halberd" }, {.name = "rustyhalberd" } },
     { 0.5f, {.name = "shield" }, {.name = "rustyshield" } },
     { 0.2f, {.name = "chainmail"}, {.name = "rustychainmail" }},
+    { 0.2f, {.name = "plate" }, {.name = "rustyplate" } },
     { 0.0f, {.name = NULL}, { .name = NULL} }
 };