im schmoovin, slightly more
This commit is contained in:
parent
f53d693a0c
commit
e6fc2dcf96
21 changed files with 689 additions and 31 deletions
|
@ -1,7 +1,7 @@
|
|||
function st_control() {
|
||||
c_input();
|
||||
var mouse = c_2dto3d(mouse_x,mouse_y);
|
||||
if select && selectedunit == noone {
|
||||
if select {
|
||||
var mousex = floor(mouse.x/global.tilesize.x);
|
||||
var mousey = floor(mouse.y/global.tilesize.y);
|
||||
log(mousex, mousey);
|
||||
|
@ -12,7 +12,7 @@ function st_control() {
|
|||
if global.map[mousex][mousey].contents[i].object_index == o_unit {
|
||||
var dude = global.map[mousex][mousey].contents[i];
|
||||
if dude.alignment == global.turn {
|
||||
c_selectunit(dude);
|
||||
if selectedunit == noone c_selectunit(dude);
|
||||
} else {
|
||||
c_markunit(dude);
|
||||
}
|
||||
|
@ -37,14 +37,16 @@ function st_control() {
|
|||
vspd = lerp(vspd, (down-up)*((.1+stop*.1)*(ts.y)), .4);
|
||||
x += hspd;
|
||||
y += vspd;
|
||||
|
||||
} else {
|
||||
hspd = 0;
|
||||
vspd = 0;
|
||||
x = lerp(x, selectedunit.x, .4);
|
||||
y = lerp(y, selectedunit.y, .4);
|
||||
//cursor.x = selectedunit.x;
|
||||
//cursor.y = selectedunit.y;
|
||||
}
|
||||
|
||||
cursor.x = mouse_x;
|
||||
cursor.y = mouse_y;
|
||||
global.camerax = x;
|
||||
global.cameray = y;
|
||||
var mousex = floor(mouse.x/global.tilesize.x);
|
||||
|
@ -61,7 +63,10 @@ function st_control() {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
if hoveredunit != noone {
|
||||
//cursor.x = lerp(mouse_x, hoveredunit.x, .4);
|
||||
//cursor.y = lerp(mouse_y, hoveredunit.y, .4);
|
||||
}
|
||||
var i;
|
||||
for (i=0; i<array_length(global.units[global.turn]); i++) {
|
||||
if global.units[global.turn][i].waiting = false exit;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue