From 13fd6caaa055f7c939b1ef08662be61196228371 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Mon, 5 Oct 2020 19:54:16 +0900
Subject: [PATCH] =?utf8?q?[Implement]=20#37285=20SM-DOS=E3=81=A8Fuxckintos?=
 =?utf8?q?h=E3=81=AE=E4=BB=81=E7=BE=A9=E3=81=AA=E3=81=8D=E6=88=A6=E3=81=84?=
 =?utf8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F=20/=20Added=20a=20?=
 =?utf8?q?battle=20without=20hornor=20between=20SM-DOS=20and=20Fuxkintosh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/edit/r_info.txt                  |  7 +++----
 lib/file/monspeak_j.txt              |  1 +
 src/monster-race/race-indice-types.h |  3 ++-
 src/mspell/mspell-summon.c           |  5 ++++-
 src/mspell/specified-summon.c        | 19 ++++++++++++++-----
 src/mspell/specified-summon.h        |  4 ++--
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index 7bf165e96..1e1e430fc 100644
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -24754,8 +24754,7 @@ S:1_IN_5 | BA_ACID |  BA_ELEC | BA_POIS | BA_CHAO | BA_NETH
 S:S_KIN | BLIND | SCARE | CONF
 D:$This devout Buddhist created every information apples
 D:$ with LSD's inspiration.
-D:$  His slogan is "I only accept the usage I envisioned!!
-D:$ I will lock all other usages!".
+D:$His obsession was terrifying and he sought too much perfection,
+D:$ so he had fired too many employees.
 D:この敬虔な仏教徒は幻覚によるインスピレーションであらゆる品種のリンゴを作り上げた。
-D:合言葉は「オレが想定した使い方しか認めない！
-D:　他の使い方は全てロックしてやる！！」である。
+D:彼の執念は凄まじく、完璧を求めるがあまり組織が機能不全に陥ることがあった。
diff --git a/lib/file/monspeak_j.txt b/lib/file/monspeak_j.txt
index 69efa880e..5b8569776 100644
--- a/lib/file/monspeak_j.txt
+++ b/lib/file/monspeak_j.txt
@@ -1091,6 +1091,7 @@ N:1247:ゲイツの宿敵『スティーヴン・ジョーブツ』
 「素晴らしい新機種のアイディアが浮かんだぞ！　なに、『それは私のアイディアです』だと！？　ウソをこけ！　オレのアイディアに決まっている！！」
 「株式を上場する！　手元の株主はオレ一人だ！！」
 「明日までにこのコードを書き上げろ！　できれば２０万ドル、できなきゃクビだ！！」
+「オレが想定した使い方しか認めない！　他の使い方は全てロックしてやる！！」
 
 N:*:Default lines
 #cackles evilly.
