Merge pull request #61 from FullSimplex/stoogoff

Some changes on different branchs
Eclipse-Phase-Unofficial · Jul 7, 2015 · 1d60646 · 1d60646
2 parents 7106e76 + 1f56b4d
commit 1d60646
Show file tree

Hide file tree

Showing 15 changed files with 460 additions and 599 deletions.
diff --git a/src/Creator/version4/css/main7.css b/src/Creator/version4/css/main7.css
diff --git a/src/Creator/version4/index.php b/src/Creator/version4/index.php
@@ -162,21 +162,23 @@
         	</section>
 
         	<!-- SECONDARY PANNEL - DYNAMIC CONTENT -->
-        	<section id="secondary"></section>	
+        	<section id="secondary" class="panel"></section>	
 
         	<!-- TERTIARY PANNEL - DYNAMIC CONTENT-->
-        	<section id="tertiary"></section>	
+        	<section id="tertiary" class="panel"></section>	
 
         	<!-- QUATERNARY PANNEL - DYNAMIC CONTENT-->
-        	<section id="quaternary"></section>	
+        	<section id="quaternary" class="panel"></section>	
 
         	<!-- REMAINAING POINTS - DYNAMIC CONTENT-->
         	<section class="points">
             		CP <span id="creation_remain" class="rest"></span><br>  
             		AP <span id="aptitude_remain" class="rest"></span><br>
             		RP <span id="reputation_remain" class="rest"></span><br>
             		CR <span id="credit_remain" class="rest"></span><br>
-                    RZ <span id="rez_remain" class="rest"></span><span class="btnhelpPoint" data-icon="&#x2a;"></span><br>
+                    ASR <span id="asr_remain" class="rest"></span><br>
+                    KSR <span id="ksr_remain" class="rest"></span><span class="btnhelpPoint" data-icon="&#x2a;"></span><br>
+                    RZ <span id="rez_remain" class="rest"></span><br>
         	</section>
         	<!-- MESSAGES FOR THE USER - DYNAMIC CONTENT-->
         	<section id="messages"></section>

diff --git a/src/Creator/version4/other/armorDegatsLayer.php b/src/Creator/version4/other/armorDegatsLayer.php
@@ -16,10 +16,10 @@ function getADHtml($gear){
 			  echo "		<label class='listSection'>Offensive capacity</label>";
 			  echo "</li>"; 
 			  echo "<li>";
-			  echo "		<label class='bmGranted'>Degats <b>".$gear->degat."</b></label>";
+			  echo "		<label class='bmGranted'>Damage: <b>".$gear->degat."</b></label>";
 			  echo "</li>";
 			  echo "<li>";
-			  echo "		<label class='bmGranted'>Armor penetration <b>".$gear->armorPenetration."</b></label>";
+			  echo "		<label class='bmGranted'>Armor penetration: <b>".$gear->armorPenetration."</b></label>";
 			  echo "</li>";
 		  }
 }

diff --git a/src/Creator/version4/popup-contents/about.php b/src/Creator/version4/popup-contents/about.php
@@ -10,7 +10,7 @@
     <tr align="center">
         <td>
             Eclipse Phase Character Creator<br>
-            <small><a href="https://github.com/rbewley4/ep-character-creator/releases/tag/v1.2.0" target="_blank">Version 1.2.0 (09.2014)<a/></small>
+            <small><a href="https://github.com/rbewley4/ep-character-creator/releases/tag/v1.2.0" target="_blank">Version 1.2.1 (07.2015)<a/></small>
             <br><br>
             A character creator for the <a href="http://eclipsephase.com" target="_blank">Eclipse Phase</a> role-playing game.
             <br><br>
@@ -23,6 +23,8 @@
     <tr align="center">
         <td>
         		<b>Russell Bewley</b><br>
+        		<b>Stoo Goof</b><br>
+        		<b>Derek Payne</b><br>
             <b>Cédric Reinhardt</b><br>
             <b>Jigé Pont</b><br>
             <b>Olivier Murith</b><br>

diff --git a/src/Creator/version4/popup-contents/load.php b/src/Creator/version4/popup-contents/load.php
@@ -24,11 +24,11 @@
 			<td>
 				<input type="checkbox" name="creationMode" value="cre"/> Check if you want to continue on creation mode.
 				<br><br>
-				I have earn <input style="line-height: 1em;" id="rezPoints" name="rezPoints" type="number" min="0" value="0"> Rez points.
+				I have earned <input style="line-height: 1em;" id="rezPoints" name="rezPoints" type="number" min="0" value="0"> Rez points.
 				<br><br>
-				I have earn <input style="line-height: 1em;" id="repPoints" name="repPoints" type="number" min="0" value="0"> Reputation points.
+				I have earned <input style="line-height: 1em;" id="repPoints" name="repPoints" type="number" min="0" value="0"> Reputation points.
 				<br><br>
-				I have earn <input style="line-height: 1em;" id="credPoints" name="credPoints" type="number" min="0" value="0"> Credits.
+				I have earned <input style="line-height: 1em;" id="credPoints" name="credPoints" type="number" min="0" value="0"> Credits.
 				<br><br>
 			</td>
 		</tr>

diff --git a/src/Creator/version4/popup-contents/reset.php b/src/Creator/version4/popup-contents/reset.php
@@ -27,7 +27,7 @@
 		<td>
 			<br><br>
 			<button class="startButton">
-		       			Begin !
+		       			Begin!
 	        </button>
 	        <button class="cancelButton">
 		       			Cancel
@@ -47,7 +47,7 @@
 	
 	<tr align="center">
 		<td>
-            <small><a href="https://github.com/rbewley4/ep-character-creator/releases/tag/v1.2.0" target="_blank">Version 1.2.0 (09.2014)<a/></small>
+            <small><a href="https://github.com/rbewley4/ep-character-creator/releases/tag/v1.2.0" target="_blank">Version 1.2.1 (07.2015)<a/></small>
 			<br><br>
 		</td>
 	</tr>