Commit Graph

839 Commits

Author SHA1 Message Date
Steve ba81b19c31 Don't save the game in the middle of the battle. 2016-05-26 18:17:57 +01:00
Steve 4cd0c36b73 Revenge trophy requires player to kill the enemy that killed them last. 2016-05-26 18:17:46 +01:00
Steve 4e36f0731f Check surrender chance earlier in ai call. 2016-05-25 12:26:25 +01:00
Steve 197e630fee Add Surrender challenge type. 2016-05-25 12:25:13 +01:00
Steve 997574dbf3 3 second leeway for killing a surrendering target. 2016-05-25 09:43:39 +01:00
Steve b8a9608b10 When changing something's side, make it a mission target if no longer aligned with player. 2016-05-25 09:43:15 +01:00
Steve b36b35834d Move away from targets that you're not allowed to kill, but are still aggressive. 2016-05-25 08:20:53 +01:00
Steve fcb4d815df Misc. code clean up. 2016-05-25 07:57:13 +01:00
Steve 0088dfdee3 Added AIF_SURRENDERING, to better handle surrendering targets and prevent race conditions. 2016-05-25 07:56:48 +01:00
Steve c9536ae938 Reset epic kill streak when switching fighters. 2016-05-24 16:49:14 +01:00
Steve 66263396d9 Added REVENGE trophy. 2016-05-24 16:16:34 +01:00
Steve 9ecdd106dc Only award PANDORAN trophy at end of successful mission. 2016-05-24 11:46:20 +01:00
Steve 300d4ab867 Don't update surrender condition if killed by non-player side. 2016-05-24 09:11:07 +01:00
Steve b2e22b31b9 Reassign linked list pointers after memset (title screen crash). 2016-05-24 09:10:36 +01:00
Steve 4092ae6a10 Increased surrender chance. 2016-05-24 09:09:58 +01:00
Steve dee2d4eecb Set current value = target value when auto completing conditions (hud is inconsistent). 2016-05-23 09:18:52 +01:00
Steve 108a41310c Disable capital ship itself, when gun and engines are destroyed (not just components). 2016-05-23 09:18:10 +01:00
Steve 2a725471c7 If at edge of battle area when fleeing, turn around. 2016-05-22 16:50:11 +01:00
Steve 9af331c64f Memset battle, to avoid stats being added up twice. 2016-05-22 14:18:41 +01:00
Steve ef8d397e17 Added STAT_ENEMIES_SURRENDERED lookup. 2016-05-22 12:17:12 +01:00
Steve e2744cd4d5 Script to call is "ENEMIES_SURRENDERED %d". 2016-05-22 12:17:01 +01:00
Steve b4761e43a9 Don't check other functions if you've already found one to fire. 2016-05-22 12:09:02 +01:00
Steve cda791cfe8 Manual mission complete bug fix. 2016-05-22 12:08:48 +01:00
Steve 41aff3ee3c Added ability for enemy fighters to surrender, if AIF_SURRENDERS is set. 2016-05-22 12:08:19 +01:00
Steve 946afe4a02 Removed INTERVAL script checking - unused. 2016-05-20 10:54:09 +01:00
Steve 7e7b8c5454 Moved max suspicion reaction to scripts in missions. 2016-05-20 10:51:35 +01:00
Steve fba7fc1f54 Misc. clean up. 2016-05-20 09:53:06 +01:00
Steve 6afbc40d6c Allow hasSuspicionLevel to be specified in mission file. 2016-05-20 09:52:45 +01:00
Steve e5092291d3 Don't check for team mates if the player is on the side of the Pandorans. 2016-05-20 09:52:23 +01:00
Steve c090942f81 Implemented updateEntitySide(). 2016-05-20 09:51:53 +01:00
Steve c17f1af851 Added AIF_ZAK_SUSPICIOUS. 2016-05-20 09:51:34 +01:00
Steve e45485cee8 Don't display messages if you're a Pandoran ship. 2016-05-19 16:52:47 +01:00
Steve e972bc0224 Clip suspicion % to 0. 2016-05-19 16:52:13 +01:00
Steve de2a29e4b6 Show suspicion % on HUD. 2016-05-19 10:54:25 +01:00
Steve ebf95cb631 Only raise suspicion level if the battle is in progress. 2016-05-19 09:31:37 +01:00
Steve 5a250e73d2 Also run ALL_OBJECTIVES_COMPLETE in doObjectives(). 2016-05-19 09:31:09 +01:00
Steve 5f6a4d1b16 Removed unneeded debugging. 2016-05-19 09:30:33 +01:00
Steve e98b354ce2 Allow script to run also with MS_COMPLETE status, to allow for ALL_OBJECTIVES_COMPLETE to work properly. 2016-05-19 09:30:15 +01:00
Steve 6f0e8ee397 Minimum width for trophy alert. 2016-05-19 08:53:14 +01:00
Steve e7cfa09f8a Lower suspicion a little more quickly when bullets land. 2016-05-19 08:52:57 +01:00
Steve c02c4686f3 Handle lowering suspicion level in main entity code. 2016-05-19 08:52:34 +01:00
Steve ee16c25a9b Fix for capital ship destruction triggers. 2016-05-19 08:52:11 +01:00
Steve e0fb778c10 SIDE_REBEL -> SIDE_TZAC 2016-05-18 12:23:42 +01:00
Steve 2c64f5f8c0 Debugging. 2016-05-18 09:51:16 +01:00
Steve 0b72d5c859 Reduced max suspicion level. 2016-05-18 09:49:11 +01:00
Steve 5999bc12d6 Clip suspicion level to 0 on HUD. 2016-05-18 09:48:56 +01:00
Steve 0b1045cadc Debugging. 2016-05-18 09:48:18 +01:00
Steve 01376bfbb5 Allow suspicion level to become negative. 2016-05-18 09:48:06 +01:00
Steve 8f438c4467 Deactivate jumpgate if Pandoran choose to attack the player. 2016-05-18 09:47:27 +01:00
Steve b55574a9e6 Start of Frequent Flyer trophy. 2016-05-17 19:02:58 +01:00
Steve 8bbe9f69e2 Removed unused TT_PLAYER_ESCAPED. 2016-05-17 16:04:03 +01:00
Steve dd407e2f1c Don't allow an objective to be failed and completed at the same time. 2016-05-17 15:55:18 +01:00
Steve 3593832a76 Activate / deactivate nodes as well as jumpgate. 2016-05-17 13:49:33 +01:00
Steve e7bfeef2cd Suspicion tweaks. 2016-05-17 13:49:21 +01:00
Steve 3778b2e22e Don't become suspicious if still in cool off period. 2016-05-17 13:47:36 +01:00
Steve 96f94dba14 Update the Player escape objective when using a jumpgate. 2016-05-17 13:47:04 +01:00
Steve 60d477b754 Don't become suspicious of the player immediately after combat ends. 2016-05-17 11:34:32 +01:00
Steve d3091caed5 Don't circle your destination if you're near it. 2016-05-17 11:34:08 +01:00
Steve 6794a3c268 Entities with SIDE_NONE don't count as enemies. 2016-05-17 11:32:48 +01:00
Steve 75c9a25a96 Halved maximum suspicion level. 2016-05-17 11:32:13 +01:00
Steve 45e95451bd Spawn Pandoran backup more quickly. 2016-05-17 11:31:59 +01:00
Steve f8590ce106 React quickly to retreat call (might be wandering for several more seconds). 2016-05-17 11:31:42 +01:00
Steve 8e8e0394fd Remove wander flag when retreating. 2016-05-17 11:17:54 +01:00
Steve 268a7165e7 Attempt to prevent the last speaker from becoming the chosen wingmate. 2016-05-16 17:04:49 +01:00
Steve 447fb22630 Suspicion rendering tweaks. 2016-05-16 17:04:32 +01:00
Steve 7471371b61 Raise suspicion levels if player fires guns or uses ECM when enemies are present. 2016-05-16 17:03:46 +01:00
Steve 2af1fa6476 Summon backup when player's cover is blown. 2016-05-16 17:03:02 +01:00
Steve c61f47ec33 NULL scriptJSON when destroying script. 2016-05-16 17:02:26 +01:00
Steve 13253ee1e8 Suspicion related updates. 2016-05-16 11:40:39 +01:00
Steve ceb7040ce8 Use MB_IMPORTANT. 2016-05-16 10:55:28 +01:00
Steve 059ba3c540 Measure Pandoran font properly. 2016-05-16 10:55:13 +01:00
Steve ee4e88668e Added suspicion level, for optional missions. 2016-05-16 10:54:46 +01:00
Steve fa04c4bd1b hasThreats counts for active and inactive enemy vessels. 2016-05-15 17:38:44 +01:00
Steve af55539daa Only speak if you're on the same side as the player..! 2016-05-15 17:28:31 +01:00
Steve 4aec10e614 Updated hasThreats logic. 2016-05-15 17:28:17 +01:00
Steve 89eb8d4a34 Allow script to change the side of an entity (for use during optional missions). 2016-05-15 14:02:35 +01:00
Steve 038a119965 Added isOptional and optional stats, to allow for optional mission tracking. 2016-05-15 13:53:19 +01:00
Steve 5722b19ec0 Optional Pandoran mission updates. 2016-05-15 11:59:37 +01:00
Steve 0116202471 Use type in Star System instead of isSol, to allow for special Pandoran missions. 2016-05-15 10:50:09 +01:00
Steve 7865a22072 Put Khosrau font into index 0, at 18 point size. Used exclusively for Pandoran missions. 2016-05-15 10:00:56 +01:00
Steve b6513dc1f7 Added type to message box, to allow for Pandoran messages, using different font. 2016-05-15 10:00:06 +01:00
Steve 50883125e1 Merge. 2016-05-15 08:19:26 +01:00
Steve 5d59f1f353 Allow screenshot key to be configured. 2016-04-23 17:46:47 +01:00
Steve d0aa4879eb Allow saving of screenshots by pressing F12. 2016-04-23 08:09:15 +01:00
Steve a5ed044fff Remove addedTo if no ents added and children have none. 2016-04-20 15:44:57 +01:00
Steve 7e752ccae4 Don't recurse into quads that haven't had anything added to them. 2016-04-20 13:53:25 +01:00
Steve 6d8856deae Don't exceed your own speed when following a leader. 2016-04-20 13:53:06 +01:00
Steve d4b791ed17 Tell fighters not to separate from EF_NON_SOLID objects. 2016-04-20 09:38:54 +01:00
Steve a3be44a000 Mine deployment fix. 2016-04-20 09:38:29 +01:00
Steve d871e48144 AIF_ASSASSIN check fix. 2016-04-19 12:50:27 +01:00
Steve c395ee25e5 Allow AIF_ASSASSIN flag to be set, to always attack a target. 2016-04-19 11:13:43 +01:00
Steve add135d62e Jumpgate state fix. 2016-04-19 11:13:20 +01:00
Steve 9f4be9a780 If a mission has hidden objectives, don't complete when all current ones are finished. 2016-04-18 10:54:59 +01:00
Steve 2723e084da Run script function when an enemy is disabled. 2016-04-18 10:54:28 +01:00
Steve c215dc75d3 Jumpgate state fix. 2016-04-17 11:52:48 +01:00
Steve 7c100f0c37 Added button to restore default controls. 2016-04-17 11:26:04 +01:00
Steve 474ede91af Drawing health bars over fighters. 2016-04-17 11:00:08 +01:00
Steve dde34beedb Tell retreating enemies to head for the jumpgate. 2016-04-17 09:11:49 +01:00
Steve c729d59c3a Script call to complete the mission now also completes all objectives. 2016-04-17 09:11:36 +01:00
Steve 9e6d34b914 Made size of mine explosion a little larger. 2016-04-16 16:48:48 +01:00
Steve ccd4160f0e Don't allow boost if you have 0 speed (when playing as a cannon, for example). 2016-04-16 16:48:30 +01:00
Steve 97a067cb34 Load default config first, and then overwrite with user config. 2016-04-16 15:50:23 +01:00
Steve 22ff6aeeb7 Only attach tow ropes to ET_FIGHTER types. 2016-04-16 14:04:32 +01:00
Steve 82acb9f96a Highlight OK button by default when pausing. 2016-04-16 11:07:26 +01:00
Steve 38eca9480d Allow for important messages to be created (such as maydays from capital ships). 2016-04-16 11:00:19 +01:00
Steve 344b2d27b8 Give AIF_TARGET_FOCUS fighters a low chance of targetting something else. 2016-04-16 10:59:42 +01:00
Steve f7c1aa6f1b Update conditions when capital ships are destroyed. 2016-04-16 08:59:14 +01:00
Steve b40936fd79 Always add ents to quadtree, to allow AI to see components. Shuffle around later. 2016-04-15 13:08:30 +01:00
Steve 5e58f09fcf Don't trash original string when working with flags. #funwithflags 2016-04-15 13:07:58 +01:00
Steve 87048e4c85 Apply all flags to capitals ship, except for EF_AI_LEADER. 2016-04-15 13:07:28 +01:00
Steve c3136ea3af Allow flags of spawned entities to be set. 2016-04-15 11:31:39 +01:00
Steve a49817ba2e Leader following AI bug fix. 2016-04-15 11:31:11 +01:00
Steve 915eec5cf0 Allow shadow mines to hunt player, or wander around if not near them. 2016-04-14 16:10:21 +01:00
Steve 7dea0c440e Aster doesn't have a planet, as it's a star system. 2016-04-14 16:09:41 +01:00
Steve 7eee4d3d8e Spawner updates. 2016-04-14 11:56:58 +01:00
Steve 9c8b7af0d6 Added Shadow Mine. 2016-04-14 11:56:42 +01:00
Steve d976c7d3c8 Don't fire missiles at things flagged with EF_NO_KILL. 2016-04-13 11:46:42 +01:00
Steve d2412c2dcb Restore speed of disabled entity when being towed. 2016-04-13 11:46:23 +01:00
Steve 561f427c13 Engine effect bug fix. 2016-04-13 11:04:47 +01:00
Steve 2af802231a Load challenges in Challenge.c 2016-04-13 11:04:28 +01:00
Steve 5fa24f55f2 Added Survive challenge type. 2016-04-13 11:02:08 +01:00
Steve 9ad7f87ca9 Misc. tidy up. 2016-04-12 08:41:13 +01:00
Steve 8e6fcf81fa Using constants for save and config filenames. 2016-04-11 08:44:36 +01:00
Steve 78f125a4ec Added challenge icons. 2016-04-10 12:00:29 +01:00
Steve bcb634befb Player kill count bug fix. 2016-04-10 09:35:30 +01:00
Steve 61b3ede526 Wander takes priority over moving to leaders. Don't suddenly stop when close to leader during flocking. 2016-04-10 08:36:27 +01:00
Steve 4652d6c7e4 Lowered component health. 2016-04-10 08:23:59 +01:00
Steve 6c8349781c Use quadtree for drawing, now that quadtree bug is squashed (hopefully). 2016-04-09 18:13:59 +01:00
Steve bea850f755 Wander fixes. 2016-04-09 17:40:34 +01:00
Steve 90d157411a Quadtree fetch fix. 2016-04-09 17:39:24 +01:00
Steve cb6ad171a7 Jumpgates are neutral by default. 2016-04-09 15:48:00 +01:00
Steve c716f84884 Allow bullets to still hit immortal entities, but not inflict any real damage. 2016-04-09 13:23:54 +01:00
Steve a5676b9b49 Added EF_AI_IGNORE, to tell AI to ignore entities. 2016-04-09 13:23:10 +01:00
Steve 57e9d6d036 EF_NO_TARGET -> EF_NO_PLAYER_TARGET 2016-04-09 13:22:45 +01:00
Steve 554c3678df Made COMPONENTS more generic, not just for capital ships. 2016-04-09 13:22:20 +01:00
Steve e0adc2baee Show jumpgate and components as white on radar. 2016-04-09 13:21:40 +01:00
Steve 64b85f122e Added components to jumpgate, to allow it to be targetted. 2016-04-09 13:21:19 +01:00
Steve 648ea2e0a7 Further flocking tweaks. 2016-04-08 18:41:51 +01:00
Steve 4792c6d971 Added TEAM_PLAYER trophy. 2016-04-08 11:03:50 +01:00
Steve f983b7e2f2 Player / Leader following tweaks. 2016-04-08 10:58:22 +01:00
Steve 0abfb672d7 Don't attach rope if disabled. Speed is 0 if created disabled. 2016-04-07 12:40:14 +01:00
Steve 5e8b983f3e Update to showing objective numbers. 2016-04-07 12:39:53 +01:00
Steve 505fbb2547 Don't update target location, unless there are enemies nearby. 2016-04-06 16:49:47 +01:00
Steve f97e0bc299 Report number of civilians killed. 2016-04-06 12:56:48 +01:00
Steve 1afc9e65f0 Updated capital ship destruction. 2016-04-05 12:21:17 +01:00
Steve b26a5cecd5 Code tidy up. 2016-04-05 10:00:17 +01:00
Steve b02850d0fc Logging update. 2016-04-05 09:58:59 +01:00
Steve 0eaeaba386 Disabling trophies for now. Will activate in v0.7 or later. 2016-04-04 11:40:13 +01:00
Steve 5e1220b9a4 Merge branch 'develop' into trophies
Conflicts:
	src/battle/bullets.c
	src/battle/bullets.h
	src/battle/fighters.c
