Scanner fix and thrust tuning

main
parent 9ac93e0bca
commit ebf5e2a433

@ -15,19 +15,19 @@
// #define SERVER_ADDRESS "207.246.80.160" // #define SERVER_ADDRESS "207.246.80.160"
#define CONSOLE_CREATE #define CONSOLE_CREATE
#define PROFILING // #define PROFILING
// Intensive profiling means profiling a lot of little tiny stuff. Not always enabled because tanks performance // Intensive profiling means profiling a lot of little tiny stuff. Not always enabled because tanks performance
// #define INTENSIVE_PROFILING // #define INTENSIVE_PROFILING
// #define DEBUG_RENDERING // #define DEBUG_RENDERING
#define DEBUG_WORLD // #define DEBUG_WORLD
#define UNLOCK_ALL // #define UNLOCK_ALL
#define TIME_BETWEEN_WORLD_SAVE 1000000.0f #define TIME_BETWEEN_WORLD_SAVE 1000000.0f
// #define TIME_BETWEEN_WORLD_SAVE 1.0f // #define TIME_BETWEEN_WORLD_SAVE 1.0f
// #define INFINITE_RESOURCES // #define INFINITE_RESOURCES
#define DEBUG_TOOLS #define DEBUG_TOOLS
#define CHIPMUNK_INTEGRITY_CHECK #define CHIPMUNK_INTEGRITY_CHECK
// #define FAT_THRUSTERS // #define FAT_THRUSTERS
#define NO_GRAVITY // #define NO_GRAVITY
// #define NO_SUNS // #define NO_SUNS
#else #else

Binary file not shown.

@ -2453,6 +2453,7 @@ void create_initial_world(GameState *gs)
} }
#define SUN_POS(index) (entity_pos(get_entity(gs, suns[index]))) #define SUN_POS(index) (entity_pos(get_entity(gs, suns[index])))
create_bomb_station(gs, cpvadd(SUN_POS(0), cpv(0.0, 300.0)), BoxExplosive); create_bomb_station(gs, cpvadd(SUN_POS(0), cpv(0.0, 300.0)), BoxExplosive);
create_bomb_station(gs, cpvadd(SUN_POS(0), cpv(-300.0, 0.0)), BoxLandingGear);
create_bomb_station(gs, cpvadd(SUN_POS(0), cpv(0.0, -300.0)), BoxCloaking); create_bomb_station(gs, cpvadd(SUN_POS(0), cpv(0.0, -300.0)), BoxCloaking);
create_bomb_station(gs, cpvadd(SUN_POS(0), cpv(300.0, 0.0)), BoxMissileLauncher); create_bomb_station(gs, cpvadd(SUN_POS(0), cpv(300.0, 0.0)), BoxMissileLauncher);
create_bomb_station(gs, cpvadd(SUN_POS(1), cpv(0.0, 300.0)), BoxMerge); create_bomb_station(gs, cpvadd(SUN_POS(1), cpv(0.0, 300.0)), BoxMerge);
@ -3397,6 +3398,7 @@ void process(struct GameState *gs, double dt)
detections[detections_i].used_in_scanner_closest_lightning_bolts = true; detections[detections_i].used_in_scanner_closest_lightning_bolts = true;
cur_box->detected_platonics[i] = detections[detections_i]; cur_box->detected_platonics[i] = detections[detections_i];
cur_box->detected_platonics[i].intensity = max(0.1, 1.0 - clamp01(cur_box->detected_platonics[i].intensity / 100.0)); cur_box->detected_platonics[i].intensity = max(0.1, 1.0 - clamp01(cur_box->detected_platonics[i].intensity / 100.0));
break;
} }
} }
} }
@ -3447,7 +3449,6 @@ void process(struct GameState *gs, double dt)
if (cur_potential_platonic->is_platonic) if (cur_potential_platonic->is_platonic)
{ {
kind = Platonic; kind = Platonic;
break;
} }
} }
} }

@ -54,7 +54,7 @@
#define BOX_MASS 1.0 #define BOX_MASS 1.0
#define COLLISION_DAMAGE_SCALING 0.15 #define COLLISION_DAMAGE_SCALING 0.15
#define THRUSTER_FORCE 24.0 #define THRUSTER_FORCE 34.0
#define THRUSTER_ENERGY_USED_PER_SECOND 0.005 #define THRUSTER_ENERGY_USED_PER_SECOND 0.005
#define THRUSTER_DAMAGE_PER_SEC 2.0 #define THRUSTER_DAMAGE_PER_SEC 2.0

Loading…
Cancel
Save