Commit Graph

207 Commits (ea690beab7a2cfa5f20cac440e94f24b93804cb5)

Author SHA1 Message Date
Giel van Schijndel b918d96671 * Stuff the CONSTRUCT stats in the SQLite database
* Use the database-meta-language code generator to generate a new stats loading function: loadConstructStatsFromDB
 * Add a new resource type, DBCONSTR, which uses loadConstructStatsFromDB to load the construction stats
 * Employ this new type in "base"

This addresses #2


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6326 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-16 03:43:29 +00:00
Giel van Schijndel 1835d9aa04 Add a new code generator to generate a series of INSERT statements from the CSV files to fill a database with
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6322 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-16 02:20:42 +00:00
Giel van Schijndel 903b23ce7f Store SENSOR->location as "enum LOC" instead of an UDWORD
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6320 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-16 01:45:44 +00:00
Giel van Schijndel 31f8183789 Forgotten to update in r6318
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6319 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-16 01:42:43 +00:00
Giel van Schijndel 5b1c63f31c Mark optional IMD_model fields as such
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6315 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-16 00:34:39 +00:00
Giel van Schijndel d57d5d5001 Generate the SQL table definition as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6313 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-15 22:02:30 +00:00
Gerard Krol 7c6366f930 Fix a bug in the Skirmish AI that caused it to build loads of bunkers at oil derricks. Also change the type of a variable from PUBLIC to
PRIVATE, as it is not defined in the .vlo. The current scripting engine does not seem to notice, but this helps 
the wz2lua converter.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6306 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-15 13:00:27 +00:00
Buginator 03990706e6 Disables the AI from executing the reassignAI() routine, which is broken, and it instead took control of a human player, and not the dropped player (which doesn't make sense to do, since we nuke all that player's stuff.)
See ticket:105 for more info.
Fixes bug #12398 , bug  #12443


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6186 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-18 18:38:25 +00:00
Giel van Schijndel d871a85964 Add video playback support:
* Add support for decoding and displaying of OggTheora/Vorbis videos
 * Change all references to *.rpl files to *.ogg files (and lower case them)
 * Add a new menu (and config) option for selecting the size at which to display videos (1x (native), 2x, full screen)

This closes ticket:64 and ticket:46

Code changes are ticket:64 (patch by Gerard Krol, Giel van Schijndel and Buginator)

FMVs can be found at http://download.gna.org/warzone/videos/sequences_ogg.zip (for now at least)
Videos encoded by Angus Lees


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6119 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-08 18:24:19 +00:00
Giel van Schijndel 58117a87c0 * Remove duplicate sound effect pcv483.ogg
* Rename pcv483.ogg to power-transferred.ogg


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6117 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-04 21:49:58 +00:00
Per Inge Mathisen 4a9c00e469 Revert tagfile changes in r6084, r6080 and r6079. Apparently not ready for the unwashed masses yet.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6102 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-02 21:50:05 +00:00
Per Inge Mathisen b66897f058 Port to trunk the fix for virtual group recursion from tagfile branch. Add unit test to ensure
it never comes back.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6084 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-26 19:14:56 +00:00
Per Inge Mathisen 6fc021819c Do a dummy load of basic object data from tagfile to stress test tagfile system. Ported from work in tagfile branch.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6079 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-26 17:45:18 +00:00
Giel van Schijndel 2c616f323e Trunk is currently broken when playing music and switching between the "base" and "mp" mods, see ticket:57.
This revision fixes ticket:57. We (Buginator, EvilGuru and Giel) decided to use the fix suggested in ticket:57 for now and to use [wiki:Proposal:ModMounting] on a later date. I.e. fix the problem now (however dirty the solution may be), and implement a properly designed one later on, instead of letting trunk remain broken until said proposal is worked out in enough detail.

This revision fixes bug #11847, bug #11875, bug #11898, bug #11976, bug #11989, bug #12017, bug #12250 and bug #12280.

