2.0.0

Author: RSamaium

core/game/Game_Character.js

@@ -1728,7 +1728,8 @@ State #3 = 50%
 @return {Object}
 */
 	getItem: function(type, id) {
-		return this.items[type][id] ? this.items[type][id] : false;
+		var it = this.getItems(type);
+		return it[id] ? this.items[type][id] : false;
 	},
 
 /**
@@ -1739,6 +1740,9 @@ State #3 = 50%
 */
 	getItems: function(type) {
 		if (type) {
+			if (!this.items[type]) {
+				this.items[type] = {};
+			}
 			return this.items[type];
 		}
 		return this.items;

core/game/Game_Map.js

@@ -288,10 +288,10 @@ var _class = {
 			if (!e || (!e.exist || id == entity.id)) continue;
 
 			state = entity.hit(e);
-			
+
 			if (state.over >= 1) {
 				if (!testLineTile(state.result.coincident)) {
-					e._hit = true;
+					if (entity.id == 0) e._hit = true;
 					entity.restorePosition();
 
 					if (state.over == 1) {
@@ -310,11 +310,11 @@ var _class = {
 
 				}
 				else {
-					e._hit = false;
+					if (entity.id == 0) e._hit = false;
 				}
 			}
 			else {
-				e._hit = false;
+				if (entity.id == 0) e._hit = false;
 			}
 
 		}

core/game/Interpreter.js

@@ -856,6 +856,7 @@ if (typeof exports != "undefined") {
 	// CHANGE_GRAPHIC: {'actor': 'all','graphic': '5'}
 	cmdChangeGraphic: function(params) {
 		global.game_player.graphic = params.graphic;
+		global.game_player.graphic_params = params['graphic-params']
 		global.game_map.refreshPlayer();
 		this.nextCommand();
 	},
@@ -1110,8 +1111,8 @@ if (typeof exports != "undefined") {
 
 
 		var _var = {
-			'switch[%1]'					: 'global.game_switches.get(%1)',
 			'self_switch[%1]'				: 'global.game_selfswitches.get(this_event.map_id, this_event.id, "%1")',
+			'switch[%1]'					: 'global.game_switches.get(%1)',
 			'variable[%1]'					: 'global.game_variables.get(%1)',
 			'actor_in_party[%1]'			: 'global.game_actors.getById(%1)',
 			'actor_name[%1]'				: 'actor(%1, "name", "isParameter")',

core/scene/Scene_Map.js

@@ -61,7 +61,7 @@ RPGJS_Canvas.Scene.New({
 		var images = [], sounds = [], load_i = 0, self = this;
 		if (data.graphics.tileset) images.push({tileset: RPGJS.Path.get("tilesets", data.graphics.tileset)});
 		if ( data.player.graphic) images.push(RPGJS.Path.get("characters", data.player.graphic, true));
-		// images.push({window: "../materials/Graphics/Windowskins/window.png"});
+		//images.push({window: "../materials/Graphics/Windowskins/window.png"});
 		if (global.materials.windowskins) {
 			var win_id = 1;
 			for (var id in global.materials.windowskins) {
@@ -111,21 +111,48 @@ RPGJS_Canvas.Scene.New({
 
 		sounds.concat(RPGJS.Plugin.call("Sprite", "mapLoadSounds", [sounds, this]));
 
-		function finish() {
+		
+
+		 var pourcent = 0,
+            _canvas = this.getCanvas(),
+            bar_full = this.createElement(300, 20),
+            bar_empty = this.createElement(300, 20),
+            text = this.createElement(),
+            width_init = bar_full.width;
+
+        text.font = '15px Arial';
+        text.fillStyle = 'white';
+       
+
+        bar_empty.x = _canvas.width / 2 - bar_empty.width / 2;
+        bar_empty.y = _canvas.height / 2 - bar_empty.height / 2;
+
+        bar_empty.strokeStyle = "white";
+       // bar_empty.strokeRect();
+        
+        bar_empty.append(bar_full, text);
+
+       	this.stage.append(bar_empty);
+
+        function progress() {
+        	var total = images.length + sounds.length;
+        	pourcent += Math.round(100 / total);
+        	bar_full.width = width_init * (pourcent / 100);
+           // bar_full.fillRect("#428bca");
+            text.fillText("Loading " + pourcent + "%", 100, 15);
+        }
+
+        function finish() {
 			if (load_i){
+				self.stage.empty();
 				self.tilesetLoad(data);
 				if (callback) callback();
 			}
 			load_i++;
 		}
 
-		RPGJS_Canvas.Materials.load("images", images, function(img) {
-			// -- Empty
-		}, finish);
-		
-		RPGJS_Canvas.Materials.load("sounds", sounds, function(snd) {
-			// -- Empty
-		}, finish);
+		RPGJS_Canvas.Materials.load("images", images, progress, finish);		
+		RPGJS_Canvas.Materials.load("sounds", sounds, progress, finish);
 
 
 	},
@@ -215,6 +242,7 @@ RPGJS_Canvas.Scene.New({
 	render: function(stage) {
 
 		if (!this.spriteset) {
+			stage.refresh();
 			return;
 		}
 

core/scene/Scene_Window.js

@@ -72,13 +72,16 @@ RPGJS_Canvas.Scene.New({
 			array_el.push(el);
 			box.getContent().append(el);
 		}
+
 
 		var cursor = this.createElement();
 		cursor.fillStyle = "#7778AA";
 		cursor.fillRect(-10, -10, width-30, 30);
 		cursor.opacity = .5;
 
-		box.cursor.init(cursor, array_el);
+		box.cursor.init(cursor, array_el, {
+			enter: [Input.Enter, Input.Space]
+		});
 
 		box.cursor.select(function(el) {
 			self._onEnterPressChoice(el.attr('index'));

core/sprite/Sprite_Character.js

@@ -92,7 +92,7 @@ Class.create("Sprite_Character", {
 				self.width = img.width / self.nbSequenceX;
 				self.height = img.height / self.nbSequenceY;
 
-				//self.entity.el.drawImage("characters_" + self.graphic, 0, 0, self.width, self.height, -self.regX, -self.regY, self.width, self.height);
+				self.entity.el.drawImage("characters_" + self.graphic, 0, 0, self.width, self.height, -self.regX, -self.regY, self.width, self.height);
 				self.setAnimation();
 				self.setSpritesheet();
 				self.stop();
@@ -101,12 +101,7 @@ Class.create("Sprite_Character", {
 				}
 			}
 
-			if (this.id != 0) { // if not player
-				RPGJS.Path.loadMaterial("characters", this.graphic, load);
-			}
-			else {
-				load();
-			}
+			RPGJS.Path.loadMaterial("characters", this.graphic, load);
 		}
 		else {
 			this.stop();

core/sprite/Spriteset_Map.js

@@ -433,7 +433,7 @@ Class.create("Spriteset_Map", {
 			el.width = img.width;
 			el.height = img.height;
 			if (params.origin == "center") {
-				el.setPositionOrigin("middle");
+				el.setOriginPoint("middle");
 			}
 			el.scaleX = params.zoom_x / 100;
 			el.scaleY = params.zoom_y / 100;
@@ -464,7 +464,7 @@ Class.create("Spriteset_Map", {
 		var el = this.pictures[id];
 		if (!el) return false;
 		if (params.origin == "center") {
-			el.setPositionOrigin("middle");
+			el.setOriginPoint("middle");
 		}
 		var t = RPGJS_Canvas.Timeline.New(el);
 
@@ -473,12 +473,8 @@ Class.create("Spriteset_Map", {
 		params.zoom_y = params.zoom_y || 100;
 
 		t.to({
-			x: params.x, 
-			y: params.y, 
-			opacity: params.opacity / 255, 
-			scaleX: params.zoom_x / 100, 
-			scaleY: params.zoom_y / 100
-		}, time).call(finish);
+			x: +params.x
+		}, +time).call(finish);
 	},
 
 /**

readme.md

@@ -1,6 +1,6 @@
-# RPG JS v2 Beta #
+# RPG JS v2 #
 
->  RPG JS use [CanvasEngine](http://canvasengine.net) 1.3.1 dev. Think integrate CanvasEngine and all extensions before RPG JS
+>  RPG JS use [CanvasEngine](http://canvasengine.net) 1.3.1. Think integrate CanvasEngine and all extensions before RPG JS
 
 > Uses http://localhost for to test
 
@@ -22,10 +22,19 @@ The core of RPG JS is composed of three parts:
 
 ## Changelog ##
 
+#### v2.0.0
+
+* Fix change the appearance of the hero
+* Fix execution of an event when the hero is stopped
+* Spacebar usable in the selection
+* Fix the moving pictures and rotations
+* Fix test of a item possessed in the condition command if item does not exist
+* Fix test of self switch 
+
 #### Beta 1.4.3
 
 * Works on IE
-* Fix refresh an event after choice*
+* Fix refresh an event after choice
 * Fix collision when the height of the Sprite is different from 48px
 
 #### Beta 1.4.2