Implement church career information retrieval and update related components: Add a new method in FalukantService to fetch church career details for characters, including current and approved office levels. Enhance DashboardWidget, StatusBar, and ChurchView components to handle new church-related socket events and display relevant information. Update localization files for church-related terms and error messages in English, German, and Spanish.
This commit is contained in:
@@ -6965,6 +6965,66 @@ ORDER BY r.id`,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async getChurchCareerInfo(characterId) {
|
||||||
|
const [currentOffices, approvedApplications] = await Promise.all([
|
||||||
|
ChurchOffice.findAll({
|
||||||
|
where: { characterId },
|
||||||
|
include: [{
|
||||||
|
model: ChurchOfficeType,
|
||||||
|
as: 'type',
|
||||||
|
attributes: ['id', 'name', 'hierarchyLevel']
|
||||||
|
}]
|
||||||
|
}),
|
||||||
|
ChurchApplication.findAll({
|
||||||
|
where: {
|
||||||
|
characterId,
|
||||||
|
status: 'approved'
|
||||||
|
},
|
||||||
|
include: [{
|
||||||
|
model: ChurchOfficeType,
|
||||||
|
as: 'officeType',
|
||||||
|
attributes: ['id', 'name', 'hierarchyLevel']
|
||||||
|
}]
|
||||||
|
})
|
||||||
|
]);
|
||||||
|
|
||||||
|
const currentLevels = currentOffices.map((office) => Number(office.type?.hierarchyLevel ?? -1));
|
||||||
|
const approvedLevels = approvedApplications.map((application) => Number(application.officeType?.hierarchyLevel ?? -1));
|
||||||
|
const highestCurrentLevel = currentLevels.length ? Math.max(...currentLevels) : -1;
|
||||||
|
const highestEverLevel = [...currentLevels, ...approvedLevels].length
|
||||||
|
? Math.max(...currentLevels, ...approvedLevels)
|
||||||
|
: -1;
|
||||||
|
|
||||||
|
const currentHighest = currentOffices
|
||||||
|
.map((office) => office.type)
|
||||||
|
.filter(Boolean)
|
||||||
|
.sort((a, b) => Number(b.hierarchyLevel || 0) - Number(a.hierarchyLevel || 0))[0] || null;
|
||||||
|
|
||||||
|
const allAttained = [
|
||||||
|
...currentOffices.map((office) => office.type),
|
||||||
|
...approvedApplications.map((application) => application.officeType)
|
||||||
|
]
|
||||||
|
.filter(Boolean)
|
||||||
|
.sort((a, b) => Number(b.hierarchyLevel || 0) - Number(a.hierarchyLevel || 0));
|
||||||
|
|
||||||
|
const highestEver = allAttained[0] || null;
|
||||||
|
|
||||||
|
return {
|
||||||
|
highestCurrentLevel,
|
||||||
|
highestEverLevel,
|
||||||
|
highestCurrentOffice: currentHighest ? {
|
||||||
|
id: currentHighest.id,
|
||||||
|
name: currentHighest.name,
|
||||||
|
hierarchyLevel: currentHighest.hierarchyLevel
|
||||||
|
} : null,
|
||||||
|
highestEverOffice: highestEver ? {
|
||||||
|
id: highestEver.id,
|
||||||
|
name: highestEver.name,
|
||||||
|
hierarchyLevel: highestEver.hierarchyLevel
|
||||||
|
} : null
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
async getAvailableChurchPositions(hashedUserId) {
|
async getAvailableChurchPositions(hashedUserId) {
|
||||||
const user = await getFalukantUserOrFail(hashedUserId);
|
const user = await getFalukantUserOrFail(hashedUserId);
|
||||||
const character = await FalukantCharacter.findOne({
|
const character = await FalukantCharacter.findOne({
|
||||||
@@ -6975,6 +7035,8 @@ ORDER BY r.id`,
|
|||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const churchCareer = await this.getChurchCareerInfo(character.id);
|
||||||
|
|
||||||
// Prüfe welche Kirchenämter der Charakter bereits innehat
|
// Prüfe welche Kirchenämter der Charakter bereits innehat
|
||||||
const heldOffices = await ChurchOffice.findAll({
|
const heldOffices = await ChurchOffice.findAll({
|
||||||
where: { characterId: character.id },
|
where: { characterId: character.id },
|
||||||
@@ -7029,7 +7091,8 @@ ORDER BY r.id`,
|
|||||||
const availablePositions = [];
|
const availablePositions = [];
|
||||||
|
|
||||||
for (const officeType of officeTypes) {
|
for (const officeType of officeTypes) {
|
||||||
// Prüfe Voraussetzungen: Hat der User bereits das erforderliche niedrigere Amt?
|
// Prüfe Voraussetzungen: Maßgeblich ist die höchste bisherige Kirchenlaufbahn,
|
||||||
|
// nicht nur das aktuell gehaltene Amt.
|
||||||
const requirement = officeType.requirements?.[0];
|
const requirement = officeType.requirements?.[0];
|
||||||
|
|
||||||
console.log(`[getAvailableChurchPositions] Checking ${officeType.name} (id=${officeType.id}, hierarchyLevel=${officeType.hierarchyLevel}):`, {
|
console.log(`[getAvailableChurchPositions] Checking ${officeType.name} (id=${officeType.id}, hierarchyLevel=${officeType.hierarchyLevel}):`, {
|
||||||
@@ -7043,9 +7106,12 @@ ORDER BY r.id`,
|
|||||||
// Wenn eine Voraussetzung definiert ist
|
// Wenn eine Voraussetzung definiert ist
|
||||||
const prerequisiteId = requirement.prerequisiteOfficeTypeId;
|
const prerequisiteId = requirement.prerequisiteOfficeTypeId;
|
||||||
if (prerequisiteId !== null && prerequisiteId !== undefined) {
|
if (prerequisiteId !== null && prerequisiteId !== undefined) {
|
||||||
// Prüfe ob der User das erforderliche Amt innehat
|
const prerequisiteOffice = await ChurchOfficeType.findByPk(prerequisiteId, {
|
||||||
if (!heldOfficeTypeIds.includes(prerequisiteId)) {
|
attributes: ['id', 'hierarchyLevel']
|
||||||
console.log(`[getAvailableChurchPositions] Skipping ${officeType.name}: User doesn't have prerequisite office ${prerequisiteId}. Held offices:`, heldOfficeTypeIds);
|
});
|
||||||
|
const requiredLevel = Number(prerequisiteOffice?.hierarchyLevel ?? (officeType.hierarchyLevel - 1));
|
||||||
|
if (churchCareer.highestEverLevel < requiredLevel) {
|
||||||
|
console.log(`[getAvailableChurchPositions] Skipping ${officeType.name}: User career too low for prerequisite level ${requiredLevel}. Highest ever:`, churchCareer.highestEverLevel);
|
||||||
continue; // Voraussetzung nicht erfüllt - User hat das erforderliche Amt nicht
|
continue; // Voraussetzung nicht erfüllt - User hat das erforderliche Amt nicht
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7113,6 +7179,7 @@ ORDER BY r.id`,
|
|||||||
if (availableSeats > 0) {
|
if (availableSeats > 0) {
|
||||||
// Finde den Supervisor (höheres Amt in derselben Region oder Eltern-Region)
|
// Finde den Supervisor (höheres Amt in derselben Region oder Eltern-Region)
|
||||||
let supervisor = null;
|
let supervisor = null;
|
||||||
|
let decisionMode = officeType.hierarchyLevel === 0 ? 'entry' : 'interim';
|
||||||
const higherOfficeTypeIds = await ChurchOfficeType.findAll({
|
const higherOfficeTypeIds = await ChurchOfficeType.findAll({
|
||||||
where: {
|
where: {
|
||||||
hierarchyLevel: { [Op.gt]: officeType.hierarchyLevel }
|
hierarchyLevel: { [Op.gt]: officeType.hierarchyLevel }
|
||||||
@@ -7135,7 +7202,21 @@ ORDER BY r.id`,
|
|||||||
{
|
{
|
||||||
model: FalukantCharacter,
|
model: FalukantCharacter,
|
||||||
as: 'holder',
|
as: 'holder',
|
||||||
attributes: ['id']
|
attributes: ['id', 'userId'],
|
||||||
|
include: [
|
||||||
|
{
|
||||||
|
model: FalukantPredefineFirstname,
|
||||||
|
as: 'definedFirstName',
|
||||||
|
attributes: ['name'],
|
||||||
|
required: false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
model: FalukantPredefineLastname,
|
||||||
|
as: 'definedLastName',
|
||||||
|
attributes: ['name'],
|
||||||
|
required: false
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
order: [
|
order: [
|
||||||
@@ -7147,8 +7228,10 @@ ORDER BY r.id`,
|
|||||||
if (supervisorOffice && supervisorOffice.holder) {
|
if (supervisorOffice && supervisorOffice.holder) {
|
||||||
supervisor = {
|
supervisor = {
|
||||||
id: supervisorOffice.holder.id,
|
id: supervisorOffice.holder.id,
|
||||||
name: 'Supervisor' // Wird später geladen falls nötig
|
name: `${supervisorOffice.holder.definedFirstName?.name || ''} ${supervisorOffice.holder.definedLastName?.name || ''}`.trim() || 'Supervisor',
|
||||||
|
controlledBy: supervisorOffice.holder.userId ? 'player' : 'npc'
|
||||||
};
|
};
|
||||||
|
decisionMode = supervisor.controlledBy;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -7163,7 +7246,8 @@ ORDER BY r.id`,
|
|||||||
},
|
},
|
||||||
regionId: region.id,
|
regionId: region.id,
|
||||||
availableSeats: availableSeats,
|
availableSeats: availableSeats,
|
||||||
supervisor: supervisor
|
supervisor: supervisor,
|
||||||
|
decisionMode
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7280,13 +7364,31 @@ ORDER BY r.id`,
|
|||||||
attributes: ['id', 'regionId']
|
attributes: ['id', 'regionId']
|
||||||
});
|
});
|
||||||
if (!character) {
|
if (!character) {
|
||||||
throw new Error('Character not found');
|
throw new Error('falukant.church.available.errors.characterNotFound');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const churchCareer = await this.getChurchCareerInfo(character.id);
|
||||||
|
|
||||||
// Prüfe ob Position verfügbar ist
|
// Prüfe ob Position verfügbar ist
|
||||||
const officeType = await ChurchOfficeType.findByPk(officeTypeId);
|
const officeType = await ChurchOfficeType.findByPk(officeTypeId);
|
||||||
if (!officeType) {
|
if (!officeType) {
|
||||||
throw new Error('Office type not found');
|
throw new Error('falukant.church.available.errors.officeTypeNotFound');
|
||||||
|
}
|
||||||
|
|
||||||
|
const requirement = await ChurchOfficeRequirement.findOne({
|
||||||
|
where: { officeTypeId },
|
||||||
|
attributes: ['prerequisiteOfficeTypeId']
|
||||||
|
});
|
||||||
|
if (requirement?.prerequisiteOfficeTypeId) {
|
||||||
|
const prerequisiteOffice = await ChurchOfficeType.findByPk(requirement.prerequisiteOfficeTypeId, {
|
||||||
|
attributes: ['hierarchyLevel']
|
||||||
|
});
|
||||||
|
const requiredLevel = Number(prerequisiteOffice?.hierarchyLevel ?? (officeType.hierarchyLevel - 1));
|
||||||
|
if (churchCareer.highestEverLevel < requiredLevel) {
|
||||||
|
throw new Error('falukant.church.available.errors.churchCareerTooLow');
|
||||||
|
}
|
||||||
|
} else if (officeType.hierarchyLevel > 0 && churchCareer.highestEverLevel < officeType.hierarchyLevel - 1) {
|
||||||
|
throw new Error('falukant.church.available.errors.churchCareerTooLow');
|
||||||
}
|
}
|
||||||
|
|
||||||
const occupiedCount = await ChurchOffice.count({
|
const occupiedCount = await ChurchOffice.count({
|
||||||
@@ -7297,7 +7399,7 @@ ORDER BY r.id`,
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (occupiedCount >= officeType.seatsPerRegion) {
|
if (occupiedCount >= officeType.seatsPerRegion) {
|
||||||
throw new Error('No available seats');
|
throw new Error('falukant.church.available.errors.noAvailableSeats');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Finde Supervisor (nur wenn es nicht die niedrigste Position ist)
|
// Finde Supervisor (nur wenn es nicht die niedrigste Position ist)
|
||||||
@@ -7334,16 +7436,13 @@ ORDER BY r.id`,
|
|||||||
limit: 1
|
limit: 1
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!supervisorOffice) {
|
if (supervisorOffice?.holder) {
|
||||||
throw new Error('No supervisor position exists in this region. Higher church offices must be filled before you can apply.');
|
supervisorId = supervisorOffice.holder.id;
|
||||||
|
} else {
|
||||||
|
supervisorId = null;
|
||||||
}
|
}
|
||||||
if (!supervisorOffice.holder) {
|
|
||||||
const officeName = supervisorOffice.type?.name || 'higher';
|
|
||||||
throw new Error(`The ${officeName} position in this region is vacant. It must be filled before you can apply.`);
|
|
||||||
}
|
|
||||||
supervisorId = supervisorOffice.holder.id;
|
|
||||||
} else {
|
} else {
|
||||||
throw new Error('No supervisor office type found');
|
supervisorId = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Für Einstiegspositionen (hierarchyLevel 0) ist kein Supervisor erforderlich
|
// Für Einstiegspositionen (hierarchyLevel 0) ist kein Supervisor erforderlich
|
||||||
@@ -7359,7 +7458,7 @@ ORDER BY r.id`,
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (existingApplication) {
|
if (existingApplication) {
|
||||||
throw new Error('Application already exists');
|
throw new Error('falukant.church.available.errors.applicationAlreadyExists');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Erstelle Bewerbung
|
// Erstelle Bewerbung
|
||||||
|
|||||||
328
docs/FALUKANT_CHURCH_ADVANCEMENT_DAEMON_SPEC.md
Normal file
328
docs/FALUKANT_CHURCH_ADVANCEMENT_DAEMON_SPEC.md
Normal file
@@ -0,0 +1,328 @@
|
|||||||
|
# Falukant: Kirchenämter, Aufstieg und NPC-Besetzung
|
||||||
|
|
||||||
|
Dieses Dokument beschreibt das Zielmodell für das Kirchensystem in Falukant. Es fokussiert auf drei Probleme:
|
||||||
|
|
||||||
|
- Spieler können sich derzeit nicht sinnvoll auf höhere kirchliche Ämter bewerben.
|
||||||
|
- Nicht alle Ämter werden besetzt.
|
||||||
|
- NPCs sollen sich ebenfalls bewerben und Ämter aktiv besetzen.
|
||||||
|
|
||||||
|
Der Daemon soll die laufende Besetzung und Beförderung übernehmen. Der eigentliche Antrag des Spielers bleibt ein aktiver Spielzug in der UI.
|
||||||
|
|
||||||
|
## 1. Zielbild
|
||||||
|
|
||||||
|
Kirchliche Ämter sollen ein lebendes Hierarchiesystem sein:
|
||||||
|
|
||||||
|
- Leere Ämter werden nach und nach besetzt.
|
||||||
|
- Spieler und NPCs konkurrieren um offene Positionen.
|
||||||
|
- Höhere Amtsträger entscheiden über untere Ebenen.
|
||||||
|
- Wo kein Spieler-Entscheider vorhanden ist, übernimmt ein NPC-Amtsträger die Entscheidung.
|
||||||
|
- Wo ganze Hierarchieebenen leer sind, darf das System kontrolliert von unten nach oben oder über Interimslogik nachbesetzen.
|
||||||
|
|
||||||
|
## 2. Grundregeln
|
||||||
|
|
||||||
|
### 2.1 Bewerbung
|
||||||
|
|
||||||
|
- Ein Spieler beantragt ein Amt weiterhin aktiv über die UI.
|
||||||
|
- NPCs bewerben sich nicht per UI, sondern durch den Daemon.
|
||||||
|
- Es darf gleichzeitig mehrere Bewerber für dieselbe Position geben.
|
||||||
|
- Eine Bewerbung ist immer regionsbezogen.
|
||||||
|
|
||||||
|
### 2.2 Hierarchie
|
||||||
|
|
||||||
|
Kirchenämter bleiben über `church_office_type.hierarchy_level` geordnet.
|
||||||
|
|
||||||
|
Der normale Aufstiegspfad ist:
|
||||||
|
|
||||||
|
1. `lay-preacher`
|
||||||
|
2. `village-priest`
|
||||||
|
3. `parish-priest`
|
||||||
|
4. `dean`
|
||||||
|
5. `archdeacon`
|
||||||
|
6. `bishop`
|
||||||
|
7. `archbishop`
|
||||||
|
8. `cardinal`
|
||||||
|
9. `pope`
|
||||||
|
|
||||||
|
### 2.3 Bewerbung auf höhere Ämter
|
||||||
|
|
||||||
|
Der aktuelle Fehler "man kann sich nicht auf höhere Positionen bewerben als man gerade hat" soll ersetzt werden durch:
|
||||||
|
|
||||||
|
- Ein Charakter darf sich auf das nächsthöhere sinnvolle Amt bewerben.
|
||||||
|
- Zusätzlich darf ein Charakter sich auf ein höheres Amt bewerben, wenn sein bisher höchstes Kirchenamt die Mindestvoraussetzung erfüllt.
|
||||||
|
- Das System soll nicht nur aktuelle Ämter, sondern auch die bisher höchste kirchliche Laufbahn berücksichtigen.
|
||||||
|
|
||||||
|
Daraus folgt:
|
||||||
|
|
||||||
|
- Es reicht nicht, nur aktuelle `church_office` zu prüfen.
|
||||||
|
- Es muss ein Konzept von `highestChurchOfficeRankEver` geben.
|
||||||
|
|
||||||
|
## 3. Entscheidungsmodell für Bewerbungen
|
||||||
|
|
||||||
|
### 3.1 Grundsatz
|
||||||
|
|
||||||
|
Über eine Bewerbung entscheidet immer das direkt übergeordnete Amt.
|
||||||
|
|
||||||
|
Beispiele:
|
||||||
|
|
||||||
|
- Über `village-priest` entscheidet `parish-priest`.
|
||||||
|
- Über `parish-priest` entscheidet `dean`.
|
||||||
|
- Über `dean` entscheidet `archdeacon`.
|
||||||
|
|
||||||
|
### 3.2 Wenn der direkte Vorgesetzte fehlt
|
||||||
|
|
||||||
|
Falls das direkt übergeordnete Amt in der relevanten Aufsichtskette nicht besetzt ist:
|
||||||
|
|
||||||
|
- Das System sucht das nächsthöhere besetzte Amt.
|
||||||
|
- Falls überhaupt kein höheres Amt vorhanden ist, greift ein Interimsmodus.
|
||||||
|
|
||||||
|
Interimsmodus:
|
||||||
|
|
||||||
|
- Für die untersten Ebenen darf der Daemon nach Reputation und Eignung direkt besetzen.
|
||||||
|
- Für hohe Ämter oberhalb von `bishop` soll das nur sehr zurückhaltend geschehen.
|
||||||
|
|
||||||
|
## 4. NPC-Bewerbungen
|
||||||
|
|
||||||
|
### 4.1 Ziel
|
||||||
|
|
||||||
|
NPCs sollen das Kirchensystem lebendig halten und offene Ämter nach und nach füllen.
|
||||||
|
|
||||||
|
### 4.2 Wann NPCs sich bewerben
|
||||||
|
|
||||||
|
Der Daemon prüft täglich:
|
||||||
|
|
||||||
|
- offene Sitze pro Region und Amt
|
||||||
|
- vorhandene Spielerbewerbungen
|
||||||
|
- vorhandene NPC-Kandidaten
|
||||||
|
|
||||||
|
NPC-Bewerbungen entstehen bevorzugt wenn:
|
||||||
|
|
||||||
|
- ein Amt offen ist
|
||||||
|
- keine ausreichende Zahl an Bewerbungen existiert
|
||||||
|
- in der Region oder der Elternregion geeignete NPCs vorhanden sind
|
||||||
|
|
||||||
|
### 4.3 Geeignete NPCs
|
||||||
|
|
||||||
|
Ein NPC ist grundsätzlich geeignet, wenn:
|
||||||
|
|
||||||
|
- er lebt
|
||||||
|
- er nicht bereits ein gleiches oder höheres unvereinbares Kirchenamt innehat
|
||||||
|
- sein bisher höchstes Kirchenamt oder seine bisherige Laufbahn die Stufe plausibel macht
|
||||||
|
- seine Reputation ausreichend ist
|
||||||
|
|
||||||
|
Zusätzliche Faktoren für NPC-Eignung:
|
||||||
|
|
||||||
|
- Alter
|
||||||
|
- Gesundheit
|
||||||
|
- Adelstitel
|
||||||
|
- Reputation
|
||||||
|
- bestehendes Kirchenamt
|
||||||
|
- bisher höchstes Kirchenamt
|
||||||
|
|
||||||
|
## 5. Auswahl- und Beförderungslogik
|
||||||
|
|
||||||
|
### 5.1 Bewertungswert
|
||||||
|
|
||||||
|
Für jede Bewerbung wird ein Score berechnet:
|
||||||
|
|
||||||
|
`churchCandidateScore`
|
||||||
|
|
||||||
|
Bestandteile:
|
||||||
|
|
||||||
|
- bisher höchstes Kirchenamt
|
||||||
|
- aktuelles Kirchenamt
|
||||||
|
- Reputation
|
||||||
|
- Adelstitel
|
||||||
|
- Alter in idealem Bereich
|
||||||
|
- regionale Nähe
|
||||||
|
- ggf. geringe Bonuspunkte für lange Wartezeit
|
||||||
|
|
||||||
|
### 5.2 Entscheidung durch Spieler
|
||||||
|
|
||||||
|
Wenn der zuständige Vorgesetzte ein Spielercharakter ist:
|
||||||
|
|
||||||
|
- Die Bewerbung erscheint wie bisher in der UI.
|
||||||
|
- Der Spieler kann annehmen oder ablehnen.
|
||||||
|
- Solange eine Spielerentscheidung aussteht, entscheidet der Daemon nicht automatisch.
|
||||||
|
|
||||||
|
Optionaler Timeout:
|
||||||
|
|
||||||
|
- Nach längerer Untätigkeit darf später ein automatischer Verfall oder eine automatische Daemon-Entscheidung ergänzt werden.
|
||||||
|
- Das ist nicht Teil der ersten Ausbaustufe.
|
||||||
|
|
||||||
|
### 5.3 Entscheidung durch NPC
|
||||||
|
|
||||||
|
Wenn der zuständige Vorgesetzte ein NPC ist:
|
||||||
|
|
||||||
|
- Der Daemon entscheidet automatisch.
|
||||||
|
- Maßgeblich ist primär der Bewerber-Score.
|
||||||
|
- Zusätzlich wirkt die Reputation des NPC-Vorgesetzten als "Strengefaktor".
|
||||||
|
|
||||||
|
## 6. Reputation des NPC-Vorgesetzten
|
||||||
|
|
||||||
|
Wenn ein NPC ein Amt innehat, entscheidet er über die unter ihm liegende Position anhand von Reputation.
|
||||||
|
|
||||||
|
Das bedeutet:
|
||||||
|
|
||||||
|
- Ein angesehener NPC-Vorgesetzter bevorzugt reputationsstarke, standesgemäße und stabile Bewerber.
|
||||||
|
- Ein schwacher oder verrufener NPC-Vorgesetzter entscheidet unberechenbarer.
|
||||||
|
|
||||||
|
Empfohlenes Modell:
|
||||||
|
|
||||||
|
- `supervisorInfluence = supervisor.reputation / 100`
|
||||||
|
- je höher dieser Wert, desto stärker zählt der objektive Bewerber-Score
|
||||||
|
- bei niedriger Reputation steigt der Zufallsanteil
|
||||||
|
|
||||||
|
Praktische Wirkung:
|
||||||
|
|
||||||
|
- Hohe NPC-Reputation:
|
||||||
|
- bessere, berechenbarere Besetzung
|
||||||
|
- Niedrige NPC-Reputation:
|
||||||
|
- mehr Fehlbesetzungen
|
||||||
|
- mehr schwankende Entscheidungen
|
||||||
|
|
||||||
|
## 7. Fehlende historische Kirchenlaufbahn
|
||||||
|
|
||||||
|
Damit ein Charakter sich später auf höhere Ämter bewerben kann, braucht das System mehr als nur aktuelle `church_office`.
|
||||||
|
|
||||||
|
Es wird deshalb ein persistierter Höchstwert benötigt:
|
||||||
|
|
||||||
|
- `highestChurchOfficeRankEver`
|
||||||
|
|
||||||
|
Empfehlung:
|
||||||
|
|
||||||
|
- eigener Wert am Charakter oder in einer Laufbahntabelle
|
||||||
|
- beim erstmaligen Erreichen eines höheren Kirchenamts aktualisieren
|
||||||
|
- bei Verlust des Amts nicht zurücksetzen
|
||||||
|
|
||||||
|
Ohne diesen Wert bleibt höherer Aufstieg nach Amtsverlust oder Umstrukturierung unzuverlässig.
|
||||||
|
|
||||||
|
## 8. Verfügbarkeit in der UI
|
||||||
|
|
||||||
|
Die UI soll später drei Dinge klar darstellen:
|
||||||
|
|
||||||
|
- aktuelle Ämter
|
||||||
|
- verfügbare Bewerbungen
|
||||||
|
- eigene höchste Kirchenlaufbahn
|
||||||
|
|
||||||
|
Zusätzlich sinnvoll:
|
||||||
|
|
||||||
|
- ob die Entscheidung durch einen Spieler oder NPC getroffen wird
|
||||||
|
- wer der zuständige Vorgesetzte ist
|
||||||
|
- ob eine Position automatisch nachbesetzt wird
|
||||||
|
|
||||||
|
## 9. Daemon-Aufgaben
|
||||||
|
|
||||||
|
Der Daemon soll täglich folgende Schritte ausführen:
|
||||||
|
|
||||||
|
### 9.1 Kirchenlage erfassen
|
||||||
|
|
||||||
|
- offene Sitze je `church_office_type` und Region zählen
|
||||||
|
- aktuelle Amtsträger laden
|
||||||
|
- Spielerbewerbungen laden
|
||||||
|
- NPC-Kandidaten bestimmen
|
||||||
|
|
||||||
|
### 9.2 NPC-Bewerbungen erzeugen
|
||||||
|
|
||||||
|
- für vakante Positionen fehlende NPC-Bewerbungen anlegen
|
||||||
|
- keine Doppelbewerbungen für dieselbe Position erzeugen
|
||||||
|
|
||||||
|
### 9.3 Bewerbungen bewerten
|
||||||
|
|
||||||
|
- Bewerber-Score berechnen
|
||||||
|
- zuständigen Vorgesetzten ermitteln
|
||||||
|
- falls NPC-Vorgesetzter: Entscheidung automatisch treffen
|
||||||
|
- falls Spieler-Vorgesetzter: Bewerbung offen lassen
|
||||||
|
|
||||||
|
### 9.4 Beförderungen und Besetzungen durchführen
|
||||||
|
|
||||||
|
- `church_office` anlegen oder aktualisieren
|
||||||
|
- alte widersprechende Bewerbungen schließen
|
||||||
|
- `highestChurchOfficeRankEver` aktualisieren
|
||||||
|
|
||||||
|
### 9.5 Sonderfall komplett leere Hierarchie
|
||||||
|
|
||||||
|
Wenn eine Hierarchiestufe samt Vorgesetzten fehlt:
|
||||||
|
|
||||||
|
- untere Ebene darf durch den Daemon interimistisch mit dem besten Kandidaten besetzt werden
|
||||||
|
- dies soll selten und regelgeleitet geschehen
|
||||||
|
- für hohe Spitzenämter deutlich restriktiver als für niedrige Ämter
|
||||||
|
|
||||||
|
## 10. Event-Kommunikation zwischen Daemon und UI
|
||||||
|
|
||||||
|
Neue oder präzisierte Events:
|
||||||
|
|
||||||
|
### 10.1 `falukantUpdateChurch`
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"event": "falukantUpdateChurch",
|
||||||
|
"user_id": 123,
|
||||||
|
"reason": "applications"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Zulässige `reason`-Werte:
|
||||||
|
|
||||||
|
- `applications`
|
||||||
|
- `appointment`
|
||||||
|
- `promotion`
|
||||||
|
- `vacancy_fill`
|
||||||
|
- `npc_decision`
|
||||||
|
|
||||||
|
### 10.2 UI-Reaktion
|
||||||
|
|
||||||
|
- `applications`:
|
||||||
|
- Bewerbungslisten neu laden
|
||||||
|
- `appointment`:
|
||||||
|
- aktuelle Ämter und verfügbare Ämter neu laden
|
||||||
|
- `promotion`:
|
||||||
|
- aktuelle Ämter, verfügbare Ämter, ggf. Sozialstatus/Ansehen neu laden
|
||||||
|
- `vacancy_fill`:
|
||||||
|
- aktuelle Ämter und verfügbare Positionen neu laden
|
||||||
|
- `npc_decision`:
|
||||||
|
- supervised applications und current positions neu laden
|
||||||
|
|
||||||
|
Zusätzlich kann weiterhin `falukantUpdateStatus` gesendet werden.
|
||||||
|
|
||||||
|
## 11. Backend-Anpassungen außerhalb des Daemons
|
||||||
|
|
||||||
|
Die Daemon-Logik allein reicht nicht. Das Backend muss angepasst werden:
|
||||||
|
|
||||||
|
- `getAvailableChurchPositions()` darf nicht nur aktuelle Ämter als Voraussetzung ansehen
|
||||||
|
- es muss die bisher höchste Kirchenlaufbahn berücksichtigen
|
||||||
|
- freie Positionen dürfen nicht nur an schon exakt lineare Amtshalter gebunden sein
|
||||||
|
- Spielerbewerbungen und NPC-Bewerbungen müssen dieselbe Bewertungslogik unterstützen
|
||||||
|
|
||||||
|
## 12. Empfohlene Umsetzung in Phasen
|
||||||
|
|
||||||
|
### Phase C1
|
||||||
|
|
||||||
|
- Konzept `highestChurchOfficeRankEver` einführen
|
||||||
|
- `getAvailableChurchPositions()` auf höchste Kirchenlaufbahn erweitern
|
||||||
|
- UI lesbar machen
|
||||||
|
|
||||||
|
### Phase C2
|
||||||
|
|
||||||
|
- NPC-Bewerbungen im Daemon
|
||||||
|
- automatische NPC-Entscheidungen
|
||||||
|
|
||||||
|
### Phase C3
|
||||||
|
|
||||||
|
- Interimsbesetzung für leere Hierarchien
|
||||||
|
- Feintuning von Reputation und Zufall
|
||||||
|
|
||||||
|
## 13. Wichtige Designentscheidungen
|
||||||
|
|
||||||
|
- Spieleraufstieg bleibt antragsbasiert
|
||||||
|
- NPCs füllen das System aktiv auf
|
||||||
|
- hohe Reputation eines NPC-Vorgesetzten verbessert die Besetzungsqualität
|
||||||
|
- höhere Ämter sollen auch dann erreichbar bleiben, wenn der Charakter das Voramt nicht mehr aktuell innehat
|
||||||
|
- komplett leere Kirchenstrukturen dürfen sich wieder aufbauen
|
||||||
|
|
||||||
|
## 14. Offene Punkte
|
||||||
|
|
||||||
|
- Wo genau `highestChurchOfficeRankEver` gespeichert wird
|
||||||
|
- ob es zusätzlich `highestChurchOfficeTypeEver` geben soll
|
||||||
|
- ob automatische NPC-Entscheidungen ein Timeout für offene Spielerbewerbungen bekommen
|
||||||
|
- wie stark Reputation gegenüber Adelstitel und Alter gewichtet wird
|
||||||
|
|
||||||
@@ -108,7 +108,7 @@ export default {
|
|||||||
},
|
},
|
||||||
setupSocketListeners() {
|
setupSocketListeners() {
|
||||||
this.teardownSocketListeners();
|
this.teardownSocketListeners();
|
||||||
const daemonEvents = ['falukantUpdateStatus', 'falukantUpdateFamily', 'children_update', 'falukantUpdateProductionCertificate', 'stock_change', 'familychanged'];
|
const daemonEvents = ['falukantUpdateStatus', 'falukantUpdateFamily', 'falukantUpdateChurch', 'children_update', 'falukantUpdateProductionCertificate', 'stock_change', 'familychanged'];
|
||||||
if (this.daemonSocket) {
|
if (this.daemonSocket) {
|
||||||
this._daemonMessageHandler = (event) => {
|
this._daemonMessageHandler = (event) => {
|
||||||
if (event.data === 'ping') return;
|
if (event.data === 'ping') return;
|
||||||
@@ -126,6 +126,9 @@ export default {
|
|||||||
this._familySocketHandler = (data) => {
|
this._familySocketHandler = (data) => {
|
||||||
if (this.matchesCurrentUser(data)) this.queueFetchData();
|
if (this.matchesCurrentUser(data)) this.queueFetchData();
|
||||||
};
|
};
|
||||||
|
this._churchSocketHandler = (data) => {
|
||||||
|
if (this.matchesCurrentUser(data)) this.queueFetchData();
|
||||||
|
};
|
||||||
this._childrenSocketHandler = (data) => {
|
this._childrenSocketHandler = (data) => {
|
||||||
if (this.matchesCurrentUser(data)) this.queueFetchData();
|
if (this.matchesCurrentUser(data)) this.queueFetchData();
|
||||||
};
|
};
|
||||||
@@ -136,6 +139,7 @@ export default {
|
|||||||
|
|
||||||
this.socket.on('falukantUpdateStatus', this._statusSocketHandler);
|
this.socket.on('falukantUpdateStatus', this._statusSocketHandler);
|
||||||
this.socket.on('falukantUpdateFamily', this._familySocketHandler);
|
this.socket.on('falukantUpdateFamily', this._familySocketHandler);
|
||||||
|
this.socket.on('falukantUpdateChurch', this._churchSocketHandler);
|
||||||
this.socket.on('children_update', this._childrenSocketHandler);
|
this.socket.on('children_update', this._childrenSocketHandler);
|
||||||
this.socket.on('falukantUpdateProductionCertificate', this._productionCertificateSocketHandler);
|
this.socket.on('falukantUpdateProductionCertificate', this._productionCertificateSocketHandler);
|
||||||
this.socket.on('falukantBranchUpdate', this._branchSocketHandler);
|
this.socket.on('falukantBranchUpdate', this._branchSocketHandler);
|
||||||
@@ -149,6 +153,7 @@ export default {
|
|||||||
if (this.socket) {
|
if (this.socket) {
|
||||||
if (this._statusSocketHandler) this.socket.off('falukantUpdateStatus', this._statusSocketHandler);
|
if (this._statusSocketHandler) this.socket.off('falukantUpdateStatus', this._statusSocketHandler);
|
||||||
if (this._familySocketHandler) this.socket.off('falukantUpdateFamily', this._familySocketHandler);
|
if (this._familySocketHandler) this.socket.off('falukantUpdateFamily', this._familySocketHandler);
|
||||||
|
if (this._churchSocketHandler) this.socket.off('falukantUpdateChurch', this._churchSocketHandler);
|
||||||
if (this._childrenSocketHandler) this.socket.off('children_update', this._childrenSocketHandler);
|
if (this._childrenSocketHandler) this.socket.off('children_update', this._childrenSocketHandler);
|
||||||
if (this._productionCertificateSocketHandler) this.socket.off('falukantUpdateProductionCertificate', this._productionCertificateSocketHandler);
|
if (this._productionCertificateSocketHandler) this.socket.off('falukantUpdateProductionCertificate', this._productionCertificateSocketHandler);
|
||||||
if (this._branchSocketHandler) this.socket.off('falukantBranchUpdate', this._branchSocketHandler);
|
if (this._branchSocketHandler) this.socket.off('falukantBranchUpdate', this._branchSocketHandler);
|
||||||
|
|||||||
@@ -176,6 +176,7 @@ export default {
|
|||||||
if (!this.socket) return;
|
if (!this.socket) return;
|
||||||
this._statusSocketHandler = (data) => this.handleEvent({ event: 'falukantUpdateStatus', ...data });
|
this._statusSocketHandler = (data) => this.handleEvent({ event: 'falukantUpdateStatus', ...data });
|
||||||
this._familySocketHandler = (data) => this.handleEvent({ event: 'falukantUpdateFamily', ...data });
|
this._familySocketHandler = (data) => this.handleEvent({ event: 'falukantUpdateFamily', ...data });
|
||||||
|
this._churchSocketHandler = (data) => this.handleEvent({ event: 'falukantUpdateChurch', ...data });
|
||||||
this._childrenSocketHandler = (data) => this.handleEvent({ event: 'children_update', ...data });
|
this._childrenSocketHandler = (data) => this.handleEvent({ event: 'children_update', ...data });
|
||||||
this._productionCertificateSocketHandler = (data) => this.handleEvent({ event: 'falukantUpdateProductionCertificate', ...data });
|
this._productionCertificateSocketHandler = (data) => this.handleEvent({ event: 'falukantUpdateProductionCertificate', ...data });
|
||||||
this._stockSocketHandler = (data) => this.handleEvent({ event: 'stock_change', ...data });
|
this._stockSocketHandler = (data) => this.handleEvent({ event: 'stock_change', ...data });
|
||||||
@@ -183,6 +184,7 @@ export default {
|
|||||||
|
|
||||||
this.socket.on('falukantUpdateStatus', this._statusSocketHandler);
|
this.socket.on('falukantUpdateStatus', this._statusSocketHandler);
|
||||||
this.socket.on('falukantUpdateFamily', this._familySocketHandler);
|
this.socket.on('falukantUpdateFamily', this._familySocketHandler);
|
||||||
|
this.socket.on('falukantUpdateChurch', this._churchSocketHandler);
|
||||||
this.socket.on('children_update', this._childrenSocketHandler);
|
this.socket.on('children_update', this._childrenSocketHandler);
|
||||||
this.socket.on('falukantUpdateProductionCertificate', this._productionCertificateSocketHandler);
|
this.socket.on('falukantUpdateProductionCertificate', this._productionCertificateSocketHandler);
|
||||||
this.socket.on('stock_change', this._stockSocketHandler);
|
this.socket.on('stock_change', this._stockSocketHandler);
|
||||||
@@ -192,6 +194,7 @@ export default {
|
|||||||
if (this.socket) {
|
if (this.socket) {
|
||||||
if (this._statusSocketHandler) this.socket.off('falukantUpdateStatus', this._statusSocketHandler);
|
if (this._statusSocketHandler) this.socket.off('falukantUpdateStatus', this._statusSocketHandler);
|
||||||
if (this._familySocketHandler) this.socket.off('falukantUpdateFamily', this._familySocketHandler);
|
if (this._familySocketHandler) this.socket.off('falukantUpdateFamily', this._familySocketHandler);
|
||||||
|
if (this._churchSocketHandler) this.socket.off('falukantUpdateChurch', this._churchSocketHandler);
|
||||||
if (this._childrenSocketHandler) this.socket.off('children_update', this._childrenSocketHandler);
|
if (this._childrenSocketHandler) this.socket.off('children_update', this._childrenSocketHandler);
|
||||||
if (this._productionCertificateSocketHandler) this.socket.off('falukantUpdateProductionCertificate', this._productionCertificateSocketHandler);
|
if (this._productionCertificateSocketHandler) this.socket.off('falukantUpdateProductionCertificate', this._productionCertificateSocketHandler);
|
||||||
if (this._stockSocketHandler) this.socket.off('stock_change', this._stockSocketHandler);
|
if (this._stockSocketHandler) this.socket.off('stock_change', this._stockSocketHandler);
|
||||||
@@ -204,7 +207,7 @@ export default {
|
|||||||
this._daemonHandler = (event) => {
|
this._daemonHandler = (event) => {
|
||||||
try {
|
try {
|
||||||
const data = JSON.parse(event.data);
|
const data = JSON.parse(event.data);
|
||||||
if (['falukantUpdateStatus', 'falukantUpdateFamily', 'children_update', 'falukantUpdateProductionCertificate', 'stock_change', 'familychanged'].includes(data.event)) {
|
if (['falukantUpdateStatus', 'falukantUpdateFamily', 'falukantUpdateChurch', 'children_update', 'falukantUpdateProductionCertificate', 'stock_change', 'familychanged'].includes(data.event)) {
|
||||||
this.handleEvent(data);
|
this.handleEvent(data);
|
||||||
}
|
}
|
||||||
} catch (_) {}
|
} catch (_) {}
|
||||||
@@ -243,6 +246,7 @@ export default {
|
|||||||
switch (eventData.event) {
|
switch (eventData.event) {
|
||||||
case 'falukantUpdateStatus':
|
case 'falukantUpdateStatus':
|
||||||
case 'falukantUpdateFamily':
|
case 'falukantUpdateFamily':
|
||||||
|
case 'falukantUpdateChurch':
|
||||||
case 'children_update':
|
case 'children_update':
|
||||||
case 'falukantUpdateProductionCertificate':
|
case 'falukantUpdateProductionCertificate':
|
||||||
case 'stock_change':
|
case 'stock_change':
|
||||||
|
|||||||
@@ -1024,10 +1024,18 @@
|
|||||||
"church": {
|
"church": {
|
||||||
"title": "Kirche",
|
"title": "Kirche",
|
||||||
"tabs": {
|
"tabs": {
|
||||||
|
"baptism": "Taufen",
|
||||||
"current": "Aktuelle Positionen",
|
"current": "Aktuelle Positionen",
|
||||||
"available": "Verfügbare Positionen",
|
"available": "Verfügbare Positionen",
|
||||||
"applications": "Bewerbungen"
|
"applications": "Bewerbungen"
|
||||||
},
|
},
|
||||||
|
"summary": {
|
||||||
|
"highestCurrentOffice": "Höchstes aktuelles Amt",
|
||||||
|
"availableApplications": "Mögliche Bewerbungen",
|
||||||
|
"supervisedApplications": "Zu entscheidende Bewerbungen",
|
||||||
|
"guidance": "Kirchenämter steigen stufenweise auf. Über Bewerbungen entscheidet in der Regel das nächsthöhere Amt; falls dort kein Spieler sitzt, kann später ein NPC entscheiden.",
|
||||||
|
"none": "Noch kein Kirchenamt"
|
||||||
|
},
|
||||||
"current": {
|
"current": {
|
||||||
"office": "Amt",
|
"office": "Amt",
|
||||||
"region": "Region",
|
"region": "Region",
|
||||||
@@ -1039,11 +1047,25 @@
|
|||||||
"office": "Amt",
|
"office": "Amt",
|
||||||
"region": "Region",
|
"region": "Region",
|
||||||
"supervisor": "Vorgesetzter",
|
"supervisor": "Vorgesetzter",
|
||||||
|
"decision": "Entscheidung durch",
|
||||||
|
"decisionType": {
|
||||||
|
"entry": "Direkter Einstieg",
|
||||||
|
"player": "Spieler",
|
||||||
|
"npc": "NPC",
|
||||||
|
"interim": "Interim"
|
||||||
|
},
|
||||||
"seats": "Verfügbare Plätze",
|
"seats": "Verfügbare Plätze",
|
||||||
"action": "Aktion",
|
"action": "Aktion",
|
||||||
"apply": "Bewerben",
|
"apply": "Bewerben",
|
||||||
"applySuccess": "Bewerbung erfolgreich eingereicht.",
|
"applySuccess": "Bewerbung erfolgreich eingereicht.",
|
||||||
"applyError": "Fehler beim Einreichen der Bewerbung.",
|
"applyError": "Fehler beim Einreichen der Bewerbung.",
|
||||||
|
"errors": {
|
||||||
|
"characterNotFound": "Dein Charakter konnte nicht gefunden werden.",
|
||||||
|
"officeTypeNotFound": "Das Kirchenamt wurde nicht gefunden.",
|
||||||
|
"churchCareerTooLow": "Deine bisherige kirchliche Laufbahn reicht für dieses Amt noch nicht aus.",
|
||||||
|
"noAvailableSeats": "Für dieses Kirchenamt sind derzeit keine Plätze frei.",
|
||||||
|
"applicationAlreadyExists": "Für dieses Kirchenamt in dieser Region besteht bereits eine offene Bewerbung."
|
||||||
|
},
|
||||||
"none": "Keine verfügbaren Positionen."
|
"none": "Keine verfügbaren Positionen."
|
||||||
},
|
},
|
||||||
"applications": {
|
"applications": {
|
||||||
|
|||||||
@@ -651,10 +651,18 @@
|
|||||||
"church": {
|
"church": {
|
||||||
"title": "Church",
|
"title": "Church",
|
||||||
"tabs": {
|
"tabs": {
|
||||||
|
"baptism": "Baptism",
|
||||||
"current": "Current Positions",
|
"current": "Current Positions",
|
||||||
"available": "Available Positions",
|
"available": "Available Positions",
|
||||||
"applications": "Applications"
|
"applications": "Applications"
|
||||||
},
|
},
|
||||||
|
"summary": {
|
||||||
|
"highestCurrentOffice": "Highest current office",
|
||||||
|
"availableApplications": "Possible applications",
|
||||||
|
"supervisedApplications": "Applications to decide",
|
||||||
|
"guidance": "Church offices usually progress step by step. Applications are normally decided by the next higher office; if no player holds it, an NPC may later decide.",
|
||||||
|
"none": "No church office yet"
|
||||||
|
},
|
||||||
"current": {
|
"current": {
|
||||||
"office": "Office",
|
"office": "Office",
|
||||||
"region": "Region",
|
"region": "Region",
|
||||||
@@ -666,11 +674,25 @@
|
|||||||
"office": "Office",
|
"office": "Office",
|
||||||
"region": "Region",
|
"region": "Region",
|
||||||
"supervisor": "Supervisor",
|
"supervisor": "Supervisor",
|
||||||
|
"decision": "Decision by",
|
||||||
|
"decisionType": {
|
||||||
|
"entry": "Direct entry",
|
||||||
|
"player": "Player",
|
||||||
|
"npc": "NPC",
|
||||||
|
"interim": "Interim"
|
||||||
|
},
|
||||||
"seats": "Available Seats",
|
"seats": "Available Seats",
|
||||||
"action": "Action",
|
"action": "Action",
|
||||||
"apply": "Apply",
|
"apply": "Apply",
|
||||||
"applySuccess": "Application submitted successfully.",
|
"applySuccess": "Application submitted successfully.",
|
||||||
"applyError": "Error submitting application.",
|
"applyError": "Error submitting application.",
|
||||||
|
"errors": {
|
||||||
|
"characterNotFound": "Your character could not be found.",
|
||||||
|
"officeTypeNotFound": "The church office could not be found.",
|
||||||
|
"churchCareerTooLow": "Your previous church career is not yet sufficient for this office.",
|
||||||
|
"noAvailableSeats": "There are currently no free seats for this church office.",
|
||||||
|
"applicationAlreadyExists": "There is already an open application for this church office in this region."
|
||||||
|
},
|
||||||
"none": "No available positions."
|
"none": "No available positions."
|
||||||
},
|
},
|
||||||
"applications": {
|
"applications": {
|
||||||
|
|||||||
@@ -967,6 +967,64 @@
|
|||||||
},
|
},
|
||||||
"church": {
|
"church": {
|
||||||
"title": "Iglesia",
|
"title": "Iglesia",
|
||||||
|
"tabs": {
|
||||||
|
"baptism": "Bautizos",
|
||||||
|
"current": "Cargos actuales",
|
||||||
|
"available": "Cargos disponibles",
|
||||||
|
"applications": "Solicitudes"
|
||||||
|
},
|
||||||
|
"summary": {
|
||||||
|
"highestCurrentOffice": "Cargo actual más alto",
|
||||||
|
"availableApplications": "Solicitudes posibles",
|
||||||
|
"supervisedApplications": "Solicitudes por decidir",
|
||||||
|
"guidance": "Los cargos eclesiásticos suelen ascender paso a paso. Las solicitudes normalmente las decide el cargo inmediatamente superior; si no hay jugador en ese puesto, más adelante puede decidir un NPC.",
|
||||||
|
"none": "Todavía sin cargo eclesiástico"
|
||||||
|
},
|
||||||
|
"current": {
|
||||||
|
"office": "Cargo",
|
||||||
|
"region": "Región",
|
||||||
|
"holder": "Titular",
|
||||||
|
"supervisor": "Superior",
|
||||||
|
"none": "No hay cargos actuales."
|
||||||
|
},
|
||||||
|
"available": {
|
||||||
|
"office": "Cargo",
|
||||||
|
"region": "Región",
|
||||||
|
"supervisor": "Superior",
|
||||||
|
"decision": "Decide",
|
||||||
|
"decisionType": {
|
||||||
|
"entry": "Acceso directo",
|
||||||
|
"player": "Jugador",
|
||||||
|
"npc": "NPC",
|
||||||
|
"interim": "Interino"
|
||||||
|
},
|
||||||
|
"seats": "Plazas disponibles",
|
||||||
|
"action": "Acción",
|
||||||
|
"apply": "Solicitar",
|
||||||
|
"applySuccess": "Solicitud enviada correctamente.",
|
||||||
|
"applyError": "Error al enviar la solicitud.",
|
||||||
|
"errors": {
|
||||||
|
"characterNotFound": "No se pudo encontrar tu personaje.",
|
||||||
|
"officeTypeNotFound": "No se encontró el cargo eclesiástico.",
|
||||||
|
"churchCareerTooLow": "Tu trayectoria eclesiástica todavía no es suficiente para este cargo.",
|
||||||
|
"noAvailableSeats": "Actualmente no hay plazas libres para este cargo eclesiástico.",
|
||||||
|
"applicationAlreadyExists": "Ya existe una solicitud abierta para este cargo eclesiástico en esta región."
|
||||||
|
},
|
||||||
|
"none": "No hay cargos disponibles."
|
||||||
|
},
|
||||||
|
"applications": {
|
||||||
|
"office": "Cargo",
|
||||||
|
"region": "Región",
|
||||||
|
"applicant": "Solicitante",
|
||||||
|
"date": "Fecha",
|
||||||
|
"action": "Acción",
|
||||||
|
"approve": "Aceptar",
|
||||||
|
"reject": "Rechazar",
|
||||||
|
"approveSuccess": "Solicitud aceptada.",
|
||||||
|
"rejectSuccess": "Solicitud rechazada.",
|
||||||
|
"decideError": "Error al tomar la decisión.",
|
||||||
|
"none": "No hay solicitudes."
|
||||||
|
},
|
||||||
"baptism": {
|
"baptism": {
|
||||||
"title": "Bautizos",
|
"title": "Bautizos",
|
||||||
"table": {
|
"table": {
|
||||||
|
|||||||
@@ -3,6 +3,25 @@
|
|||||||
<StatusBar />
|
<StatusBar />
|
||||||
<div class="church-content">
|
<div class="church-content">
|
||||||
<h2>{{ $t('falukant.church.title') }}</h2>
|
<h2>{{ $t('falukant.church.title') }}</h2>
|
||||||
|
<div class="church-summary">
|
||||||
|
<div class="church-summary-card">
|
||||||
|
<div class="church-summary-label">{{ $t('falukant.church.summary.highestCurrentOffice') }}</div>
|
||||||
|
<div class="church-summary-value">{{ highestCurrentOfficeLabel }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="church-summary-card">
|
||||||
|
<div class="church-summary-label">{{ $t('falukant.church.summary.availableApplications') }}</div>
|
||||||
|
<div class="church-summary-value">{{ availablePositions.length }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="church-summary-card">
|
||||||
|
<div class="church-summary-label">{{ $t('falukant.church.summary.supervisedApplications') }}</div>
|
||||||
|
<div class="church-summary-value">{{ supervisedApplications.length }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="church-guidance">
|
||||||
|
<p>{{ $t('falukant.church.summary.guidance') }}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
<SimpleTabs v-model="activeTab" :tabs="tabs" />
|
<SimpleTabs v-model="activeTab" :tabs="tabs" />
|
||||||
|
|
||||||
<div class="tab-content">
|
<div class="tab-content">
|
||||||
@@ -87,6 +106,7 @@
|
|||||||
<th>{{ $t('falukant.church.available.office') }}</th>
|
<th>{{ $t('falukant.church.available.office') }}</th>
|
||||||
<th>{{ $t('falukant.church.available.region') }}</th>
|
<th>{{ $t('falukant.church.available.region') }}</th>
|
||||||
<th>{{ $t('falukant.church.available.supervisor') }}</th>
|
<th>{{ $t('falukant.church.available.supervisor') }}</th>
|
||||||
|
<th>{{ $t('falukant.church.available.decision') }}</th>
|
||||||
<th>{{ $t('falukant.church.available.seats') }}</th>
|
<th>{{ $t('falukant.church.available.seats') }}</th>
|
||||||
<th>{{ $t('falukant.church.available.action') }}</th>
|
<th>{{ $t('falukant.church.available.action') }}</th>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -101,6 +121,7 @@
|
|||||||
</span>
|
</span>
|
||||||
<span v-else>—</span>
|
<span v-else>—</span>
|
||||||
</td>
|
</td>
|
||||||
|
<td>{{ decisionModeLabel(pos.decisionMode) }}</td>
|
||||||
<td>{{ pos.availableSeats }}</td>
|
<td>{{ pos.availableSeats }}</td>
|
||||||
<td>
|
<td>
|
||||||
<button @click="applyForPosition(pos)" :disabled="pos.availableSeats === 0">
|
<button @click="applyForPosition(pos)" :disabled="pos.availableSeats === 0">
|
||||||
@@ -109,7 +130,7 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr v-if="!availablePositions.length">
|
<tr v-if="!availablePositions.length">
|
||||||
<td colspan="5">{{ $t('falukant.church.available.none') }}</td>
|
<td colspan="6">{{ $t('falukant.church.available.none') }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
@@ -166,6 +187,7 @@ import MessageDialog from '@/dialogues/standard/MessageDialog.vue'
|
|||||||
import ErrorDialog from '@/dialogues/standard/ErrorDialog.vue'
|
import ErrorDialog from '@/dialogues/standard/ErrorDialog.vue'
|
||||||
import apiClient from '@/utils/axios.js'
|
import apiClient from '@/utils/axios.js'
|
||||||
import SimpleTabs from '@/components/SimpleTabs.vue'
|
import SimpleTabs from '@/components/SimpleTabs.vue'
|
||||||
|
import { mapState } from 'vuex'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ChurchView',
|
name: 'ChurchView',
|
||||||
@@ -196,9 +218,37 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
computed: {
|
||||||
|
...mapState(['socket', 'daemonSocket', 'user']),
|
||||||
|
highestCurrentOffice() {
|
||||||
|
if (!this.currentPositions.length) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return [...this.currentPositions]
|
||||||
|
.filter(pos => this.isOwnPosition(pos))
|
||||||
|
.sort((a, b) => this.officeRank(b.officeType?.name) - this.officeRank(a.officeType?.name))[0] || null;
|
||||||
|
},
|
||||||
|
highestCurrentOfficeLabel() {
|
||||||
|
if (!this.highestCurrentOffice?.officeType?.name) {
|
||||||
|
return this.$t('falukant.church.summary.none');
|
||||||
|
}
|
||||||
|
return this.$t(`falukant.church.offices.${this.highestCurrentOffice.officeType.name}`);
|
||||||
|
}
|
||||||
|
},
|
||||||
async mounted() {
|
async mounted() {
|
||||||
await this.loadNotBaptisedChildren();
|
await this.loadNotBaptisedChildren();
|
||||||
await this.loadOwnCharacterId();
|
await this.loadOwnCharacterId();
|
||||||
|
await Promise.all([
|
||||||
|
this.loadCurrentPositions(),
|
||||||
|
this.loadAvailablePositions(),
|
||||||
|
this.loadSupervisedApplications()
|
||||||
|
]);
|
||||||
|
this.setupSocketEvents();
|
||||||
|
this.setupDaemonListeners();
|
||||||
|
},
|
||||||
|
beforeUnmount() {
|
||||||
|
this.teardownSocketEvents();
|
||||||
|
this.teardownDaemonListeners();
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
activeTab(newTab) {
|
activeTab(newTab) {
|
||||||
@@ -212,6 +262,90 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
matchesCurrentUser(eventData) {
|
||||||
|
if (eventData?.user_id == null) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
const currentIds = [this.user?.id, this.user?.hashedId]
|
||||||
|
.filter(Boolean)
|
||||||
|
.map((value) => String(value));
|
||||||
|
return currentIds.includes(String(eventData.user_id));
|
||||||
|
},
|
||||||
|
setupSocketEvents() {
|
||||||
|
this.teardownSocketEvents();
|
||||||
|
if (!this.socket) {
|
||||||
|
setTimeout(() => this.setupSocketEvents(), 1000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this._statusSocketHandler = (data) => this.handleEvent({ event: 'falukantUpdateStatus', ...data });
|
||||||
|
this._churchSocketHandler = (data) => this.handleEvent({ event: 'falukantUpdateChurch', ...data });
|
||||||
|
this.socket.on('falukantUpdateStatus', this._statusSocketHandler);
|
||||||
|
this.socket.on('falukantUpdateChurch', this._churchSocketHandler);
|
||||||
|
},
|
||||||
|
teardownSocketEvents() {
|
||||||
|
if (!this.socket) return;
|
||||||
|
if (this._statusSocketHandler) this.socket.off('falukantUpdateStatus', this._statusSocketHandler);
|
||||||
|
if (this._churchSocketHandler) this.socket.off('falukantUpdateChurch', this._churchSocketHandler);
|
||||||
|
},
|
||||||
|
setupDaemonListeners() {
|
||||||
|
this.teardownDaemonListeners();
|
||||||
|
if (!this.daemonSocket) return;
|
||||||
|
this._daemonChurchHandler = (event) => {
|
||||||
|
if (event.data === 'ping') return;
|
||||||
|
try {
|
||||||
|
const message = JSON.parse(event.data);
|
||||||
|
if (['falukantUpdateStatus', 'falukantUpdateChurch'].includes(message.event)) {
|
||||||
|
this.handleEvent(message);
|
||||||
|
}
|
||||||
|
} catch (_) {}
|
||||||
|
};
|
||||||
|
this.daemonSocket.addEventListener('message', this._daemonChurchHandler);
|
||||||
|
},
|
||||||
|
teardownDaemonListeners() {
|
||||||
|
if (this.daemonSocket && this._daemonChurchHandler) {
|
||||||
|
this.daemonSocket.removeEventListener('message', this._daemonChurchHandler);
|
||||||
|
this._daemonChurchHandler = null;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
queueChurchRefresh({ current = true, available = true, applications = true } = {}) {
|
||||||
|
if (this._pendingChurchRefresh) {
|
||||||
|
clearTimeout(this._pendingChurchRefresh);
|
||||||
|
}
|
||||||
|
this._pendingChurchRefresh = setTimeout(async () => {
|
||||||
|
this._pendingChurchRefresh = null;
|
||||||
|
const tasks = [];
|
||||||
|
if (current) tasks.push(this.loadCurrentPositions());
|
||||||
|
if (available) tasks.push(this.loadAvailablePositions());
|
||||||
|
if (applications) tasks.push(this.loadSupervisedApplications());
|
||||||
|
await Promise.all(tasks);
|
||||||
|
}, 120);
|
||||||
|
},
|
||||||
|
handleEvent(eventData) {
|
||||||
|
if (!this.matchesCurrentUser(eventData)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
switch (eventData.event) {
|
||||||
|
case 'falukantUpdateStatus':
|
||||||
|
this.queueChurchRefresh();
|
||||||
|
break;
|
||||||
|
case 'falukantUpdateChurch':
|
||||||
|
switch (eventData.reason) {
|
||||||
|
case 'applications':
|
||||||
|
this.queueChurchRefresh({ current: false, available: false, applications: true });
|
||||||
|
break;
|
||||||
|
case 'npc_decision':
|
||||||
|
this.queueChurchRefresh({ current: true, available: true, applications: true });
|
||||||
|
break;
|
||||||
|
case 'appointment':
|
||||||
|
case 'vacancy_fill':
|
||||||
|
case 'promotion':
|
||||||
|
default:
|
||||||
|
this.queueChurchRefresh({ current: true, available: true, applications: false });
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
},
|
||||||
async loadNotBaptisedChildren() {
|
async loadNotBaptisedChildren() {
|
||||||
try {
|
try {
|
||||||
const { data } = await apiClient.get('/api/falukant/family/notbaptised')
|
const { data } = await apiClient.get('/api/falukant/family/notbaptised')
|
||||||
@@ -292,6 +426,24 @@ export default {
|
|||||||
}
|
}
|
||||||
return pos.character.id === this.ownCharacterId;
|
return pos.character.id === this.ownCharacterId;
|
||||||
},
|
},
|
||||||
|
officeRank(name) {
|
||||||
|
const ranks = {
|
||||||
|
'lay-preacher': 0,
|
||||||
|
'village-priest': 1,
|
||||||
|
'parish-priest': 2,
|
||||||
|
dean: 3,
|
||||||
|
archdeacon: 4,
|
||||||
|
bishop: 5,
|
||||||
|
archbishop: 6,
|
||||||
|
cardinal: 7,
|
||||||
|
pope: 8
|
||||||
|
};
|
||||||
|
return ranks[name] ?? -1;
|
||||||
|
},
|
||||||
|
decisionModeLabel(mode) {
|
||||||
|
const key = `falukant.church.available.decisionType.${mode || 'interim'}`;
|
||||||
|
return this.$te(key) ? this.$t(key) : mode || '—';
|
||||||
|
},
|
||||||
async applyForPosition(position) {
|
async applyForPosition(position) {
|
||||||
try {
|
try {
|
||||||
const regionId = position.regionId || position.region?.id;
|
const regionId = position.regionId || position.region?.id;
|
||||||
@@ -310,7 +462,7 @@ export default {
|
|||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Error applying for position', err);
|
console.error('Error applying for position', err);
|
||||||
const errorMsg = err.response?.data?.message || 'falukant.church.available.applyError';
|
const errorMsg = err.response?.data?.message || 'falukant.church.available.applyError';
|
||||||
this.$root.$refs.errorDialog?.open(`tr:${errorMsg}`);
|
this.$root.$refs.errorDialog?.open(errorMsg.startsWith('falukant.') ? `tr:${errorMsg}` : `tr:falukant.church.available.applyError`);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async decideOnApplication(applicationId, decision) {
|
async decideOnApplication(applicationId, decision) {
|
||||||
@@ -370,6 +522,35 @@ h2 {
|
|||||||
margin-top: 1rem;
|
margin-top: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.church-summary {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
|
||||||
|
gap: 0.75rem;
|
||||||
|
margin: 1rem 0 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.church-summary-card,
|
||||||
|
.church-guidance {
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
background: #fff;
|
||||||
|
padding: 0.85rem 1rem;
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.church-summary-label {
|
||||||
|
font-size: 0.85rem;
|
||||||
|
color: #666;
|
||||||
|
}
|
||||||
|
|
||||||
|
.church-summary-value {
|
||||||
|
margin-top: 0.25rem;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.church-guidance {
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
input[type="text"] {
|
input[type="text"] {
|
||||||
width: 140px;
|
width: 140px;
|
||||||
margin-right: 0.5rem;
|
margin-right: 0.5rem;
|
||||||
|
|||||||
@@ -455,6 +455,7 @@ export default {
|
|||||||
'falukantUpdateStatus',
|
'falukantUpdateStatus',
|
||||||
'falukantUpdateFamily',
|
'falukantUpdateFamily',
|
||||||
'children_update',
|
'children_update',
|
||||||
|
'falukantUpdateChurch',
|
||||||
'familychanged',
|
'familychanged',
|
||||||
'falukant_family_scandal_hint'
|
'falukant_family_scandal_hint'
|
||||||
].includes(message.event)) {
|
].includes(message.event)) {
|
||||||
@@ -513,7 +514,7 @@ export default {
|
|||||||
} else if (eventData.reason === 'lover_birth') {
|
} else if (eventData.reason === 'lover_birth') {
|
||||||
showInfo(this, this.$t('falukant.family.notifications.loverBirth'));
|
showInfo(this, this.$t('falukant.family.notifications.loverBirth'));
|
||||||
}
|
}
|
||||||
this.queueFamilyRefresh({ reloadCharacter: eventData.reason === 'monthly' || eventData.reason === 'daily' });
|
this.queueFamilyRefresh({ reloadCharacter: ['monthly', 'daily', 'lover_installment'].includes(eventData.reason) });
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -356,6 +356,7 @@ export default {
|
|||||||
this.socket.off("falukantUserUpdated", this.fetchFalukantUser);
|
this.socket.off("falukantUserUpdated", this.fetchFalukantUser);
|
||||||
this.socket.off("falukantUpdateStatus");
|
this.socket.off("falukantUpdateStatus");
|
||||||
this.socket.off("falukantUpdateFamily");
|
this.socket.off("falukantUpdateFamily");
|
||||||
|
this.socket.off("falukantUpdateChurch");
|
||||||
this.socket.off("falukantUpdateProductionCertificate");
|
this.socket.off("falukantUpdateProductionCertificate");
|
||||||
this.socket.off("children_update");
|
this.socket.off("children_update");
|
||||||
this.socket.off("falukantBranchUpdate");
|
this.socket.off("falukantBranchUpdate");
|
||||||
@@ -372,6 +373,9 @@ export default {
|
|||||||
this.socket.on("falukantUpdateFamily", (data) => {
|
this.socket.on("falukantUpdateFamily", (data) => {
|
||||||
this.handleEvent({ event: 'falukantUpdateFamily', ...data });
|
this.handleEvent({ event: 'falukantUpdateFamily', ...data });
|
||||||
});
|
});
|
||||||
|
this.socket.on("falukantUpdateChurch", (data) => {
|
||||||
|
this.handleEvent({ event: 'falukantUpdateChurch', ...data });
|
||||||
|
});
|
||||||
this.socket.on("falukantUpdateProductionCertificate", (data) => {
|
this.socket.on("falukantUpdateProductionCertificate", (data) => {
|
||||||
this.handleEvent({ event: 'falukantUpdateProductionCertificate', ...data });
|
this.handleEvent({ event: 'falukantUpdateProductionCertificate', ...data });
|
||||||
});
|
});
|
||||||
@@ -441,6 +445,7 @@ export default {
|
|||||||
switch (eventData.event) {
|
switch (eventData.event) {
|
||||||
case 'falukantUpdateStatus':
|
case 'falukantUpdateStatus':
|
||||||
case 'falukantUpdateFamily':
|
case 'falukantUpdateFamily':
|
||||||
|
case 'falukantUpdateChurch':
|
||||||
case 'falukantUpdateProductionCertificate':
|
case 'falukantUpdateProductionCertificate':
|
||||||
case 'children_update':
|
case 'children_update':
|
||||||
case 'falukantBranchUpdate':
|
case 'falukantBranchUpdate':
|
||||||
|
|||||||
Reference in New Issue
Block a user