Patch by Buginator and myself


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6028 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 20:36:50 +00:00
Steven Koenig d755c30648 * Set power generator output boost for Gas Turbine Generator to +30%
* This fixes bug #12262
* Added myself to the AUTHORS file


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5955 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 17:59:16 +00:00
Elio Gubser 1465f18367 reversed first line because order green, orange, grey... is hardcoded
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5812 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-14 20:07:11 +00:00
Per Inge Mathisen 44861ebd89 Add naval propulsion PIE model and texture.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5803 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-13 19:15:55 +00:00
Elio Gubser f7e29e9709 new data directory for svg-icons, there's no naming specification yet
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5780 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-07 13:50:33 +00:00
Elio Gubser fce4029e9d small changes in intfac1(hammer modified), intfac2(new weapon icon) and frontend2(nicer computer-ai)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5779 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-07 12:37:46 +00:00
Giel van Schijndel 068d2d3174 Move the last translatable string that's used by the scripts into the scripts themselves: _("Return to LZ")
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5708 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 18:28:40 +00:00
Giel van Schijndel e48619f9eb Convert data/base/messages/resmessagesall.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5702 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 00:26:41 +00:00
Giel van Schijndel b122c5a07c Convert resmessages1.txt and resmessages3.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5699 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 23:48:49 +00:00
Giel van Schijndel aaf666d026 Convert resmessages2.txt and resmessages23.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5698 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 23:27:15 +00:00
Giel van Schijndel e5ca53e2ec Convert resmessages12.txt and messages.txt to the new research message format
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5697 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 22:49:28 +00:00
Per Inge Mathisen 7f768ba83e Add naval propulsion, appropriating the unused 'Propellor'
propulsion for this purpose. To test, use 'give all' cheat
before design, and the ctrl+o menu to place.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5691 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 09:15:20 +00:00
Giel van Schijndel 49944c6e3b * Remove several unused strings
* Move some strings to scripts

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5690 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 02:46:36 +00:00
Giel van Schijndel 40a8a0c1ff Remove several unused strings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5688 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 02:12:52 +00:00
Giel van Schijndel 8175833f5b * Move all translatable strings used by the tutorial into the tutorial's script file and out of the string resource file (`tutstrings.txt`)
* make -C po update-po

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5687 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 02:12:42 +00:00
Giel van Schijndel 04f5392dd2 Fix stock AI's `takeover` trigger:
* Called upon receiving a CALL_UNITTAKEOVER event, which is sent when handing over droids or "stealing" them using the NEXUS turret
 * Prevent it from trying to add command or transporter droids to any groups, as these droids cannot be added to a group

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5678 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-26 21:48:15 +00:00
Per Inge Mathisen f0fd48673d Add the 4c-cockpit map by zydonk.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5567 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 13:00:45 +00:00
Per Inge Mathisen e827d8e580 Update of the 8c-cockate map by zydonk.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5566 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 12:55:01 +00:00
Per Inge Mathisen eb3ac2e356 Fix bug #11911: two patrol buttons. Patrol now has a new icon, drawn by
elio. Circle now has correct tooltip and uses old patrol icon. Some
spelling issues also fixed.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5565 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 12:06:26 +00:00
Giel van Schijndel b7f1b4aae1 Read some scripts using their __lower-case__ name (as these file's names are lower-case)
This might fix bug #12011

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5539 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 22:25:44 +00:00
Giel van Schijndel 0d997d617f Remove `hitPoints` from the code as it's never used.
It's loaded in from the stats files and copied all over a dozen places, but never actually __used__.

NOTE: This __shouldn't__ break savegames, I've checked it quite thoroughly, but game.c is evil & large enough that the chance exists I made a mistake in this department.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5454 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-09 19:02:19 +00:00
Elio Gubser 3695f6258b minor change of the power bar gradient
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5394 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 09:14:36 +00:00
Elio Gubser 147d658ade completed intfac1.svg
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5393 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 08:57:49 +00:00
Elio Gubser 7372b84341 Working on intfac2.svg, colours aren't correct in this version
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5392 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 08:42:19 +00:00
Per Inge Mathisen 4f63fba465 Add the map 8c-cockate by forum user zydonk. Original work licensed under the GPL.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5286 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 17:38:53 +00:00
Per Inge Mathisen a1c47bccf8 patch #1075: Simplify playlist code. Thanks to Giel for patch review.
The playlist file is no a simple list of files to play during the game.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5281 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 15:40:56 +00:00
Elio Gubser 66e2bee6d3 main interface buttons finished
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5275 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-19 20:07:24 +00:00
Elio Gubser 364c32afea working on buttons, i replaced my close button with kreuvf's, copyright added 'Copyright (C) 2008 Steven Koenig (for the Close Button)'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5267 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 19:37:31 +00:00
Dennis Schridde c9b9e98dc9 Fix "Create default playlist file; This is an ugly HACK which should be FIXME'd into oblivion some other time" by adding a default playlist file to base.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5263 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 18:25:35 +00:00
Per Inge Mathisen 1c3835ce23 Add original music soundtracks. If you have a playlist already, you need to delete it
or add the music to it manually.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5261 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-17 19:32:17 +00:00
Elio Gubser ed4d0af31a working on main-ingame icons
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5252 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-13 20:41:11 +00:00
Elio Gubser e5b6cf18b6 continuing work on intfac1.svg
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5237 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-08 17:00:12 +00:00
Dennis Schridde 8b2859c7e9 A dummy model, useful for testing
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5209 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-01 10:13:36 +00:00
Elio Gubser f8261c6427 beginning with intfac1, it's fairly big atm, because i copied some frontend svg's into
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5208 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-01 06:48:57 +00:00
Elio Gubser a955be34c5 intfac0.svg done
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5197 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-28 18:40:29 +00:00
Elio Gubser bab67317cd intfac0.svg almost done
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5195 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-26 20:12:16 +00:00
Elio Gubser fb0ffbc567 made the blue target pointer (when opening with inkscape there is also a circle-version of this pointer outside the border lines, but i'm not proud of it)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5194 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-26 18:44:13 +00:00
Giel van Schijndel 1d739ce56b * Pass the table name as well from the .wrf resource file
* "table" will now attempt to load the given resource type from the given table (in the currently opened database)
 * Maintain the current database's name (for error message, etc.)
 * Pass the table name to the database loading functions and use it (in combination with sqlite3_mprintf) to produce the SQL statements


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5189 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 19:38:59 +00:00
Giel van Schijndel 452c167e9a * Add a new resource loading function type: RES_TABLELOAD
* Add two new keywords to the .wrf files: "database" and "table"
  * "database" will cause the given filename to be opened as a database file (using SQLite3)
  * "table" will attempt to load the given resource type from the currently opened database
 * Don't open the database in the file loading functions (src/data.c) anymore; turn them in table loading functions instead (which get the current database passed as a paramter)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5188 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 19:38:53 +00:00
Giel van Schijndel d193dce6f9 * Add a new resource type (for use with .wrf files): DBSENSOR which is similar to SSENSOR, with as difference that instead of a CSV file it specifies an SQLite database file to load from
* Add the code to load sensors from the sensor table of the given database file (function `loadSensorStatsFromDB`)
  * This code will make sure to load the sensor stats-data in a similar manner (i.e. the resulting data in-memory should be the same) to the sensor.txt loading code
 * Use this stats loading implementation on single player


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5182 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 15:41:04 +00:00
Giel van Schijndel ce7928738f * Add a new resource type (for use with .wrf files): DBECM which is similar to SECM, with as difference that instead of a CSV file it specifies an SQLite database file to load from
* Add the code to load ECM entries from the ecm table of the given database file (function `loadECMStatsFromDB`)
  * This code will make sure to load the ECM stats-data in a similar manner (i.e. the resulting data in-memory should be the same) to the ecm.txt loading code
 * Use this stats loading implementation on single player


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5178 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 14:58:03 +00:00
Elio Gubser 3c235cb99f made the circle background
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5172 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 09:36:38 +00:00
Elio Gubser 797050d523 frontend4 finished so far, working on intfac's now. these svg's haven't been optimised yet (lots of unused defs)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5170 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 15:37:05 +00:00
Dennis Schridde 85ab4e02e9 Move base files from data/ into data/base/ (and stuff from warzone.wz to base.wz respecitively).
Should not create any problems, buildsystems were changed (MacOSX, please test).
Reason: Organisation, later: simplification.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5156 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 21:42:44 +00:00