diff --git a/Terror Infinity/Terror Infinity.html b/Terror Infinity/Terror Infinity.html
index deea31f68c..7510f10e47 100644
--- a/Terror Infinity/Terror Infinity.html	
+++ b/Terror Infinity/Terror Infinity.html	
@@ -1182,7 +1182,7 @@
                             </button>
                         </div>
                         <div class="greybg boxed">
-                            <input type="number" name="attr_C1" class="nospin boxed" disabled="true" value="@{C2}+@{C3}+@{C4}+@{C1_temp}" />                        </div>
+                            <input type="number" name="attr_C1" class="nospin boxed" disabled="true" value="@{C2}+@{C3}+@{C4}+@{C1_temp}+((@{Wits_bonus_sum})*10)" />                        </div>
                         <div class="boxed">
                             <input type="number" name="attr_C1_temp" class="nospin boxed" value="0" />
                         </div>                    </div>
@@ -1346,7 +1346,7 @@
                             </button>
                         </div>
                         <div class="greybg boxed">
-                            <input type="number" name="attr_D1" class="nospin boxed" disabled="true" value="@{D2}+@{D3}+@{D4}+@{D1_temp}" />
+                            <input type="number" name="attr_D1" class="nospin boxed" disabled="true" value="@{D2}+@{D3}+@{D4}+@{D1_temp}+((@{dexterity_bonus_sum})*3)" />
                         </div>
                         <div class="boxed">
                             <input type="number" name="attr_D1_temp" class="nospin boxed" value="0" title="@{D1_temp}" />
@@ -1918,7 +1918,7 @@
                         </div>
                         <div class="boxed">
                             <input type="number" name="attr_N1_temp" class="nospin boxed" value="0" />                        </div>                        <div class="blacklabel sqr flatfooted" style="width:70px">
-                            <button class="myrol big" type="roll" name="roll_Size" value="@{whispertype} &{template:pc}{{name=偵查}}  {{charname=@{character_name}}} {{roll=[[@{O1}]]}}{{notes=@{O_notes}}}{{conditions=@{O1_1}+@{O1_2}+@{O1_3}}}">
+                            <button class="myrol big" type="roll" name="roll_Size" value="@{whispertype} &{template:pc}{{name=偵查}}  {{charname=@{character_name}}} {{roll=[[(@{O1})d10>8!]]}}{{notes=@{O_notes}}}{{conditions=@{O1_1}+@{O1_2}+@{O1_3}}}">
                                 <span title="">偵查</span>
                             </button>
                         </div>
