Commit Graph

1861 Commits

Author SHA1 Message Date
reaperrr
5458f459b1 Merge pull request #12688 from MustaphaTR/d2k-fix-some-more-tiles
D2K - Fix tiles 58, 365, 366 and 368
2017-02-06 19:45:00 +01:00
Paul Chote
847a00e938 Remove SpawnActor from SpiceBloom. 2017-02-05 12:32:42 +00:00
Paul Chote
b018c3d837 Merge pull request #12350 from reaperrr/rem-spicebloom-DelAct
Merge SpiceBloom RespawnDelay & GrowthDelay into Lifetime
2017-02-04 16:22:39 +00:00
reaperrr
cfbc465040 Make spicebloom.spawnpoint more visible in editor 2017-02-04 12:31:22 +01:00
reaperrr
8fd83e5134 Fix spice bloom and spice bloom spawner health radii 2017-02-04 12:31:20 +01:00
reaperrr
76f8fe02e2 Refactor SpiceBloom
- Remove SpiceBloom.RespawnDelay

It is basically redundant (giving the spice bloom spawner a longer
self-kill delay at yaml level has the same effect) and uses the savegame-blocking DelayedAction, so just removing it is the cleanest solution.

- Rename SpiceBloom GrowthDelay to Lifetime

- Refactor spicebloom.spawnpoint to not use SpiceBloom trait and make it visible in editor with corresponding tooltip.
2017-02-04 12:31:19 +01:00
Mustafa Alperen Seki
fcba36cd31 Fix Tiles 58, 365, 366 and 368 2017-02-04 10:12:55 +02:00
abcdefg30
a413cc81ea Merge pull request #12605 from reaperrr/ts-weapon-inheritance
Introduce TargetDamageWarhead + some TS weapon fixes
2017-02-04 00:59:14 +01:00
reaperrr
940cf67da4 Merge pull request #12653 from MustaphaTR/d2k-fix-618
D2K - Fix tiles 251, 306, 435 and 618
2017-02-02 20:52:25 +01:00
Mustafa Alperen Seki
d85526d5d2 Fix tiles 251, 306, 435 and 618. 2017-02-02 08:26:59 +02:00
reaperrr
77c96db768 Merge pull request #12647 from abcdefg30/mercFlag
Fix the mercenary faction having no valid flag
2017-01-31 20:01:03 +01:00
abcdefg30
ed39e512dd Merge pull request #12655 from MustaphaTR/d2k-thumper-voice
D2K - Change Thumper's Voice to normal Inf. Voice
2017-01-31 15:12:37 +01:00
Mustafa Alperen Seki
c1817005ab Change Thumper's Voice to normal Inf. Voice 2017-01-31 09:31:27 +02:00
ltem
b8ec633514 Fixes an error of pr 12658 2017-01-30 22:26:00 +01:00
reaperrr
c057acba7a Use TargetDamage for D2k WormJaw 2017-01-30 21:22:11 +01:00
reaperrr
e2419f4faa Merge pull request #12654 from MustaphaTR/d2k-engineer-passenger-color
D2K - Remove PipType from Engineer and Thumper
2017-01-30 20:31:37 +01:00
reaperrr
ee33fb3254 Merge pull request #12658 from ltem/d2k-additional-faction-description
D2K faction specific information
2017-01-30 20:29:32 +01:00
ltem
ea9141270f Added additional faction specific information 2017-01-30 20:18:54 +01:00
abcdefg30
f5a8afa506 Merge pull request #12644 from MustaphaTR/d2k-fremen-desc
D2K - Some description work
2017-01-30 20:04:48 +01:00
Mustafa Alperen Seki
ed2d98b275 Edit some D2K descriptions 2017-01-30 17:18:10 +02:00
Mustafa Alperen Seki
bc96efa3fa Remove PipType from Engineer and Thumper 2017-01-30 15:26:11 +02:00
abcdefg30
8b9f6f8e4e Update the chrome definitions of the smuggler, fremen and worm flags 2017-01-29 22:10:27 +01:00
abcdefg30
8afec71032 Add a definition for the mercenary flag to chrome.yaml 2017-01-29 22:09:30 +01:00
MustaphaTR
4c86475581 Add a new flag for the mercenary faction 2017-01-29 22:05:15 +01:00
Oliver Brakmann
3011cea11d Merge pull request #12641 from MustaphaTR/d2k-fix-mercenary-hfac-offset
D2K - Fix Mercenary Heavy Factory offset
2017-01-29 19:40:33 +01:00
Paul Chote
213b3dad2c Merge pull request #12293 from abcdefg30/swallowNull
Fix null being passed through the INotifyAttack interface
2017-01-29 16:32:35 +00:00
Mustafa Alperen Seki
81b1373db0 Fix Mercenary Heavy Factory offset 2017-01-29 18:28:49 +02:00
reaperrr
3e0db5cd2a Merge pull request #12623 from MustaphaTR/d2k-reorder-yaml
D2K - Reorder rule files on mod.yaml
2017-01-29 15:26:11 +01:00
abcdefg30
48cee8c426 Disable the SpreadDamageWarhead of WormJaw 2017-01-29 11:08:31 +01:00
abcdefg30
248d9df3ab Merge pull request #12622 from MustaphaTR/d2k-ai-building
D2K - Some AI Fixes
2017-01-25 15:50:18 +01:00
abcdefg30
2eb8718938 Merge pull request #12618 from MustaphaTR/d2k-ai-fremen
D2K - Make AI able to use Fremen SW.
2017-01-25 15:45:26 +01:00
Mustafa Alperen Seki
ec4f79f372 Reorder D2K rule files on mod.yaml
This effects the order on map editor.
2017-01-25 11:33:18 +02:00
Mustafa Alperen Seki
86180adc13 Some AI fixes and reorder Structures on AI.yaml 2017-01-25 11:20:56 +02:00
abcdefg30
f6c66c4f63 Merge pull request #12598 from MustaphaTR/d2k-str-repair-and-damage
D2K - Fix Low Repair and Terrain Damage.
2017-01-24 20:05:45 +01:00
abcdefg30
68dd2b57fc Merge pull request #12621 from MustaphaTR/d2k-debris-bounce
D2K - Add bouncing to Debris.
2017-01-24 20:03:28 +01:00
abcdefg30
83d6100c18 Merge pull request #12619 from MustaphaTR/d2k-orni-target-types2
D2K - Remove the unused "TargetTypes: Air" from ornithopter
2017-01-24 15:49:01 +01:00
Mustafa Alperen Seki
4601331f7f Add bouncing to D2K Debris. 2017-01-24 15:04:29 +02:00
Mustafa Alperen Seki
5c24512735 Make D2K AI able to use Fremen SW. 2017-01-24 14:13:54 +02:00
Mustafa Alperen Seki
61b0d46155 Remove unused "TargetTypes: Air" from ornithopter 2017-01-24 12:33:20 +02:00
abcdefg30
d165523072 Merge pull request #12608 from MustaphaTR/d2k-crate-terrain-types
D2K - Add more tile types to possible places Crates can spawn
2017-01-23 13:49:31 +01:00
Mustafa Alperen Seki
695b6e5c9a Add Transition, Spice and Concrete to Crate's TerrainTypes 2017-01-23 07:53:08 +02:00
Oliver Brakmann
6177855e20 Merge pull request #12607 from MustaphaTR/d2k-fix-carryall-on-concrete
D2K - Fix Carryalls can't land on Concrete
2017-01-22 21:07:11 +01:00
Mustafa Alperen Seki
bcee1fafd8 Add "Concrete" to Carryall's "LandableTerrainTypes:" 2017-01-22 20:31:59 +02:00
reaperrr
a9d8cd58c5 Replace pre-placed spiceblooms with spawners on all D2k maps
Spice Blooms are not supposed to grow on cells occupied with spice, so it's better to use the spicebloom.spawnpoint actor instead as most of them are placed on cells initially covered by spice.
2017-01-22 12:10:38 +01:00
reaperrr
c80072e7f3 Minor d2k yaml style fixes 2017-01-22 12:10:36 +01:00
abcdefg30
b5944fe1a7 Merge pull request #12515 from reaperrr/slim-d2k-weapons
Slim down D2k weapon yamls
2017-01-22 00:06:43 +01:00
Paul Chote
1f44e91746 Migrate ProvidesRadar to conditions and remove JamsRadar. 2017-01-21 17:24:54 +00:00
reaperrr
bb972fa46d Merge pull request #12591 from MustaphaTR/d2k-map-tsimpo
D2K - Add Tsimpo to map pool.
2017-01-21 11:05:55 +01:00
reaperrr
67e225f12d Merge pull request #12590 from MustaphaTR/d2k-map-sietch-tabr
D2K - Add Sietch Tabr to map pool.
2017-01-21 11:05:36 +01:00
reaperrr
71dcc11e57 Merge pull request #12589 from MustaphaTR/d2k-map-habbanya-erg
D2K - Add Habbanya Erg to map pool.
2017-01-21 11:05:20 +01:00