• R/O
  • SSH
  • HTTPS

jinrousiki: Commit


Commit MetaInfo

Revision2313 (tree)
Time2018-12-30 20:46:36
Authorumethyl

Log Message

WeatherData::NAME

Change Summary

Incremental Difference

--- trunk/include/data/weather_data_class.php (revision 2312)
+++ trunk/include/data/weather_data_class.php (revision 2313)
@@ -1,225 +1,229 @@
11 <?php
22 //-- 天候データベース --//
33 final class WeatherData {
4+ const NAME = 'name';
5+ const EVENT = 'event';
6+ const CAPTION = 'caption';
7+
48 /* 天候リスト */
59 public static $list = [
6- 0 => ['name' => 'スコール',
10+ 0 => [self::NAME => 'スコール',
711 'event' => 'grassy',
812 'caption' => '全員 草原迷彩'],
9- 1 => ['name' => '酸性雨',
13+ 1 => [self::NAME => '酸性雨',
1014 'event' => 'mower',
1115 'caption' => '全員 草刈り'],
12- 2 => ['name' => '晴嵐',
16+ 2 => [self::NAME => '晴嵐',
1317 'event' => 'blind_vote',
1418 'caption' => '処刑投票結果隠蔽'],
15- 3 => ['name' => '天気雨',
19+ 3 => [self::NAME => '天気雨',
1620 'event' => 'no_fox_dead',
1721 'caption' => '呪殺無し'],
18- 4 => ['name' => '烈日',
22+ 4 => [self::NAME => '烈日',
1923 'event' => 'critical',
2024 'caption' => '会心・痛恨 発動率 100%'],
21- 5 => ['name' => '強風',
25+ 5 => [self::NAME => '強風',
2226 'event' => 'blind_talk_day',
2327 'caption' => '昼会話妨害'],
24- 6 => ['name' => '風雨',
28+ 6 => [self::NAME => '風雨',
2529 'event' => 'blind_talk_night',
2630 'caption' => '夜会話妨害'],
27- 7 => ['name' => '満月',
31+ 7 => [self::NAME => '満月',
2832 'event' => 'full_moon',
2933 'caption' => '占い妨害・呪術・狩人系 封印'],
30- 8 => ['name' => '新月',
34+ 8 => [self::NAME => '新月',
3135 'event' => 'new_moon',
3236 'caption' => '占い・魔法・人狼・吸血・悪戯 封印'],
33- 9 => ['name' => '花曇',
37+ 9 => [self::NAME => '花曇',
3438 'event' => 'no_contact',
3539 'caption' => '接触系封印'],
36- 10 => ['name' => '黄砂',
40+ 10 => [self::NAME => '黄砂',
3741 'event' => 'invisible',
3842 'caption' => '全員 光学迷彩'],
39- 11 => ['name' => '虹',
43+ 11 => [self::NAME => '虹',
4044 'event' => 'rainbow',
4145 'caption' => '全員 虹色迷彩'],
42- 12 => ['name' => 'ダイヤモンドダスト',
46+ 12 => [self::NAME => 'ダイヤモンドダスト',
4347 'event' => 'side_reverse',
4448 'caption' => '全員 鏡面迷彩'],
45- 13 => ['name' => 'バナナの皮',
49+ 13 => [self::NAME => 'バナナの皮',
4650 'event' => 'line_reverse',
4751 'caption' => '全員 天地迷彩'],
48- 14 => ['name' => 'スポットライト',
52+ 14 => [self::NAME => 'スポットライト',
4953 'event' => 'actor',
5054 'caption' => '全員 役者'],
51- 15 => ['name' => 'タライ',
55+ 15 => [self::NAME => 'タライ',
5256 'event' => 'critical_luck',
5357 'caption' => '全員 痛恨'],
54- 16 => ['name' => '凪',
58+ 16 => [self::NAME => '凪',
5559 'event' => 'no_sudden_death',
5660 'caption' => 'ショック死サブ無効'],
57- 17 => ['name' => '青天の霹靂',
61+ 17 => [self::NAME => '青天の霹靂',
5862 'event' => 'thunderbolt',
5963 'caption' => 'ショック死発生'],
60- 18 => ['name' => '涙雨',
64+ 18 => [self::NAME => '涙雨',
6165 'event' => 'no_last_words',
6266 'caption' => '全員 筆不精'],
63- 19 => ['name' => '熱帯夜',
67+ 19 => [self::NAME => '熱帯夜',
6468 'event' => 'no_dream',
6569 'caption' => '夢能力封印'],
66- 20 => ['name' => '朧月',
70+ 20 => [self::NAME => '朧月',
6771 'event' => 'full_ogre',
6872 'caption' => '鬼強化'],
69- 21 => ['name' => '叢雲',
73+ 21 => [self::NAME => '叢雲',
7074 'event' => 'seal_ogre',
7175 'caption' => '鬼封印'],
72- 22 => ['name' => '雷雨',
76+ 22 => [self::NAME => '雷雨',
7377 'event' => 'full_revive',
7478 'caption' => '蘇生強化'],
75- 23 => ['name' => '快晴',
79+ 23 => [self::NAME => '快晴',
7680 'event' => 'no_revive',
7781 'caption' => '蘇生封印'],
78- 24 => ['name' => '慈雨',
82+ 24 => [self::NAME => '慈雨',
7983 'event' => 'brownie',
8084 'caption' => '村人 投票数 +1'],
81- 25 => ['name' => '波風',
85+ 25 => [self::NAME => '波風',
8286 'event' => 'whisper_ringing',
8387 'caption' => '全員 囁耳鳴'],
84- 26 => ['name' => '小夜嵐',
88+ 26 => [self::NAME => '小夜嵐',
8589 'event' => 'howl_ringing',
8690 'caption' => '全員 吠耳鳴'],
87- 27 => ['name' => '流星群',
91+ 27 => [self::NAME => '流星群',
8892 'event' => 'sweet_ringing',
8993 'caption' => '全員 恋耳鳴'],
90- 28 => ['name' => '春時雨',
94+ 28 => [self::NAME => '春時雨',
9195 'event' => 'deep_sleep',
9296 'caption' => '全員 爆睡者'],
93- 29 => ['name' => '木漏れ日',
97+ 29 => [self::NAME => '木漏れ日',
9498 'event' => 'silent',
9599 'caption' => '全員 無口'],
96- 30 => ['name' => '疎雨',
100+ 30 => [self::NAME => '疎雨',
97101 'event' => 'missfire_revive',
98102 'caption' => '蘇生誤爆率上昇'],
99- 31 => ['name' => '川霧',
103+ 31 => [self::NAME => '川霧',
100104 'event' => 'no_hunt',
101105 'caption' => '護衛狩り無し'],
102- 32 => ['name' => '蒼天',
106+ 32 => [self::NAME => '蒼天',
103107 'event' => 'full_guard',
104108 'caption' => '護衛制限無し'],
105- 33 => ['name' => '雪',
109+ 33 => [self::NAME => '雪',
106110 'event' => 'frostbite',
107111 'caption' => '凍傷付加'],
108- 34 => ['name' => '梅雨',
112+ 34 => [self::NAME => '梅雨',
109113 'event' => 'alchemy_pharmacist',
110114 'caption' => '毒強化'],
111- 35 => ['name' => '雹',
115+ 35 => [self::NAME => '雹',
112116 'event' => 'hyper_random_voter',
113117 'caption' => '投票数ランダム増加'],
114- 36 => ['name' => '半月',
118+ 36 => [self::NAME => '半月',
115119 'event' => 'half_moon',
116120 'caption' => '占い妨害'],
117- 37 => ['name' => '曇天',
121+ 37 => [self::NAME => '曇天',
118122 'event' => 'half_guard',
119123 'caption' => '護衛成功率低下'],
120- 38 => ['name' => '箒星',
124+ 38 => [self::NAME => '箒星',
121125 'event' => 'passion',
122126 'caption' => '全員 恋色迷彩'],
123- 39 => ['name' => '旱魃',
127+ 39 => [self::NAME => '旱魃',
124128 'event' => 'no_poison',
125129 'caption' => '毒無し'],
126- 40 => ['name' => '濃霧',
130+ 40 => [self::NAME => '濃霧',
127131 'event' => 'psycho_infected',
128132 'caption' => '洗脳者付加'],
129- 41 => ['name' => '台風',
133+ 41 => [self::NAME => '台風',
130134 'event' => 'hyper_critical',
131135 'caption' => '全員 会心・痛恨'],
132- 42 => ['name' => '萌動',
136+ 42 => [self::NAME => '萌動',
133137 'event' => 'boost_cute',
134138 'caption' => '萌え発動率上昇'],
135- 43 => ['name' => '蜃気楼',
139+ 43 => [self::NAME => '蜃気楼',
136140 'event' => 'no_authority',
137141 'caption' => '投票/得票数補正サブ無効'],
138- 44 => ['name' => '紅月',
142+ 44 => [self::NAME => '紅月',
139143 'event' => 'force_assassin_do',
140144 'caption' => '暗殺キャンセル投票不可'],
141- 45 => ['name' => '砂塵嵐',
145+ 45 => [self::NAME => '砂塵嵐',
142146 'event' => 'corpse_courier_mad',
143147 'caption' => '霊能妨害'],
144- 46 => ['name' => '霧雨',
148+ 46 => [self::NAME => '霧雨',
145149 'event' => 'full_wizard',
146150 'caption' => '魔法強化'],
147- 47 => ['name' => '木枯らし',
151+ 47 => [self::NAME => '木枯らし',
148152 'event' => 'debilitate_wizard',
149153 'caption' => '魔法弱体化'],
150- 48 => ['name' => '雪明り',
154+ 48 => [self::NAME => '雪明り',
151155 'event' => 'no_trap',
152156 'caption' => '罠封印'],
153- 49 => ['name' => '蛍火',
157+ 49 => [self::NAME => '蛍火',
154158 'event' => 'no_sacrifice',
155159 'caption' => '身代わり封印'],
156- 50 => ['name' => '日蝕',
160+ 50 => [self::NAME => '日蝕',
157161 'event' => 'no_reflect_assassin',
158162 'caption' => '暗殺反射封印'],
159- 51 => ['name' => '月蝕',
163+ 51 => [self::NAME => '月蝕',
160164 'event' => 'no_cursed',
161165 'caption' => '呪返し封印'],
162- 52 => ['name' => '宵闇',
166+ 52 => [self::NAME => '宵闇',
163167 'event' => 'blinder',
164168 'caption' => '全員 目隠し'],
165- 53 => ['name' => '白夜',
169+ 53 => [self::NAME => '白夜',
166170 'event' => 'mind_open',
167171 'caption' => '全員 公開者'],
168- 54 => ['name' => '極光',
172+ 54 => [self::NAME => '極光',
169173 'event' => 'aurora',
170174 'caption' => '全員 目隠し・公開者'],
171- 55 => ['name' => '霜柱',
175+ 55 => [self::NAME => '霜柱',
172176 'event' => 'random_step',
173177 'caption' => 'ランダム足音発生'],
174- 56 => ['name' => '地吹雪',
178+ 56 => [self::NAME => '地吹雪',
175179 'event' => 'no_step',
176180 'caption' => '足音能力封印'],
177- 57 => ['name' => '月虹',
181+ 57 => [self::NAME => '月虹',
178182 'event' => 'confession',
179183 'caption' => '全員 告白'],
180- 58 => ['name' => '春一番',
184+ 58 => [self::NAME => '春一番',
181185 'event' => 'gentleman',
182186 'caption' => '全員 紳士'],
183- 59 => ['name' => '桜吹雪',
187+ 59 => [self::NAME => '桜吹雪',
184188 'event' => 'lady',
185189 'caption' => '全員 淑女'],
186- 60 => ['name' => '宵月',
190+ 60 => [self::NAME => '宵月',
187191 'event' => 'liar',
188192 'caption' => '全員 狼少年'],
189- 61 => ['name' => '寒波',
193+ 61 => [self::NAME => '寒波',
190194 'event' => 'boost_reflect',
191195 'caption' => '暗殺反射率上昇'],
192- 62 => ['name' => '野分',
196+ 62 => [self::NAME => '野分',
193197 'event' => 'no_cute',
194198 'caption' => '萌え封印'],
195- 63 => ['name' => '時化',
199+ 63 => [self::NAME => '時化',
196200 'event' => 'strong_voice',
197201 'caption' => '全員 大声'],
198- 64 => ['name' => '細雪',
202+ 64 => [self::NAME => '細雪',
199203 'event' => 'weak_voice',
200204 'caption' => '全員 小声'],
201- 65 => ['name' => '天狗風',
205+ 65 => [self::NAME => '天狗風',
202206 'event' => 'full_tengu',
203207 'caption' => '天狗強化'],
204- 66 => ['name' => '無風',
208+ 66 => [self::NAME => '無風',
205209 'event' => 'seal_tengu',
206210 'caption' => '天狗封印'],
207- 67 => ['name' => '彩雲',
211+ 67 => [self::NAME => '彩雲',
208212 'event' => 'settle',
209213 'caption' => '決着村'],
210- 68 => ['name' => '星空',
214+ 68 => [self::NAME => '星空',
211215 'event' => 'star_fairy',
212216 'caption' => '悪戯 星妖精'],
213- 69 => ['name' => '花吹雪',
217+ 69 => [self::NAME => '花吹雪',
214218 'event' => 'flower_fairy',
215219 'caption' => '悪戯 花妖精'],
216- 70 => ['name' => '白羽の矢',
220+ 70 => [self::NAME => '白羽の矢',
217221 'event' => 'tengu_kill',
218222 'caption' => 'ランダム神隠し発生'],
219- 71 => ['name' => '闇夜',
223+ 71 => [self::NAME => '闇夜',
220224 'event' => 'full_escape',
221225 'caption' => '逃亡失敗無し・罠無効'],
222- 72 => ['name' => 'サーチライト',
226+ 72 => [self::NAME => 'サーチライト',
223227 'event' => 'no_escape',
224228 'caption' => '逃亡・離脱・暗殺無効']
225229 ];
--- trunk/include/event/weather_class.php (revision 2312)
+++ trunk/include/event/weather_class.php (revision 2313)
@@ -18,7 +18,7 @@
1818
1919 //天候名出力
2020 public static function OutputName($id) {
21- echo WeatherData::$list[$id]['name'];
21+ echo WeatherData::$list[$id][WeatherData::NAME];
2222 }
2323
2424 //説明出力
--- trunk/include/html/game_html_class.php (revision 2312)
+++ trunk/include/html/game_html_class.php (revision 2313)
@@ -641,13 +641,13 @@
641641 private static function GenerateWeather() {
642642 //スキップ判定
643643 if (DB::$ROOM->Stack()->IsEmpty('weather') ||
644- (DB::$ROOM->IsOn(RoomMode::LOG) && ! DB::$ROOM->IsTest() && DB::$ROOM->IsNight())) {
644+ (DB::$ROOM->IsOn(RoomMode::LOG) && false === DB::$ROOM->IsTest() && DB::$ROOM->IsNight())) {
645645 return '';
646646 }
647647
648648 $format = HTML::GenerateDiv(GameMessage::WEATHER, 'weather');
649649 $weather = WeatherManager::Get(DB::$ROOM->Stack()->Get('weather'));
650- return sprintf($format, $weather['name'], $weather['caption']);
650+ return sprintf($format, $weather[WeatherData::NAME], $weather['caption']);
651651 }
652652
653653 //死因表示判定処理
Show on old repository browser