Merge pull request #5 from 01010111/dev

Dev

Author: 01010111

.travis.yml

@@ -0,0 +1,25 @@
+sudo: required
+dist: trusty
+
+language: haxe
+
+haxe:
+ - "3.4.7"
+ - "development"
+
+matrix:
+ allow_failures:
+   - haxe: development
+
+install:
+ - haxelib dev zerolib .
+
+script:
+ - lime build neko
+
+deploy:
+ - provider: script
+   haxe: 3.4.7
+   script: bash ./release_haxelib.sh $HAXELIB_PWD
+   on:
+	 tags: true

haxelib.json

@@ -5,6 +5,7 @@
 	"tags": ["game", "flixel", "openfl", "flash", "html5", "neko", "cpp", "android", "ios", "cross"],
 	"description": "Zerolib is a library of extensions, utilities, and other helpful classes for making games quickly in haxeflixel!",
 	"version": "0.2.3",
+	"classPath": "zero",
 	"releasenote": "A few bugfixes, better documentation",
 	"contributors": ["01010111"],
 	"dependencies": {

project.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+	<!-- _________________________ Application Settings _________________________ -->
+
+	<app title="zerolib" file="zerolib" main="Main" version="0.0.1" company="01010111" />
+
+	<!-- _____________________________ Path Settings ____________________________ -->
+
+	<classpath name="src" />
+
+	<!-- _______________________________ Libraries ______________________________ -->
+
+	<haxelib name="flixel" />
+	<haxelib name="flixel-addons" />
+	<haxelib name="zerolib" />
+
+	<!-- _________________________________ Custom _______________________________ -->
+
+	<haxeflag name="--macro" value="include('zero')" />
+
+</project>

release_haxelib.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+rm -f zerolib.zip
+zip -r zerolib.zip zero *.md *.json *.hxml run.n
+haxelib submit zerolib.zip $HAXELIB_PWD --always

src/Main.hx

@@ -0,0 +1,2 @@
+package;
+class Main { public static function main() {} }

zero/flxutil/ecs/components/PlatformerAnimator.hx

@@ -0,0 +1,47 @@
+package zero.flxutil.ecs.components;
+
+import zero.flxutil.ecs.Component;
+import flixel.FlxObject.*;
+
+using Math;
+
+/**
+ * An Animator component for a basic Platformer entity
+ */
+class PlatformerAnimator extends Component
+{
+
+	var idle:String;
+	var walk:String;
+	var jump:String;
+	var fall:String;
+
+	/**
+	 * Creates a new Animator component for a platformer entity
+	 * @param idle	Idle animation name
+	 * @param walk	Walk animation name
+	 * @param jump	Jump animation name
+	 * @param fall	Fall animation name
+	 */
+	public function new(idle:String = 'idle', walk:String = 'walk', jump:String = 'jump', fall:String = 'fall')
+	{
+		super('platformer_animation');
+		this.idle = idle;
+		this.walk = walk;
+		this.jump = jump;
+		this.fall = fall;
+	}
+
+	@:dox(hide)
+	override function update(dt:Float)
+	{
+		super.update(dt);
+		entity.animation.play(animate());
+	}
+
+	function animate():String
+	{
+		return entity.isTouching(FLOOR) ? velocity.x.abs() > 0 ? walk : idle : velocity.y > 0 ? jump : fall;
+	}
+
+}

zero/flxutil/ecs/components/PlatformerJumper.hx

@@ -0,0 +1,57 @@
+package zero.flxutil.ecs.components;
+
+import flixel.FlxObject.*;
+import zero.flxutil.input.Controller;
+import zero.flxutil.ecs.Component;
+
+/**
+ * A Component to make an entity in a platformer Jump
+ */
+class PlatformerJumper extends Component
+{
+
+	var jump_power:Float;
+	var jump_button:ControllerButton;
+	var controller:Controller;
+	var coyote_time:Float;
+	
+	var coyote_timer:Float;
+	var just_jumped_timer:Float;
+
+	/**
+	 * Create a new Jumper component with options
+	 * @param options 
+	 */
+	public function new(options:JumperOptions)
+	{
+		super('jumper');
+		jump_power = options.jump_power;
+		jump_button = options.jump_button;
+		controller = options.controller;
+		coyote_time = options.coyote_time;
+	}
+
+	@:dox(hide)
+	override public function update(dt:Float)
+	{
+		if (coyote_timer > 0) coyote_timer -= dt;
+		if (just_jumped_timer > 0) just_jumped_timer -= dt;
+
+		if (entity.wasTouching & FLOOR > 0) coyote_timer = coyote_time;
+		if (controller.get_just_pressed(jump_button)) just_jumped_timer = coyote_time;
+		if (controller.get_just_released(jump_button) && entity.velocity.y < 0) entity.velocity.y *= 0.5;
+
+		if (just_jumped_timer <= 0 || coyote_timer <= 0) return;
+		entity.velocity.y = -jump_power;
+		just_jumped_timer = 0;
+	}
+
+}
+
+typedef JumperOptions = 
+{
+	controller:Controller,
+	jump_power:Float,
+	jump_button:ControllerButton,
+	coyote_time:Float
+}

zero/flxutil/ecs/components/PlatformerWalker.hx

@@ -0,0 +1,54 @@
+package zero.flxutil.ecs.components;
+
+import flixel.FlxObject.*;
+import zero.flxutil.input.Controller;
+import zero.flxutil.ecs.Component;
+
+/**
+ * A Component to make an entity in a platformer Walk
+ */
+class PlatformerWalker extends Component
+{
+
+	var controller:Controller;
+	var walk_speed:Float;
+	var accel_amt:Float;
+	var drag_amt:Float;
+
+	/**
+	 * Create a new Walker component with options
+	 * @param options 
+	 */
+	public function new(options:WalkerOptions)
+	{
+		super('walker');
+		controller = options.controller;
+		walk_speed = options.walk_speed;
+		accel_amt = options.acceleration_force;
+		drag_amt = options.drag_force;
+	}
+
+	override function on_add()
+	{
+		entity.maxVelocity.x = walk_speed;
+		drag.x = drag_amt;
+	}
+
+	override public function update(dt:Float)
+	{
+		acceleration.x = 0;
+		if (controller.get_pressed(DPAD_LEFT)) acceleration.x -= accel_amt;
+		if (controller.get_pressed(DPAD_RIGHT)) acceleration.x += accel_amt;
+		if (entity.facing == LEFT && velocity.x > 0 || entity.facing == RIGHT && velocity.x < 0) velocity.x *= 0.5;
+		entity.facing = acceleration.x < 0 ? LEFT : acceleration.x > 0 ? RIGHT : entity.facing;
+	}
+
+}
+
+typedef WalkerOptions =
+{
+	controller:Controller,
+	walk_speed:Float,
+	acceleration_force:Float,
+	drag_force:Float
+}

zero/flxutil/editors/ZomeLoader.hx

@@ -2,8 +2,9 @@ package zero.flxutil.editors;
 
 import flixel.tile.FlxTilemap;
 import flixel.tile.FlxBaseTilemap;
-import flixel.tile.FlxTilemapExt;
+import flixel.addons.tile.FlxTilemapExt;
 import flixel.system.FlxAssets;
+import haxe.Json;
 
 /**
  * A class for loading json levels created with ZOME (01010111/itch.io/zome)
@@ -21,7 +22,7 @@ class ZomeLoader
 	 */
 	public function new(json_path:String, tileset_folder:String = 'assets/images/')
 	{
-		this.level = openfl.Assets.getText(json_path);
+		this.level = Json.parse(openfl.Assets.getText(json_path));
 		this.tileset_folder = tileset_folder;
 	}
 
@@ -45,7 +46,7 @@ class ZomeLoader
 	public function get_tilemap(?options:TilemapOptions):FlxTilemap
 	{
 		var tilemap = new FlxTilemap();
-		tilemap.load_tilemap(tilemap, options);
+		load_tilemap(tilemap, options);
 		return tilemap;
 	}
 
@@ -57,12 +58,12 @@ class ZomeLoader
 	public function get_tilemap_ext(?options:TilemapExtOptions):FlxTilemapExt
 	{
 		var tilemap = new FlxTilemapExt();
-		tilemap.load_tilemap(tilemap, options.tilemap_options);
+		load_tilemap(tilemap, options.tilemap_options);
 		tilemap.setSlopes(options.northwest_slopes, options.northeast_slopes, options.southwest_slopes, options.southeast_slopes);
 		return tilemap;
 	}
 
-	function load_tilemap(tilemap:FlxBaseTilemap, options:TilemapOptions)
+	function load_tilemap(tilemap:FlxTilemap, options:TilemapOptions)
 	{
 		options = prep_tilemap_options(options);
 		tilemap.loadMapFrom2DArray(
@@ -76,6 +77,7 @@ class ZomeLoader
 			options.collide_index
 		);
 		if (options.collision_array != null) set_tile_properties(tilemap, options.collision_array);
+		if (options.follow) tilemap.follow();
 	}
 
 	function prep_tilemap_options(options:TilemapOptions):TilemapOptions
@@ -87,10 +89,14 @@ class ZomeLoader
 		if (options.starting_index == null) options.starting_index = 0;
 		if (options.draw_index == null) options.draw_index = 0;
 		if (options.collide_index == null) options.collide_index = 1;
+		if (options.follow == null) options.follow = true;
 		return options;
 	}
 
-	function set_tile_properties(tilemap:FlxBaseTilemap, collision_array:Array<Int>) for (tile in collision_array) tilemap.setTileProperties(tile, collision_array[tile]);
+	function set_tile_properties(tilemap:FlxTilemap, collision_array:Array<Int>)
+	{
+		for (i in 0...collision_array.length) tilemap.setTileProperties(i, collision_array[i]);
+	}
 
 }
 
@@ -109,14 +115,15 @@ typedef TilemapOptions =
 	?starting_index:Int,
 	?draw_index:Int,
 	?collide_index:Int,
-	?collision_array:Array<Int>
+	?collision_array:Array<Int>,
+	?follow:Bool
 }
 
 typedef TilemapExtOptions =
 {
-	tilemap_options:TilemapOptions,
-	northeast_slopes:Array<Int>,
-	northwest_slopes:Array<Int>,
-	southeast_slopes:Array<Int>,
-	southwest_slopes:Array<Int>
+	?tilemap_options:TilemapOptions,
+	?northeast_slopes:Array<Int>,
+	?northwest_slopes:Array<Int>,
+	?southeast_slopes:Array<Int>,
+	?southwest_slopes:Array<Int>
 }