From 3e4ee61b5187d086afa73cd797e0b7e8537d32ea Mon Sep 17 00:00:00 2001 From: Nemo Ma <nemoma@nmonolith.com> Date: Thu, 17 Aug 2023 10:12:43 -0400 Subject: [PATCH] Interim 4 Add: A mix of the 4 joke items will produce a mine item with 2 different outcomes, one to inflict a batch of statuses, the other will act as a miracle mine and kill the opposing player, also trigger an Easter egg music change. --- gamedata/cache/audio_1.php | 6 ++++++ gamedata/cache/mixitem_1.php | 2 ++ gamedata/cache/randomFS_1.php | 6 ++++++ gamedata/cache/style_20190718.css | 2 +- gamedata/cache/tooltip_1.php | 9 +++++++++ include/game/item.func.php | 8 ++++++++ include/game/itemmain.func.php | 19 ++++++++++++++++++- include/game/itemmix.func.php | 23 +++++++++++++++++++++++ 8 files changed, 73 insertions(+), 2 deletions(-) diff --git a/gamedata/cache/audio_1.php b/gamedata/cache/audio_1.php index 432dca4..d23897e 100644 --- a/gamedata/cache/audio_1.php +++ b/gamedata/cache/audio_1.php @@ -40,6 +40,7 @@ $bgmbook = Array 'realcrimzure' => Array(17), 'pls33' => Array(21), 'introduction' => Array(22), + 'notYMCA' => Array(25), ); # 所有bgmç¼–å·æ¸…å•ï¼š @@ -170,6 +171,11 @@ $bgmlist = Array 'url' => 'https://res.dts.gay/BGM/Skaven252-MMC-2023-03_LifeAsAHole.mp3', 'type' => 'audio/mpeg', ), + 25 => Array( + 'name' => 'Turbo - Ikouze Paradise - Eurobeat Version', + 'url' => 'https://res.dts.gay/BGM/ikouze_paradise_eurobeat.mp3', + 'type' => 'audio/mpeg', + ) ); ?> diff --git a/gamedata/cache/mixitem_1.php b/gamedata/cache/mixitem_1.php index 00bdf52..d71aa35 100644 --- a/gamedata/cache/mixitem_1.php +++ b/gamedata/cache/mixitem_1.php @@ -126,6 +126,8 @@ $mixinfo = array array('class' => 'item', 'stuff' => array('æ°´','黑色方å—','白色é›èŠ'),'result' => array('仪水镜','Y',1,1,),), array('class' => 'item', 'stuff' => array('风ç¥æ²³æ°´','仪水镜','白色é›èŠ','黑色é›èŠ'),'result' => array('å…«å’«é•œ','DH',1,1,'b'),), array('class' => 'item', 'stuff' => array('乌黑的脸','乌黑的脸','乌黑的脸','乌黑的脸','乌黑的脸'),'result' => array('😂我太酷啦ï¼ðŸ˜‚','Y',1,1,'xX'),), + array('class' => 'item', 'stuff' => array('ã€æˆ‘太帅啦ï¼ã€‘','ã€æˆ‘太棒啦ï¼ã€‘','ã€æˆ‘太牛啦ï¼ã€‘','ã€æˆ‘太强啦ï¼ã€‘'),'result' => array('「我头四ã€','TNe',300,1,'eipuz'),), + array('class' => 'item', 'stuff' => array('ã€æˆ‘太帅啦ï¼ã€‘','ã€æˆ‘太棒啦ï¼ã€‘','ã€æˆ‘太牛啦ï¼ã€‘','ã€æˆ‘太强啦ï¼ã€‘','神秘æ¡ä»¶'),'result' => array('ç ´åˆ™æˆ˜æœ¯ã€Œæˆ‘å¤´å››ã€','TNd',1,1,'xX'),), array('class' => 'pokemon', 'stuff' => array('《å°é»„çš„è‰å¸½ã€‹','《å°é»„的钓鱼竿》','《å°é»„的行军é´ã€‹'),'result' => array('《å°é»„çš„ç²¾çµçƒã€‹','WC',386,'∞',),), array('class' => 'pokemon', 'stuff' => array('《å°é»„çš„ç²¾çµçƒã€‹','《å°é»„的收æœç‰¹è®ã€‹'),'result' => array('《å°é»„的超级çƒã€‹','WC',386,'∞','Zir'),), diff --git a/gamedata/cache/randomFS_1.php b/gamedata/cache/randomFS_1.php index 8d4ef76..0d06191 100644 --- a/gamedata/cache/randomFS_1.php +++ b/gamedata/cache/randomFS_1.php @@ -15,6 +15,12 @@ EOT; $item = <<<EOT 针线包,Y,100,1,, 磨刀石,Y,100,1,, +针线包,Y,150,1,, +磨刀石,Y,150,1,, +针线包,Y,200,1,, +磨刀石,Y,200,1,, +针线包,Y,777,1,, +磨刀石,Y,777,1,, â—†ç«ä¹‹ç¢Žç‰‡,HB,13337,1,, 银白盒å,ps,1,1,, 游æˆçŽ‹å¡åŒ…,ygo,1,1,, diff --git a/gamedata/cache/style_20190718.css b/gamedata/cache/style_20190718.css index e6721a9..7bb5c8f 100644 --- a/gamedata/cache/style_20190718.css +++ b/gamedata/cache/style_20190718.css @@ -747,7 +747,7 @@ input.range{ .shoprow .leftbox{ width:50px;float:left;margin-right:5px; } -.shoprow .leftbox input{width:50px;} +.shoprow .leftbox input{min-width:50px;} .shoprow .rightbox{ width:60px;float:right; } diff --git a/gamedata/cache/tooltip_1.php b/gamedata/cache/tooltip_1.php index 6982b61..cd01d6d 100644 --- a/gamedata/cache/tooltip_1.php +++ b/gamedata/cache/tooltip_1.php @@ -72,10 +72,19 @@ $tps_name = Array 'éšæœºæ•°ä¹‹ç¥žçš„神力' => 2,'éšæœºæ•°ä¹‹ç¥žçš„震撼' => 2,'éšæœºæ•°ä¹‹ç¥žçš„æ‘„ç†' => 2,'éšæœºæ•°ä¹‹ç¥žçš„æ¶æˆ' => 2, # ç¦è¢‹æƒ©ç½šç‰©å“ '乌黑的脸' => Array('title'=>"è´ª 心 ä¸ è¶³ 蛇 åž è±¡"), + # 一个特判 - 这游æˆä¸ä¸ä¼šå‡ºçŽ°å«åšã€ç¥žç§˜æ¡ä»¶ã€‘的物å“å§â€¦â€¦ + '神秘æ¡ä»¶' => Array('class'=>'lime', 'title'=>"è¦åˆæˆè¯¥ç‰©å“需è¦æ»¡è¶³ä¸€ä¸ªç‰¹å®šçš„神秘æ¡ä»¶ã€‚"), # OTHERS '😂我太酷啦ï¼ðŸ˜‚' =>Array('class'=>'rainbow', 'title'=>"一个笑å“é»„è±†æ¨¡æ ·çš„æŒ‰é’®ï¼ŒæŒ‰ä¸‹åŽç«‹åˆ»å°†è‡ªå·±ç‚¸æˆä¸€æœµçƒŸèŠ±ï¼ˆè‡ªèº«æ»äº¡ï¼‰ã€‚"), + 'ã€æˆ‘太帅啦ï¼ã€‘' =>Array('title'=>"è¿™æ˜¯ä¸€ä¸ªæ•´è›Šè‡ªå·±çš„æŒ‰é’®ã€‚å°†ä¼šæŠŠä½ çš„èƒŒåŒ…æ›¿æ¢æˆä¸€å †æ— 用的游æˆçŽ‹å¡ç‰‡ã€‚"), + 'ã€æˆ‘太棒啦ï¼ã€‘' =>Array('title'=>"è¿™æ˜¯ä¸€ä¸ªæ•´è›Šè‡ªå·±çš„æŒ‰é’®ã€‚å°†ä¼šå‰ŠæŽ‰ä½ çš„ç”Ÿå‘½å’Œä½“åŠ›ï¼Œå¹¶å°†å®ƒä»¬è½¬åŒ–ä¸ºç‰æ•ˆè¡¥ç»™ã€‚"), + 'ã€æˆ‘太强啦ï¼ã€‘' =>Array('title'=>"è¿™æ˜¯ä¸€ä¸ªæ•´è›Šè‡ªå·±çš„æŒ‰é’®ã€‚ä½ ä¼šå‘ä¼—äººå®£è¨€ä½ å¾ˆå¼ºï¼Œç„¶åŽä¸ºäº†è¯æ˜Žä½ çš„å®žåŠ›ï¼Œä½ çš„æœ€å¤§ç”Ÿå‘½å€¼å°†ä¼šä¸‹é™100点。"), + 'ã€æˆ‘太牛啦ï¼ã€‘' =>Array('title'=>"这是一个整蛊自己的按钮。将会å‘ä¼—äººå®£è¨€ä½ å¾ˆç‰›ï¼Œç„¶åŽä¸ºäº†è¯æ˜Žè¿™ä¸€ç‚¹ï¼Œä½ ä¼šå°†ä½ çš„æœ€å¤§ç”Ÿå‘½å€¼å’Œæœ€å¤§ä½“åŠ›å€¼å˜æˆé‡‘钱。"), + '「我头四ã€' =>Array('title'=>"使用四ç§ä¸åŒçš„整蛊é“å…·åˆæˆçš„强力彩虹陷阱,踩到的玩家将å—到300点固定伤害并å˜å¾—é体鳞伤。但如果满足æŸä¸ªæ¡ä»¶çš„è¯â€¦â€¦"), + 'ç ´åˆ™æˆ˜æœ¯ã€Œæˆ‘å¤´å››ã€' =>Array('class'=>'minirainbow', 'title'=>"满足æŸä¸ªç‰¹å®šæ¡ä»¶åŽï¼Œåˆæˆçš„「我头四ã€ä¾¿å¯ä»¥ä¸€å‡»å¿…æ€ã€‚"), '神秘的「🥚ã€' =>Array('class'=>'glitch1', 'title'=>"一个神秘的蛋状物å“ï¼Œä½ æ½œæ„识觉得它å¯èƒ½ä¼šå¾ˆå¤§æ¡ï¼Œè€Œä¸”觉得它åƒæ˜¯ä»€ä¹ˆå“ºä¹³ç”Ÿç‰©äº§ç”Ÿçš„……"), '✦ЦВЙΨХЩΗЖФ✦' =>Array('class'=>'spitem2', 'title'=>"看起æ¥æ˜¯ä¸€ä¸ªé»‘色的,安é™çš„ç›’å,里é¢å¯èƒ½æ”¾ç€å¥½ä¸œè¥¿ã€‚"), + '✦ЦΨЙЩЦΑПΨÐВЦЩΨ✦' =>Array('class'=>'spitem2', 'title'=>"看起æ¥æ˜¯ä¸€ä¸ªæ©™è‰²çš„,骚动的盒å,里é¢å¯èƒ½æ”¾ç€èŽ«å其妙的东西。"), ); $tps_name_lore = Array diff --git a/include/game/item.func.php b/include/game/item.func.php index e10e812..a50dcc4 100644 --- a/include/game/item.func.php +++ b/include/game/item.func.php @@ -2918,6 +2918,8 @@ function itemuse($itmn,&$data=NULL) { # Destroy the item. //$itm = $itmk = $itmsk = ''; //$itme = $itms = 0; + # Sign + $clbpara['iAmHandsome'] += 1; } elseif($itm == 'ã€æˆ‘太棒啦ï¼ã€‘') { # Joke Item, shred the user's HP and SP, then convert them into health item. $log .= "按下这个按钮åŽï¼Œä½ çªç„¶è§‰å¾—ä½ å¾ˆæ£’ï¼Œ<br> @@ -2939,6 +2941,8 @@ function itemuse($itmn,&$data=NULL) { # Destroy the item. $itm = $itmk = $itmsk = ''; $itme = $itms = 0; + # Sign + $clbpara['iAmGreat'] += 1; } elseif($itm == 'ã€æˆ‘太强啦ï¼ã€‘') { # Joke Item, Alerting the position of the user by generate a chatlog and decrease their $mhp by 100. if ($mhp < 100) { @@ -2956,6 +2960,8 @@ function itemuse($itmn,&$data=NULL) { # Destroy the item. $itm = $itmk = $itmsk = ''; $itme = $itms = 0; + # Sign + $clbpara['iAmStrong'] += 1; } } elseif($itm == 'ã€æˆ‘太牛啦ï¼ã€‘') { # Joke Item, Aleating the position of the user, then turn their $mhp and $msp into money. @@ -2976,6 +2982,8 @@ function itemuse($itmn,&$data=NULL) { # Destroy the item. $itm = $itmk = $itmsk = ''; $itme = $itms = 0; + # Sign + $clbpara['iAmRich'] += 1; } else { $log .= " <span class=\"yellow\">$itm</span> 该如何使用呢?<br>"; } diff --git a/include/game/itemmain.func.php b/include/game/itemmain.func.php index e47265b..8057561 100644 --- a/include/game/itemmain.func.php +++ b/include/game/itemmain.func.php @@ -86,6 +86,23 @@ function calc_trap_damage(&$pa,$pd=NULL,$playerflag=0,$selflag=0) $damage = $pa['hp']; return $damage; } + // 普通普通我头四 + if($pa['itmk0'] == 'TOe'){ + $log .= "<br>çªç„¶ä»Žåœ°ä¸Šçªœå‡ºäº†å››ä¸ªå¤§åªä½¬ï¼<br>ä»–ä»¬ä¼¼ä¹Žå¯¹ä½ åšäº†ä»€ä¹ˆä¸å¯æ述的事情……<br> + 总之在他们心满æ„足地沉回地é¢ä¹‹åŽï¼Œä½ 头晕目眩地站了起æ¥ã€‚<br>"; + $pa['inf'] = 'hbafpuie'; + $damage = 300; + return $damage; + } + // è¶…çº§æ— æ•Œæˆ‘å¤´å›› + if($pa['itmk0'] == 'TOd') + { + $log .= "<br>一阵强劲的音ä¹çªç„¶å“起,似乎是一首最近的æŒï¼Œä½†æœ‰ç€ä¸€ç§è€æŒçš„æ°”æ¯â€¦â€¦<br> + <br><span class=\"minirainbow\">一ç§å¾ˆå¸…,很强,很棒,很牛的力é‡å°†ä½ 的生命改写æˆäº†è™šæ— ï¼</span><br>"; + $pa['clbpara']['event_bgmbook'] = Array('notYMCA'); + $damage = $pa['hp']; + return $damage; + } // éšæœºæ•°å¤§ç¥žçš„陷阱 if($pa['itmk0'] == 'TO8') { @@ -114,7 +131,7 @@ function calc_trap_damage(&$pa,$pd=NULL,$playerflag=0,$selflag=0) function check_trap_def_event(&$pa,$damage,$playerflag=0,$selflag=0) { # 奇迹雷ã€ç¥žåŠ›é›·ä¸èƒ½è¿Žå‡» - if($pa['itmk0'] == 'TOc' || $pa['itmk0'] == 'TO8') return $damage; + if($pa['itmk0'] == 'TOc' || $pa['itmk0'] == 'TO8' || $pa['itmk0'] == 'TOd') return $damage; # 检查是å¦æœ‰è¿Žå‡»å±žæ€§ include_once GAME_ROOT.'./include/game/revattr.func.php'; if(empty($pa['ex_keys'])) $pa['ex_keys'] = array_merge(\revattr\get_equip_ex_array($pa),\revattr\get_wep_ex_array($pa)); diff --git a/include/game/itemmix.func.php b/include/game/itemmix.func.php index 93051ae..a53a9d9 100644 --- a/include/game/itemmix.func.php +++ b/include/game/itemmix.func.php @@ -447,6 +447,29 @@ function itemmix_events(&$data=NULL) 啊……?<br>"; } + # If one attempts to mix 我头四, check if they have used all 4 我太XX item, if they do, replace the result with the miracle mine, if not, then it's just a normal mine. + if($itm0 =='「我头四ã€'){ + # Check if all 4 「我太XX〠have been used. + if($clbpara['iAmHandsome'] > 0 && $clbpara['iAmGreat'] > 0 && $clbpara['iAmRich'] > 0 && $clbpara['iAmStrong'] > 0){ + $log .= "<span class='minirainbow'>å¾ˆå¸…ï¼Œå¾ˆå¼ºï¼Œå¾ˆæ£’ï¼Œå¾ˆç‰›çš„ä½ æ‹¿èµ·äº†ä½ åˆšåˆšåˆæˆçš„这个å为「我头四ã€çš„陷阱。<br> + ä½ æ‰‹ä¸Šçš„ä¸œè¥¿å“应ç€ä½ çš„çµé‚,竟然产生了å˜åŒ–ï¼</span><br>"; + + $itm0 = 'ç ´åˆ™æˆ˜æœ¯ã€Œæˆ‘å¤´å››ã€'; + $itme0 = 1; + $itmk0 = 'TNd'; + $itmsk0 = 'xX'; + + $log .= "ä½†æ˜¯ä½ çš„é¢„æ„Ÿå‘Šè¯‰ä½ ï¼Œè¦å†åšä¸€ä¸ªè¿™æ ·çš„东西,<br><span class='minirainbow'>æ怕需è¦é‡æ–°å°†ä½ 之å‰åšè¿‡çš„æŸäº›äº‹æƒ…åšä¸€é了……</span><br>"; + # Clear the 4「我太XX〠$clbpara values to prevent abuse of this trap. + $clbpara['iAmHandsome'] = 0; + $clbpara['iAmGreat'] = 0; + $clbpara['iAmRich'] = 0; + $clbpara['iAmStrong'] = 0; + }else{ + # Output a hint about the above trap. + $log .= "<span class='lime'>ä½ æ§ç€è¿™ä¸ªåˆšåˆšåˆæˆå‡ºæ¥çš„陷阱……<br>ä½ æœ‰ä¸€ç§é¢„感,它å¯ä»¥åœ¨ç‰¹å®šæ¡ä»¶ä¸‹å˜æˆä¸€ä¸ªæ›´å¼ºçš„东西,但那æ¡ä»¶æ˜¯ä»€ä¹ˆå‘¢ï¼Ÿ</span><br>"; + } + } return; } -- 2.24.1