mirror of
https://github.com/veden/Rampant.git
synced 2024-12-26 20:54:12 +02:00
Merge remote-tracking branch 'garrotte/master' into dev
This commit is contained in:
commit
0a0d97e699
@ -18,6 +18,7 @@ Version: 3.2.0
|
||||
- Fixed faction mutation mutating to an existing faction is no longer counted towards max number of mutations per base
|
||||
- Corrected typo of `randominess` to `randomness` in tooltips
|
||||
- Fixed alignmentTable being nil due to an invalid reference to the neutral faction
|
||||
- Missing turret sounds due too many sounds triggering at once
|
||||
Optimizations:
|
||||
- Moved most constants out of global
|
||||
- Removed new enemy variations setting
|
||||
|
@ -295,7 +295,7 @@ function biterUtils.makeBiter(attributes)
|
||||
enemy_map_color = ((not settings.startup["rampant--oldRedEnemyMapColor"].value) and attributes.tint2) or nil,
|
||||
affected_by_tiles = settings.startup["rampant--unitsAffectedByTiles"].value,
|
||||
dying_sound = attributes.dyingSounds,
|
||||
working_sound = attributes.workingSounds,
|
||||
-- working_sound = attributes.workingSounds,
|
||||
walking_sound = attributes.walkingSounds,
|
||||
running_sound_animation_positions = {2,},
|
||||
run_animation = biterrunanimation(attributes.scale, attributes.tint, attributes.tint2 or attributes.tint, attributes.altBiter)
|
||||
@ -351,7 +351,7 @@ function biterUtils.makeSpitter(attributes)
|
||||
enemy_map_color = ((not settings.startup["rampant--oldRedEnemyMapColor"].value) and attributes.tint2) or nil,
|
||||
dying_trigger_effect = attributes.dyingEffect,
|
||||
dying_sound = attributes.dyingSounds,
|
||||
working_sound = attributes.workingSounds,
|
||||
-- working_sound = attributes.workingSounds,
|
||||
walking_sound = attributes.walkingSounds,
|
||||
running_sound_animation_positions = {2,},
|
||||
water_reflection = spitter_water_reflection(attributes.scale),
|
||||
|
Loading…
Reference in New Issue
Block a user