OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision0e33967be74662b766ab21a8bff523387adf18e3 (tree)
Time2003-07-22 06:09:57
Authorhenkma <henkma@0568...>
Commiterhenkma

Log Message

4つの新アーティファクト導入. 古い城の報酬に.

Change Summary

Incremental Difference

--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3447,3 +3447,51 @@ D:
34473447 D:ベレンノールの野において魔王に振るった剣だ。
34483448 D:「しかしわたしは生き身の人間の男ではない！お前が向き合って
34493449 D:いるのは女だ。わたしはエオウィン、エオムンドの娘だ。」
3450+
3451+N:217:聖騎士の
3452+E:of Sacred Knights
3453+I:40:25:1
3454+W:50:50:2:77777
3455+P:0:0d0:0:0:10
3456+F:WIS | MAGIC_MASTERY | HIDE_TYPE |
3457+F:RES_CONF | RES_CHAOS |
3458+F:SEE_INVIS | FREE_ACT | REGEN | HOLD_LIFE | ACTIVATE |
3459+F:INSTA_ART
3460+D:聖騎士の説明だよ。
3461+D:そのうちなんかかくよ。
3462+
3463+N:218:地獄の
3464+E:of the Hell
3465+I:40:26:-2
3466+W:50:40:30:66666
3467+P:0:0d0:15:15:-5
3468+F:INT | WIS | CHR | STEALTH | SPEED | HIDE_TYPE |
3469+F:RES_DARK | RES_NETHER |
3470+F:SEE_INVIS | AGGRAVATE | ESP_UNDEAD | ACTIVATE |
3471+F:INSTA_ART
3472+D:地獄の説明だよ。
3473+D:そのうちなんかかくよ。
3474+
3475+N:219:帯魔力
3476+E:The Charmed
3477+I:40:27:2
3478+W:50:80:2:100000
3479+P:0:0d0:0:0:5
3480+F:INT | CHR | INFRA | SEARCH | HIDE_TYPE |
3481+F:SEE_INVIS | FREE_ACT | SLOW_DIGEST | REGEN | LITE | WARNING |
3482+F:SH_FIRE | SH_ELEC | SH_COLD | ACTIVATE |
3483+F:INSTA_ART
3484+D:帯魔力の説明だよ。
3485+D:そのうちなんかかくよ。
3486+
3487+N:220:ものまねの始祖ゴゴの
3488+E:of Gogo
3489+I:40:28:4
3490+W:50:50:2:55555
3491+P:0:0d0:0:0:0
3492+F:INT | WIS | DEX |
3493+F:SEE_INVIS | LITE |
3494+F:INSTA_ART
3495+D:ゴゴの説明だよ。
3496+D:そのうちなんかかくよ。
3497+
--- a/lib/edit/k_info.txt
+++ b/lib/edit/k_info.txt
@@ -6286,3 +6286,31 @@ P:0:1d2:0:0:0
62866286 D:$It does nothing when you use it.
62876287 D:それは使っても何も起こらない。
62886288 F:FULL_NAME
6289+
6290+N:659:首飾
6291+E:& Amulet~
6292+G:":d
6293+I:40:25:0
6294+W:50:0:2:77777
6295+F:INSTA_ART
6296+
6297+N:660:首輪
6298+E:& Collar Harness~
6299+G:":d
6300+I:40:26:0
6301+W:50:0:30:66666
6302+F:INSTA_ART
6303+
6304+N:661:ペンダント
6305+E:& Pendant~
6306+G:":d
6307+I:40:27:0
6308+W:50:0:2:100000
6309+F:INSTA_ART
6310+
6311+N:662:ペンダント
6312+E:& Pendant~
6313+G:":d
6314+I:40:28:0
6315+W:50:0:2:55555
6316+F:INSTA_ART
--- a/lib/edit/misc.txt
+++ b/lib/edit/misc.txt
@@ -16,7 +16,7 @@ M:WY:66
1616 M:R:1070
1717
1818 # Maximum number of items in k_info.txt
19-M:K:659
19+M:K:663
2020
2121 # Maximum number of vaults in v_info.txt
2222 M:V:129
@@ -25,7 +25,7 @@ M:V:129
2525 M:F:255
2626
2727 # Maximum number of artifacts in a_info.txt
28-M:A:217
28+M:A:221
2929
3030 # Maximum number of ego-items in e_info.txt
3131 M:E:255
--- a/lib/edit/t0000001.txt
+++ b/lib/edit/t0000001.txt
@@ -410,10 +410,18 @@ F:@:1:3:0:0:0:33
410410 F:a:128:3
411411 F:@:1:3:0:0:0:15
412412
413+#--- this is old ---
413414 # Quest 27 rewarding (Magiceater, Mirror-Master)
414415 # get The Jewel Encrusted Crown of Numenor
415416 # continue with quest 33
416-?:[AND [EQU $QUEST27 3] [IOR [EQU $CLASS Magiceater] [EQU $CLASS Mirror-Master] ] ] ]
417+#?:[AND [EQU $QUEST27 3] [IOR [EQU $CLASS Magiceater] [EQU $CLASS Mirror-Master] ] ] ]
418+#F:a:128:3
419+#F:@:1:3:0:0:0:132
420+
421+# Quest 27 rewarding (Mirror-Master)
422+# get The Jewel Encrusted Crown of Numenor
423+# continue with quest 33
424+?:[AND [EQU $QUEST27 3] [EQU $CLASS Mirror-Master] ]
417425 F:a:128:3
418426 F:@:1:3:0:0:0:132
419427
@@ -424,6 +432,34 @@ F:@:1:3:0:0:0:132
424432 F:a:128:3
425433 F:@:1:3:0:0:0:81
426434
435+# Quest 27 rewarding (crusade Paladin)
436+# get the Amulet of Sacred Knights
437+# continue with quest 33
438+?:[AND [EQU $QUEST27 3] [EQU $CLASS Paladin] [EQU $REALM1 Crusade] ]
439+F:a:128:3
440+F:@:1:3:0:0:0:217
441+
442+# Quest 27 rewarding (death Paladin)
443+# get the Collar Harness of the Hell
444+# continue with quest 33
445+?:[AND [EQU $QUEST27 3] [EQU $CLASS Paladin] [EQU $REALM1 Death] ]
446+F:a:128:3
447+F:@:1:3:0:0:0:218
448+
449+# Quest 27 rewarding (Warrior-Mage, Red-Mage, Magic-Eater )
450+# get the Charmed Pendant
451+# continue with quest 33
452+?:[AND [EQU $QUEST27 3] [IOR [EQU $CLASS Warrior-Mage] [EQU $CLASS Red-Mage] [EQU $CLASS Magic-Eater] ] ]
453+F:a:128:3
454+F:@:1:3:0:0:0:219
455+
456+# Quest 27 rewarding (Imitator)
457+# get the Pendant of Gogo
458+# continue with quest 33
459+?:[AND [EQU $QUEST27 3] [EQU $CLASS Imitator] ]
460+F:a:128:3
461+F:@:1:3:0:0:0:220
462+
427463 # Quest 27 finished, continue with quest 33
428464 ?:[EQU $QUEST27 4]
429465 F:a:128:3
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -5729,6 +5729,48 @@ msg_print("
57295729 o_ptr->timeout = randint0(150) + 150;
57305730 break;
57315731 }
5732+ case ART_HELL:
5733+ {
5734+#ifdef JP
5735+ msg_print("首輪が深い闇に覆われた...");
5736+#else
5737+ msg_print("Your collar harness is coverd in pitch-darkness...");
5738+#endif
5739+ if (!get_aim_dir(&dir)) return;
5740+ fire_ball(GF_DARK, dir, 250, 4);
5741+ o_ptr->timeout = randint0(150) + 150;
5742+ break;
5743+ }
5744+ case ART_SACRED_KNIGHTS:
5745+ {
5746+#ifdef JP
5747+ msg_print("首飾が真実を照らし出す...");
5748+#else
5749+ msg_print("Your amulet exhibits the truth...");
5750+#endif
5751+ if (remove_all_curse())
5752+ {
5753+#ifdef JP
5754+ msg_print("誰かに見守られているような気がする。");
5755+#else
5756+ msg_print("You feel as if someone is watching over you.");
5757+#endif
5758+ }
5759+ (void)probing();
5760+ break;
5761+ }
5762+ case ART_CHARMED:
5763+ {
5764+#ifdef JP
5765+ msg_print("ペンダントが青白く光った．．．");
5766+#else
5767+ msg_print("Your pendant glows pale...");
5768+#endif
5769+ if (!get_aim_dir(&dir)) return;
5770+ fire_ball(GF_MANA, dir, 200, 4);
5771+ o_ptr->timeout = randint0(150) + 150;
5772+ break;
5773+ }
57325774 }
57335775
57345776 /* Window stuff */
--- a/src/defines.h
+++ b/src/defines.h
@@ -1141,6 +1141,10 @@
11411141 #define ART_MAGATAMA 149
11421142 #define ART_INROU 166
11431143 #define ART_NIGHT 215
1144+#define ART_SACRED_KNIGHTS 217
1145+#define ART_HELL 218
1146+#define ART_CHARMED 219
1147+#define ART_GOGO 220
11441148
11451149 /* Rings */
11461150 #define ART_FRAKIR 8
--- a/src/flavor.c
+++ b/src/flavor.c
@@ -26,7 +26,7 @@
2626 * Max sizes of the following arrays
2727 */
2828 #define MAX_ROCKS 59 /* Used with rings (min 38) */
29-#define MAX_AMULETS 26 /* Used with amulets (min 14) */
29+#define MAX_AMULETS 30 /* Used with amulets (min 14) */
3030 #define MAX_WOODS 34 /* Used with staffs (min 30) */
3131 #define MAX_METALS 40 /* Used with wands/rods (min 29/29) */
3232 #define MAX_COLORS 70 /* Used with potions (min 60) */
@@ -106,7 +106,7 @@ static cptr amulet_adj[MAX_AMULETS]
106106 "Tortoise Shell", "Golden", "Azure", "Crystal", "Silver",
107107 "Copper", "Swastika", "Platinum","Runed", "Rusty",
108108 "Curved", "Dragon's claw", "Rosary", "Jade", "Mithril",
109- "Ruby"
109+ "Ruby", "Emerald", "Sapphire", "Garnet", "Diamond"
110110 };
111111 #else
112112 = {
@@ -115,7 +115,7 @@ static cptr amulet_adj[MAX_AMULETS]
115115 "べっ甲の","金の","瑠璃の","水晶の","銀の",
116116 "銅の","卍の", "プラチナの", "ルーンが刻まれた","錆びた",
117117 "曲がった", "ドラゴンの爪の", "数珠の", "ひすいの", "ミスリルの",
118- "ルビーの"
118+ "ルビーの", "エメラルドの", "サファイアの", "ガーネットの", "ダイアモンドの"
119119 };
120120 #endif
121121
@@ -126,7 +126,7 @@ static byte amulet_col[MAX_AMULETS] =
126126 TERM_GREEN, TERM_YELLOW, TERM_L_BLUE, TERM_L_BLUE, TERM_L_WHITE,
127127 TERM_L_UMBER, TERM_VIOLET, TERM_WHITE, TERM_UMBER, TERM_RED,
128128 TERM_GREEN, TERM_L_GREEN, TERM_L_GREEN, TERM_GREEN, TERM_L_BLUE,
129- TERM_RED
129+ TERM_RED, TERM_GREEN, TERM_BLUE, TERM_RED, TERM_WHITE
130130 };
131131
132132
--- a/src/object1.c
+++ b/src/object1.c
@@ -1856,6 +1856,7 @@ return "
18561856 #endif
18571857 }
18581858 case ART_NIGHT:
1859+ case ART_HELL:
18591860 {
18601861 #ifdef JP
18611862 return "暗黒の嵐(250) : 150+d150 ターン毎";
@@ -1864,6 +1865,24 @@ return "
18641865 #endif
18651866
18661867 }
1868+ case ART_SACRED_KNIGHTS:
1869+ {
1870+#ifdef JP
1871+return "*解呪*と調査: いつでも";
1872+#else
1873+ return "Dispel Curse and Probing every turn";
1874+#endif
1875+
1876+ }
1877+ case ART_CHARMED:
1878+ {
1879+#ifdef JP
1880+return "魔力の嵐(200) : 150+d150 ターン毎";
1881+#else
1882+ return "mana storm (200) every 150+d150 turns";
1883+#endif
1884+
1885+ }
18671886 }
18681887
18691888
Show on old repository browser