mirror of
				https://github.com/Klagarge/PokeHES.git
				synced 2025-10-29 11:01:07 +00:00 
			
		
		
		
	some maps and fix turn, display and new sprite
This commit is contained in:
		
							
								
								
									
										
											BIN
										
									
								
								resources/Base_flipped.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								resources/Base_flipped.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 1.4 KiB | 
							
								
								
									
										
											BIN
										
									
								
								resources/Character_flipped.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								resources/Character_flipped.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 4.2 KiB | 
| @@ -90,7 +90,7 @@ | ||||
|  <objectgroup id="6" name="door"> | ||||
|   <object id="1" name="down" x="80.6667" y="177.667"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21RS"/> | ||||
|     <property name="nextX" type="int" value="5"/> | ||||
|     <property name="nextY" type="int" value="16"/> | ||||
| @@ -98,26 +98,19 @@ | ||||
|   </object> | ||||
|   <object id="2" name="up" x="178" y="177.667"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21N3"/> | ||||
|     <property name="nextX" type="int" value="2"/> | ||||
|     <property name="nextY" type="int" value="16"/> | ||||
|    </properties> | ||||
|   </object> | ||||
|   <object id="3" name="21N209" x="48.6667" y="369.333"/> | ||||
|   <object id="4" name="21N208" x="370" y="370"/> | ||||
|   <object id="5" name="WC" x="336" y="208"/> | ||||
|   <object id="6" name="WC" x="400.667" y="208.666"/> | ||||
|   <object id="7" name="21N203" x="688.667" y="207.333"/> | ||||
|   <object id="8" name="21N208" x="657.333" y="369.333"/> | ||||
|   <object id="9" name="21N205" x="1039.67" y="368.75"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="nextDirection" value="UP"/> | ||||
|     <property name="nextMap" value="21N205"/> | ||||
|     <property name="nextX" type="int" value="1"/> | ||||
|     <property name="nextY" type="int" value="1"/> | ||||
|    </properties> | ||||
|   </object> | ||||
|   <object id="10" name="21N206" x="1008" y="529.333"/> | ||||
|  </objectgroup> | ||||
| </map> | ||||
|   | ||||
| @@ -60,7 +60,7 @@ | ||||
|  <objectgroup id="7" name="door"> | ||||
|   <object id="1" x="49" y="433.5"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="changeDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21N2"/> | ||||
|     <property name="nextX" type="int" value="32"/> | ||||
|     <property name="nextY" type="int" value="11"/> | ||||
|   | ||||
| @@ -78,16 +78,20 @@ | ||||
|  <objectgroup id="6" name="door"> | ||||
|   <object id="1" name="down" x="78" y="48.6667"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21N2"/> | ||||
|     <property name="nextX" type="int" value="5"/> | ||||
|     <property name="nextY" type="int" value="16"/> | ||||
|    </properties> | ||||
|   </object> | ||||
|   <object id="2" name="up" x="175.333" y="48.6667"/> | ||||
|   <object id="2" name="up" x="175.333" y="48.6667"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|    </properties> | ||||
|   </object> | ||||
|   <object id="3" name="21N308" x="48.6667" y="241.333"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21N308"/> | ||||
|     <property name="nextX" type="int" value="1"/> | ||||
|     <property name="nextY" type="int" value="12"/> | ||||
| @@ -95,25 +99,15 @@ | ||||
|   </object> | ||||
|   <object id="4" name="21N307" x="370" y="242"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21N307"/> | ||||
|     <property name="nextX" type="int" value="2"/> | ||||
|     <property name="nextY" type="int" value="12"/> | ||||
|    </properties> | ||||
|   </object> | ||||
|   <object id="5" name="WC" x="336" y="80.0003"/> | ||||
|   <object id="6" name="WC" x="400.667" y="80.6663"/> | ||||
|   <object id="7" name="21N303" x="688.667" y="79.3333"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="nextMap" value="21N303"/> | ||||
|     <property name="nextX" type="int" value="0"/> | ||||
|     <property name="nextY" type="int" value="0"/> | ||||
|    </properties> | ||||
|   </object> | ||||
|   <object id="8" name="21N307" x="657.333" y="241.333"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21N307"/> | ||||
|     <property name="nextX" type="int" value="11"/> | ||||
|     <property name="nextY" type="int" value="0"/> | ||||
| @@ -121,12 +115,11 @@ | ||||
|   </object> | ||||
|   <object id="9" name="21N304" x="1039.67" y="240.75"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="nextDirection" value="UP"/> | ||||
|     <property name="nextMap" value="21N304"/> | ||||
|     <property name="nextX" type="int" value="1"/> | ||||
|     <property name="nextY" type="int" value="1"/> | ||||
|    </properties> | ||||
|   </object> | ||||
|   <object id="10" name="21N305" x="1008" y="401.333"/> | ||||
|  </objectgroup> | ||||
| </map> | ||||
|   | ||||
| @@ -60,7 +60,7 @@ | ||||
|  <objectgroup id="7" name="door"> | ||||
|   <object id="1" x="49" y="433.5"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="changeDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21N3"/> | ||||
|     <property name="nextX" type="int" value="32"/> | ||||
|     <property name="nextY" type="int" value="11"/> | ||||
|   | ||||
| @@ -60,7 +60,7 @@ | ||||
|  <objectgroup id="5" name="door"> | ||||
|   <object id="1" x="81.3333" y="14.6667"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="changeDirection" value="UP"/> | ||||
|     <property name="nextMap" value="21N3"/> | ||||
|     <property name="nextX" type="int" value="11"/> | ||||
|     <property name="nextY" type="int" value="7"/> | ||||
| @@ -68,7 +68,7 @@ | ||||
|   </object> | ||||
|   <object id="2" x="370.667" y="16"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="changeDirection" value="UP"/> | ||||
|     <property name="nextMap" value="21N307"/> | ||||
|     <property name="nextX" type="int" value="20"/> | ||||
|     <property name="nextY" type="int" value="7"/> | ||||
|   | ||||
| @@ -78,7 +78,7 @@ | ||||
|  <objectgroup id="7" name="door"> | ||||
|   <object id="1" x="80.6667" y="16"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="changeDirection" value="UP"/> | ||||
|     <property name="nextMap" value="21N3"/> | ||||
|     <property name="nextX" type="int" value="1"/> | ||||
|     <property name="nextY" type="int" value="13"/> | ||||
|   | ||||
| @@ -90,7 +90,7 @@ | ||||
|  <objectgroup id="6" name="door"> | ||||
|   <object id="1" name="down" x="80.6667" y="177.667"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="SS"/> | ||||
|     <property name="nextX" type="int" value="5"/> | ||||
|     <property name="nextY" type="int" value="20"/> | ||||
| @@ -98,7 +98,7 @@ | ||||
|   </object> | ||||
|   <object id="2" name="up" x="178" y="177.667"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21RS"/> | ||||
|     <property name="nextX" type="int" value="2"/> | ||||
|     <property name="nextY" type="int" value="16"/> | ||||
|   | ||||
| @@ -10,7 +10,7 @@ | ||||
| 1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837, | ||||
| 1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837, | ||||
| 1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837, | ||||
| 1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837, | ||||
| 1007,1007,1063,1007,1007,1063,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837, | ||||
| 1063,1063,1063,1063,1063,1063,1063,1063,1063,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837, | ||||
| 1063,1063,1063,1063,1063,1063,1063,1063,1063,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1031,1031,1031,1031,837,837,837,837,837,837,837, | ||||
| 1063,1063,1063,1063,1063,1063,1063,1063,1063,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, | ||||
| @@ -90,7 +90,7 @@ | ||||
|  <objectgroup id="6" name="door"> | ||||
|   <object id="1" name="down" x="80.6667" y="177.667"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21RI"/> | ||||
|     <property name="nextX" type="int" value="5"/> | ||||
|     <property name="nextY" type="int" value="16"/> | ||||
| @@ -98,7 +98,7 @@ | ||||
|   </object> | ||||
|   <object id="2" name="up" x="178" y="177.667"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21N2"/> | ||||
|     <property name="nextX" type="int" value="2"/> | ||||
|     <property name="nextY" type="int" value="16"/> | ||||
| @@ -106,7 +106,7 @@ | ||||
|   </object> | ||||
|   <object id="11" name="RI" x="1231.5" y="497.5"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21RI"/> | ||||
|     <property name="nextX" type="int" value="38"/> | ||||
|     <property name="nextY" type="int" value="2"/> | ||||
| @@ -114,16 +114,16 @@ | ||||
|   </object> | ||||
|   <object id="12" name="out" x="1200.5" y="16.5"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextMap" value="21N1"/> | ||||
|     <property name="nextDirection" value="UP"/> | ||||
|     <property name="nextMap" value="RS"/> | ||||
|     <property name="nextX" type="int" value="0"/> | ||||
|     <property name="nextY" type="int" value="0"/> | ||||
|    </properties> | ||||
|   </object> | ||||
|   <object id="13" name="out" x="1233" y="15.5"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextMap" value="21N1"/> | ||||
|     <property name="nextDirection" value="UP"/> | ||||
|     <property name="nextMap" value="RS"/> | ||||
|     <property name="nextX" type="int" value="0"/> | ||||
|     <property name="nextY" type="int" value="0"/> | ||||
|    </properties> | ||||
|   | ||||
| @@ -10,8 +10,8 @@ | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,21,21,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| @@ -21,8 +21,8 @@ | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,77,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,21,21,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,77,77,77,77,77,77,77,77,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, | ||||
| @@ -92,7 +92,7 @@ | ||||
|  <objectgroup id="5" name="door"> | ||||
|   <object id="1" name="up" x="878.5" y="210.5"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value=""/> | ||||
|     <property name="nextX" type="int" value="0"/> | ||||
|     <property name="nextY" type="int" value="0"/> | ||||
| @@ -100,23 +100,23 @@ | ||||
|   </object> | ||||
|   <object id="2" name="down" x="976" y="208.5"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="nextMap" value=""/> | ||||
|     <property name="nextX" type="int" value="0"/> | ||||
|     <property name="nextY" type="int" value="0"/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="SS"/> | ||||
|     <property name="nextX" type="int" value="81"/> | ||||
|     <property name="nextY" type="int" value="10"/> | ||||
|    </properties> | ||||
|   </object> | ||||
|   <object id="3" name="down" x="2511" y="592.5"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="nextMap" value=""/> | ||||
|     <property name="nextX" type="int" value="0"/> | ||||
|     <property name="nextY" type="int" value="0"/> | ||||
|     <property name="nextDirection" value="UP"/> | ||||
|     <property name="nextMap" value="SS"/> | ||||
|     <property name="nextX" type="int" value="133"/> | ||||
|     <property name="nextY" type="int" value="1"/> | ||||
|    </properties> | ||||
|   </object> | ||||
|   <object id="4" name="up" x="2607" y="592"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value=""/> | ||||
|     <property name="nextDirection" value="UP"/> | ||||
|     <property name="nextMap" value=""/> | ||||
|     <property name="nextX" type="int" value="0"/> | ||||
|     <property name="nextY" type="int" value="0"/> | ||||
|   | ||||
| @@ -19,11 +19,11 @@ | ||||
|             "expandedObjectLayers": [ | ||||
|                 6 | ||||
|             ], | ||||
|             "scale": 1.5, | ||||
|             "scale": 0.75, | ||||
|             "selectedLayer": 3, | ||||
|             "viewCenter": { | ||||
|                 "x": 254, | ||||
|                 "y": 269 | ||||
|                 "x": 968.6666666666666, | ||||
|                 "y": 588.6666666666666 | ||||
|             } | ||||
|         }, | ||||
|         "21N205.tmx": { | ||||
| @@ -33,8 +33,8 @@ | ||||
|             "scale": 2, | ||||
|             "selectedLayer": 3, | ||||
|             "viewCenter": { | ||||
|                 "x": 80.5, | ||||
|                 "y": 302.25 | ||||
|                 "x": 173.25, | ||||
|                 "y": 328.75 | ||||
|             } | ||||
|         }, | ||||
|         "21N3.tmx": { | ||||
| @@ -42,10 +42,10 @@ | ||||
|                 6 | ||||
|             ], | ||||
|             "scale": 1, | ||||
|             "selectedLayer": 0, | ||||
|             "selectedLayer": 3, | ||||
|             "viewCenter": { | ||||
|                 "x": 673, | ||||
|                 "y": 358.5 | ||||
|                 "x": 697.5, | ||||
|                 "y": 339.5 | ||||
|             } | ||||
|         }, | ||||
|         "21N304.tmx": { | ||||
| @@ -55,8 +55,8 @@ | ||||
|             "scale": 2.0908482142857143, | ||||
|             "selectedLayer": 3, | ||||
|             "viewCenter": { | ||||
|                 "x": 122.43834738977259, | ||||
|                 "y": 302.50880751574675 | ||||
|                 "x": 126.02540834845733, | ||||
|                 "y": 270.94267107932103 | ||||
|             } | ||||
|         }, | ||||
|         "21N307.tmx": { | ||||
| @@ -64,10 +64,10 @@ | ||||
|                 5 | ||||
|             ], | ||||
|             "scale": 1.5, | ||||
|             "selectedLayer": 0, | ||||
|             "selectedLayer": 3, | ||||
|             "viewCenter": { | ||||
|                 "x": 251.3333333333333, | ||||
|                 "y": 237 | ||||
|                 "x": 173.66666666666666, | ||||
|                 "y": 52.333333333333314 | ||||
|             } | ||||
|         }, | ||||
|         "21N308.tmx": { | ||||
| @@ -77,7 +77,7 @@ | ||||
|             "scale": 1.5, | ||||
|             "selectedLayer": 4, | ||||
|             "viewCenter": { | ||||
|                 "x": 256.6666666666667, | ||||
|                 "x": 257, | ||||
|                 "y": 214.33333333333331 | ||||
|             } | ||||
|         }, | ||||
| @@ -93,11 +93,11 @@ | ||||
|             "expandedObjectLayers": [ | ||||
|                 6 | ||||
|             ], | ||||
|             "scale": 1, | ||||
|             "selectedLayer": 1, | ||||
|             "scale": 0.75, | ||||
|             "selectedLayer": 3, | ||||
|             "viewCenter": { | ||||
|                 "x": 233, | ||||
|                 "y": 318.5 | ||||
|                 "x": 772.6666666666666, | ||||
|                 "y": 484.66666666666663 | ||||
|             } | ||||
|         }, | ||||
|         "21RS.tmx": { | ||||
| @@ -107,19 +107,19 @@ | ||||
|             "scale": 1, | ||||
|             "selectedLayer": 3, | ||||
|             "viewCenter": { | ||||
|                 "x": 313, | ||||
|                 "y": 380.5 | ||||
|                 "x": 933.5, | ||||
|                 "y": 292.5 | ||||
|             } | ||||
|         }, | ||||
|         "23N1.tmx": { | ||||
|             "expandedObjectLayers": [ | ||||
|                 5 | ||||
|             ], | ||||
|             "scale": 2, | ||||
|             "selectedLayer": 3, | ||||
|             "scale": 1, | ||||
|             "selectedLayer": 0, | ||||
|             "viewCenter": { | ||||
|                 "x": 2511, | ||||
|                 "y": 592.25 | ||||
|                 "x": 2131.5, | ||||
|                 "y": 597.5 | ||||
|             } | ||||
|         }, | ||||
|         "C:/Users/remi/AppData/Roaming/Tiled/#Tests": { | ||||
| @@ -243,8 +243,8 @@ | ||||
|             "scale": 0.5, | ||||
|             "selectedLayer": 3, | ||||
|             "viewCenter": { | ||||
|                 "x": 3098, | ||||
|                 "y": 503 | ||||
|                 "x": 3567, | ||||
|                 "y": 847 | ||||
|             } | ||||
|         }, | ||||
|         "assets/32x32 first tileset.tsx": { | ||||
| @@ -323,6 +323,7 @@ | ||||
|             "scaleInEditor": 1.5 | ||||
|         }, | ||||
|         "assets/pokemon_v2.tsx": { | ||||
|             "dynamicWrapping": false, | ||||
|             "scaleInDock": 1.5, | ||||
|             "scaleInEditor": 1 | ||||
|         }, | ||||
| @@ -434,18 +435,18 @@ | ||||
|     "project": "Maps.tiled-project", | ||||
|     "property.type": "string", | ||||
|     "recentFiles": [ | ||||
|         "21N205.tmx", | ||||
|         "21RS.tmx", | ||||
|         "21N2.tmx", | ||||
|         "21N3.tmx", | ||||
|         "assets/pokemon_v2.tsx", | ||||
|         "assets/PokeMudry.tsx", | ||||
|         "SS.tmx", | ||||
|         "21RI.tmx", | ||||
|         "23N1.tmx", | ||||
|         "assets/Dungeon_v2.tsx", | ||||
|         "21RS.tmx", | ||||
|         "21N3.tmx", | ||||
|         "21N307.tmx", | ||||
|         "21N308.tmx", | ||||
|         "21N205.tmx", | ||||
|         "21N2.tmx", | ||||
|         "21N304.tmx", | ||||
|         "assets/pokemon_v2.tsx" | ||||
|         "21N308.tmx" | ||||
|     ], | ||||
|     "resizeMap.removeObjects": true, | ||||
|     "tileset.lastUsedFilter": "Fichiers de jeu de tuiles Tiled (*.tsx *.xml)", | ||||
|   | ||||
| @@ -5,8 +5,8 @@ | ||||
|  <tileset firstgid="1215" source="assets/Slates_v2.tsx"/> | ||||
|  <layer id="4" name="floor" width="166" height="22"> | ||||
|   <data encoding="csv"> | ||||
| 1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 586,586,1139,586,586,1139,586,586,586,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1007,1007,1007,1007,1007,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 586,586,1139,586,586,1139,586,586,586,1007,1063,1007,1007,1007,1007,1007,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| @@ -15,8 +15,8 @@ | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,586,586,586,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1063,1063,1007,1007,1007,1063,1007,1007,1063,1063,1007,586,586,586,1007,1063,1007,1007,1007,1007,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1007,1007,1007,1063,1007,1007,1007,1007,1063,1007,1007,1007,1007,1007,1007,1007,1007,1063,1063,1063,1007,1007,1063,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1063,1007,1007,1007,1007,1007,1007,1007,1007,1063,1063,1007,1007,1007,1007,1007,1063,1007,1007,1007,1007,1063,1063,1007,1007,1063,1063,1007,1007,1007, | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139, | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139, | ||||
| 1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139, | ||||
| @@ -25,8 +25,8 @@ | ||||
| 1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1139,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007 | ||||
| 1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1063,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, | ||||
| 1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1063,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007 | ||||
| </data> | ||||
|  </layer> | ||||
|  <layer id="2" name="stairs" width="166" height="22"> | ||||
| @@ -90,24 +90,24 @@ | ||||
|   </properties> | ||||
|   <object id="2" name="up" x="178" y="17.667"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="21RI"/> | ||||
|     <property name="nextX" type="int" value="2"/> | ||||
|     <property name="nextY" type="int" value="16"/> | ||||
|    </properties> | ||||
|   </object> | ||||
|   <object id="20" x="2607.33" y="336"> | ||||
|   <object id="20" name="up" x="2607.33" y="336"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextMap" value="23RI"/> | ||||
|     <property name="nextDirection" value="DOWN"/> | ||||
|     <property name="nextMap" value="23N1"/> | ||||
|     <property name="nextX" type="int" value="0"/> | ||||
|     <property name="nextY" type="int" value="0"/> | ||||
|    </properties> | ||||
|   </object> | ||||
|   <object id="21" x="4271.33" y="686.667"> | ||||
|   <object id="21" name="up" x="4271.33" y="686.667"> | ||||
|    <properties> | ||||
|     <property name="nextDirection" value="down"/> | ||||
|     <property name="nextMap" value="23RS"/> | ||||
|     <property name="nextDirection" value="UP"/> | ||||
|     <property name="nextMap" value="23N1"/> | ||||
|     <property name="nextX" type="int" value="0"/> | ||||
|     <property name="nextY" type="int" value="0"/> | ||||
|    </properties> | ||||
|   | ||||
| @@ -4342,7 +4342,7 @@ | ||||
|  <tile id="723"> | ||||
|   <properties> | ||||
|    <property name="speed" type="float" value="1"/> | ||||
|    <property name="walkable" type="bool" value="true"/> | ||||
|    <property name="walkable" type="bool" value="false"/> | ||||
|   </properties> | ||||
|  </tile> | ||||
|  <tile id="724"> | ||||
| @@ -4360,7 +4360,7 @@ | ||||
|  <tile id="726"> | ||||
|   <properties> | ||||
|    <property name="speed" type="float" value="1"/> | ||||
|    <property name="walkable" type="bool" value="true"/> | ||||
|    <property name="walkable" type="bool" value="false"/> | ||||
|   </properties> | ||||
|  </tile> | ||||
|  <tile id="727"> | ||||
| @@ -4564,7 +4564,7 @@ | ||||
|  <tile id="760"> | ||||
|   <properties> | ||||
|    <property name="speed" type="float" value="1"/> | ||||
|    <property name="walkable" type="bool" value="true"/> | ||||
|    <property name="walkable" type="bool" value="false"/> | ||||
|   </properties> | ||||
|  </tile> | ||||
|  <tile id="761"> | ||||
|   | ||||
							
								
								
									
										26
									
								
								resources/sprite_flipper.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								resources/sprite_flipper.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,26 @@ | ||||
