diff --git a/android/assets/textures/level.atlas b/android/assets/textures/level.atlas index 46734eb..e12d120 100644 --- a/android/assets/textures/level.atlas +++ b/android/assets/textures/level.atlas @@ -4,6 +4,20 @@ size: 1024,1024 format: RGBA8888 filter: Linear,Linear repeat: none +Button-Add-icon + rotate: false + xy: 970, 847 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +Button-Next-icon + rotate: false + xy: 970, 813 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 Warningmsg rotate: false xy: 717, 451 @@ -171,14 +185,14 @@ size: 1024,1024 format: RGBA8888 filter: Linear,Linear repeat: none -Button-Add-icon +activation rotate: false xy: 931, 103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -Button-Close-icon +add rotate: false xy: 932, 37 size: 64, 64 @@ -436,133 +450,133 @@ size: 1024,1024 format: RGBA8888 filter: Linear,Linear repeat: none -Button-Delete-icon +add1 rotate: false xy: 1, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -Button-Next-icon +add10 rotate: false xy: 911, 276 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -activation +add100 rotate: false xy: 67, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -cout +add1000 rotate: false xy: 911, 210 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -cycle +add10000 rotate: false xy: 133, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -database +cout rotate: false xy: 911, 144 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -database-save +cycle rotate: false xy: 199, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -end +database rotate: false xy: 911, 78 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -evolution +database-save rotate: false xy: 265, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -exits +end rotate: false xy: 331, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -extend +evolution rotate: false xy: 397, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -extend2 +exits rotate: false xy: 463, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -french +extend rotate: false xy: 529, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -fullscreen +extend2 rotate: false xy: 595, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -grid +french rotate: false xy: 661, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -grid-64 +fullscreen rotate: false xy: 727, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -infos +grid rotate: false xy: 793, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -jauge0 +grid-64 rotate: false xy: 859, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -jauge1 +infos rotate: false xy: 925, 12 size: 64, 64 @@ -953,167 +967,181 @@ size: 1024,1024 format: RGBA8888 filter: Linear,Linear repeat: none -jauge2 +jauge0 rotate: false xy: 1, 3 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -jauge3 +jauge1 rotate: false xy: 911, 913 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -levels +jauge2 rotate: false xy: 261, 133 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -middle +jauge3 rotate: false xy: 391, 263 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -move +levels rotate: false xy: 521, 393 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -nogrid +middle rotate: false xy: 651, 523 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -nosound +move rotate: false xy: 781, 653 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -nothing +nogrid rotate: false xy: 67, 3 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -nrj +nosound rotate: false xy: 911, 847 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -overlay +nothing rotate: false xy: 133, 3 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -overlay-end +nrj rotate: false xy: 911, 781 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -overlay-middle +overlay rotate: false xy: 261, 67 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -overlay-start +overlay-end rotate: false xy: 327, 133 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -pause +overlay-middle rotate: false xy: 327, 67 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -points +overlay-start rotate: false xy: 457, 263 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -rayon +pause rotate: false xy: 587, 393 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -raz +points rotate: false xy: 717, 523 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -run +rayon rotate: false xy: 847, 653 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -save +raz rotate: false xy: 199, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -screen +run rotate: false xy: 265, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -settings +save rotate: false xy: 331, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -sound +screen rotate: false xy: 523, 327 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -speed +settings rotate: false xy: 523, 261 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 +sound + rotate: false + xy: 589, 327 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +speed + rotate: false + xy: 589, 261 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 sprite-transmuter rotate: false xy: 1, 849 @@ -1354,78 +1382,120 @@ sprite-transmuter index: 135 start rotate: false - xy: 589, 327 + xy: 783, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stat rotate: false - xy: 589, 261 + xy: 783, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stop - rotate: false - xy: 783, 587 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -tech - rotate: false - xy: 783, 521 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -temp rotate: false xy: 849, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -tree +sub rotate: false xy: 849, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -tuto +tech rotate: false xy: 393, 197 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -usa +temp rotate: false xy: 393, 131 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -windows +tree rotate: false xy: 653, 457 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -zoomm +tuto rotate: false xy: 913, 715 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -zoomp +up rotate: false xy: 459, 195 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 +up_cycle + rotate: false + xy: 525, 195 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +up_nrj + rotate: false + xy: 459, 129 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +up_rayon + rotate: false + xy: 525, 129 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +up_temp + rotate: false + xy: 591, 195 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +usa + rotate: false + xy: 591, 129 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +windows + rotate: false + xy: 915, 649 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +zoomm + rotate: false + xy: 915, 583 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +zoomp + rotate: false + xy: 915, 517 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 diff --git a/android/assets/textures/level.json b/android/assets/textures/level.json index 7e79ca0..944eff1 100644 --- a/android/assets/textures/level.json +++ b/android/assets/textures/level.json @@ -74,7 +74,25 @@ exit2_down: { name: exit2, color: veryred }, exit2_over: { name: exit2, color: red }, exit2_disabled: { name: exit2, color: lowgrey }, - + up_rayon_down: { name: up_rayon, color: veryred }, + up_rayon_over: { name: up_rayon, color: red }, + up_rayon_disabled: { name: up_rayon, color: lowgrey }, + up_nrj_down: { name: up_nrj, color: veryred }, + up_nrj_over: { name: up_nrj, color: red }, + up_nrj_disabled: { name: up_nrj, color: lowgrey }, + up_temp_down: { name: up_temp, color: veryred }, + up_temp_over: { name: up_temp, color: red }, + up_temp_disabled: { name: up_temp, color: lowgrey }, + up_cycle_down: { name: up_cycle, color: veryred }, + up_cycle_over: { name: up_cycle, color: red }, + up_cycle_disabled: { name: up_cycle, color: lowgrey }, + up_down: { name: up, color: veryred }, + up_over: { name: up, color: red }, + up_disabled: { name: up, color: lowgrey }, + points_down: { name: points, color: veryred }, + points_over: { name: points, color: red }, + points_disabled: { name: points, color: lowgrey }, + run_down: { name: run, color: veryred }, stop_down: { name: stop, color: veryred }, speed_down: { name: speed, color: veryred }, @@ -130,6 +148,12 @@ info_cout: { disabledFontColor:white, fontColor:white, overFontColor:red ,up: cout , down: cout, over:cout, disabled:cout, font: OpenDyslexicAlta-20, pressedOffsetY: -35, unpressedOffsetY: -37, checkedOffsetY: -37 } info_tech: { disabledFontColor:white, fontColor:white, overFontColor:red ,up: tech , down: tech, over:tech, disabled:tech, font: OpenDyslexicAlta-20, pressedOffsetY: -35, unpressedOffsetY: -37, checkedOffsetY: -37 } default: { checkedFontColor:red,disabledFontColor:white, fontColor:white, overFontColor:red , font: OpenDyslexicAlta-25, pressedOffsetY: 0, unpressedOffsetY: -2 } + up_rayon: { disabledFontColor:white, fontColor:white, overFontColor:red ,up: up_rayon , down: up_rayon_down, over:up_rayon_over, disabled:up_rayon_disabled, font: OpenDyslexicAlta-25, pressedOffsetY: -45, unpressedOffsetY: -47, checkedOffsetY: -47 } + up_nrj: { disabledFontColor:white, fontColor:white, overFontColor:red ,up: up_nrj , down: up_nrj_down, over:up_nrj_over, disabled:up_nrj_disabled, font: OpenDyslexicAlta-25, pressedOffsetY: -45, unpressedOffsetY: -47, checkedOffsetY: -47 } + up_cycle: { disabledFontColor:white, fontColor:white, overFontColor:red ,up: up_cycle , down: up_cycle_down, over:up_cycle_over, disabled:up_cycle_disabled, font: OpenDyslexicAlta-25, pressedOffsetY: -45, unpressedOffsetY: -47, checkedOffsetY: -47 } + up_temp: { disabledFontColor:white, fontColor:white, overFontColor:red ,up: up_temp , down: up_temp_down, over:up_temp_over, disabled:up_temp_disabled, font: OpenDyslexicAlta-25, pressedOffsetY: -45, unpressedOffsetY: -47, checkedOffsetY: -47 } + up: { disabledFontColor:white, fontColor:white, overFontColor:red ,up: up , down: up_down, over:up_over, disabled:up_disabled, font: OpenDyslexicAlta-25, pressedOffsetY: -45, unpressedOffsetY: -47, checkedOffsetY: -47 } + research: { disabledFontColor:white, fontColor:white, overFontColor:red ,up: points , down: points_down, over:points_over, disabled:points_disabled, font: OpenDyslexicAlta-25, pressedOffsetY: -45, unpressedOffsetY: -47, checkedOffsetY: -47 } } com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: { @@ -176,6 +200,13 @@ extend: { up: extend, disabled:extend_disabled, down:extend_down } extend2: { up: extend2, disabled:extend2_disabled, down:extend2_down } evolution: { up: evolution, disabled:evolution_disabled, down:evolution_down } + add: { up:add } + sub: { up:sub } + add1: { up:add1 } + add10: { up:add10 } + add100: { up:add100 } + add1000: { up:add1000 } + add10000: { up:add10000 } } com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: { diff --git a/android/assets/textures/level.pack b/android/assets/textures/level.pack index 46734eb..e12d120 100644 --- a/android/assets/textures/level.pack +++ b/android/assets/textures/level.pack @@ -4,6 +4,20 @@ size: 1024,1024 format: RGBA8888 filter: Linear,Linear repeat: none +Button-Add-icon + rotate: false + xy: 970, 847 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +Button-Next-icon + rotate: false + xy: 970, 813 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 Warningmsg rotate: false xy: 717, 451 @@ -171,14 +185,14 @@ size: 1024,1024 format: RGBA8888 filter: Linear,Linear repeat: none -Button-Add-icon +activation rotate: false xy: 931, 103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -Button-Close-icon +add rotate: false xy: 932, 37 size: 64, 64 @@ -436,133 +450,133 @@ size: 1024,1024 format: RGBA8888 filter: Linear,Linear repeat: none -Button-Delete-icon +add1 rotate: false xy: 1, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -Button-Next-icon +add10 rotate: false xy: 911, 276 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -activation +add100 rotate: false xy: 67, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -cout +add1000 rotate: false xy: 911, 210 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -cycle +add10000 rotate: false xy: 133, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -database +cout rotate: false xy: 911, 144 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -database-save +cycle rotate: false xy: 199, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -end +database rotate: false xy: 911, 78 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -evolution +database-save rotate: false xy: 265, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -exits +end rotate: false xy: 331, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -extend +evolution rotate: false xy: 397, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -extend2 +exits rotate: false xy: 463, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -french +extend rotate: false xy: 529, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -fullscreen +extend2 rotate: false xy: 595, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -grid +french rotate: false xy: 661, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -grid-64 +fullscreen rotate: false xy: 727, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -infos +grid rotate: false xy: 793, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -jauge0 +grid-64 rotate: false xy: 859, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -jauge1 +infos rotate: false xy: 925, 12 size: 64, 64 @@ -953,167 +967,181 @@ size: 1024,1024 format: RGBA8888 filter: Linear,Linear repeat: none -jauge2 +jauge0 rotate: false xy: 1, 3 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -jauge3 +jauge1 rotate: false xy: 911, 913 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -levels +jauge2 rotate: false xy: 261, 133 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -middle +jauge3 rotate: false xy: 391, 263 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -move +levels rotate: false xy: 521, 393 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -nogrid +middle rotate: false xy: 651, 523 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -nosound +move rotate: false xy: 781, 653 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -nothing +nogrid rotate: false xy: 67, 3 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -nrj +nosound rotate: false xy: 911, 847 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -overlay +nothing rotate: false xy: 133, 3 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -overlay-end +nrj rotate: false xy: 911, 781 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -overlay-middle +overlay rotate: false xy: 261, 67 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -overlay-start +overlay-end rotate: false xy: 327, 133 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -pause +overlay-middle rotate: false xy: 327, 67 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -points +overlay-start rotate: false xy: 457, 263 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -rayon +pause rotate: false xy: 587, 393 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -raz +points rotate: false xy: 717, 523 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -run +rayon rotate: false xy: 847, 653 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -save +raz rotate: false xy: 199, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -screen +run rotate: false xy: 265, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -settings +save rotate: false xy: 331, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -sound +screen rotate: false xy: 523, 327 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -speed +settings rotate: false xy: 523, 261 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 +sound + rotate: false + xy: 589, 327 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +speed + rotate: false + xy: 589, 261 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 sprite-transmuter rotate: false xy: 1, 849 @@ -1354,78 +1382,120 @@ sprite-transmuter index: 135 start rotate: false - xy: 589, 327 + xy: 783, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stat rotate: false - xy: 589, 261 + xy: 783, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stop - rotate: false - xy: 783, 587 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -tech - rotate: false - xy: 783, 521 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -temp rotate: false xy: 849, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -tree +sub rotate: false xy: 849, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -tuto +tech rotate: false xy: 393, 197 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -usa +temp rotate: false xy: 393, 131 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -windows +tree rotate: false xy: 653, 457 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -zoomm +tuto rotate: false xy: 913, 715 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -zoomp +up rotate: false xy: 459, 195 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 +up_cycle + rotate: false + xy: 525, 195 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +up_nrj + rotate: false + xy: 459, 129 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +up_rayon + rotate: false + xy: 525, 129 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +up_temp + rotate: false + xy: 591, 195 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +usa + rotate: false + xy: 591, 129 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +windows + rotate: false + xy: 915, 649 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +zoomm + rotate: false + xy: 915, 583 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +zoomp + rotate: false + xy: 915, 517 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 diff --git a/android/assets/textures/level.png b/android/assets/textures/level.png index 7e7ee91..5f1997d 100644 Binary files a/android/assets/textures/level.png and b/android/assets/textures/level.png differ diff --git a/android/assets/textures/level2.png b/android/assets/textures/level2.png index c596fc7..05afbde 100644 Binary files a/android/assets/textures/level2.png and b/android/assets/textures/level2.png differ diff --git a/android/assets/textures/level3.png b/android/assets/textures/level3.png index 39341ec..6f15e21 100644 Binary files a/android/assets/textures/level3.png and b/android/assets/textures/level3.png differ diff --git a/android/assets/textures/level4.png b/android/assets/textures/level4.png index b3b7173..ec1ed4e 100644 Binary files a/android/assets/textures/level4.png and b/android/assets/textures/level4.png differ