diff --git a/src/monster-race/race-indice-types.h b/src/monster-race/race-indice-types.h
index 92935623b..22dee8b79 100644
--- a/src/monster-race/race-indice-types.h
+++ b/src/monster-race/race-indice-types.h
@@ -95,7 +95,6 @@ typedef enum monster_race_type {
     MON_D_ELF_SHADE = 886,
     MON_TROLL_KING = 894,
     MON_ELF_LORD = 900,
-    MON_IE = 921,
     MON_TSUCHINOKO = 926,
     MON_LOCKE_CLONE = 930,
     MON_CALDARM = 931,
@@ -159,4 +158,6 @@ typedef enum monster_race_type {
     MON_MIRAAK = 1212,
     MON_SCARAB = 1220,
     MON_IMHOTEP = 1221,
+    MON_EDGE = 1245,
+    MON_JOBZ = 1247,
 } monster_race_type;
diff --git a/src/mspell/mspell-summon.c b/src/mspell/mspell-summon.c
index 540349d58..89f5d4f1e 100644
--- a/src/mspell/mspell-summon.c
+++ b/src/mspell/mspell-summon.c
@@ -122,7 +122,7 @@ void spell_RF6_S_KIN(player_type *target_ptr, POSITION y, POSITION x, MONSTER_ID
         count += summon_EAGLE(target_ptr, y, x, rlev, m_idx);
         break;
     case MON_BULLGATES:
-        count += summon_IE(target_ptr, y, x, rlev, m_idx);
+        count += summon_EDGE(target_ptr, y, x, rlev, m_idx);
         break;
     case MON_SERPENT:
     case MON_ZOMBI_SERPENT:
@@ -149,6 +149,9 @@ void spell_RF6_S_KIN(player_type *target_ptr, POSITION y, POSITION x, MONSTER_ID
     case MON_IMHOTEP:
         count += summon_PYRAMID(target_ptr, y, x, rlev, m_idx);
         break;
+    case MON_JOBZ:
+        count += summon_EYE_PHORN(target_ptr, y, x, rlev, m_idx);
+        break;
     default:
         count += summon_Kin(target_ptr, y, x, rlev, m_idx);
         break;
diff --git a/src/mspell/specified-summon.c b/src/mspell/specified-summon.c
index 24626775b..bbc9a388c 100644
--- a/src/mspell/specified-summon.c
+++ b/src/mspell/specified-summon.c
@@ -36,7 +36,7 @@ MONSTER_NUMBER summon_EAGLE(player_type *target_ptr, POSITION y, POSITION x, int
 }
 
 /*!
- * @brief インターネット・エクスプローダー召喚の処理。 /
+ * @brief エッヂ召喚の処理。 /
  * @param target_ptr プレーヤーへの参照ポインタ
  * @param y 対象の地点のy座標
  * @param x 対象の地点のx座標
@@ -44,13 +44,12 @@ MONSTER_NUMBER summon_EAGLE(player_type *target_ptr, POSITION y, POSITION x, int
  * @param m_idx 呪文を唱えるモンスターID
  * @return 召喚したモンスターの数を返す。
  */
-MONSTER_NUMBER summon_IE(player_type *target_ptr, POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx)
+MONSTER_NUMBER summon_EDGE(player_type *target_ptr, POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx)
 {
     int count = 0;
     int num = 2 + randint1(1 + rlev / 20);
-    for (int k = 0; k < num; k++) {
-        count += summon_named_creature(target_ptr, m_idx, y, x, MON_IE, PM_NONE);
-    }
+    for (int k = 0; k < num; k++)
+        count += summon_named_creature(target_ptr, m_idx, y, x, MON_EDGE, PM_NONE);
 
     return count;
 }
@@ -241,3 +240,13 @@ MONSTER_NUMBER summon_PYRAMID(player_type* target_ptr, POSITION y, POSITION x, i
 
     return count;
 }
+
+MONSTER_NUMBER summon_EYE_PHORN(player_type *target_ptr, POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx)
+{
+    int count = 0;
+    int num = 2 + randint1(1 + rlev / 20);
+    for (int k = 0; k < num; k++)
+        count += summon_named_creature(target_ptr, m_idx, y, x, MON_EDGE, PM_NONE);
+
+    return count;
+}
diff --git a/src/mspell/specified-summon.h b/src/mspell/specified-summon.h
index 17c5b8f31..13210aa33 100644
--- a/src/mspell/specified-summon.h
+++ b/src/mspell/specified-summon.h
@@ -3,7 +3,7 @@
 #include "system/angband.h"
 
 MONSTER_NUMBER summon_EAGLE(player_type *target_ptr, POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx);
-MONSTER_NUMBER summon_IE(player_type *target_ptr, POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx);
+MONSTER_NUMBER summon_EDGE(player_type *target_ptr, POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx);
 MONSTER_NUMBER summon_guardian(player_type *target_ptr, POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE);
 MONSTER_NUMBER summon_LOCKE_CLONE(player_type *target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx);
 MONSTER_NUMBER summon_LOUSE(player_type *target_ptr, POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx);
@@ -13,4 +13,4 @@ MONSTER_NUMBER summon_NAZGUL(player_type *target_ptr, POSITION y, POSITION x, MO
 MONSTER_NUMBER summon_APOCRYPHA(player_type *target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx);
 MONSTER_NUMBER summon_HIGHEST_DRAGON(player_type *target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx);
 MONSTER_NUMBER summon_PYRAMID(player_type *target_ptr, POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx);
-
+MONSTER_NUMBER summon_EYE_PHORN(player_type *target_ptr, POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx);
-- 
2.11.0