-
-
Notifications
You must be signed in to change notification settings - Fork 146
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Simplifies create food and localizes. Fixes localization fallback (
- Loading branch information
1 parent
912eaab
commit 6cb18f8
Showing
2 changed files
with
50 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,88 +1,65 @@ | ||
| using System; | ||
| using Server.Items; | ||
| using Server.Utilities; | ||
|
|
||
| namespace Server.Spells.First | ||
| namespace Server.Spells.First; | ||
|
|
||
| public class CreateFoodSpell : MagerySpell | ||
| { | ||
| public class CreateFoodSpell : MagerySpell | ||
| { | ||
| private static readonly SpellInfo _info = new( | ||
| "Create Food", | ||
| "In Mani Ylem", | ||
| 224, | ||
| 9011, | ||
| Reagent.Garlic, | ||
| Reagent.Ginseng, | ||
| Reagent.MandrakeRoot | ||
| ); | ||
| private static readonly SpellInfo _info = new( | ||
| "Create Food", | ||
| "In Mani Ylem", | ||
| 224, | ||
| 9011, | ||
| Reagent.Garlic, | ||
| Reagent.Ginseng, | ||
| Reagent.MandrakeRoot | ||
| ); | ||
|
|
||
| private static readonly FoodInfo[] m_Food = | ||
| private static Item CreateRandomFood() => | ||
| Utility.Random(10) switch | ||
| { | ||
| new(typeof(Grapes), "a grape bunch"), | ||
| new(typeof(Ham), "a ham"), | ||
| new(typeof(CheeseWedge), "a wedge of cheese"), | ||
| new(typeof(Muffins), "muffins"), | ||
| new(typeof(FishSteak), "a fish steak"), | ||
| new(typeof(Ribs), "cut of ribs"), | ||
| new(typeof(CookedBird), "a cooked bird"), | ||
| new(typeof(Sausage), "sausage"), | ||
| new(typeof(Apple), "an apple"), | ||
| new(typeof(Peach), "a peach") | ||
| 0 => new Grapes(), | ||
| 1 => new Ham(), | ||
| 2 => new CheeseWedge(), | ||
| 3 => new Muffins(), | ||
| 4 => new FishSteak(), | ||
| 5 => new Ribs(), | ||
| 6 => new CookedBird(), | ||
| 7 => new Sausage(), | ||
| 8 => new Apple(), | ||
| 9 => new Peach(), | ||
| _ => null | ||
| }; | ||
|
|
||
| public CreateFoodSpell(Mobile caster, Item scroll = null) : base(caster, scroll, _info) | ||
| { | ||
| } | ||
| public CreateFoodSpell(Mobile caster, Item scroll = null) : base(caster, scroll, _info) | ||
| { | ||
| } | ||
|
|
||
| public override SpellCircle Circle => SpellCircle.First; | ||
| public override SpellCircle Circle => SpellCircle.First; | ||
|
|
||
| public override void OnCast() | ||
| public override void OnCast() | ||
| { | ||
| if (CheckSequence()) | ||
| { | ||
| if (CheckSequence()) | ||
| var food = CreateRandomFood(); | ||
|
|
||
| if (food != null) | ||
| { | ||
| var foodInfo = m_Food.RandomElement(); | ||
| var food = foodInfo.Create(); | ||
| Caster.AddToBackpack(food); | ||
|
|
||
| if (food != null) | ||
| if (Caster.NetState != null) | ||
| { | ||
| Caster.AddToBackpack(food); | ||
| var foodName = Localization.GetText(food.LabelNumber, Caster.Language); | ||
|
|
||
| // Note: On OSI, the food name is not localized. | ||
| // You magically create food in your backpack: | ||
| Caster.SendLocalizedMessage(1042695, true, $" {foodInfo.Name}"); | ||
|
|
||
| Caster.FixedParticles(0, 10, 5, 2003, EffectLayer.RightHand); | ||
| Caster.PlaySound(0x1E2); | ||
| Caster.SendLocalizedMessage(1042695, true, $" {foodName}"); | ||
| } | ||
| } | ||
|
|
||
| FinishSequence(); | ||
| } | ||
| } | ||
|
|
||
| public class FoodInfo | ||
| { | ||
| public FoodInfo(Type type, string name) | ||
| { | ||
| Type = type; | ||
| Name = name; | ||
| } | ||
|
|
||
| public Type Type { get; set; } | ||
|
|
||
| public string Name { get; set; } | ||
|
|
||
| public Item Create() | ||
| { | ||
| try | ||
| { | ||
| return Type.CreateInstance<Item>(); | ||
| } | ||
| catch | ||
| { | ||
| // ignored | ||
| Caster.FixedParticles(0, 10, 5, 2003, EffectLayer.RightHand); | ||
| Caster.PlaySound(0x1E2); | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| FinishSequence(); | ||
| } | ||
| } |