| #!/usr/bin/env python | ||||
| # -*- coding: utf-8 -*- | ||||
| from PIL import Image | ||||
| import numpy as np | ||||
| import os | ||||
|  | ||||
| W, H = 32, 32 | ||||
|  | ||||
| if __name__ == "__main__": | ||||
|     path = input("Path: ") | ||||
|      | ||||
|     img = Image.open(path).convert() | ||||
|     a = np.array(img) | ||||
|     b = np.zeros((a.shape[1], a.shape[0], *a.shape[2:]), dtype=a.dtype) | ||||
|      | ||||
|     w, h = a.shape[1]//W, a.shape[0]//H | ||||
|      | ||||
|     for y in range(h): | ||||
|         for x in range(w): | ||||
|             b[x*W:x*W+W,y*H:y*H+H] = a[y*H:y*H+H,x*W:x*W+W] | ||||
|  | ||||
|     img.close() | ||||
|     img = Image.fromarray(b) | ||||
|     dirname, basename = os.path.dirname(path), os.path.basename(path) | ||||
|     basename, ext = os.path.splitext(basename) | ||||
|     img.save(os.path.join(dirname, basename+"_flipped"+ext)) | ||||
| @@ -137,10 +137,10 @@ public abstract class Character extends Entity{ | ||||
|                 textureY = 2; | ||||
|                 break; | ||||
|             case LEFT: | ||||
|                 textureY = 1; | ||||
|                 textureY = 3; | ||||
|                 break; | ||||
|             case UP: | ||||
|                 textureY = 3; | ||||
|                 textureY = 1; | ||||
|                 break; | ||||
|             case DOWN: | ||||
|                 textureY = 0; | ||||
|   | ||||
| @@ -17,7 +17,7 @@ public class Player extends Character{ | ||||
| 	public boolean onEnemy = false; | ||||
|  | ||||
|     public Player(int x, int y, String map) { | ||||
|         super("Player", x, y, "Character", map); | ||||
|         super("Player", x, y, "Character_flipped", map); | ||||
|     } | ||||
|  | ||||
|     public void addXp(int xp){ | ||||
| @@ -26,6 +26,8 @@ public class Player extends Character{ | ||||
|  | ||||
|     public void manageEntity(ScreenMap sm, Controller c) { | ||||
|  | ||||
| 		boolean onDoor = sm.isDoor(getPosition()); | ||||
|  | ||||
| 		// Do nothing if hero is already moving | ||||
| 		if (!isMoving()) { | ||||
|  | ||||
| @@ -34,19 +36,21 @@ public class Player extends Character{ | ||||
| 			Player.Direction goalDirection = Player.Direction.NULL; | ||||
| 			Vector2 nextPos = new Vector2(position); | ||||
|  | ||||
| 			if (c.keyStatus.get(Input.Keys.RIGHT)) { | ||||
|  | ||||
|  | ||||
| 			if (c.keyStatus.get(Input.Keys.RIGHT) && !onDoor) { | ||||
| 				goalDirection = Player.Direction.RIGHT; | ||||
| 				nextCell = sm.getTile(getPosition(), 1, 0); | ||||
| 				nextPos.x+=sm.tileWidth; | ||||
| 			} else if (c.keyStatus.get(Input.Keys.LEFT)) { | ||||
| 			} else if (c.keyStatus.get(Input.Keys.LEFT) && !onDoor) { | ||||
| 				goalDirection = Player.Direction.LEFT; | ||||
| 				nextCell = sm.getTile(getPosition(), -1, 0); | ||||
| 				nextPos.x-=sm.tileWidth; | ||||
| 			} else if (c.keyStatus.get(Input.Keys.UP)) { | ||||
| 			} else if (c.keyStatus.get(Input.Keys.UP) && !onDoor) { | ||||
| 				goalDirection = Player.Direction.UP; | ||||
| 				nextCell = sm.getTile(getPosition(), 0, 1); | ||||
| 				nextPos.y+=sm.tileHeight; | ||||
| 			} else if (c.keyStatus.get(Input.Keys.DOWN)) { | ||||
| 			} else if (c.keyStatus.get(Input.Keys.DOWN) && !onDoor) { | ||||
| 				goalDirection = Player.Direction.DOWN; | ||||
| 				nextCell = sm.getTile(getPosition(), 0, -1); | ||||
| 				nextPos.y-=sm.tileHeight; | ||||
| @@ -59,7 +63,7 @@ public class Player extends Character{ | ||||
| 					turn(goalDirection); | ||||
| 					System.out.println("It's a enemy !!"); | ||||
| 				} else { | ||||
| 					setSpeed(sm.getSpeed(nextCell)); | ||||
| 					setSpeed(sm.getSpeed(nextCell)*3); //TODO remove x3 | ||||
| 					go(goalDirection); | ||||
| 				} | ||||
| 			} else { | ||||
| @@ -68,7 +72,7 @@ public class Player extends Character{ | ||||
| 			} | ||||
|  | ||||
| 			 | ||||
| 			if(sm.isDoor(getPosition())){ | ||||
| 			if(onDoor){ | ||||
| 				String nMap = null; | ||||
| 				Integer x = null; | ||||
| 				Integer y = null; | ||||
| @@ -77,12 +81,32 @@ public class Player extends Character{ | ||||
| 					x = ScreenMap.Door.nextX; | ||||
| 					y = ScreenMap.Door.nextY; | ||||
| 					goalDirection = ScreenMap.Door.nextDirection; | ||||
| 					/* | ||||
| 					if (ScreenMap.Door.changeDirection) { | ||||
| 						switch (goalDirection) { | ||||
| 							case UP: | ||||
| 								goalDirection = Direction.DOWN; | ||||
| 								System.out.println("go down"); | ||||
| 								break; | ||||
|  | ||||
| 							case DOWN: | ||||
| 								goalDirection = Direction.UP; | ||||
| 								System.out.println("go up"); | ||||
| 						 | ||||
| 							default: | ||||
| 								goalDirection = Direction.NULL; | ||||
| 								break; | ||||
| 						} | ||||
| 					} | ||||
| 					*/ | ||||
| 				} catch (Exception e) { } | ||||
| 				ScreenMap.Door.reset(); | ||||
| 				if (nMap == null || x == null || y == null) return; | ||||
| 				map = nMap; | ||||
| 				setPosition(x*sm.tileWidth, y*sm.tileHeight); | ||||
| 				System.out.println("Go to: " + sm.map + " in " + x + " x " + y); | ||||
| 				System.out.println(goalDirection); | ||||
| 				turn(goalDirection); | ||||
| 				System.out.println("Go to: " + map + " in " + x + " x " + y); | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
|   | ||||
| @@ -46,7 +46,8 @@ public class PokeMudry extends PortableApplication { | ||||
|         // add player, create and add all enemies in entities | ||||
| 		entities.add((Entity) sp.p); | ||||
| 		enemies.add(new Enemy("Mudry", 10, 15, "lumberjack_sheet32", "desert", 25, "informatique")); | ||||
| 		//enemies.add(new Enemy("Pignat", 5, 1, "lumberjack_sheet32", "test", 150)); | ||||
| 		enemies.add(new Enemy("Mudry", 5, 11, "lumberjack_sheet32", "21N304", 25, "informatique")); | ||||
| 		 | ||||
|         for (Enemy enemy : enemies) { entities.add(enemy); } | ||||
|  | ||||
| 		//Init all entities | ||||
|   | ||||
| @@ -16,6 +16,7 @@ import com.badlogic.gdx.maps.tiled.TmxMapLoader; | ||||
| import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer; | ||||
| import com.badlogic.gdx.math.Vector2; | ||||
|  | ||||
| import Entity.Character; | ||||
| import Entity.Player; | ||||
| import ch.hevs.gdx2d.components.screen_management.RenderingScreen; | ||||
| import ch.hevs.gdx2d.lib.GdxGraphics; | ||||
| @@ -52,15 +53,28 @@ public class ScreenMap extends RenderingScreen{ | ||||
| 		createMap("test"); | ||||
| 		createMap("test_couloir"); | ||||
| 		createMap("desert"); | ||||
|  | ||||
|         createMap("SS"); | ||||
|         //createMap("RI"); | ||||
|         //createMap("RS"); | ||||
|          | ||||
|         createMap("21RI"); | ||||
|         createMap("21RS"); | ||||
|         createMap("21N2"); | ||||
|         createMap("21N3"); | ||||
|          | ||||
|         createMap("21N205"); | ||||
|         createMap("21N304"); | ||||
|         createMap("21N307"); | ||||
|         createMap("21N308"); | ||||
|  | ||||
|         //createMap("23RI"); | ||||
|         //createMap("23RS"); | ||||
|         createMap("23N1"); | ||||
|         //createMap("23N2"); | ||||
|          | ||||
|         //createMap("23N20"); | ||||
|         //createMap("23N215"); | ||||
|          | ||||
| 	} | ||||
|  | ||||
| @@ -69,11 +83,15 @@ public class ScreenMap extends RenderingScreen{ | ||||
|          | ||||
|         tiledLayer.clear(); | ||||
|          | ||||
|         // Get actual map of the player | ||||
|         try { map = player.getMap(); } catch (Exception e) {} | ||||
|  | ||||
| 		for (int i = 0; i < 50; i++) { | ||||
| 		// Get all layers on the current map | ||||
|         for (int i = 0; i < 50; i++) { | ||||
|             try { tiledLayer.add((TiledMapTileLayer) tMap.get(map).getLayers().get(i)); } catch (Exception e) { } | ||||
|         } | ||||
|  | ||||
|         // Get heigh and width of tiles and the size of the tiles | ||||
|         TiledMapTileLayer tl = tiledLayer.get(0); | ||||
|         width = tl.getWidth(); | ||||
|         tileWidth = (int) tl.getTileWidth(); | ||||
| @@ -82,14 +100,15 @@ public class ScreenMap extends RenderingScreen{ | ||||
|          | ||||
|         //System.out.println(width + " x " + height + " - " + tileWidth + " x " + tileHeight); | ||||
|          | ||||
| 		try { | ||||
| 		// Get all doors on the current map | ||||
|         try { | ||||
|             doors = tMap.get(map).getLayers().get("door").getObjects(); | ||||
| 		} catch (Exception e) {	doors = null; } | ||||
|          | ||||
| 		 | ||||
| 		// Render the tileMap | ||||
|         //g.zoom(zoom); | ||||
|         g.moveCamera(player.getPosition().x, player.getPosition().y, width * tileWidth, height * tileHeight); | ||||
|         g.zoom(zoom); | ||||
|         g.moveCamera((int)player.getPosition().x, (int)player.getPosition().y, width * tileWidth, height * tileHeight); | ||||
|  | ||||
| 		tMapRenderer.get(map).setView(g.getCamera()); | ||||
| 		tMapRenderer.get(map).render(); | ||||
| @@ -116,10 +135,11 @@ public class ScreenMap extends RenderingScreen{ | ||||
|  | ||||
|     public boolean isWalkable(Vector<TiledMapTile> tile) { | ||||
| 		if (tile == null) return false; | ||||
|         boolean walkable = false; | ||||
| 		if (tile.size() == 0) return false; | ||||
|         boolean walkable = true; | ||||
|         for (TiledMapTile tiledMapTile : tile) { | ||||
|             Object test = tiledMapTile.getProperties().get("walkable"); | ||||
|             walkable = Boolean.parseBoolean(test.toString()) ? true:walkable; | ||||
|             walkable = Boolean.parseBoolean(test.toString()) ? walkable:false; | ||||
|         } | ||||
|         return walkable; | ||||
| 	} | ||||
| @@ -160,7 +180,8 @@ public class ScreenMap extends RenderingScreen{ | ||||
| 				try { Door.nextMap = mapProperties.get("nextMap").toString(); } catch (Exception e) { } | ||||
| 				try { Door.nextX = Integer.parseInt(mapProperties.get("nextX").toString()); } catch (Exception e) { } | ||||
| 				try { Door.nextY = Integer.parseInt(mapProperties.get("nextY").toString()); } catch (Exception e) { } | ||||
| 				try { Door.nextDirection = Door.nextDirection.valueOf(mapProperties.get("nextDirection").toString()); } catch (Exception e) { } | ||||
|                 try { Door.nextDirection = Character.Direction.valueOf(mapProperties.get("nextDirection").toString()); } catch (Exception e) { } | ||||
| 				try { Door.changeDirection = Boolean.parseBoolean(mapProperties.get("changeDirection").toString()); } catch (Exception e) { } | ||||
| 			} | ||||
|         } | ||||
|          | ||||
| @@ -171,13 +192,15 @@ public class ScreenMap extends RenderingScreen{ | ||||
| 		public static String nextMap; | ||||
| 		public static Integer nextX; | ||||
| 		public static Integer nextY; | ||||
|         public static Player.Direction nextDirection; | ||||
|         public static Character.Direction nextDirection; | ||||
|         public static Boolean changeDirection; | ||||
|  | ||||
| 		public static void reset(){ | ||||
| 			nextMap = null; | ||||
| 			nextX = null; | ||||
| 			nextY = null; | ||||
|             nextDirection = null; | ||||
|             changeDirection = null; | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
|   | ||||
| @@ -16,10 +16,10 @@ public class ScreenPlayer { | ||||
|     public void init(){ | ||||
|  | ||||
|         // One player by ScreenPlayer | ||||
|         p = new Player(8, 15, "desert"); | ||||
|       //p = new Player(4, 2, "21RI"); | ||||
|         //p = new Player(8, 15, "desert"); | ||||
|         p = new Player(4, 2, "21RI"); | ||||
|  | ||||
|         b = new Battle(new Enemy("enemi", 0, 0, "charachter", "desert", 50, "enemi")); | ||||
|         b = new Battle(new Enemy("enemi", 0, 0, "lumberjack_sheet32", "desert", 50, "enemi")); | ||||
|  | ||||
|         // Create both type of screen and record for reuse | ||||
|         screenManager.registerScreen(ScreenMap.class); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user