Skip to content

Refactor environment effect lookup #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MikeJeffers merged 9 commits into from
Mar 12, 2021
Merged

Refactor environment effect lookup #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
082e9b5
add dictionary for weather effects
Veritania Mar 9, 2021
e5b9846
refactor to use new weather dictionary
Veritania Mar 9, 2021
5cafccc
Add enums for game & weather state
Veritania Mar 10, 2021
7d593c4
EffectHandler using new day-weather enums
Veritania Mar 10, 2021
d27cf14
Cleanup unused code
Veritania Mar 10, 2021
e81b72c
Allow neutral combo to result in Null nextEffect
Veritania Mar 10, 2021
a35a0f2
dictionary accepts dynamic instead of explicit EffectType
Veritania Mar 11, 2021
3976274
Replace EffectType array with Day/Weather dictionary
Veritania Mar 11, 2021
d24abe0
Remove null init and code cleanup
Veritania Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 20 additions & 61 deletions src/Perpetuum/Services/EventServices/EventProcessors/EnvironmentalEffectHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Perpetuum.Services.Weather;
using Perpetuum.Zones;
using Perpetuum.Zones.Effects.ZoneEffects;
using System;
using System.Collections.Generic;

namespace Perpetuum.Services.EventServices.EventProcessors
Expand All @@ -17,36 +18,35 @@ public class EnvironmentalEffectHandler : EventProcessor
private WeatherInfo _weatherState;
private GameTimeInfo _gameTime;
private ZoneEffect _currentEffect;
private readonly EffectType[] _effectTypes = new EffectType[] {
EffectType.effect_day,
EffectType.effect_day_clear,
EffectType.effect_day_overcast,
EffectType.effect_night,
EffectType.effect_night_clear,
EffectType.effect_night_overcast,
EffectType.effect_weather_good,
EffectType.effect_weather_bad
};
private readonly IDictionary<EffectType, ZoneEffect> _effects = new Dictionary<EffectType, ZoneEffect>();
private readonly IDictionary<Tuple<GameTimeInfo.DayState, WeatherInfo.WeatherState>, ZoneEffect> _effects = new Dictionary<Tuple<GameTimeInfo.DayState, WeatherInfo.WeatherState>, ZoneEffect>();

public EnvironmentalEffectHandler(IZone zone)
{
_zone = zone;
_effects = InitEffectCollection(_effectTypes);
_effects = InitEffectCollection();
}

private IDictionary<EffectType, ZoneEffect> InitEffectCollection(EffectType[] effectTypes)
private IDictionary<Tuple<GameTimeInfo.DayState, WeatherInfo.WeatherState>, ZoneEffect> InitEffectCollection()
{
var dict = new Dictionary<EffectType, ZoneEffect>();
foreach (var effType in effectTypes)
var dict = new Dictionary<Tuple<GameTimeInfo.DayState, WeatherInfo.WeatherState>, ZoneEffect>()
{
dict.Add(effType, new ZoneEffect(_zone.Id, effType, true));
}
{ Tuple.Create(GameTimeInfo.DayState.DAY, WeatherInfo.WeatherState.NEUTRAL_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_day, true) },
{ Tuple.Create(GameTimeInfo.DayState.DAY, WeatherInfo.WeatherState.GOOD_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_day_clear, true) },
{ Tuple.Create(GameTimeInfo.DayState.DAY, WeatherInfo.WeatherState.BAD_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_day_overcast, true) },
{ Tuple.Create(GameTimeInfo.DayState.NIGHT, WeatherInfo.WeatherState.NEUTRAL_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_night, true) },
{ Tuple.Create(GameTimeInfo.DayState.NIGHT, WeatherInfo.WeatherState.GOOD_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_night_clear, true) },
{ Tuple.Create(GameTimeInfo.DayState.NIGHT, WeatherInfo.WeatherState.BAD_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_night_overcast, true) },
{ Tuple.Create(GameTimeInfo.DayState.NEUTRAL, WeatherInfo.WeatherState.GOOD_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_weather_good, true) },
{ Tuple.Create(GameTimeInfo.DayState.NEUTRAL, WeatherInfo.WeatherState.BAD_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_weather_bad, true) },
{ Tuple.Create(GameTimeInfo.DayState.NEUTRAL, WeatherInfo.WeatherState.NEUTRAL_WEATHER), null }
};
return dict;
}

