Showing with 12,969 additions and 12,836 deletions.
  1. +4 −2 .gitignore
  2. +39 −0 ChangeLog
  3. +6 −3 configure.ac
  4. +0 −21 data/base/multiplay/maps/4c-pyramidal/droid.ini
  5. +6 −5 data/base/multiplay/skirmish/nexus.vlo
  6. +31 −29 data/base/multiplay/skirmish/semperfi.vlo
  7. +8 −8 data/base/stats/structures.txt
  8. +1 −1 data/base/structs/blcfact1.pie
  9. +197 −193 data/base/structs/blderik.pie
  10. +73 −77 data/base/structs/blfact0.pie
  11. +133 −137 data/base/structs/blfact1.pie
  12. +187 −195 data/base/structs/blfact2.pie
  13. +148 −185 data/base/structs/blpower0.pie
  14. +220 −257 data/base/structs/blpower4.pie
  15. +36 −36 data/base/structs/blresch0.pie
  16. +182 −234 data/base/structs/blresch4.pie
  17. +99 −99 data/base/structs/blvfact0.pie
  18. +180 −180 data/base/structs/blvfact1.pie
  19. +261 −261 data/base/structs/blvfact2.pie
  20. +6 −24 data/base/structs/blwallc1.pie
  21. +2 −11 data/base/structs/blwallh.pie
  22. +90 −0 data/base/structs/blwallh_l.pie
  23. +133 −0 data/base/structs/blwallh_t.pie
  24. +80 −0 data/base/structs/factory_module1.pie
  25. +80 −0 data/base/structs/factory_module2.pie
  26. +81 −0 data/base/structs/power_module4.pie
  27. +151 −0 data/base/structs/research_module4.pie
  28. +106 −0 data/base/structs/vtolfactory_module1.pie
  29. +106 −0 data/base/structs/vtolfactory_module2.pie
  30. BIN data/base/texpages/page-13-player-buildings.png
  31. BIN data/base/texpages/page-13_tcmask.png
  32. +9 −1 data/base/wrf/piestats.wrf
  33. +8 −8 data/mp/stats/structures.txt
  34. +9 −1 data/mp/wrf/piestats.wrf
  35. +14 −2 doc/Makefile.am
  36. +11 −2 icons/warzone2100.desktop
  37. +8 −27 lib/framework/Makefile.am
  38. +21 −0 lib/framework/debug.cpp
  39. +3 −0 lib/framework/debug.h
  40. +14 −56 lib/framework/frame.cpp
  41. +2 −2 lib/framework/frame.h
  42. +26 −20 lib/framework/framework.vcxproj
  43. +33 −33 lib/framework/framework.vcxproj.filters
  44. +5 −2 lib/framework/{resource_lexer.l → resource_lexer.lpp}
  45. +1 −0 lib/framework/{resource_parser.y → resource_parser.ypp}
  46. +1 −7 lib/framework/strres.cpp
  47. +5 −2 lib/framework/{strres_lexer.l → strres_lexer.lpp}
  48. +1 −0 lib/framework/{strres_parser.y → strres_parser.ypp}
  49. +0 −1 lib/framework/vector.h
  50. +4 −20 lib/gamelib/Makefile.am
  51. +5 −1 lib/gamelib/{audp_lexer.l → audp_lexer.lpp}
  52. +1 −0 lib/gamelib/{audp_parser.y → audp_parser.ypp}
  53. +17 −13 lib/gamelib/gamelib.vcxproj
  54. +9 −9 lib/gamelib/gamelib.vcxproj.filters
  55. +1 −1 lib/ivis_opengl/piedef.h
  56. +73 −101 lib/ivis_opengl/piedraw.cpp
  57. +89 −4 lib/ivis_opengl/piestate.cpp
  58. +5 −1 lib/ivis_opengl/piestate.h
  59. +8 −2 lib/ivis_opengl/screen.cpp
  60. +15 −28 lib/ivis_opengl/textdraw.cpp
  61. +2 −2 lib/netplay/netplay.cpp
  62. +1 −0 lib/qtgame/qtgame.cpp
  63. +7 −30 lib/script/Makefile.am
  64. +5 −1 lib/script/{chat_lexer.l → chat_lexer.lpp}
  65. +1 −0 lib/script/{chat_parser.y → chat_parser.ypp}
  66. +24 −18 lib/script/script.vcxproj
  67. +18 −18 lib/script/script.vcxproj.filters
  68. +5 −2 lib/script/{script_lexer.l → script_lexer.lpp}
  69. +1 −0 lib/script/{script_parser.y → script_parser.ypp}
  70. +8 −4 lib/sound/audio.cpp
  71. +1 −1 lib/sound/audio.h
  72. +2 −2 macosx/Resources/Warzone-Info.plist
  73. +2 −2 macosx/Resources/wzlocal/English.lproj/InfoPlist.strings
  74. +3 −3 macosx/Resources/wzlocal/ca_ES.lproj/InfoPlist.strings
  75. +2 −2 macosx/Resources/wzlocal/cs.lproj/InfoPlist.strings
  76. +2 −2 macosx/Resources/wzlocal/da.lproj/InfoPlist.strings
  77. +2 −2 macosx/Resources/wzlocal/de.lproj/InfoPlist.strings
  78. +2 −2 macosx/Resources/wzlocal/en_GB.lproj/InfoPlist.strings
  79. +2 −2 macosx/Resources/wzlocal/es.lproj/InfoPlist.strings
  80. +2 −2 macosx/Resources/wzlocal/et_EE.lproj/InfoPlist.strings
  81. +2 −2 macosx/Resources/wzlocal/fi.lproj/InfoPlist.strings
  82. +2 −2 macosx/Resources/wzlocal/fr.lproj/InfoPlist.strings
  83. +2 −2 macosx/Resources/wzlocal/fy.lproj/InfoPlist.strings
  84. +2 −2 macosx/Resources/wzlocal/ga.lproj/InfoPlist.strings
  85. +2 −2 macosx/Resources/wzlocal/hr.lproj/InfoPlist.strings
  86. +3 −3 macosx/Resources/wzlocal/hu.lproj/InfoPlist.strings
  87. +2 −2 macosx/Resources/wzlocal/it.lproj/InfoPlist.strings
  88. +2 −2 macosx/Resources/wzlocal/ko.lproj/InfoPlist.strings
  89. +2 −2 macosx/Resources/wzlocal/la.lproj/InfoPlist.strings
  90. +2 −2 macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings
  91. +2 −2 macosx/Resources/wzlocal/nb.lproj/InfoPlist.strings
  92. +2 −2 macosx/Resources/wzlocal/nl.lproj/InfoPlist.strings
  93. +2 −2 macosx/Resources/wzlocal/pl.lproj/InfoPlist.strings
  94. +2 −2 macosx/Resources/wzlocal/pt.lproj/InfoPlist.strings
  95. +2 −2 macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings
  96. +2 −2 macosx/Resources/wzlocal/ro.lproj/InfoPlist.strings
  97. +2 −2 macosx/Resources/wzlocal/ru.lproj/InfoPlist.strings
  98. +2 −2 macosx/Resources/wzlocal/sk.lproj/InfoPlist.strings
  99. +2 −2 macosx/Resources/wzlocal/sl.lproj/InfoPlist.strings
  100. +2 −2 macosx/Resources/wzlocal/tr.lproj/InfoPlist.strings
  101. +2 −2 macosx/Resources/wzlocal/uk_UA.lproj/InfoPlist.strings
  102. +2 −2 macosx/Resources/wzlocal/zh_CN.lproj/InfoPlist.strings
  103. +2 −2 macosx/Resources/wzlocal/zh_TW.lproj/InfoPlist.strings
  104. +75 −75 macosx/Warzone.xcodeproj/project.pbxproj
  105. +3 −0 po/Makefile.in.in
  106. +274 −260 po/ca_ES.po
  107. +267 −261 po/cs.po
  108. +267 −260 po/da.po
  109. +274 −260 po/de.po
  110. +275 −261 po/en_GB.po
  111. +274 −260 po/es.po
  112. +274 −260 po/et_EE.po
  113. +263 −260 po/fi.po
  114. +275 −261 po/fr.po
  115. +274 −261 po/fy.po
  116. +263 −260 po/ga.po
  117. +274 −260 po/hr.po
  118. +274 −260 po/hu.po
  119. +274 −260 po/it.po
  120. +274 −260 po/ko.po
  121. +266 −260 po/la.po
  122. +263 −260 po/lt.po
  123. +268 −261 po/nb.po
  124. +274 −260 po/nl.po
  125. +274 −260 po/pl.po
  126. +275 −261 po/pt.po
  127. +274 −260 po/pt_BR.po
  128. +267 −260 po/ro.po
  129. +274 −260 po/ru.po
  130. +266 −260 po/sk.po
  131. +275 −261 po/sl.po
  132. +276 −264 po/tr.po
  133. +274 −260 po/uk_UA.po
  134. +275 −261 po/zh_CN.po
  135. +275 −261 po/zh_TW.po
  136. +12 −27 src/Makefile.am
  137. +32 −24 src/Warzone2100.vcxproj
  138. +31 −31 src/Warzone2100.vcxproj.filters
  139. +14 −57 src/action.cpp
  140. +1 −1 src/advvis.cpp
  141. +1 −1 src/astar.cpp
  142. +1 −1 src/basedef.h
  143. +7 −34 src/combat.cpp
  144. +2 −2 src/combat.h
  145. +7 −7 src/component.cpp
  146. +1 −0 src/configuration.cpp
  147. +1 −1 src/data.cpp
  148. +10 −38 src/design.cpp
  149. +8 −2 src/display.cpp
  150. +142 −108 src/display3d.cpp
  151. +2 −1 src/display3d.h
  152. +44 −56 src/droid.cpp
  153. +2 −1 src/droid.h
  154. +5 −13 src/feature.cpp
  155. +1 −1 src/feature.h
  156. +8 −0 src/fpath.cpp
  157. +3 −7 src/function.cpp
  158. +51 −10 src/game.cpp
  159. +6 −0 src/geometry.cpp
  160. +8 −8 src/hci.cpp
  161. +7 −10 src/init.cpp
  162. +83 −163 src/intdisplay.cpp
  163. +0 −1 src/intdisplay.h
  164. +17 −25 src/keybind.cpp
  165. 0 src/{level_lexer.l → level_lexer.lpp}
  166. +1 −6 src/loop.cpp
  167. +0 −1 src/loop.h
  168. +0 −1 src/map.cpp
  169. +1 −1 src/mapdisplay.cpp
  170. +1 −1 src/mechanics.cpp
  171. +5 −1 src/{message_lexer.l → message_lexer.lpp}
  172. +1 −0 src/{message_parser.y → message_parser.ypp}
  173. +4 −5 src/miscimd.cpp
  174. +2 −2 src/miscimd.h
  175. +0 −6 src/mission.cpp
  176. +97 −59 src/move.cpp
  177. +0 −3 src/move.h
  178. +11 −33 src/multibot.cpp
  179. +9 −18 src/multigifts.cpp
  180. +26 −5 src/multiint.cpp
  181. +25 −3 src/multimenu.cpp
  182. +1 −1 src/multimenu.h
  183. +3 −3 src/multiopt.cpp
  184. +9 −13 src/multiplay.cpp
  185. +1 −1 src/multiplay.h
  186. +15 −23 src/objmem.cpp
  187. +12 −5 src/order.cpp
  188. +12 −90 src/projectile.cpp
  189. +1 −1 src/qtscript.cpp
  190. +3 −4 src/qtscriptfuncs.cpp
  191. +15 −10 src/radar.cpp
  192. +0 −1 src/radar.h
  193. +217 −917 src/research.cpp
  194. +2 −3 src/research.h
  195. +12 −24 src/researchdef.h
  196. +13 −12 src/scriptai.cpp
  197. +37 −51 src/scriptfuncs.cpp
  198. +5 −2 src/{scriptvals_lexer.l → scriptvals_lexer.lpp}
  199. +7 −1 src/{scriptvals_parser.y → scriptvals_parser.ypp}
  200. +32 −23 src/stats.cpp
  201. +1 −1 src/stats.h
  202. +3 −15 src/statsdef.h
  203. +323 −387 src/structure.cpp
  204. +10 −4 src/structure.h
  205. +18 −1 src/structuredef.h
  206. +4 −4 src/terrain.cpp
  207. +78 −101 src/transporter.cpp
  208. +1 −0 src/transporter.h
  209. +1 −1 tools/conversion/simplipie.c
  210. +2 −6 tools/map/maplib.h
  211. +4 −0 tools/qwzm/qwzm.pro
  212. +22 −22 win32/MSVCdelparser.bat
  213. +2 −2 win32/warzone2100.rc
