From ba51efb06b706a47d6ee70b501219a00657af9b7 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 12 Apr 2021 20:14:19 +0200
Subject: [PATCH] =?UTF-8?q?Kr=C3=B6ten=20und=20Schl=C3=BCmpfe=20k=C3=B6nne?=
 =?UTF-8?q?n=20nichts=20lernen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md          |  1 +
 CMakeSettings.json    | 17 ++++++++++++++---
 res/e3a/races.xml     |  4 ++--
 res/eressea/races.xml |  4 ++--
 src/study.c           |  2 +-
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index beb897365..d6be5abcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
   - Effektiv gezauberte Stufe von Zauber anhängig von Verfügbarkeit der Materialen.
   - Ring der Macht und Steinkreis erhöhen nicht die Zauberkosten [2737].
   - Limits für Vertrautenzauber korrekt implementiert.
+  - Kröten und Schlümpfe können nichts lernen.
 
 # 3.27
 
diff --git a/CMakeSettings.json b/CMakeSettings.json
index 8bf3c23fc..83de1577e 100644
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@@ -1,4 +1,4 @@
-{
+{
   "configurations": [
     {
       "name": "x64-Debug",
@@ -33,7 +33,18 @@
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "inheritEnvironments": [ "msvc_x86" ],
-      "variables": []
+      "variables": [
+        {
+          "name": "CMAKE_TOOLCHAIN_FILE",
+          "value": "${env.VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_MODULE_PATH",
+          "value": "${workspaceRoot}/cmake/Modules",
+          "type": "STRING"
+        }
+      ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/res/e3a/races.xml b/res/e3a/races.xml
index 25d0248b2..1203adbb4 100644
--- a/res/e3a/races.xml
+++ b/res/e3a/races.xml
@@ -603,7 +603,7 @@
     <attack type="3" damage="1d1"/>
     <attack type="4" damage="1d1"/>
   </race>
-  <race name="toad" magres="20" maxaura="1" regaura="1" maintenance="10" weight="100" capacity="540" speed="1.0" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes">
+  <race name="toad" magres="20" maxaura="1" regaura="1" maintenance="10" weight="100" capacity="540" speed="1.0" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes" nolearn="yes">
     <ai splitsize="1" learn="yes"/>
     <skill name="crossbow" modifier="-10"/>
     <skill name="mining" modifier="-10"/>
@@ -627,7 +627,7 @@
     <skill name="stamina" modifier="-10"/>
     <attack type="4" damage="1d2"/>
   </race>
-  <race name="smurf" weight="1000" capacity="540" speed="1.0" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes">
+  <race name="smurf" weight="1000" capacity="540" speed="1.0" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes" nolearn="yes">
     <ai splitsize="1" learn="yes"/>
     <skill name="crossbow" modifier="-10"/>
     <skill name="mining" modifier="-10"/>
diff --git a/res/eressea/races.xml b/res/eressea/races.xml
index e994cbb0a..d1e25c3bf 100644
--- a/res/eressea/races.xml
+++ b/res/eressea/races.xml
@@ -584,7 +584,7 @@
     <attack type="3" damage="1d1"/>
     <attack type="4" damage="1d1"/>
   </race>
-  <race name="toad" magres="20" maxaura="1" regaura="1" maintenance="10" weight="100" capacity="540" speed="1" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes">
+  <race name="toad" magres="20" maxaura="1" regaura="1" maintenance="10" weight="100" capacity="540" speed="1" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes" nolearn="yes">
     <ai splitsize="1" learn="yes"/>
     <skill name="alchemy" modifier="-10"/>
     <skill name="crossbow" modifier="-10"/>
@@ -616,7 +616,7 @@
     <skill name="stamina" modifier="-10"/>
     <attack type="4" damage="1d2"/>
   </race>
-  <race name="smurf" weight="1000" capacity="540" speed="1" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes">
+  <race name="smurf" weight="1000" capacity="540" speed="1" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes" nolearn="yes">
     <ai splitsize="1" learn="yes"/>
     <skill name="alchemy" modifier="-10"/>
     <skill name="crossbow" modifier="-10"/>
diff --git a/src/study.c b/src/study.c
index 28d762560..4518a3cd1 100644
--- a/src/study.c
+++ b/src/study.c
@@ -469,7 +469,7 @@ bool check_student(const struct unit *u, struct order *ord, skill_t sk) {
     int err = 0;
     const race *rc = u_race(u);
 
-    if (sk < 0) {
+    if (sk < 0 || sk >= MAXSKILLS) {
         err = 77;
     }
     /* Hack: Talente mit Malus -99 koennen nicht gelernt werden */