2016-04-04 11:30:27 +01:00
Steve c4d9fae84c Removed \n from logging. 2016-04-04 11:25:09 +01:00
Steve 29d873d28a Allow waypoints to be manually activated. Removed entId from Battle (redundant). 2016-04-04 11:23:32 +01:00
Steve 77da136e75 Time limit warning for challenges. 2016-04-03 14:04:56 +01:00
Steve 16a1e1b20a Challenge completion bug fix. 2016-04-03 14:04:31 +01:00
Steve 8537e5207f Entity drawing bug fix. 2016-04-03 08:37:45 +01:00
Steve e7190150bf Added killedBy, for easier stat counting. 2016-04-03 08:37:31 +01:00
Steve f9d02696fd Added mines destroyed stat. 2016-04-03 08:37:09 +01:00
Steve 86ed4678e2 Misc clean up. 2016-04-02 16:38:26 +01:00
Steve 4a1958319c Don't use quadtree for drawing. 2016-04-02 16:37:49 +01:00
Steve c555aeccbe Capital ship bug fixes. 2016-04-02 10:47:44 +01:00
Steve 67c7bc7d55 Misc. HUD updates. 2016-04-02 09:37:49 +01:00
Steve a64b41f851 Allow challenges to be completed even if the player is killed. 2016-04-02 09:37:39 +01:00
Steve 28eec0b8e0 Merge branch 'develop' into trophies
Conflicts:
	README.md
	src/defs.h
	src/galaxy/mission.c
	src/system/sound.c