6 changes: 4 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ win32/__BUILD_CONFIG.USER
# Autogenerated files:
*.lex.[ch]
*.tab.[ch]
*.lex.[ch]pp
*.tab.[ch]pp
*lexer.[ch]pp
*parser.[ch]pp
/src/autorevision.h
*.moc.h

Expand Down Expand Up @@ -109,7 +109,9 @@ Makefile.in
/ltmain.sh
/missing
/stamp-h1
/ylwrap
/po/POTFILES
/po/messages.mo
/po/remove-potcdate.sed
/po/stamp-po
/po/warzone2100.pot
Expand Down
39 changes: 39 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,42 @@
master_20111204
* General:
* Change: Remove the rule that made droids fire and move slower when damaged, since it was confusing and led to less tactical play (commit:88815c3e8bdf6d8afc640d1e82da8eb21d9f17a2)
* Change: Scrolling stops instantly when changing direction to make it more accurate (commit:943b4c345d5227d486c3be1e2e05b99762ffad07)
* Change: Allow building gates on top of walls (commit:a7b2a5b45fa2634f225d9ae9c823fc62ef946f59)
* Change: Units spin on the spot when turning large angles (ticket:1691, commit:4b08dd0b0ca210b9ad08a192fb8267e35b94cd7f)
* Fix: Try to improve pathfinding behaviour (commit:828fea7ba030b571eade620570a0938d8b0ca9b6)
* Fix: Don't pathfind through unfinished gates (commit:e0362c36399ad2429c8254b71152dc2eafef940a)
* Fix: Make sure that the win/lose messages are shown for the players who actually won/lost (commit:bf6e450a30578bdaf5b31427c33ce8d37e1c4179)
* Fix: Make sure units are linked to their commander when loading a game (ticket:2928, commit:47ac282bcd9904083c0e54414de8e9caeb662fda)
* Fix: Allow unloading single droids from transporters again (ticket:2617, commit:2a4a8a68848be306fd9c0d06390d85a79ae697fd)
* Fix: Do not report incomplete structures as damaged, unless they actually were (ticket:1911, commit:8d7df45d354f1030b3aaf91502cf2036237ca7f5)
* Fix: Make trucks not stop building a wall when its type changes due to connecting with other walls (commit:0898e56847e583500d418feade5688b6d27eadd1)
* Fix: Don't cancel an order queue when trying to build an unresearched module (ticket:2797, commit:a4ac61551c7d7ff8f92a599ef9f1df8028137ea2)
* Fix: Loading/saving of rearm functionality (commit:ae2896fcb18986ae29f4c1444136ad4dad60247c)
* Graphics:
* Change: Readd the team colour fallback for OpenGL 1.4+ (commit:2f816f5bf47ff2513fde638a012700180697b841)
* Change: When upgrading a building, only the added part is shown as blueprint and built (ticket:2954, commit:e02cb38ac02c2929823a08d1ce1419df8073b038, commit:84eb46fa53f172b5a7d6529485ce7a699f957cb8, commit:de1a96e2f2778067f9a2345362be470d7c56cc84, commit:af8088f61f8e6b0ba561ca830eae28d0d69cd72e, commit:999b559af342bdb0c393ff6c291fbb08f917b4d3, commit:1f194e78f3577f62aeb435677b5342179efa6812, commit:71a614caebf2d2c90d89ea8f83a0140ebc53e991)
* Change: Align walls to visually block narrow passages (commit:233ee5e711469ab491c3eaac0a2a681b94207fcd)
* Change: Add L- and T-shaped walls (commit:aa8b290324e222987224e60954adb3357aed36f9, commit:1f194e78f3577f62aeb435677b5342179efa6812)
* Fix: Walls correctly align to 2x2 fortresses, allied walls, and hardpoints (commit:cff886cc3630ffd8374d6cfea5fd77b0ffb60acb, commit:312b4a21c949a8296cf0eb798563f0fc071b4d7b)
* Fix: Make wall blueprints show the actual walls that will be built (ticket:2581, commit:42f57b6116429c0a94c570fc6996429b5b666229)
* Fix: Display an order arrow when queueing modules (ticket:2602, ticket:2732, commit:a6c307920bd721230b54c3cc92d0999d2eb99a1d)
* Fix: Show hardpoint blueprints even over walls (ticket:1173, commit:a0aaaa99a7f1ead7aa15bd886f9a777a9e1e659f)
* Fix: Show queued module blueprints (commit:6a3eaf0e4d7f26fee354a792dc493eb2b2c95948)
* Fix: Prevent ally blueprints from disappearing before the structure is visible (commit:db864047f71347f1776d549cc7e31b194a3a3cb5)
* Fix: Properly show delivery point numbers again (ticket:2497, commit:0d75a3b62984ee35b90872daa505a41377f57f35)
* UI:
* Change: Animate changes in power, only for the UI (commit:53e042be1566ffa830f67ccd3031de41c88019e8)
* Change: In multiplayer/skirmish setup, show map preview for the map the mouse is hovering over (commit:48eda8df503810d3fd24e807427bfb28aaac064e)
* Fix: Don't close the build menu unless all selected trucks are destroyed (commit:e2cec529296f66782c9f280e84be89d5996b711d)
* Fix: Make sure new radar modes are always used (commit:7861f33505b7deedcbe13da507fa03e669b1752f)
* AIs:
* Change: Make sure Nexus and Semperfi land AIs research half-tracks early on (ticket:2953, commit:e15eaa349ff163d552b660a4d12f453997247073)
* Maps:
* Fix: Remove three surplus trucks from 4c-Pyramidal (ticket:2945, commit:54080cc5561a65c5cda0939b8a766c44475211f2)
* Translations:
* Update: Turkish (ticket:2937, ticket:2947, commit:e2f6e7f3c1253a5fc5b4b7de576c20aa9cd5513b, commit:c9fca43d79f97f41f97e712b5e5d4841adbf4d20)

