* - fix: Genitals sprite shit and meow for tajaran

* - add: fart sound if kicked from server

* - tweak: vulpies and tajaran now for donaters!!!

* - fix: Fart on exit

* - add: roleplay think

* - fix: database shit and loc

* - add: ears for slime

* - fix: LOC interaction fix

* - add: height setting

* - fix: height for felinids

* - fix: nigga fix

* - fix: no bitches on captain

* - fix: interaction panel animation shit
This commit is contained in:
Cinkafox
2024-03-11 11:13:33 +03:00
committed by GitHub
parent db920c3942
commit 95054e072a
65 changed files with 12561 additions and 91 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,48 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace Content.Server.Database.Migrations.Postgres
{
/// <inheritdoc />
public partial class RolePlayThink : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "roleplay_info",
columns: table => new
{
roleplay_info_id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
profile_id = table.Column<int>(type: "integer", nullable: false),
name = table.Column<string>(type: "text", nullable: false),
value = table.Column<int>(type: "integer", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_roleplay_info", x => x.roleplay_info_id);
table.ForeignKey(
name: "FK_roleplay_info_profile_profile_id",
column: x => x.profile_id,
principalTable: "profile",
principalColumn: "profile_id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_roleplay_info_profile_id_name",
table: "roleplay_info",
columns: new[] { "profile_id", "name" });
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "roleplay_info");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,37 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Content.Server.Database.Migrations.Postgres
{
/// <inheritdoc />
public partial class RPMigrationEblya : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_roleplay_info_profile_id_name",
table: "roleplay_info");
migrationBuilder.CreateIndex(
name: "IX_roleplay_info_profile_id_name",
table: "roleplay_info",
columns: new[] { "profile_id", "name" },
unique: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_roleplay_info_profile_id_name",
table: "roleplay_info");
migrationBuilder.CreateIndex(
name: "IX_roleplay_info_profile_id_name",
table: "roleplay_info",
columns: new[] { "profile_id", "name" });
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,29 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Content.Server.Database.Migrations.Postgres
{
/// <inheritdoc />
public partial class HeightPrikoli : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<byte>(
name: "height",
table: "profile",
type: "smallint",
nullable: false,
defaultValue: (byte)0);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "height",
table: "profile");
}
}
}

View File

@@ -852,6 +852,10 @@ namespace Content.Server.Database.Migrations.Postgres
.HasColumnType("text")
.HasColumnName("hair_name");
b.Property<byte>("Height")
.HasColumnType("smallint")
.HasColumnName("height");
b.Property<JsonDocument>("Markings")
.HasColumnType("jsonb")
.HasColumnName("markings");
@@ -909,6 +913,37 @@ namespace Content.Server.Database.Migrations.Postgres
b.ToTable("profile", (string)null);
});
modelBuilder.Entity("Content.Server.Database.RoleplayInfo", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("roleplay_info_id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text")
.HasColumnName("name");
b.Property<int>("ProfileId")
.HasColumnType("integer")
.HasColumnName("profile_id");
b.Property<int>("Value")
.HasColumnType("integer")
.HasColumnName("value");
b.HasKey("Id")
.HasName("PK_roleplay_info");
b.HasIndex("ProfileId", "Name")
.IsUnique();
b.ToTable("roleplay_info", (string)null);
});
modelBuilder.Entity("Content.Server.Database.Round", b =>
{
b.Property<int>("Id")
@@ -1618,6 +1653,18 @@ namespace Content.Server.Database.Migrations.Postgres
b.Navigation("Preference");
});
modelBuilder.Entity("Content.Server.Database.RoleplayInfo", b =>
{
b.HasOne("Content.Server.Database.Profile", "Profile")
.WithMany("RoleplayInfo")
.HasForeignKey("ProfileId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired()
.HasConstraintName("FK_roleplay_info_profile_profile_id");
b.Navigation("Profile");
});
modelBuilder.Entity("Content.Server.Database.Round", b =>
{
b.HasOne("Content.Server.Database.Server", "Server")
@@ -1832,6 +1879,8 @@ namespace Content.Server.Database.Migrations.Postgres
b.Navigation("Jobs");
b.Navigation("RoleplayInfo");
b.Navigation("Traits");
});

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,47 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Content.Server.Database.Migrations.Sqlite
{
/// <inheritdoc />
public partial class RolePlayThink : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "roleplay_info",
columns: table => new
{
roleplay_info_id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
profile_id = table.Column<int>(type: "INTEGER", nullable: false),
name = table.Column<string>(type: "TEXT", nullable: false),
value = table.Column<int>(type: "INTEGER", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_roleplay_info", x => x.roleplay_info_id);
table.ForeignKey(
name: "FK_roleplay_info_profile_profile_id",
column: x => x.profile_id,
principalTable: "profile",
principalColumn: "profile_id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_roleplay_info_profile_id_name",
table: "roleplay_info",
columns: new[] { "profile_id", "name" });
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "roleplay_info");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,37 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Content.Server.Database.Migrations.Sqlite
{
/// <inheritdoc />
public partial class RPMigrationEblya : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_roleplay_info_profile_id_name",
table: "roleplay_info");
migrationBuilder.CreateIndex(
name: "IX_roleplay_info_profile_id_name",
table: "roleplay_info",
columns: new[] { "profile_id", "name" },
unique: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_roleplay_info_profile_id_name",
table: "roleplay_info");
migrationBuilder.CreateIndex(
name: "IX_roleplay_info_profile_id_name",
table: "roleplay_info",
columns: new[] { "profile_id", "name" });
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,29 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Content.Server.Database.Migrations.Sqlite
{
/// <inheritdoc />
public partial class HeightPrikoli : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<byte>(
name: "height",
table: "profile",
type: "INTEGER",
nullable: false,
defaultValue: (byte)0);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "height",
table: "profile");
}
}
}