2016-04-01 17:14:06 +01:00
Steve d329fbaf2f Only deploy mines if you're moving. 2016-04-01 17:02:56 +01:00
Steve cfc41a624b Exploded mines will push others aside. 2016-04-01 17:02:36 +01:00
Steve 26ed8dc322 Allow side to be set for entities (mostly applies to mines). 2016-04-01 14:21:11 +01:00
Steve a913dc613b Set width and height of entities in spawn functions. 2016-04-01 14:20:47 +01:00
Steve e2172a1789 Show mines on radar as white. 2016-04-01 14:20:03 +01:00
Steve 994c0b55dd Don't explode mine on owner. 2016-04-01 14:19:55 +01:00
Steve d178134a00 Allow AI to drop mines. 2016-04-01 14:19:03 +01:00
Steve 58fb3e911b Tell AI to avoid mines. 2016-04-01 11:40:09 +01:00
Steve e8f70072d5 Don't cause damage to immortal fighters. 2016-04-01 11:39:52 +01:00
Steve 3bf73b5d70 Updates to mines. 2016-04-01 10:49:41 +01:00
Steve daa8eff104 Mines have a short radar range. 2016-03-30 22:41:34 +01:00
Steve 3646a9326a Start of mines. 2016-03-30 07:22:58 +01:00
Steve 52691f7be5 Enable AI flags to focus on targets. 2016-03-29 22:45:46 +01:00
Steve 8705337e2a Show number of conditions on HUD, as well as objectives. 2016-03-29 07:19:39 +01:00
Steve e6ea4bff06 Reworked canAttack logic. 2016-03-29 07:09:26 +01:00
Steve c288fce12f Windows build fixes. 2016-03-28 18:26:02 +01:00
Steve f114ad7e7e Merge branch 'develop' into trophies 2016-03-28 16:09:24 +01:00
Steve 2168b72401 Allow -info to enable INFO level logging. 2016-03-28 16:07:47 +01:00
Steve ab8be196b5 Khepri now green and associated with rogue nation. 2016-03-28 11:47:11 +01:00
Steve 81f2dd1947 Stray revert compile fix. 2016-03-28 11:46:20 +01:00
Steve 45d9d2a00d Don't show mission target boxes around capital ship components. 2016-03-28 11:45:48 +01:00
Steve bd8e88b3ac Don't allow tugs to take ownership of something that is already owned. 2016-03-28 10:39:52 +01:00
Steve c7bdeb195c Allow capital ship to be disabled. 2016-03-28 10:39:25 +01:00
Steve 47f7f5671a Added trophy graphics. 2016-03-27 11:32:38 +01:00
Steve 147f2afae4 Merge branch 'trophies' of ssh://github.com/stephenjsweeney/tbftss into trophies
Conflicts:
	locale/tbftss.pot
	src/battle/battle.c
	src/battle/battle.h
	src/galaxy/mission.c