private ZoneEffect GetEffect(EffectType type)
private ZoneEffect GetEffect(GameTimeInfo.DayState dayState, WeatherInfo.WeatherState weatherState)
{
if (_effects.TryGetValue(type, out ZoneEffect effect))
var lookupEffect = Tuple.Create(dayState, weatherState);
if (_effects.TryGetValue(lookupEffect, out ZoneEffect effect))
{
return effect;
}
Expand All @@ -58,48 +58,7 @@ private void OnStateChange()
if (_gameTime == null || _weatherState == null)
return;

ZoneEffect nextEffect = null;
if (_gameTime.IsDay)
{
if (_weatherState.IsGoodWeather)
{
nextEffect = GetEffect(EffectType.effect_day_clear);
}
else if (_weatherState.IsBadWeather)
{
nextEffect = GetEffect(EffectType.effect_day_overcast);
}
else
{
nextEffect = GetEffect(EffectType.effect_day);
}
}
else if (_gameTime.IsNight)
{
if (_weatherState.IsGoodWeather)
{
nextEffect = GetEffect(EffectType.effect_night_clear);
}
else if (_weatherState.IsBadWeather)
{
nextEffect = GetEffect(EffectType.effect_night_overcast);
}
else
{
nextEffect = GetEffect(EffectType.effect_night);
}
}
else
{
if (_weatherState.IsGoodWeather)
{
nextEffect = GetEffect(EffectType.effect_weather_good);
}
else if (_weatherState.IsBadWeather)
{
nextEffect = GetEffect(EffectType.effect_weather_bad);
}
}
var nextEffect = GetEffect(_gameTime.GetDayState(), _weatherState.getWeatherState());

var isSameEffect = ReferenceEquals(_currentEffect, nextEffect) ||
(_currentEffect != null && _currentEffect.Equals(nextEffect));
Expand Down
23 changes: 15 additions & 8 deletions src/Perpetuum/Services/GameTime/GameTimeInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,26 @@ public GameTimeInfo(int gameTime)
GameTimeStamp = gameTime;
}

public bool IsDay
public enum DayState
{
get
{
return GameTimeStamp > DAY_START && GameTimeStamp < DAY_END;
}
DAY,
NEUTRAL,
NIGHT
}

public bool IsNight
public DayState GetDayState()
{
get
if (GameTimeStamp > DAY_START && GameTimeStamp < DAY_END)
{
return DayState.DAY;
}
else if (GameTimeStamp > NIGHT_START || GameTimeStamp < NIGHT_END)
{
return DayState.NIGHT;
}
else
{
return GameTimeStamp > NIGHT_START || GameTimeStamp < NIGHT_END;
return DayState.NEUTRAL;
}
}
}
Expand Down
23 changes: 15 additions & 8 deletions src/Perpetuum/Services/Weather/WeatherInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,26 @@ public override string ToString()
return sb.ToString();
}

public bool IsBadWeather
public enum WeatherState
{
get
{
return Current > BAD_WEATHER && Next > BAD_WEATHER;
}
GOOD_WEATHER,
NEUTRAL_WEATHER,
BAD_WEATHER
}

public bool IsGoodWeather
public WeatherState getWeatherState()
{
get
if(Current > BAD_WEATHER && Next > BAD_WEATHER)
{
return WeatherState.BAD_WEATHER;
}
else if (Current < GOOD_WEATHER && Next < GOOD_WEATHER)
{
return WeatherState.GOOD_WEATHER;
}
else
{
return Current < GOOD_WEATHER && Next < GOOD_WEATHER;
return WeatherState.NEUTRAL_WEATHER;
}
}
}
Expand Down