View File

@@ -801,6 +801,10 @@ namespace Content.Server.Database.Migrations.Sqlite
.HasColumnType("TEXT")
.HasColumnName("hair_name");
b.Property<byte>("Height")
.HasColumnType("INTEGER")
.HasColumnName("height");
b.Property<byte[]>("Markings")
.HasColumnType("jsonb")
.HasColumnName("markings");
@@ -858,6 +862,35 @@ namespace Content.Server.Database.Migrations.Sqlite
b.ToTable("profile", (string)null);
});
modelBuilder.Entity("Content.Server.Database.RoleplayInfo", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER")
.HasColumnName("roleplay_info_id");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("name");
b.Property<int>("ProfileId")
.HasColumnType("INTEGER")
.HasColumnName("profile_id");
b.Property<int>("Value")
.HasColumnType("INTEGER")
.HasColumnName("value");
b.HasKey("Id")
.HasName("PK_roleplay_info");
b.HasIndex("ProfileId", "Name")
.IsUnique();
b.ToTable("roleplay_info", (string)null);
});
modelBuilder.Entity("Content.Server.Database.Round", b =>
{
b.Property<int>("Id")
@@ -1545,6 +1578,18 @@ namespace Content.Server.Database.Migrations.Sqlite
b.Navigation("Preference");
});
modelBuilder.Entity("Content.Server.Database.RoleplayInfo", b =>
{
b.HasOne("Content.Server.Database.Profile", "Profile")
.WithMany("RoleplayInfo")
.HasForeignKey("ProfileId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired()
.HasConstraintName("FK_roleplay_info_profile_profile_id");
b.Navigation("Profile");
});
modelBuilder.Entity("Content.Server.Database.Round", b =>
{
b.HasOne("Content.Server.Database.Server", "Server")
@@ -1759,6 +1804,8 @@ namespace Content.Server.Database.Migrations.Sqlite
b.Navigation("Jobs");
b.Navigation("RoleplayInfo");
b.Navigation("Traits");
});

View File

@@ -64,6 +64,10 @@ namespace Content.Server.Database
.HasIndex(p => new {HumanoidProfileId = p.ProfileId, p.GenitalPrototype })
.IsUnique();
modelBuilder.Entity<RoleplayInfo>()
.HasIndex(r => new { HumanoidProfileId = r.ProfileId, r.Name })
.IsUnique();
modelBuilder.Entity<Job>()
.HasIndex(j => j.ProfileId);
@@ -329,6 +333,15 @@ namespace Content.Server.Database
public string Color { get; set; } = null!;
}
public class RoleplayInfo
{
public int Id { get; set; }
public Profile Profile { get; set; } = null!;
public int ProfileId { get; set; }
public string Name { get; set; } = null!;
public int Value { get; set; }
}
// Amour end
public class Preference
@@ -361,6 +374,7 @@ namespace Content.Server.Database
//WD-EDIT
public string BodyType { get; set; } = null!;
public string Voice { get; set; } = null!;
public byte Height { get; set; }
//WD-EDIT
public string Species { get; set; } = null!;
@@ -377,7 +391,8 @@ namespace Content.Server.Database
public List<Job> Jobs { get; } = new();
public List<Antag> Antags { get; } = new();
public List<Trait> Traits { get; } = new();
public List<Genital> Genitals { get; } = new();
public List<Genital> Genitals { get; } = new(); //AMOUR
public List<RoleplayInfo> RoleplayInfo { get; } = new(); //AMOUR
[Column("pref_unavailable")] public DbPreferenceUnavailableMode PreferenceUnavailable { get; set; }