lifning
/
anodyne
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WIP: new for iterator syntax

This commit is contained in:
lif 2020-04-04 23:49:22 -07:00
parent babc4de491
commit 4db2b31176
28 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intra/source/Intra.hx
View File

@ -858,7 +858,7 @@ class Intra extends FlxGame {
set_dpad_frame(4);
}
var abc:Int=0;
for(abc=0;abc<5;abc++){
for(abc in 0...5){
if(move_ids.indexOf(e.touchPointID)!=-1){
move_ids.splice(move_ids.indexOf(e.touchPointID), 1);
}

2
intra/source/Save.hx
View File

@ -196,7 +196,7 @@ class Save {
} else if(ref[0]===0 || ref[0]===1){
if(old.length<ref.length){
trace("Array with 0sr in save was shorter than in disk");
for(j=old.length;j<ref.length;j++){
for(j in old.length...ref.length){
old.push(0);
}
}

6
intra/source/data/CLASS_ID.hx
View File

@ -1,5 +1,5 @@
package data
{
package data ;
/**
* BECAUSE STRING COMPARISONS ARE SLOW AS FUCK
* IN THE COLLISION LOGIC
@ -78,4 +78,4 @@ class CLASS_ID
public static var TRADE_NPC:Int=309;
public static var MITRA:Int=310;
}
}

2
intra/source/data/SoundData.hx
View File

@ -823,7 +823,7 @@ class SoundData
a.push(i);
}
for(i=0;i<g.length;i++){
for(i in 0...g.length){
var r:Int=(g.length - i)* Math.random();// Get a random index Into the the array of sound gruop indices to check
var v:Int=a[r];// Store the sound group index to check
a.splice(r, 1);// Remove the sound group index so we dont check again

50
intra/source/data/TileData.hx
View File

@ -1,5 +1,5 @@
package data
{
package data ;
import entity.player.Player;
import global.Registry;
import org.flixel.FlxGroup;
@ -556,7 +556,7 @@ class TileData
var j:Int=0;
var no_tiles_yet:Array<Dynamic>=new Array("DEBUG");
if(Registry.CURRENT_MAP_NAME=="OVERWORLD"){
for(j=TileData.Overworld_Tilemap_Nonsolid_Row_offset*TileData.Overworld_Tileset_Width;j<TileData.Overworld_Tilemap_Nr_Rows*TileData.Overworld_Tileset_Width;j++){
for(j in (TileData.Overworld_Tilemap_Nonsolid_Row_offset*TileData.Overworld_Tileset_Width)...(TileData.Overworld_Tilemap_Nr_Rows*TileData.Overworld_Tileset_Width)){
curMapBuf.setTileProperties(j, FlxObject.NONE);
}
curMapBuf.setTileProperties(TileData.Overworld_Tilemap_Special_Row_offset * TileData.Overworld_Tileset_Width, FlxObject.DOWN);
@ -585,7 +585,7 @@ class TileData
curMapBuf.setTileProperties(136, FlxObject.NONE, null, null, 3);
curMapBuf.setTileProperties(146, FlxObject.NONE, null, null, 3);
curMapBuf.setTileProperties(150, FlxObject.NONE, conveyer, null, 2);
for(j=61;j<65;j++)curMapBuf.setTileProperties(j, FlxObject.NONE, hole);
for(j in 61...65) { curMapBuf.setTileProperties(j, FlxObject.NONE, hole); }
} else if(Registry.CURRENT_MAP_NAME=="BEACH"){
CUR_MAP_HAS_CONVEYERS=true;
@ -600,31 +600,31 @@ class TileData
curMapBuf.setTileProperties(110, FlxObject.NONE,hole,null,10);
} else if(Registry.CURRENT_MAP_NAME=="NEXUS"){
for(j=30;j<150;j++){
for(j in 30...150){
curMapBuf.setTileProperties(j, FlxObject.NONE);
}
curMapBuf.setTileProperties(44, FlxObject.ANY, null, null, 4);
} else if(Registry.CURRENT_MAP_NAME=="STREET"){
for(j=29;j<80;j++){
for(j in 29...80){
curMapBuf.setTileProperties(j, FlxObject.NONE);
}
} else if(Registry.CURRENT_MAP_NAME=="BLANK"){
curMapBuf.setTileProperties(0, FlxObject.ANY);
curMapBuf.setTileProperties(1, FlxObject.NONE);
curMapBuf.setTileProperties(2, FlxObject.ANY);
for(j=3;j<16;j++)curMapBuf.setTileProperties(j, FlxObject.ANY);
for(j=17;j<39;j++)curMapBuf.setTileProperties(j, FlxObject.NONE);
for(j in 3...16)curMapBuf.setTileProperties(j, FlxObject.ANY);
for(j in 17...39)curMapBuf.setTileProperties(j, FlxObject.NONE);
} else if(Registry.CURRENT_MAP_NAME=="BEDROOM"){
for(j=24;j<62;j++){
for(j in 24...62){
curMapBuf.setTileProperties(j, FlxObject.NONE);
}
curMapBuf.setTileProperties(5, FlxObject.NONE, TileData.thin_down);
curMapBuf.setTileProperties(37, FlxObject.NONE, TileData.hole);
} else if(Registry.CURRENT_MAP_NAME=="CROWD"){
for(j=40;j<150;j++){
for(j in 40...150){
curMapBuf.setTileProperties(j, FlxObject.NONE);
}
for(j=43;j<50;j++){
for(j in 43...50){
HOLE_INDICES.push(j);
curMapBuf.setTileProperties(j, FlxObject.NONE,TileData.hole);
}
@ -643,7 +643,7 @@ class TileData
curMapBuf.setTileProperties(140, FlxObject.NONE,ladder,Player);//Ladder
} else if(Registry.CURRENT_MAP_NAME=="APARTMENT"){
CUR_MAP_HAS_CONVEYERS=true;
for(j=150;j<300;j++){
for(j in 150...300){
curMapBuf.setTileProperties(j, FlxObject.NONE);
}
curMapBuf.setTileProperties(255, FlxObject.NONE,ladder,Player);//Ladder
@ -664,10 +664,10 @@ class TileData
curMapBuf.setTileProperties(277, FlxObject.ANY);
curMapBuf.setTileProperties(278, FlxObject.ANY);
curMapBuf.setTileProperties(279, FlxObject.ANY);
for(j=160;j<190;j++){//normal hole cases
for(j in 160...190){//normal hole cases
curMapBuf.setTileProperties(j, FlxObject.NONE,TileData.hole);
}
for(j=280;j<300;j++){//CITYLIGHT tiles=holes
for(j in 280...300){//CITYLIGHT tiles=holes
curMapBuf.setTileProperties(j, FlxObject.NONE,TileData.hole);
}
curMapBuf.setTileProperties(190, FlxObject.NONE, TileData.slow, Player);
@ -676,10 +676,10 @@ class TileData
curMapBuf.setTileProperties(206, FlxObject.NONE,TileData.conveyer);
curMapBuf.setTileProperties(231, FlxObject.NONE,TileData.conveyer);
} else if(Registry.CURRENT_MAP_NAME=="CIRCUS"){
for(j=60;j<200;j++){
for(j in 60...200){
curMapBuf.setTileProperties(j, FlxObject.NONE);
}
for(j=70;j<80;j++){
for(j in 70...80){
curMapBuf.setTileProperties(j, FlxObject.NONE,TileData.hole);
}
CUR_MAP_HAS_CONVEYERS=true;
@ -694,17 +694,17 @@ class TileData
curMapBuf.setTileProperties(69, FlxObject.NONE, TileData.spike, Player);
} else if(Registry.CURRENT_MAP_NAME=="HOTEL"){
CUR_MAP_HAS_CONVEYERS=true;
for(j=80;j<220;j++){
for(j in 80...220){
curMapBuf.setTileProperties(j, FlxObject.NONE);
}
for(j=90;j<120;j++){
for(j in 90...120){
curMapBuf.setTileProperties(j, FlxObject.NONE,TileData.hole);
}
for(j=180;j<184;j++){
for(j in 180...184){
curMapBuf.setTileProperties(j, FlxObject.NONE, TileData.conveyer);
}
for(j=190;j<195;j++){
for(j in 190...195){
curMapBuf.setTileProperties(j, FlxObject.NONE,TileData.hole);
}
curMapBuf.setTileProperties(131, FlxObject.NONE, TileData.conveyer);
@ -733,7 +733,7 @@ class TileData
curMapBuf.setTileProperties(20, FlxObject.NONE, TileData.conveyer);
curMapBuf.setTileProperties(21, FlxObject.ANY, null, null, 3);
curMapBuf.setTileProperties(32, FlxObject.NONE, TileData.spike, Player);
for(j=36;j<=48;j++){
for(j in 36...=48){
curMapBuf.setTileProperties(j, FlxObject.NONE);
}
HOLE_INDICES.push(9);
@ -758,7 +758,7 @@ class TileData
curMapBuf.setTileProperties(31, FlxObject.NONE, TileData.spike, Player);
curMapBuf.setTileProperties(32, FlxObject.NONE, TileData.spike, Player);
} else if(Registry.CURRENT_MAP_NAME=="REDSEA"){
for(j=49;j<129;j++){
for(j in 49...129){
curMapBuf.setTileProperties(j, FlxObject.NONE);
}
} else if(Registry.CURRENT_MAP_NAME=="FIELDS"){
@ -770,7 +770,7 @@ class TileData
curMapBuf.setTileProperties(250, FlxObject.NONE, conveyer);
curMapBuf.setTileProperties(270, FlxObject.NONE, conveyer,null,4);
} else if(Registry.CURRENT_MAP_NAME=="WINDMILL"){
for(j=100;j<150;j++){
for(j in 100...150){
curMapBuf.setTileProperties(j, FlxObject.NONE);
}
curMapBuf.setTileProperties(110, FlxObject.NONE, ladder, Player);//Ladder
@ -778,7 +778,7 @@ class TileData
curMapBuf.setTileProperties(130, FlxObject.NONE, conveyer, Player);
CUR_MAP_HAS_CONVEYERS=true;
} else if(Registry.CURRENT_MAP_NAME=="TRAIN"){ //CELL!!!
for(j=40;j<70;j++){
for(j in 40...70){
curMapBuf.setTileProperties(j, FlxObject.NONE);
}
@ -1237,4 +1237,4 @@ class TileData
(x<=tx + 16)&&(x>=tx));
}
}
}

6
intra/source/entity/enemy/apartment/Splitboss.hx
View File

@ -119,7 +119,7 @@ class Splitboss extends FlxSprite
addAnimation("die", [0, 3], 14);
play("float");
for(i=0;i<copies.maxSize;i++){
for(i in 0...copies.maxSize){
var copy:FlxSprite=new FlxSprite(0, 0);
copy.loadGraphic(splitboss_sprite, true, false, 24, 32);
copy.width -=8;
@ -415,7 +415,7 @@ class Splitboss extends FlxSprite
/* Set number of balls to appear, and their positions.*/
var tx:Int=Std.int(6 * Math.random());
play_sfx("shoot");
for(iter=0;iter<h_dethballz_counts[phase];iter++){
for(iter in 0...h_dethballz_counts[phase]){
DETHBALL=DETHBALLZ.getFirstAvailable()as FlxSprite;
if(DETHBALL==null)break;
DETHBALL.exists=true;
@ -431,7 +431,7 @@ class Splitboss extends FlxSprite
if(t_dethballz>h_dethballz_timeouts[phase]){
//sfx pew pew
len=dethball_queue.length;
for(iter=0;iter<len;iter++){
for(iter in 0...len){
DETHBALL=dethball_queue.pop();
DETHBALL.velocity.y=40;
DETHBALL.play("shoot", true);

2
intra/source/entity/enemy/bedroom/Slime.hx
View File

@ -121,7 +121,7 @@ class Slime extends FlxSprite
}
for(i=0;i<goo_bullets.maxSize;i++){
for(i in 0...goo_bullets.maxSize){
goo=new FlxSprite(0, 0);
goo.loadGraphic(Slime_Goo_Sprite, true, false, 6, 6);

4
intra/source/entity/enemy/bedroom/Sun_Guy.hx
View File

@ -508,7 +508,7 @@ class Sun_Guy extends FlxSprite
case 2:
sun_guy_wave.velocity.y=30;
if(!sun_wave_evaporating){
for(i=0;i<dusts.length;i++){
for(i in 0...dusts.length){
if(sun_guy_wave.overlaps(dusts.members[i])&& dusts.members[i].exists){
sun_guy_wave.play("evaporate");
sun_wave_evaporating=true;
@ -539,7 +539,7 @@ class Sun_Guy extends FlxSprite
break;
case 3:
if(!dusts_poofed){
for(i=0;i<dusts.length;i++){
for(i in 0...dusts.length){
dusts.members[i].play("poof");
}
dusts_poofed=true;

4
intra/source/entity/enemy/crowd/WallBoss.hx
View File

@ -162,7 +162,7 @@ class WallBoss extends FlxSprite
wall.immovable=true;
// Death explosions
for(ctr=0;ctr<death_explosions.maxSize;ctr++){
for(ctr in 0...death_explosions.maxSize){
var de:FlxSprite=new FlxSprite;
de.loadGraphic(EventScripts.small_explosion_sprite, true, false, 24,24);
de.addAnimation("explode", [0, 1, 2, 3, 4,4], 14, false);
@ -182,7 +182,7 @@ class WallBoss extends FlxSprite
face.addAnimation("shoot", [4], 10, true);
face.play("normal");
for(ctr=0;ctr<face_bullets.maxSize;ctr++){
for(ctr in 0...face_bullets.maxSize){
var b:FlxSprite=new FlxSprite(0, 0);
b.loadGraphic(bullet_sprite, true, false, 8, 8);
b.addAnimation("move", [0, 1], 12, true);

14
intra/source/entity/enemy/etc/Briar_Boss.hx
View File

@ -149,7 +149,7 @@ class Briar_Boss extends AnoSprite
// Create the thorns that rise from the ground.
// MARINA_ANIMS_GROUND_THORN
for(iter=0;iter<thorns.maxSize;iter++){
for(iter in 0...thorns.maxSize){
var thorn:FlxSprite=new FlxSprite(0, 0);
thorn.loadGraphic(embed_ground_thorn, true, false, 16, 16);
thorn.width=6;
@ -167,7 +167,7 @@ class Briar_Boss extends AnoSprite
// MARINA_ANIMS_BULLET_THORN
for(iter=0;iter<bullet_thorns.maxSize;iter++){
for(iter in 0...bullet_thorns.maxSize){
var bthorn:FlxSprite=new FlxSprite(0, 0);
bthorn.loadGraphic(embed_thorn_bullet, true, false, 16, 16);
bthorn.addAnimation("move", [0, 1], 10, true);
@ -181,7 +181,7 @@ class Briar_Boss extends AnoSprite
// MARINA_ANIMS_ICE_EXPLOSIONS
var ice_ex:FlxSprite;
for(iter=0;iter<ice_exs.maxSize;iter++){
for(iter in 0...ice_exs.maxSize){
ice_ex=new FlxSprite;
ice_ex.loadGraphic(embed_ice_explosion, true, false, 24, 24);
ice_ex.addAnimation("move", [0, 1, 2, 3], 15, false);
@ -408,7 +408,7 @@ class Briar_Boss extends AnoSprite
}
} else {
p.anim_tiles_group.setAll("visible", true);
for(i=0;i<100;i++){
for(i in 0...100){
t.setTileByIndex(i, old[i], true);
}
}
@ -844,7 +844,7 @@ class Briar_Boss extends AnoSprite
// Dusts init
dusts=new FlxGroup(4);
for(i=0;i<dusts.maxSize;i++){
for(i in 0...dusts.maxSize){
var dust:Dust=new Dust(0, 0, null, parent);
dust.exists=false;
dusts.add(dust);
@ -854,7 +854,7 @@ class Briar_Boss extends AnoSprite
// Explosions init MARINA_ANIMS_DUST_EXPLOSIONS
dust_explosions=new FlxGroup(4);
for(i=0;i<dust_explosions.maxSize;i++){
for(i in 0...dust_explosions.maxSize){
var dust_explos:FlxSprite=new FlxSprite(0, 0);
dust_explos.loadGraphic(embed_dust_explosion, true, false, 48, 48);
dust_explos.addAnimation("explode", [0, 1, 2, 3, 4, 5], 12, false);
@ -865,7 +865,7 @@ class Briar_Boss extends AnoSprite
// Mists init MARINA_ANIMS_MIST
mists=new FlxGroup(3);
for(i=0;i<mists.maxSize;i++){
for(i in 0...mists.maxSize){
var mist:FlxSprite=new FlxSprite();
mist.loadGraphic(embed_mist, true, false, 24, 24);
mist.addAnimation("a", [0, 1], 5);

4
intra/source/entity/enemy/etc/Sage_Boss.hx
View File

@ -75,7 +75,7 @@ class Sage_Boss extends AnoSprite
parent.sortables.add(s_bullets);
// 64x16 dust razors
for(i=0;i<l_bullets.maxSize;i++){
for(i in 0...l_bullets.maxSize){
b=new FlxSprite(0, 0);
b.loadGraphic(embed_sage_long_attacks, true, false, 64, 16);
b.addAnimation("spin", [0,1], 24, true);
@ -90,7 +90,7 @@ class Sage_Boss extends AnoSprite
parent.sortables.add(l_bullets);
// Dusts
for(i=0;i<dusts.maxSize;i++){
for(i in 0...dusts.maxSize){
var d:Dust=new Dust(0, 0, null, parent);
dusts.add(d)
d.y=tl.y + 8 * 16;

2
intra/source/entity/enemy/hotel/Eye_Boss.hx
View File

@ -148,7 +148,7 @@ class Eye_Boss extends FlxSprite
grp_water_bullets.setAll("alive", false);
for(i=0;i<grp_land_splashes.maxSize;i++){
for(i in 0...grp_land_splashes.maxSize){
/* Small splash and small splash shadow ANIMS */
var splash:FlxSprite=new FlxSprite;
splash.makeGraphic(8, 8, 0xff123412);

2
intra/source/entity/enemy/redcave/Red_Boss.hx
View File

@ -191,7 +191,7 @@ class Red_Boss extends FlxSprite
var j:Int;
/* TENTACLE + WARNING SPRITES */
for(j=0;j<tentacles.maxSize;j++){
for(j in 0...tentacles.maxSize){
var tentacle:FlxSprite=new FlxSprite();
tentacle.loadGraphic(tentacle_sprite, true, false, 10, 64);
tentacle.addAnimation("move", [0, 1], 8);

10
intra/source/entity/gadget/Big_Door.hx
View File

@ -175,7 +175,7 @@ class Big_Door extends FlxSprite
locked_squares.setAll("angularVelocity", 0);
locked_squares.setAll("angle", 0);
locked_squares.setAll("alpha", 0);
for(i=0;i<locked_squares.maxSize;i++){
for(i in 0...locked_squares.maxSize){
locked_squares.members[i].scale.x=2;
locked_squares.members[i].scale.y=2;
}
@ -197,7 +197,7 @@ class Big_Door extends FlxSprite
if(s_open_anim_ctr==0){
player.dontMove=true;
for(i=0;i<nr_squares;i++){
for(i in 0...nr_squares){
square=locked_squares.members[i];
square.rotate_angle=i *(360 / nr_squares);
square.scale.x=square.scale.y=1;
@ -206,7 +206,7 @@ class Big_Door extends FlxSprite
s_open_anim_ctr ++;
} else if(s_open_anim_ctr==1){ //rotate, fade in squaers
for(i=0;i<nr_squares;i++){
for(i in 0...nr_squares){
square=locked_squares.members[i];
square.alpha +=(((i + 1)/ nr_squares)* 0.008);
EventScripts.rotate_about_center_of_sprite(center_sprite, square, init_open_radius, 0.05, -8, -8);
@ -216,14 +216,14 @@ class Big_Door extends FlxSprite
}
} else if(s_open_anim_ctr==2){ // move squares to center and outwars
for(i=0;i<nr_squares;i++){
for(i in 0...nr_squares){
square=locked_squares.members[i];
EventScripts.rotate_about_center_of_sprite(center_sprite, square, init_open_radius, 0.1, -8, -8);
}
init_open_radius -=1.4;
if(init_open_radius<-100)s_open_anim_ctr++;
} else if(s_open_anim_ctr==3){ // move back to center
for(i=0;i<nr_squares;i++){
for(i in 0...nr_squares){
square=locked_squares.members[i];
EventScripts.rotate_about_center_of_sprite(center_sprite, square, init_open_radius, 0.15, -8, -8);
}

2
intra/source/entity/interactive/NPC.hx
View File

@ -539,7 +539,7 @@ private var locked_ticks:Int=0;
offset.x=3;
x +=3;
tm=0.8;
for(i=0;i<sparkles.maxSize;i++){
for(i in 0...sparkles.maxSize){
var s:FlxSprite=new FlxSprite;
s.loadGraphic(key_sparkle_embed, true, false, 7, 7);
s.addAnimation("sparkle", [3, 2, 1, 0], 8, false);

2
intra/source/entity/interactive/npc/Trade_NPC.hx
View File

@ -190,7 +190,7 @@ class Trade_NPC extends AnoSprite
}
items=new FlxGroup(3);
for(i=0;i<3;i++){
for(i in 0...3){
var item:FlxSprite=new FlxSprite;
item.loadGraphic(embed_dame_trade_npc, true, false, 16, 16);
if(i==2){

18
intra/source/entity/player/Player.hx
View File

@ -1,5 +1,5 @@
package entity.player
{
package entity.player ;
import data.CLASS_ID;
import data.TileData;
import flash.media.Sound;
@ -488,7 +488,7 @@ class Player extends FlxSprite
update_sentinels();
for(var t:Dynamic in Registry.subgroup_interactives){
for(t in Registry.subgroup_interactives){
if(t !=null){
if(t.active_region !=null && t.active_region.overlaps(this)){
actions_disabled=true;
@ -663,7 +663,7 @@ class Player extends FlxSprite
}
} else if(zap_timer<ZAP_TIMER_MAX){
slow_mul=0.5;
var g:FlxGroup
var g:FlxGroup;
zap_timer +=FlxG.elapsed;
}
@ -1210,7 +1210,7 @@ class Player extends FlxSprite
var skip_if_dust_overlaps:Bool=false;
for(var d:Dust in Registry.subgroup_dust){
for(d /*:Dust*/ in Registry.subgroup_dust){
if(d !=null){
if(broom.dust.overlaps(d)&& d !=broom.dust){
skip_if_dust_overlaps=true;
@ -1323,8 +1323,8 @@ class Player extends FlxSprite
}
/* Update the inventory blah blah */
public function update_player_inventory(treasure:Treasure):Void {
trace("Get treasure number ", parseInt(treasure.xml.@frame));
switch(parseInt(treasure.xml.@frame)){
trace("Get treasure number ", parseInt(treasure.xml.frame));
switch(parseInt(treasure.xml.frame)){
case Treasure.IDX_BROOM:
Registry.inventory[Registry.IDX_BROOM]=true;
Achievements.unlock(Achievements.A_GET_BROOM);
@ -1442,7 +1442,7 @@ class Player extends FlxSprite
}
if(invincible_timer>0){
invincible_timer -=FlxG.elapsed
invincible_timer -=FlxG.elapsed;
} else {
invincible=false;
if(!Registry.FUCK_IT_MODE_ON){
@ -1627,4 +1627,4 @@ class Player extends FlxSprite
break;
}
}
}
}

4
intra/source/extension/JoyQuery/Joystick.hx
View File

@ -118,7 +118,7 @@ class Joystick extends Dynamic
}
//Index each axis and button.
for(i=0;i<total;i++)
for(i in 0...total)
{
loc_inputStatus[i][0]=loc_inputStatus[i][0].split(",");
loc_inputStatus[i][1]=loc_inputStatus[i][1].split(",");
@ -127,7 +127,7 @@ class Joystick extends Dynamic
//Set each joystick axis and button capabilities.
var loc_capable:Array<Dynamic>=new Array(total);
for(i=0;i<total;i++)
for(i in 0...total)
{
loc_capable[i]=new Array(2);
loc_capable[i][0]=loc_inputStatus[i][0].length;

14
intra/source/global/Keys.hx
View File

@ -218,7 +218,7 @@ class Keys extends FlxSprite
}
}
} else if(Intra.IS_MAC){
for(i=0;i<nr_btns;i++){
for(i in 0...nr_btns){
if(Main.mac_joy_manager.joysticks[0].getButton(i)){
return true;
}
@ -239,7 +239,7 @@ class Keys extends FlxSprite
}
}
} else if(Intra.IS_MAC){
for(i=0;i<nr_axes;i++){
for(i in 0...nr_axes){
if(Math.abs(Main.mac_joy_manager.joysticks[0].getAxis(i))>0.25){
if(Main.mac_joy_manager.joysticks[0].getAxis(i)<0){
return -1;
@ -256,13 +256,13 @@ class Keys extends FlxSprite
public static function joy_get_first_active_button_id():Int {
var i:Int=0;
if(Intra.IS_WINDOWS){
for(i=0;i<nr_btns;i++){
for(i in 0...nr_btns){
if(Main.joy.buttonIsDown(0, i)){
return i + 1 + 2 * nr_axes;
}
}
} else if(Intra.IS_MAC){
for(i=0;i<nr_btns;i++){
for(i in 0...nr_btns){
if(Main.mac_joy_manager.joysticks[0].getButton(i)){
return i + 1 + 2 * nr_axes;
}
@ -274,7 +274,7 @@ class Keys extends FlxSprite
public static function joy_get_first_active_axis_id():Int {
var i:Int=0;
if(Intra.IS_WINDOWS){
for(i=0;i<nr_axes;i++){
for(i in 0...nr_axes){
if(Math.abs(Main.joy.getAxis(0, i))>0.7){
if(Main.joy.getAxis(0, i)<0){
return -(1 + i*2);// OFFSET - usually left or down
@ -284,7 +284,7 @@ class Keys extends FlxSprite
}
}
} else if(Intra.IS_MAC){
for(i=0;i<nr_axes;i++){
for(i in 0...nr_axes){
if(Math.abs(Main.mac_joy_manager.joysticks[0].getAxis(i))>0.7){
if(Main.mac_joy_manager.joysticks[0].getAxis(i)<0){
return -(1 + i * 2);
@ -466,7 +466,7 @@ class Keys extends FlxSprite
//for(asdf in 0...nr_btns){
//a.push(int(Main.joy.buttonIsDown(0, asdf)));
//}
//for(asdf=0;asdf<nr_axes + 2;asdf++){
//for(asdf in 0...nr_axes + 2){
//a.push(Main.joy.getAxis(0, asdf));
//}
//trace(a);

8
intra/source/global/Registry.hx
View File

@ -598,10 +598,10 @@ private static function patch_some_tree(disk:XML,save:XML):Void {
}
// Look for DISK objs not in SAVE.
for(i=0;i<grid.child("*").length();i++){
for(i in 0...grid.child("*").length()){
o=grid.child("*")[i];
guid=o.@guid.toXMLString();
for(j=0;j<s_grid.child("*").length();j++){
for(j in 0...s_grid.child("*").length()){
// If we find a match, then the SAVE obj should have its
// xy-coords the same as the DISK obj
if(guid==s_grid.child("*")[j].@guid.toXMLString()){
@ -639,10 +639,10 @@ private static function patch_some_tree(disk:XML,save:XML):Void {
}
// look for SAVE objs not in DISK
for(i=0;i<s_grid.child("*").length();i++){
for(i in 0...s_grid.child("*").length()){
o=s_grid.child("*")[i];
guid=o.@guid.toXMLString();
for(j=0;j<grid.child("*").length();j++){
for(j in 0...grid.child("*").length()){
if(guid==grid.child("*")[j].@guid.toXMLString()){
found_obj_match=true;
}

2
intra/source/helper/Achievements.hx
View File

@ -122,7 +122,7 @@ class Achievements
if(Registry.inventory[Registry.IDX_JUMP])rate +=2;
for(i=11;i<=Registry.IDX_WHITE;i++){
for(i in 11...=Registry.IDX_WHITE){
if(Registry.inventory[i]){
rate +=4;
}

2
intra/source/noairSave.hx
View File

@ -160,7 +160,7 @@ class Save {
} else if(ref[0]===0 || ref[0]===1){
if(old.length<ref.length){
trace("Array with 0sr in save was shorter than in disk");
for(j=old.length;j<ref.length;j++){
for(j in old.length...ref.length){
old.push(0);
}
}

4
intra/source/org/flixel/plugin/photonstorm/PNGEncoder.hx
View File

@ -71,13 +71,13 @@ class PNGEncoder
var p:Int;
var j:Int;
if(!img.transparent){
for(j=0;j<img.width;j++){
for(j in 0...img.width){
p=img.getPixel(j,i);
IDAT.writeUnsignedInt(
uint(((p&0xFFFFFF)<<8)|0xFF));
}
} else {
for(j=0;j<img.width;j++){
for(j in 0...img.width){
p=img.getPixel32(j,i);
IDAT.writeUnsignedInt(
uint(((p&0xFFFFFF)<<8)|

2
intra/source/states/DialogueState.hx
View File

@ -288,7 +288,7 @@ class DialogueState extends PushableFlxState
if(chunk.length<=Max_Line_Size){
//Remove trailing whitespace if not a single character
var nr_forced_breaks:Int=0;
for(pos=0;pos<chunk.length;pos++){
for(pos in 0...chunk.length){
if(chunk.charAt(pos)=="^"){
nr_forced_breaks++;
}

6
intra/source/states/EndingState.hx
View File

@ -146,7 +146,7 @@ class EndingState extends FlxState
add(save_dialog_selector);
save_dialog_bg.visible=save_dialog_selector.visible=save_dialog_text.visible=false;
for(i=0;i<sprites_1.maxSize;i++){
for(i in 0...sprites_1.maxSize){
var s1:FlxSprite=new FlxSprite;
var s2:FlxSprite=new FlxSprite;
s1.exists=s2.exists=false;
@ -156,7 +156,7 @@ class EndingState extends FlxState
add(sprites_1);
add(sprites_2);
for(i=0;i<30;i++){
for(i in 0...30){
init_sprites[i]=false;
}
@ -269,7 +269,7 @@ class EndingState extends FlxState
sprites_1.members[i].x=positions_1[i].x + text.x;
sprites_1.members[i].y=positions_1[i].y + text.y;
}
for(i=0;i<sprites_2.maxSize;i++){
for(i in 0...sprites_2.maxSize){
if(sprites_2.members[i]==null)continue;
sprites_2.members[i].x=positions_2[i].x + text2.x;
sprites_2.members[i].y=positions_2[i].y + text2.y;

10
intra/source/states/PauseState.hx
View File

@ -246,7 +246,7 @@ class PauseState extends PushableFlxState
menu_select_inactive.frame=2;
var selector:FlxSprite;
for(i=0;i<selectors.maxSize;i++){
for(i in 0...selectors.maxSize){
selector=new FlxSprite;
selector.loadGraphic(arrows_sprite, true, false, 7,7);
selector.addAnimation("disabled", [2]);
@ -292,7 +292,7 @@ class PauseState extends PushableFlxState
/* EQUIP */
var equip_box:FlxSprite;
for(i=0;i<equip_boxes.maxSize;i++){
for(i in 0...equip_boxes.maxSize){
equip_box=new FlxSprite;
equip_box.loadGraphic(none_icon_sprite, true, false, 18, 18);
equip_box.x=65;
@ -319,7 +319,7 @@ class PauseState extends PushableFlxState
add(equip_boxes);
//Load key icons
for(i=0;i<3;i++){
for(i in 0...3){
var key:FlxSprite=new FlxSprite;
key_icons.add(key);
key.x=95 + 16 * i;
@ -345,7 +345,7 @@ class PauseState extends PushableFlxState
/* CARDS*/
var card:FlxSprite;
for(i=0;i<cards.maxSize;i++){
for(i in 0...cards.maxSize){
card=new FlxSprite;
card.loadGraphic(card_sheet_embed, false, false, 24, 24);
card.frame=36;
@ -398,7 +398,7 @@ class PauseState extends PushableFlxState
* */
trophies=new FlxGroup;
for(i=0;i<16;i++){
for(i in 0...16){
var trophy:FlxSprite=new FlxSprite;
trophy.loadGraphic(Treasure.embed_secret_trophies, true, false, 16, 16);
trophy.frame=i;

32
intra/source/states/PlayState.hx
View File

@ -1002,8 +1002,8 @@ class PlayState extends FlxState {
var tileType:Int;
var i:Int;var j:Int;
for(j=0;j<Registry.SCREEN_HEIGHT_IN_TILES;j++){
for(i=0;i<Registry.SCREEN_WIDTH_IN_TILES;i++){
for(j in 0...Registry.SCREEN_HEIGHT_IN_TILES){
for(i in 0...Registry.SCREEN_WIDTH_IN_TILES){
tileType=mapData[(gridTileOffsetY + j)* map.widthInTiles + gridTileOffsetX + i];
if(make_anims){
TileData.make_anim_tile(anim_tiles_group, Registry.CURRENT_MAP_NAME, tileType, gridTileOffsetX * 16 + 16 * i, gridTileOffsetY * 16 + 16 * j + 20);
@ -1066,7 +1066,7 @@ class PlayState extends FlxState {
var offset:Int=0;
/** Terrible hack. Retval is how many extra *STATELESS* sprites were added.
* So offset compensates to figure out where to add the "parent" sprite */
for(i=0;i<stateless_gridXML.child("*").length();i++){
for(i in 0...stateless_gridXML.child("*").length()){
retval=SpriteFactory.makeSprite(stateless_gridXML.child("*")[i], i, statelesses, otherObjects, player, this, darkness);
if(retval !=-1){
sortables.add(statelesses[offset]);
@ -1111,7 +1111,7 @@ class PlayState extends FlxState {
if(stateful_gridXML==null)return;//No stateful sprites on this grid
var id:Int;//Stateful objects will have IDs set to index Into the XML
var nrStatefuls:Int=0;
for(id=0;id<stateful_gridXML.child("*").length();id++){
for(id in 0...stateful_gridXML.child("*").length()){
if(-1 !=SpriteFactory.makeSprite(stateful_gridXML.child("*")[id], id, statefuls,otherObjects,player,this,darkness)){
nrStatefuls++;//Number of stateful objects we made in DAME, not counting sprites that have subsprites(i.e., laser of wall laser)
} else {
@ -1119,7 +1119,7 @@ class PlayState extends FlxState {
}
}
// Now add these sprites in
for(id=0;id<statefuls.length;id++){
for(id in 0...statefuls.length){
sortables.add(statefuls[id]);
}
}
@ -1201,7 +1201,7 @@ class PlayState extends FlxState {
var id:Int;
if(stateful_mapXML !=null){
for(grid in stateful_mapXML.grid){
for(id=0;id<grid.child("*").length();id++){
for(id in 0...grid.child("*").length()){
if(grid.child("*")[id].@p==1 && grid.child("*")[id].@alive=="false"){
grid.child("*")[id].@alive="true";
}
@ -1211,7 +1211,7 @@ class PlayState extends FlxState {
if(stateless_mapXML !=null){
for(grid in stateless_mapXML.grid){
for(id=0;id<grid.child("*").length();id++){
for(id in 0...grid.child("*").length()){
if(grid.child("*")[id].@p==1 && grid.child("*")[id].@alive=="false"){
grid.child("*")[id].@alive="true";
}
@ -1893,7 +1893,7 @@ class PlayState extends FlxState {
//FlxG.camera.getContainerSprite().filters=[static_shaderFilter];
lookup_init=true;
var d:Int=0;
for(i=0;i<nr_shades;i++){
for(i in 0...nr_shades){
d=i *(255 /(nr_shades - 1));
if(i==nr_shades - 1){
shades.push(0x00ffffff);
@ -1905,7 +1905,7 @@ class PlayState extends FlxState {
}
}
for(i=0;i<256;i++){
for(i in 0...256){
lookup.push(shades[int(i /(1 +(255/nr_shades)))]);// if we want 9 shades
lookup1.push(int((10 / 16)* i)* 0x010101);
lookup3.push(int((23 / 24)* i)* 0x010101);// Some fraction of the "error" that will be added to a pixel's value
@ -1924,7 +1924,7 @@ class PlayState extends FlxState {
if(GFX_GLITCH_ALWAYS_ON){
glitch_rf +=1;
FlxG.camera.buffer.lock();
for(i=0;i<glitch_iters;i++){
for(i in 0...glitch_iters){
if(glitch_rf>=glitch_rfm){
glitch_data[2][i]=Math.max(glitch_min.x, Std.int(Math.random()* glitch_max.x));
glitch_data[3][i]=Math.max(glitch_min.y, Std.int(Math.random()* glitch_max.y));
@ -1981,8 +1981,8 @@ class PlayState extends FlxState {
if(Intra.is_mobile){
if(poop % 2==0){
FlxG.camera.buffer.lock();
for(i=0;i<180;i++){ // dont want out of bounds?
for(j=0;j<160;j++){
for(i in 0...180){ // dont want out of bounds?
for(j in 0...160){
old=FlxG.camera.buffer.getPixel(j, i);
r=(old & 0x00ff0000)>>16;
g=(old & 0x0000ff00)>>8;
@ -1999,8 +1999,8 @@ class PlayState extends FlxState {
} else {
if(poop % 3==0){
FlxG.camera.buffer.lock();
for(i=0;i<180;i++){ // dont want out of bounds?
for(j=0;j<160;j++){
for(i in 0...180){ // dont want out of bounds?
for(j in 0...160){
old=FlxG.camera.buffer.getPixel(j, i);
r=(old & 0x00ff0000)>>16;
g=(old & 0x0000ff00)>>8;
@ -2050,8 +2050,8 @@ class PlayState extends FlxState {
Registry.GFX_WAVE_EFFECT_START=(Registry.GFX_WAVE_EFFECT_START + 3)% 180;
Registry.GFX_BUFFER.copyPixels(FlxG.camera.buffer, FlxG.camera.buffer.rect, FlxG.camera.buffer.rect.topLeft);
FlxG.camera.buffer.lock()
for(i=0;i<180;i++){
for(j=0;j<160;j++){
for(i in 0...180){
for(j in 0...160){
FlxG.camera.buffer.setPixel32(j , Registry.GFX_WAVE_EFFECT_START,
Registry.GFX_BUFFER.getPixel32(Math.min(Math.max(j + Registry.GFX_WAVE_TABLE[Registry.GFX_WAVE_TABLE_INDEX],0),159),

10
intra/source/states/noairPauseState.hx
View File

@ -241,7 +241,7 @@ class PauseState extends PushableFlxState
menu_select_inactive.frame=2;
var selector:FlxSprite;
for(i=0;i<selectors.maxSize;i++){
for(i in 0...selectors.maxSize){
selector=new FlxSprite;
selector.loadGraphic(arrows_sprite, true, false, 7,7);
selector.addAnimation("disabled", [2]);
@ -287,7 +287,7 @@ class PauseState extends PushableFlxState
/* EQUIP */
var equip_box:FlxSprite;
for(i=0;i<equip_boxes.maxSize;i++){
for(i in 0...equip_boxes.maxSize){
equip_box=new FlxSprite;
equip_box.loadGraphic(none_icon_sprite, true, false, 18, 18);
equip_box.x=65;
@ -314,7 +314,7 @@ class PauseState extends PushableFlxState
add(equip_boxes);
//Load key icons
for(i=0;i<3;i++){
for(i in 0...3){
var key:FlxSprite=new FlxSprite;
key_icons.add(key);
key.x=95 + 16 * i;
@ -340,7 +340,7 @@ class PauseState extends PushableFlxState
/* CARDS*/
var card:FlxSprite;
for(i=0;i<cards.maxSize;i++){
for(i in 0...cards.maxSize){
card=new FlxSprite;
card.loadGraphic(card_sheet_embed, false, false, 24, 24);
card.frame=36;
@ -393,7 +393,7 @@ class PauseState extends PushableFlxState
* */
trophies=new FlxGroup;
for(i=0;i<16;i++){
for(i in 0...16){
var trophy:FlxSprite=new FlxSprite;
trophy.loadGraphic(Treasure.embed_secret_trophies, true, false, 16, 16);
trophy.frame=i;