2016-03-27 11:25:50 +01:00
Steve e278374490 Merge from develop. 2016-03-27 11:21:23 +01:00
Steve c00c134b70 Allow access to all missions when using -debug. 2016-03-27 11:08:44 +01:00
Steve aadb4f6949 Make shield splinter effects more visible. 2016-03-27 08:56:09 +01:00
Steve 06f7867013 Use CONTROL_NEXT_FIGHTER / CONTROL_PREV_FIGHTER to select fighters during epic missions. 2016-03-27 08:55:58 +01:00
Steve d33bcf9414 In epic battles, spawned in entities (such as swarmers) don't count towards the epicLimit. 2016-03-27 08:55:25 +01:00
Steve ca043f171c Only initially add active entities to quadtree. 2016-03-26 18:15:52 +00:00
Steve 175b7e5ca0 Moved entity loading code out of mission.c, and into appropriate c files. 2016-03-17 08:11:52 +00:00
Steve 73a3c0c78a Fixed shield splinter effect. 2016-03-16 21:54:08 +00:00
Steve 1b43e4908c Added ability to hide objective numbers. 2016-03-16 19:24:41 +00:00
Steve 4ef796bf92 Added id to objective, to allow script to function in non-English languages. 2016-03-16 06:54:34 +00:00
Steve 30fa446006 Allow script to activate spawners. 2016-03-16 06:53:49 +00:00
Steve 0332e2fe20 Fixed time script bug. 2016-03-16 06:53:30 +00:00
Steve 604526611a Increased flock leading distance. 2016-03-16 06:53:20 +00:00