• R/O
  • SSH
  • HTTPS

jinrousiki: Commit


Commit MetaInfo

Revision2315 (tree)
Time2018-12-30 21:00:08
Authorumethyl

Log Message

WeatherData::CAPTION

Change Summary

Incremental Difference

--- trunk/include/data/weather_data_class.php (revision 2314)
+++ trunk/include/data/weather_data_class.php (revision 2315)
@@ -9,222 +9,222 @@
99 public static $list = [
1010 0 => [self::NAME => 'スコール',
1111 self::EVENT => 'grassy',
12- 'caption' => '全員 草原迷彩'],
12+ self::CAPTION => '全員 草原迷彩'],
1313 1 => [self::NAME => '酸性雨',
1414 self::EVENT => 'mower',
15- 'caption' => '全員 草刈り'],
15+ self::CAPTION => '全員 草刈り'],
1616 2 => [self::NAME => '晴嵐',
1717 self::EVENT => 'blind_vote',
18- 'caption' => '処刑投票結果隠蔽'],
18+ self::CAPTION => '処刑投票結果隠蔽'],
1919 3 => [self::NAME => '天気雨',
2020 self::EVENT => 'no_fox_dead',
21- 'caption' => '呪殺無し'],
21+ self::CAPTION => '呪殺無し'],
2222 4 => [self::NAME => '烈日',
2323 self::EVENT => 'critical',
24- 'caption' => '会心・痛恨 発動率 100%'],
24+ self::CAPTION => '会心・痛恨 発動率 100%'],
2525 5 => [self::NAME => '強風',
2626 self::EVENT => 'blind_talk_day',
27- 'caption' => '昼会話妨害'],
27+ self::CAPTION => '昼会話妨害'],
2828 6 => [self::NAME => '風雨',
2929 self::EVENT => 'blind_talk_night',
30- 'caption' => '夜会話妨害'],
30+ self::CAPTION => '夜会話妨害'],
3131 7 => [self::NAME => '満月',
3232 self::EVENT => 'full_moon',
33- 'caption' => '占い妨害・呪術・狩人系 封印'],
33+ self::CAPTION => '占い妨害・呪術・狩人系 封印'],
3434 8 => [self::NAME => '新月',
3535 self::EVENT => 'new_moon',
36- 'caption' => '占い・魔法・人狼・吸血・悪戯 封印'],
36+ self::CAPTION => '占い・魔法・人狼・吸血・悪戯 封印'],
3737 9 => [self::NAME => '花曇',
3838 self::EVENT => 'no_contact',
39- 'caption' => '接触系封印'],
39+ self::CAPTION => '接触系封印'],
4040 10 => [self::NAME => '黄砂',
4141 self::EVENT => 'invisible',
42- 'caption' => '全員 光学迷彩'],
42+ self::CAPTION => '全員 光学迷彩'],
4343 11 => [self::NAME => '虹',
4444 self::EVENT => 'rainbow',
45- 'caption' => '全員 虹色迷彩'],
45+ self::CAPTION => '全員 虹色迷彩'],
4646 12 => [self::NAME => 'ダイヤモンドダスト',
4747 self::EVENT => 'side_reverse',
48- 'caption' => '全員 鏡面迷彩'],
48+ self::CAPTION => '全員 鏡面迷彩'],
4949 13 => [self::NAME => 'バナナの皮',
5050 self::EVENT => 'line_reverse',
51- 'caption' => '全員 天地迷彩'],
51+ self::CAPTION => '全員 天地迷彩'],
5252 14 => [self::NAME => 'スポットライト',
5353 self::EVENT => 'actor',
54- 'caption' => '全員 役者'],
54+ self::CAPTION => '全員 役者'],
5555 15 => [self::NAME => 'タライ',
5656 self::EVENT => 'critical_luck',
57- 'caption' => '全員 痛恨'],
57+ self::CAPTION => '全員 痛恨'],
5858 16 => [self::NAME => '凪',
5959 self::EVENT => 'no_sudden_death',
60- 'caption' => 'ショック死サブ無効'],
60+ self::CAPTION => 'ショック死サブ無効'],
6161 17 => [self::NAME => '青天の霹靂',
6262 self::EVENT => 'thunderbolt',
63- 'caption' => 'ショック死発生'],
63+ self::CAPTION => 'ショック死発生'],
6464 18 => [self::NAME => '涙雨',
6565 self::EVENT => 'no_last_words',
66- 'caption' => '全員 筆不精'],
66+ self::CAPTION => '全員 筆不精'],
6767 19 => [self::NAME => '熱帯夜',
6868 self::EVENT => 'no_dream',
69- 'caption' => '夢能力封印'],
69+ self::CAPTION => '夢能力封印'],
7070 20 => [self::NAME => '朧月',
7171 self::EVENT => 'full_ogre',
72- 'caption' => '鬼強化'],
72+ self::CAPTION => '鬼強化'],
7373 21 => [self::NAME => '叢雲',
7474 self::EVENT => 'seal_ogre',
75- 'caption' => '鬼封印'],
75+ self::CAPTION => '鬼封印'],
7676 22 => [self::NAME => '雷雨',
7777 self::EVENT => 'full_revive',
78- 'caption' => '蘇生強化'],
78+ self::CAPTION => '蘇生強化'],
7979 23 => [self::NAME => '快晴',
8080 self::EVENT => 'no_revive',
81- 'caption' => '蘇生封印'],
81+ self::CAPTION => '蘇生封印'],
8282 24 => [self::NAME => '慈雨',
8383 self::EVENT => 'brownie',
84- 'caption' => '村人 投票数 +1'],
84+ self::CAPTION => '村人 投票数 +1'],
8585 25 => [self::NAME => '波風',
8686 self::EVENT => 'whisper_ringing',
87- 'caption' => '全員 囁耳鳴'],
87+ self::CAPTION => '全員 囁耳鳴'],
8888 26 => [self::NAME => '小夜嵐',
8989 self::EVENT => 'howl_ringing',
90- 'caption' => '全員 吠耳鳴'],
90+ self::CAPTION => '全員 吠耳鳴'],
9191 27 => [self::NAME => '流星群',
9292 self::EVENT => 'sweet_ringing',
93- 'caption' => '全員 恋耳鳴'],
93+ self::CAPTION => '全員 恋耳鳴'],
9494 28 => [self::NAME => '春時雨',
9595 self::EVENT => 'deep_sleep',
96- 'caption' => '全員 爆睡者'],
96+ self::CAPTION => '全員 爆睡者'],
9797 29 => [self::NAME => '木漏れ日',
9898 self::EVENT => 'silent',
99- 'caption' => '全員 無口'],
99+ self::CAPTION => '全員 無口'],
100100 30 => [self::NAME => '疎雨',
101101 self::EVENT => 'missfire_revive',
102- 'caption' => '蘇生誤爆率上昇'],
102+ self::CAPTION => '蘇生誤爆率上昇'],
103103 31 => [self::NAME => '川霧',
104104 self::EVENT => 'no_hunt',
105- 'caption' => '護衛狩り無し'],
105+ self::CAPTION => '護衛狩り無し'],
106106 32 => [self::NAME => '蒼天',
107107 self::EVENT => 'full_guard',
108- 'caption' => '護衛制限無し'],
108+ self::CAPTION => '護衛制限無し'],
109109 33 => [self::NAME => '雪',
110110 self::EVENT => 'frostbite',
111- 'caption' => '凍傷付加'],
111+ self::CAPTION => '凍傷付加'],
112112 34 => [self::NAME => '梅雨',
113113 self::EVENT => 'alchemy_pharmacist',
114- 'caption' => '毒強化'],
114+ self::CAPTION => '毒強化'],
115115 35 => [self::NAME => '雹',
116116 self::EVENT => 'hyper_random_voter',
117- 'caption' => '投票数ランダム増加'],
117+ self::CAPTION => '投票数ランダム増加'],
118118 36 => [self::NAME => '半月',
119119 self::EVENT => 'half_moon',
120- 'caption' => '占い妨害'],
120+ self::CAPTION => '占い妨害'],
121121 37 => [self::NAME => '曇天',
122122 self::EVENT => 'half_guard',
123- 'caption' => '護衛成功率低下'],
123+ self::CAPTION => '護衛成功率低下'],
124124 38 => [self::NAME => '箒星',
125125 self::EVENT => 'passion',
126- 'caption' => '全員 恋色迷彩'],
126+ self::CAPTION => '全員 恋色迷彩'],
127127 39 => [self::NAME => '旱魃',
128128 self::EVENT => 'no_poison',
129- 'caption' => '毒無し'],
129+ self::CAPTION => '毒無し'],
130130 40 => [self::NAME => '濃霧',
131131 self::EVENT => 'psycho_infected',
132- 'caption' => '洗脳者付加'],
132+ self::CAPTION => '洗脳者付加'],
133133 41 => [self::NAME => '台風',
134134 self::EVENT => 'hyper_critical',
135- 'caption' => '全員 会心・痛恨'],
135+ self::CAPTION => '全員 会心・痛恨'],
136136 42 => [self::NAME => '萌動',
137137 self::EVENT => 'boost_cute',
138- 'caption' => '萌え発動率上昇'],
138+ self::CAPTION => '萌え発動率上昇'],
139139 43 => [self::NAME => '蜃気楼',
140140 self::EVENT => 'no_authority',
141- 'caption' => '投票/得票数補正サブ無効'],
141+ self::CAPTION => '投票/得票数補正サブ無効'],
142142 44 => [self::NAME => '紅月',
143143 self::EVENT => 'force_assassin_do',
144- 'caption' => '暗殺キャンセル投票不可'],
144+ self::CAPTION => '暗殺キャンセル投票不可'],
145145 45 => [self::NAME => '砂塵嵐',
146146 self::EVENT => 'corpse_courier_mad',
147- 'caption' => '霊能妨害'],
147+ self::CAPTION => '霊能妨害'],
148148 46 => [self::NAME => '霧雨',
149149 self::EVENT => 'full_wizard',
150- 'caption' => '魔法強化'],
150+ self::CAPTION => '魔法強化'],
151151 47 => [self::NAME => '木枯らし',
152152 self::EVENT => 'debilitate_wizard',
153- 'caption' => '魔法弱体化'],
153+ self::CAPTION => '魔法弱体化'],
154154 48 => [self::NAME => '雪明り',
155155 self::EVENT => 'no_trap',
156- 'caption' => '罠封印'],
156+ self::CAPTION => '罠封印'],
157157 49 => [self::NAME => '蛍火',
158158 self::EVENT => 'no_sacrifice',
159- 'caption' => '身代わり封印'],
159+ self::CAPTION => '身代わり封印'],
160160 50 => [self::NAME => '日蝕',
161161 self::EVENT => 'no_reflect_assassin',
162- 'caption' => '暗殺反射封印'],
162+ self::CAPTION => '暗殺反射封印'],
163163 51 => [self::NAME => '月蝕',
164164 self::EVENT => 'no_cursed',
165- 'caption' => '呪返し封印'],
165+ self::CAPTION => '呪返し封印'],
166166 52 => [self::NAME => '宵闇',
167167 self::EVENT => 'blinder',
168- 'caption' => '全員 目隠し'],
168+ self::CAPTION => '全員 目隠し'],
169169 53 => [self::NAME => '白夜',
170170 self::EVENT => 'mind_open',
171- 'caption' => '全員 公開者'],
171+ self::CAPTION => '全員 公開者'],
172172 54 => [self::NAME => '極光',
173173 self::EVENT => 'aurora',
174- 'caption' => '全員 目隠し・公開者'],
174+ self::CAPTION => '全員 目隠し・公開者'],
175175 55 => [self::NAME => '霜柱',
176176 self::EVENT => 'random_step',
177- 'caption' => 'ランダム足音発生'],
177+ self::CAPTION => 'ランダム足音発生'],
178178 56 => [self::NAME => '地吹雪',
179179 self::EVENT => 'no_step',
180- 'caption' => '足音能力封印'],
180+ self::CAPTION => '足音能力封印'],
181181 57 => [self::NAME => '月虹',
182182 self::EVENT => 'confession',
183- 'caption' => '全員 告白'],
183+ self::CAPTION => '全員 告白'],
184184 58 => [self::NAME => '春一番',
185185 self::EVENT => 'gentleman',
186- 'caption' => '全員 紳士'],
186+ self::CAPTION => '全員 紳士'],
187187 59 => [self::NAME => '桜吹雪',
188188 self::EVENT => 'lady',
189- 'caption' => '全員 淑女'],
189+ self::CAPTION => '全員 淑女'],
190190 60 => [self::NAME => '宵月',
191191 self::EVENT => 'liar',
192- 'caption' => '全員 狼少年'],
192+ self::CAPTION => '全員 狼少年'],
193193 61 => [self::NAME => '寒波',
194194 self::EVENT => 'boost_reflect',
195- 'caption' => '暗殺反射率上昇'],
195+ self::CAPTION => '暗殺反射率上昇'],
196196 62 => [self::NAME => '野分',
197197 self::EVENT => 'no_cute',
198- 'caption' => '萌え封印'],
198+ self::CAPTION => '萌え封印'],
199199 63 => [self::NAME => '時化',
200200 self::EVENT => 'strong_voice',
201- 'caption' => '全員 大声'],
201+ self::CAPTION => '全員 大声'],
202202 64 => [self::NAME => '細雪',
203203 self::EVENT => 'weak_voice',
204- 'caption' => '全員 小声'],
204+ self::CAPTION => '全員 小声'],
205205 65 => [self::NAME => '天狗風',
206206 self::EVENT => 'full_tengu',
207- 'caption' => '天狗強化'],
207+ self::CAPTION => '天狗強化'],
208208 66 => [self::NAME => '無風',
209209 self::EVENT => 'seal_tengu',
210- 'caption' => '天狗封印'],
210+ self::CAPTION => '天狗封印'],
211211 67 => [self::NAME => '彩雲',
212212 self::EVENT => 'settle',
213- 'caption' => '決着村'],
213+ self::CAPTION => '決着村'],
214214 68 => [self::NAME => '星空',
215215 self::EVENT => 'star_fairy',
216- 'caption' => '悪戯 星妖精'],
216+ self::CAPTION => '悪戯 星妖精'],
217217 69 => [self::NAME => '花吹雪',
218218 self::EVENT => 'flower_fairy',
219- 'caption' => '悪戯 花妖精'],
219+ self::CAPTION => '悪戯 花妖精'],
220220 70 => [self::NAME => '白羽の矢',
221221 self::EVENT => 'tengu_kill',
222- 'caption' => 'ランダム神隠し発生'],
222+ self::CAPTION => 'ランダム神隠し発生'],
223223 71 => [self::NAME => '闇夜',
224224 self::EVENT => 'full_escape',
225- 'caption' => '逃亡失敗無し・罠無効'],
225+ self::CAPTION => '逃亡失敗無し・罠無効'],
226226 72 => [self::NAME => 'サーチライト',
227227 self::EVENT => 'no_escape',
228- 'caption' => '逃亡・離脱・暗殺無効']
228+ self::CAPTION => '逃亡・離脱・暗殺無効']
229229 ];
230230 }
--- trunk/include/event/weather_class.php (revision 2314)
+++ trunk/include/event/weather_class.php (revision 2315)
@@ -1,6 +1,6 @@
11 <?php
22 //-- 天候データマネージャ --//
3-class WeatherManager {
3+final class WeatherManager {
44 //天候データ取得
55 public static function Get($id = null) {
66 return WeatherData::$list[$id];
@@ -23,6 +23,6 @@
2323
2424 //説明出力
2525 public static function OutputCaption($id) {
26- echo WeatherData::$list[$id]['caption'];
26+ echo WeatherData::$list[$id][WeatherData::CAPTION];
2727 }
2828 }
--- trunk/include/html/game_html_class.php (revision 2314)
+++ trunk/include/html/game_html_class.php (revision 2315)
@@ -647,7 +647,7 @@
647647
648648 $format = HTML::GenerateDiv(GameMessage::WEATHER, 'weather');
649649 $weather = WeatherManager::Get(DB::$ROOM->Stack()->Get('weather'));
650- return sprintf($format, $weather[WeatherData::NAME], $weather['caption']);
650+ return sprintf($format, $weather[WeatherData::NAME], $weather[WeatherData::CAPTION]);
651651 }
652652
653653 //死因表示判定処理
Show on old repository browser