diff --git a/mods/ts/maps/blank-conquest.oramap b/mods/ts/maps/blank-conquest.oramap index 53e2bef0f1..512fdbb8fb 100644 Binary files a/mods/ts/maps/blank-conquest.oramap and b/mods/ts/maps/blank-conquest.oramap differ diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 0e18444daf..48a87596e0 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -10,7 +10,7 @@ Dimensions: 1,1 Footprint: x BuildSounds: place2.aud - TerrainTypes: Clear,Road + TerrainTypes: Clear, Road GivesBuildableArea: Capturable: SoundOnDamageTransition: @@ -48,7 +48,7 @@ Footprint: x BuildSounds: place2.aud Adjacent: 7 - TerrainTypes: Clear,Road + TerrainTypes: Clear, Road SoundOnDamageTransition: DamagedSound: expnew01.aud DestroyedSound: crmble2.aud @@ -95,8 +95,7 @@ Clear: 90 Rough: 80 Road: 100 - Ore: 80 - Gems: 80 + Tiberium: 80 Beach: 80 SelectionDecorations: Palette: pips @@ -124,6 +123,9 @@ GivesBounty: CrushableInfantry: CrushSound: squish6.aud + PoisonedByTiberium: + SpawnViceroid: + ViceroidActor: vissml UpdatesPlayerStatistics: CombatDebugOverlay: Guard: @@ -170,6 +172,7 @@ Rough: 40 Road: 100 Beach: 40 + Tiberium: 40 ROT: 5 SelectionDecorations: Palette: pips diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml index 13759eea64..1c2bc200e1 100644 --- a/mods/ts/rules/world.yaml +++ b/mods/ts/rules/world.yaml @@ -82,17 +82,18 @@ World: Race: nod ResourceLayer: ResourceClaimLayer: - ResourceType@gem: - ResourceType: 2 - Palette: player - EditorSprite: shadow - Variants: fake + ResourceType@Tiberium: + ResourceType: 1 + Palette: player # TODO: this has to remap to green + EditorSprite: waypoint # TODO: editor can't handle the real ones + Variants: tib01, tib02, tib03, tib04, tib05, tib06, tib07, tib08, tib09, tib10, tib11, tib12, tib13, tib14, tib15, tib16, tib17, tib18, tib19, tib20 + MaxDensity: 12 ValuePerUnit: 50 - Name: Gems - PipColor: Red - AllowedTerrainTypes: Clear,Road + Name: Tiberium + PipColor: Green + AllowedTerrainTypes: Clear AllowUnderActors: false - TerrainType: Gems + TerrainType: Tiberium PathfinderDebugOverlay: SpawnMapActors: CreateMPPlayers: diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index e5d763e0c0..d09e628123 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -268,10 +268,87 @@ moveflsh: Length: * Tick: 30 -# TODO: placeholder resources: - fake: shadow - Length: * + tib01: tib01 + Start: 0 + Length: 12 + ShadowStart: 12 + tib02: tib02 + Start: 0 + Length: 12 + ShadowStart: 12 + tib03: tib03 + Start: 0 + Length: 12 + ShadowStart: 12 + tib04: tib04 + Start: 0 + Length: 12 + ShadowStart: 12 + tib05: tib05 + Start: 0 + Length: 12 + ShadowStart: 12 + tib06: tib06 + Start: 0 + Length: 12 + ShadowStart: 12 + tib07: tib07 + Start: 0 + Length: 12 + ShadowStart: 12 + tib08: tib08 + Start: 0 + Length: 12 + ShadowStart: 12 + tib09: tib09 + Start: 0 + Length: 12 + ShadowStart: 12 + tib10: tib10 + Start: 0 + Length: 12 + ShadowStart: 12 + tib11: tib11 + Start: 0 + Length: 12 + ShadowStart: 12 + tib12: tib12 + Start: 0 + Length: 12 + ShadowStart: 12 + tib13: tib13 + Start: 0 + Length: 12 + ShadowStart: 12 + tib14: tib14 + Start: 0 + Length: 12 + ShadowStart: 12 + tib15: tib15 + Start: 0 + Length: 12 + ShadowStart: 12 + tib16: tib16 + Start: 0 + Length: 12 + ShadowStart: 12 + tib17: tib17 + Start: 0 + Length: 12 + ShadowStart: 12 + tib18: tib18 + Start: 0 + Length: 12 + ShadowStart: 12 + tib19: tib19 + Start: 0 + Length: 12 + ShadowStart: 12 + tib20: tib20 + Start: 0 + Length: 12 + ShadowStart: 12 shroud: shroud: shadow diff --git a/mods/ts/tilesets/interior.yaml b/mods/ts/tilesets/interior.yaml index 3c6184d0b9..a6ec53d092 100644 --- a/mods/ts/tilesets/interior.yaml +++ b/mods/ts/tilesets/interior.yaml @@ -11,6 +11,11 @@ Terrain: AcceptsSmudgeType: Crater, Scorch Color: 0, 0, 0 TargetTypes: Ground + TerrainType@Tiberium: + Type: Tiberium + AcceptsSmudgeType: Crater, Scorch + Color: 161, 226, 28 + TargetTypes: Ground Templates: Template@255: diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml index e2bfdcba8d..868a31546f 100644 --- a/mods/ts/weapons.yaml +++ b/mods/ts/weapons.yaml @@ -693,3 +693,10 @@ Pistola: InfDeath: 1 Damage: 2 +Tiberium: + ROF: 16 + Warhead: + Spread: 42 + InfDeath: 6 + Damage: 2 + PreventProne: yes