master_20111107
* General:
* Change: Power is now deducted fully at the start of production (commit:43ce2e586e15d482831ed4f9a2532b41bb599867, commit:b780ec8d25211e01659a9a7be9bbe300701d1903)
Expand Down
9 changes: 6 additions & 3 deletions configure.ac
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ([2.56])
AC_INIT([Warzone 2100],[master],[http://wz2100.net/],[warzone2100])
AC_INIT([Warzone 2100],[master_20111204],[http://wz2100.net/],[warzone2100])

AM_INIT_AUTOMAKE([1.10 tar-ustar])

Expand Down Expand Up @@ -35,6 +35,9 @@ AC_PROG_VERSION_CHECK([bison], [1.31])

AC_PROG_LEX
AC_PROG_VERSION_CHECK([${LEX}], [2.5.33], [2.5.34])
# Hack to make sure flex produces files with names ylwrap expects.
FLEX_FLAGS="-o lex.yy.c"
AC_SUBST([FLEX_FLAGS])

AX_WITH_PROG([PERL], [perl])
AX_PROG_PERL_VERSION([5.10], [], [ PERL="" ])
Expand Down Expand Up @@ -247,7 +250,7 @@ AS_IF([test "x$enable_ssl" != "xyes"],[
# Add later for stricter checking: -Wextra -Wmissing-declarations -Wstrict-prototypes
AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug[=yes/relaxed/profile/debugprofile/optimised/no]],[Compile debug version [[yes]]]),
[ enable_debug=${enableval} ], [ enable_debug=yes ])
[ enable_debug=${enableval} ], [ enable_debug=no ])
AC_MSG_CHECKING([whether to compile in debug mode])
AC_MSG_RESULT([${enable_debug}])

Expand Down Expand Up @@ -390,7 +393,7 @@ fi

# Look for PhysicsFS
AC_CHECK_HEADER(physfs.h, , AC_MSG_ERROR([PhysicsFS header not found.]))
AC_CHECK_LIB(physfs, PHYSFS_init, AC_SUBST([PHYSFS_LIBS], [-lphysfs]), AC_MSG_ERROR([PhysicsFS not found.]), [${WIN32_LIBS}])
AC_CHECK_LIB(physfs, PHYSFS_mount, AC_SUBST([PHYSFS_LIBS], [-lphysfs]), AC_MSG_ERROR([PhysicsFS 2 not found.]), [${WIN32_LIBS}])

if test "x$host_os_mingw32" != "xyes" ; then
AC_CHECK_HEADER(X11/extensions/Xrandr.h, , AC_MSG_ERROR([Xrandr header not found.]))
Expand Down
21 changes: 0 additions & 21 deletions data/base/multiplay/maps/4c-pyramidal/droid.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,24 +502,3 @@ position = 8768, 9408, 408
rotation = 32768, 0, 0
player = scavenger
template = BabaFireTruck

[droid_1501]
id = 1501
position = 8512, 10048, 408
rotation = 0, 0, 0
startpos = 4
template = ConstructionDroid

[droid_1502]
id = 1502
position = 8640, 10048, 408
rotation = 0, 0, 0
startpos = 5
template = ConstructionDroid

[droid_1503]
id = 1503
position = 8768, 10048, 408
rotation = 0, 0, 0
startpos = 6
template = ConstructionDroid
11 changes: 6 additions & 5 deletions data/base/multiplay/skirmish/nexus.vlo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,17 @@ run
uplink STRUCTURESTAT "A0Sat-linkCentre"

//number of research topics for each research branch
techCount[0] int 5
techCount[0] int 6

//how many res facilities to use when finished researching all specified research topics
maxIdleRes[0] int -1

tech[0][0] RESEARCHSTAT "R-Wpn-MG3Mk1" //HMG
tech[0][1] RESEARCHSTAT "R-Wpn-Rocket02-MRL" //mini rocket artillery
tech[0][2] RESEARCHSTAT "R-Wpn-Rocket-ROF03"
tech[0][3] RESEARCHSTAT "R-Wpn-MG-Damage03"
tech[0][4] RESEARCHSTAT "R-Defense-Pillbox06" //lancer bunker
tech[0][1] RESEARCHSTAT "R-Vehicle-Prop-Halftracks" //half-tracks
tech[0][2] RESEARCHSTAT "R-Wpn-Rocket02-MRL" //mini rocket artillery
tech[0][3] RESEARCHSTAT "R-Wpn-Rocket-ROF03"
tech[0][4] RESEARCHSTAT "R-Wpn-MG-Damage03"
tech[0][5] RESEARCHSTAT "R-Defense-Pillbox06" //lancer bunker

//other tech: R-Vehicle-Prop-VTOL, R-Struc-VTOLPad, R-Struc-VTOLFactory
techCount[1] int 27
Expand Down
60 changes: 31 additions & 29 deletions data/base/multiplay/skirmish/semperfi.vlo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,47 +56,49 @@ run
maxIdleRes int -1

//number of research topics for each research branch
techCount[0] int 18
techCount[0] int 19

tech[0][0] RESEARCHSTAT "R-Defense-Tower01" //mg guard tower
tech[0][1] RESEARCHSTAT "R-Wpn-MG3Mk1" //HMG
tech[0][2] RESEARCHSTAT "R-Struc-PowerModuleMk1" //power module
tech[0][3] RESEARCHSTAT "R-Struc-Research-Module" //research module
tech[0][4] RESEARCHSTAT "R-Struc-Factory-Module" //factory module
tech[0][5] RESEARCHSTAT "R-Defense-WallTower01" //heavy mg hardpoint
tech[0][6] RESEARCHSTAT "R-Wpn-Rocket02-MRL" //mini rocket artillery
tech[0][7] RESEARCHSTAT "R-Wpn-Rocket-ROF03" //Fast Fire Mini-Rockets Mk3
tech[0][8] RESEARCHSTAT "R-Wpn-MG-Damage03" //APDSB MG Bullets Mk2
tech[0][9] RESEARCHSTAT "R-Vehicle-Metals02" //composite alloys Mk2
tech[0][10] RESEARCHSTAT "R-Defense-Pillbox06" //lancer tower
tech[0][11] RESEARCHSTAT "R-Defense-WallUpgrade01" //impr hardcrete - in case missed
tech[0][12] RESEARCHSTAT "R-Struc-Materials01" //reinf struc mat - in case missed
tech[0][13] RESEARCHSTAT "R-Struc-Power-Upgrade03a" //power upgrade 03a
tech[0][14] RESEARCHSTAT "R-Sys-Sensor-Upgrade01" //sensor upgrade
tech[0][15] RESEARCHSTAT "R-Vehicle-Prop-Hover" //hover propulsion - for more options
tech[0][16] RESEARCHSTAT "R-Vehicle-Body08" //scorpion body - for more options (eg new hover truck)
tech[0][17] RESEARCHSTAT "R-Struc-Research-Upgrade06" //to dedicate one reslab to cerebral stuff
tech[0][2] RESEARCHSTAT "R-Vehicle-Prop-Halftracks" //Half-tracks
tech[0][3] RESEARCHSTAT "R-Struc-PowerModuleMk1" //power module
tech[0][4] RESEARCHSTAT "R-Struc-Research-Module" //research module
tech[0][5] RESEARCHSTAT "R-Struc-Factory-Module" //factory module
tech[0][6] RESEARCHSTAT "R-Defense-WallTower01" //heavy mg hardpoint
tech[0][7] RESEARCHSTAT "R-Wpn-Rocket02-MRL" //mini rocket artillery
tech[0][8] RESEARCHSTAT "R-Wpn-Rocket-ROF03" //Fast Fire Mini-Rockets Mk3
tech[0][9] RESEARCHSTAT "R-Wpn-MG-Damage03" //APDSB MG Bullets Mk2
tech[0][10] RESEARCHSTAT "R-Vehicle-Metals02" //composite alloys Mk2
tech[0][11] RESEARCHSTAT "R-Defense-Pillbox06" //lancer tower
tech[0][12] RESEARCHSTAT "R-Defense-WallUpgrade01" //impr hardcrete - in case missed
tech[0][13] RESEARCHSTAT "R-Struc-Materials01" //reinf struc mat - in case missed
tech[0][14] RESEARCHSTAT "R-Struc-Power-Upgrade03a" //power upgrade 03a
tech[0][15] RESEARCHSTAT "R-Sys-Sensor-Upgrade01" //sensor upgrade
tech[0][16] RESEARCHSTAT "R-Vehicle-Prop-Hover" //hover propulsion - for more options
tech[0][17] RESEARCHSTAT "R-Vehicle-Body08" //scorpion body - for more options (eg new hover truck)
tech[0][18] RESEARCHSTAT "R-Struc-Research-Upgrade06" //to dedicate one reslab to cerebral stuff

//other tech: R-Vehicle-Prop-VTOL, R-Struc-VTOLPad, R-Struc-VTOLFactory
techCount[1] int 17
techCount[1] int 18

tech[1][0] RESEARCHSTAT "R-Defense-Tower01" //mg tower for early fun
tech[1][1] RESEARCHSTAT "R-Struc-Research-Module" //reslab module
tech[1][2] RESEARCHSTAT "R-Struc-PowerModuleMk1" //power module
tech[1][3] RESEARCHSTAT "R-Struc-VTOLFactory" //rush vtols
tech[1][4] RESEARCHSTAT "R-Struc-VTOLPad" //vtol pads
tech[1][5] RESEARCHSTAT "R-Wpn-Bomb04" //thermite bomb - and we win
tech[1][6] RESEARCHSTAT "R-Defense-AASite-QuadMg1" //AA hurricane site
tech[1][7] RESEARCHSTAT "R-Defense-WallTower01" //heavy mg hardpoint - in case missed
tech[1][8] RESEARCHSTAT "R-Defense-WallUpgrade01" //impr hardcrete - in case missed
tech[1][9] RESEARCHSTAT "R-Struc-Materials01" //reinf struc mat - in case missed
tech[1][10] RESEARCHSTAT "R-Vehicle-Body07" //retribution body
tech[1][11] RESEARCHSTAT "R-Vehicle-Metals09" //vtol armor
tech[1][12] RESEARCHSTAT "R-Struc-VTOLPad-Upgrade06" //rearm
tech[1][13] RESEARCHSTAT "R-Struc-VTOLFactory-Upgrade06" //production
tech[1][14] RESEARCHSTAT "R-Struc-Power-Upgrade03a" //power upgrade 03a
tech[1][15] RESEARCHSTAT "R-Sys-Autorepair-General" //autorepair
tech[1][16] RESEARCHSTAT "R-Vehicle-Engine09" //finally - speed
tech[1][6] RESEARCHSTAT "R-Vehicle-Prop-Halftracks" //half-tracks - in case missed
tech[1][7] RESEARCHSTAT "R-Defense-AASite-QuadMg1" //AA hurricane site
tech[1][8] RESEARCHSTAT "R-Defense-WallTower01" //heavy mg hardpoint - in case missed
tech[1][9] RESEARCHSTAT "R-Defense-WallUpgrade01" //impr hardcrete - in case missed
tech[1][10] RESEARCHSTAT "R-Struc-Materials01" //reinf struc mat - in case missed
tech[1][11] RESEARCHSTAT "R-Vehicle-Body07" //retribution body
tech[1][12] RESEARCHSTAT "R-Vehicle-Metals09" //vtol armor
tech[1][13] RESEARCHSTAT "R-Struc-VTOLPad-Upgrade06" //rearm
tech[1][14] RESEARCHSTAT "R-Struc-VTOLFactory-Upgrade06" //production
tech[1][15] RESEARCHSTAT "R-Struc-Power-Upgrade03a" //power upgrade 03a
tech[1][16] RESEARCHSTAT "R-Sys-Autorepair-General" //autorepair
tech[1][17] RESEARCHSTAT "R-Vehicle-Engine09" //finally - speed

maxVtolFacs[0] int 1
maxVtolFacs[1] int 4
Expand Down
16 changes: 8 additions & 8 deletions data/base/stats/structures.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ A0CommandCentreCO,HQ,Level Two,HARD,0,2,2,Concrete,500,3,10,500,10,100,30,300,1,
A0CommandCentreNE,HQ,Level Three,HARD,0,2,2,Concrete,500,3,10,500,10,100,30,300,1,1,ZNULLECM,CCSensor,0,blhq4.pie,blbhq.pie,1,0
A0CommandCentreNP,HQ,Level One,HARD,0,2,2,Concrete,500,3,10,500,10,100,30,300,1,1,ZNULLECM,CCSensor,0,blhq2.pie,blbhq.pie,1,0
A0CyborgFactory,CYBORG FACTORY,Level All,MEDIUM,1,1,2,Concrete,500,2,10,500,100,100,30,150,255,20,ZNULLECM,DefaultSensor1Mk1,1,blcfact1.pie,blbcfact.pie,1,0
A0FacMod1,FACTORY MODULE,Level All,MEDIUM,1,3,3,Concrete,250,2,10,250,100,100,25,150,255,30,ZNULLECM,DefaultSensor1Mk1,0,BLFACT1.PIE,0,1,0
A0FacMod1,FACTORY MODULE,Level All,MEDIUM,1,3,3,Concrete,250,2,10,250,100,100,25,150,255,30,ZNULLECM,DefaultSensor1Mk1,0,blfact1.pie,0,1,0
A0HardcreteMk1CWall,CORNER WALL,Level All,HARD,1,1,1,Concrete,125,2,15,250,10,25,1,0,255,0,ZNULLECM,ZNULLSENSOR,0,BLWALLC1.pie,0,0,0
A0HardcreteMk1Wall,WALL,Level All,HARD,1,1,1,Concrete,125,2,15,250,10,25,1,0,255,0,ZNULLECM,ZNULLSENSOR,0,BLWALLH.pie,0,1,0
A0LightFactory,FACTORY,Level All,MEDIUM,1,3,3,Concrete,500,3,10,500,100,100,30,150,255,20,ZNULLECM,BaBaSensor,1,BLFACT0.pie,blbfact.pie,1,0
A0PowerGenerator,POWER GENERATOR,Level All,MEDIUM,1,2,2,Concrete,500,2,20,500,30,50,30,300,255,10,ZNULLECM,DefaultSensor1Mk1,0,BLPOWER0.PIE,blbpower.pie,1,0
A0PowMod1,POWER MODULE,Level All,MEDIUM,0,2,2,Concrete,250,2,10,500,0,0,0,150,255,0,ZNULLECM,DefaultSensor1Mk1,0,BLPOWER4.PIE,0,1,0
A0HardcreteMk1Wall,WALL,Level All,HARD,1,1,1,Concrete,125,2,15,250,10,25,1,0,255,0,ZNULLECM,ZNULLSENSOR,0,blwallh.pie@blwallc1.pie@blwallh_t.pie@blwallh_l.pie,0,1,0
A0LightFactory,FACTORY,Level All,MEDIUM,1,3,3,Concrete,500,3,10,500,100,100,30,150,255,20,ZNULLECM,BaBaSensor,1,blfact0.pie@factory_module1.pie@blfact1.pie@factory_module2.pie@blfact2.pie,blbfact.pie,1,0
A0PowerGenerator,POWER GENERATOR,Level All,MEDIUM,1,2,2,Concrete,500,2,20,500,30,50,30,300,255,10,ZNULLECM,DefaultSensor1Mk1,0,blpower0.pie@power_module4.pie@blpower4.pie,blbpower.pie,1,0
A0PowMod1,POWER MODULE,Level All,MEDIUM,0,2,2,Concrete,250,2,10,500,0,0,0,150,255,0,ZNULLECM,DefaultSensor1Mk1,0,blpower4.pie,0,1,0
A0RepairCentre3,REPAIR FACILITY,Level All,MEDIUM,0,1,1,Concrete,500,2,10,500,0,100,0,150,255,0,RepairCentre,DefaultSensor1Mk1,0,BLRPAIR3.PIE,BLBGEN.PIE,1,0
A0ResearchFacility,RESEARCH,Level All,MEDIUM,1,2,2,Concrete,500,2,10,400,100,100,30,150,255,10,ZNULLECM,DefaultSensor1Mk1,0,BLRESCH0.PIE,blbresch.pie,1,0
A0ResearchModule1,RESEARCH MODULE,Level All,MEDIUM,1,2,2,Concrete,250,2,10,400,50,100,5,150,255,5,ZNULLECM,DefaultSensor1Mk1,0,blresch4.PIE,0,1,0
A0ResearchFacility,RESEARCH,Level All,MEDIUM,1,2,2,Concrete,500,2,10,400,100,100,30,150,255,10,ZNULLECM,DefaultSensor1Mk1,0,blresch0.pie@research_module4.pie@blresch4.pie,blbresch.pie,1,0
A0ResearchModule1,RESEARCH MODULE,Level All,MEDIUM,1,2,2,Concrete,250,2,10,400,50,100,5,150,255,5,ZNULLECM,DefaultSensor1Mk1,0,blresch4.pie,0,1,0
A0ResourceExtractor,RESOURCE EXTRACTOR,Level All,MEDIUM,0,1,1,Concrete,100,1,5,300,10,0,2,150,255,1,ZNULLECM,DefaultSensor1Mk1,0,BLDERIK.PIE,0,1,0
A0TankTrap,WALL,Level All,HARD,1,1,1,Concrete,40,1,10,100,10,15,1,0,255,0,ZNULLECM,ZNULLSENSOR,0,MITRAP2.PIE,0,1,0
A0VTolFactory1,VTOL FACTORY,Level All,MEDIUM,1,3,3,Concrete,500,3,10,250,100,100,30,150,255,20,ZNULLECM,DefaultSensor1Mk1,1,blvfact0.pie,blbfact.pie,1,0
A0VTolFactory1,VTOL FACTORY,Level All,MEDIUM,1,3,3,Concrete,500,3,10,250,100,100,30,150,255,20,ZNULLECM,DefaultSensor1Mk1,1,blvfact0.pie@vtolfactory_module1.pie@blvfact1.pie@vtolfactory_module2.pie@blvfact2.pie,blbfact.pie,1,0
A0VtolPad,REARM PAD,Level All,MEDIUM,0,1,1,Concrete,300,1,10,150,0,100,0,150,255,0,ZNULLECM,DefaultSensor1Mk1,0,blvtolpd.pie,blbgen.pie,1,0
AASite-QuadBof,DEFENSE,Level Two-Three,MEDIUM,0,1,1,Concrete,300,1,12,200,10,175,10,150,255,1,ZNULLECM,DefaultSensor1Mk1,1,Blaamnt1.PIE,0,0,1
AASite-QuadMg1,DEFENSE,Level Two-Three,MEDIUM,0,1,1,Concrete,250,1,12,200,10,125,10,150,255,1,ZNULLECM,DefaultSensor1Mk1,1,Blaamnt1.PIE,0,0,1
Expand Down
2 changes: 1 addition & 1 deletion data/base/structs/blcfact1.pie
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PIE 2
TYPE 200
TYPE 10200
TEXTURE 0 page-13-player-buildings.png 256 256
LEVELS 1
LEVEL 1
Expand Down
Loading