@@ -2513,8 +2513,8 @@
                                     </div>
                                     <div class="myrow padindent">                                        <span class="lbl">攻擊DP:(</span>
                                         <select class="underlined type" name="attr_atktype1" title="@{repeating_attacks_$id_atktype1}">
-                                            <option value="0" selected="selected">-</option>
-                                            <option value="@{strength_sum}" >力量</option>
+                                            <option value="0" >-</option>
+                                            <option value="@{strength_sum}" selected="selected">力量</option>
                                             <option value="@{dexterity_sum}">敏捷</option>
                                             <option value="@{stamina_sum}">耐力</option>
                                             <option value="@{intelligence_sum}">智力</option>
@@ -2550,15 +2550,15 @@
                                         <input type="text" class="underlined " style="width:60px" name="attr_atk_limit04" value="0" spellcheck="false" />                                    </div>
                                     <div class="myrow padindent">
                                         <span class="lbl atk">附加成功 :</span>
-                                        <input type="text" name="attr_atk_bonus_01" class="underlined " style="width:60px" spellcheck="false" placeholder="0" />
+                                        <input type="text" name="attr_atk_bonus_01" class="underlined " style="width:60px" spellcheck="false" value="0" placeholder="0" />
                                         <span class="lbl">+</span>
-                                        <input type="text" name="attr_atk_bonus_02" class="underlined " style="width:60px" spellcheck="false" placeholder="0" />                                        <span class="lbl">+</span>
-                                        <input type="text" name="attr_atk_bonus_03" class="underlined " style="width:60px" spellcheck="false" placeholder="0" />
+                                        <input type="text" name="attr_atk_bonus_02" class="underlined " style="width:60px" spellcheck="false" value="0" placeholder="0" />                                        <span class="lbl">+</span>
+                                        <input type="text" name="attr_atk_bonus_03" class="underlined " style="width:60px" spellcheck="false" value="0" placeholder="0" />
                                     </div>
 									<div class="myrow padindent">
 									    <input class="pseudocheck" type="checkbox" name="attr_atk_bonus_used" value="1" title="@{repeating_attacks_$id_atk_bonus_used}"  />
 										<span class="lbl atk" style="width:75px">使用附加 :</span>
-                                        <input type="text" name="attr_atk_bonus_used_amount" class="underlined " style="width:60px" spellcheck="false" placeholder="0"
+                                        <input type="text" name="attr_atk_bonus_used_amount" class="underlined " style="width:60px" spellcheck="false" placeholder="0" value="0"
                                         />
 										</div>
                                     <div class="myrow grtopbrd">
@@ -2579,8 +2579,8 @@
 										<div class="myrow padindent">
 										<span class="lbl">攻擊DP:(</span>
                                         <select class="underlined type" name="attr_atk_style01_type" title="@{repeating_attacks_$id_atk_style01_type}">
-                                            <option value="0" selected="selected">-</option>
-                                            <option value="@{strength_sum}">力量</option>
+                                            <option value="0">-</option>
+                                            <option value="@{strength_sum}"selected="selected">力量</option>
                                             <option value="@{dexterity_sum}">敏捷</option>
                                             <option value="@{stamina_sum}">耐力</option>
                                             <option value="@{intelligence_sum}">智力</option>
@@ -2599,7 +2599,7 @@
 																				</div>
 										<div class="myrow padindent">
 										<span class="lbl atk">使用附加 :</span>
-                                        <input type="text" name="attr_atk_style01_bonus_used_amount" class="underlined " style="width:60px" spellcheck="false" placeholder="0"
+                                        <input type="text" name="attr_atk_style01_bonus_used_amount" class="underlined " style="width:60px" spellcheck="false" placeholder="0" value="0"
                                         />
 										</div>
 										<div class="myrow padindent">
@@ -2627,8 +2627,8 @@
 										<div class="myrow padindent">
 										<span class="lbl">攻擊DP:(</span>
                                         <select class="underlined type" name="attr_atk_style02_type" title="@{repeating_attacks_$id_atk_style02_type}">
-                                            <option value="0"selected="selected">-</option>
-                                            <option value="@{strength_sum}">力量</option>
+                                            <option value="0">-</option>
+                                            <option value="@{strength_sum}" selected="selected">力量</option>
                                             <option value="@{dexterity_sum}">敏捷</option>
                                             <option value="@{stamina_sum}">耐力</option>
                                             <option value="@{intelligence_sum}">智力</option>
@@ -2647,7 +2647,7 @@
 																				</div>
 										<div class="myrow padindent">
 										<span class="lbl atk">使用附加 :</span>
-                                        <input type="text" name="attr_atk_style02_bonus_used_amount" class="underlined " style="width:60px" spellcheck="false" placeholder="0"
+                                        <input type="text" name="attr_atk_style02_bonus_used_amount" class="underlined " style="width:60px" spellcheck="false" placeholder="0" value="0"
                                         />
 										</div>
 										<div class="myrow padindent">
@@ -2724,8 +2724,8 @@
                         />
                     </div>
                 </div>                <div class="myrow hpvalues center labline">
-                    <div class="boxed greybg" style="width: 46px;height:46px;">
-                        <input name="attr_hp" type="number" value="0" class="nospin boxed" style="width: 40px;height:40px;font-size:25px;" />
+                    <div class="boxed greybg" style="width: 58px;height:58px;">
+                        <input name="attr_hp" type="number" disabled value="@{G1}+@{hp_temp}+@{hp_other}" class="nospin boxed" style="width: 55px;height:55px;font-size:40px;" />
                     </div>
                 </div>
                 <div class="myrow hpvalues center">
@@ -2746,11 +2746,19 @@
                     <span class="lab" title="惡性A">惡性A</span>
                 </div>
                 <div class="myrow center" style="margin-top: 2px; white-space: nowrap;">
-                    <span class="lab" title="Temporaray HP">暫時</span>
                     <div class="boxed">
-                        <input type="number" name="attr_hp_temp" class="nospin boxed" value="0" title="@{hp_temp}" />
-                    </div>
+					
+                        <input type="number" name="attr_hp_other" class="nospin boxed" value="0" title="@{hp_other}" />
+                    	</div>
+					<div class="boxed">
+					<input type="number" name="attr_hp_temp" class="nospin boxed" value="0" title="@{hp_temp}" />
+					</div>
                 </div>
+				                <div class="myrow hpvalues center labline">
+                    <span class="lab" title="其他">其他</span>
+                    <span class="lab" title="暫時">暫時</span>
+                </div>
+
                 <div class="autoex hpvalues bordered spell">
                     <span name="attr_dr"></span>
                     <textarea name="attr_dr" spellcheck="false" placeholder="備註:" title="Damage Reduction, Immunities..."></textarea>
@@ -2810,6 +2818,17 @@
                     <div class="boxed">
                         <input type="number" name="attr_energy_04_max" class="nospin hp" value="0" title="@{energy_04_max}" />
                     </div>                </div>
+					
+					<div class="myrow hpvalues center">
+                    <input type="text" name="attr_energy_05_name" class="underlined" style="width:80px;text-align:center" spellcheck="false" title="@{energy_05_name}"
+                    />                    <input type="hidden" name="attr_hp_condition" value="0" class="redbrd" />
+                    <div class="boxed">
+                        <input type="number" name="attr_energy_05" class="nospin hp" value="0" title="@{energy_05}" />
+                    </div>
+                    <div class="boxed">
+                        <input type="number" name="attr_energy_05_max" class="nospin hp" value="0" title="@{energy_05_max}" />
+                    </div>                </div>
+					
                 <div class="autoex hpvalues bordered spell">
                     <span name="attr_dr"></span>
                     <textarea name="attr_dr2" spellcheck="false" placeholder="備註" title="Damage Reduction, Immunities..."></textarea>