Skip to content
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.

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

World object fixes #137

Merged
merged 8 commits into from
Mar 16, 2017
Merged

World object fixes #137

merged 8 commits into from
Mar 16, 2017

Conversation

Forbiddenz
Copy link
Contributor

World Object Fixes + Start of Global Guid Manager

/// Index of Model being replace
/// </summary>
public byte Index { get; }
/// <summary>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

empty line between fields please.

/// <summary>
/// Index of model to replace texture.
/// </summary>
public byte Index { get; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

empty line between fields please

@@ -31,7 +31,7 @@ public GameMessageCreateLifestone(Player player) : base(GameMessageOpcode.Object
Position newPosition = new Position(player.Position.Cell, player.Position.Offset.X + dx, player.Position.Offset.Y + dy, player.Position.Offset.Z + 0.5f, 0f, 0f, 0f, 0f);

var weenie = WeenieHeaderFlag.Usable | WeenieHeaderFlag.BlipColour | WeenieHeaderFlag.Radar | WeenieHeaderFlag.UseRadius;
ImmutableWorldObject wo = new ImmutableWorldObject(ObjectType.LifeStone, new ObjectGuid(nextObjectId++, GuidType.None), "Life Stone", ObjectDescriptionFlag.LifeStone, weenie, newPosition);
ImmutableWorldObject wo = new ImmutableWorldObject(ObjectType.LifeStone, new ObjectGuid(GuidManager.NewStaticObjectGuid()), "Life Stone", 1, ObjectDescriptionFlag.LifeStone, weenie, newPosition);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're not going to implement WCID at this point, don't stub bad data. We're close to using it properly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure how to fix it, but the way its in ace now its not named correctly.
Also, passing a 1, its required now.. now sure the proper way to use this.. but interested..
can we keep this now until its in properly ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i guess. just another merge conflict for the landblock PR is all.

@@ -23,7 +23,7 @@ public enum PhysicsDescriptionFlag
DefaultScriptIntensity = 0x004000,
Position = 0x008000,
Movement = 0x010000,
AnimationFrame = 0x200000,
AnimationFrame = 0x020000,
Translucency = 0x400000
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Og II also fixed this to have Translucency of 0x040000

@@ -197,7 +197,7 @@ public Player(Session session) : base(ObjectType.Creature, session.CharacterRequ
GameData.Usable = Usable.UsableObjectSelf;

SetPhysicsState(PhysicsState.IgnoreCollision | PhysicsState.Gravity | PhysicsState.Hidden | PhysicsState.EdgeSlide, false);
PhysicsData.PhysicsDescriptionFlag = PhysicsDescriptionFlag.CSetup | PhysicsDescriptionFlag.MTable | PhysicsDescriptionFlag.Stable | PhysicsDescriptionFlag.Petable | PhysicsDescriptionFlag.Position;
PhysicsData.PhysicsDescriptionFlag = PhysicsDescriptionFlag.CSetup | PhysicsDescriptionFlag.MTable | PhysicsDescriptionFlag.Stable | PhysicsDescriptionFlag.Petable | PhysicsDescriptionFlag.Position;// | PhysicsDescriptionFlag.Movement;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cleanup on aisle 200...

/// </summary>
public abstract class MutableWorldObject : WorldObject
public abstract class MutableWorldObject : WorldObject/// </summary>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added whitespace, butchered the xml doc. fix please.

@Forbiddenz
Copy link
Contributor Author

Cleaned up

@Mogwai-TheFurry
Copy link
Contributor

MutableWorldObject xml doc header....

@Mogwai-TheFurry Mogwai-TheFurry merged commit faeeb6e into ACEmulator:master Mar 16, 2017
@Forbiddenz Forbiddenz deleted the WorldObjectFixes branch April 6, 2017 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants