mirror of
https://github.com/morbalint/kemkas.git
synced 2026-07-18 03:13:46 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c5fa7a92d9 | |||
| 700684ecfd | |||
| 43959ae94f | |||
| 88b0379c93 |
@@ -35,7 +35,7 @@
|
||||
"workbox-navigation-preload": "^7.1.0",
|
||||
"workbox-precaching": "^7.1.0",
|
||||
"workbox-range-requests": "^7.1.0",
|
||||
"workbox-routing": "^7.4.0",
|
||||
"workbox-routing": "^7.1.0",
|
||||
"workbox-strategies": "^7.1.0",
|
||||
"workbox-streams": "^7.1.0"
|
||||
},
|
||||
|
||||
@@ -1,126 +0,0 @@
|
||||
import React from "react";
|
||||
import {render} from "@testing-library/react";
|
||||
import {configureStore} from "@reduxjs/toolkit";
|
||||
import {Provider} from "react-redux";
|
||||
import KarakterKepzettsegek from "./Kepzettsegek2E";
|
||||
import userReducer from "../../shared/domain-models/userSlice";
|
||||
import characterReducer, {setCharacter} from "../domain-models/characterSlice";
|
||||
import {DefaultKarakter, Karakter2E} from "../domain-models/karakter2E";
|
||||
import {Osztaly2E} from "../domain-models/osztaly2E";
|
||||
import {Tulajdonsag2E} from "../domain-models/tulajdonsag2E";
|
||||
|
||||
function createStore() {
|
||||
return configureStore({
|
||||
reducer: {
|
||||
user: userReducer,
|
||||
character2E: characterReducer,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
describe("KarakterKepzettsegek", () => {
|
||||
it("shows one more kepzettseg selector when INT modifier increases from level-up", () => {
|
||||
const karakter: Karakter2E = {
|
||||
...DefaultKarakter,
|
||||
szint: 4,
|
||||
tulajdonsagok: {
|
||||
...DefaultKarakter.tulajdonsagok,
|
||||
t_int: 17,
|
||||
},
|
||||
szintlepesek: [
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 10 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 7 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 6 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 8, tulajdonsagNoveles: Tulajdonsag2E.Intelligencia },
|
||||
],
|
||||
tolvajKepzettsegek: [],
|
||||
varazslatok: [],
|
||||
};
|
||||
|
||||
const store = createStore();
|
||||
store.dispatch(setCharacter(karakter));
|
||||
|
||||
const sut = render(
|
||||
<Provider store={store}>
|
||||
<KarakterKepzettsegek />
|
||||
</Provider>
|
||||
);
|
||||
|
||||
const selectors = sut.container.querySelectorAll('[data-testid^="kepzettseg-"]');
|
||||
expect(selectors).toHaveLength(7);
|
||||
});
|
||||
|
||||
it("shows one more kepzettseg selector when INT modifier increases at level 8", () => {
|
||||
const karakter: Karakter2E = {
|
||||
...DefaultKarakter,
|
||||
szint: 8,
|
||||
tulajdonsagok: {
|
||||
...DefaultKarakter.tulajdonsagok,
|
||||
t_int: 14,
|
||||
},
|
||||
szintlepesek: [
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 10 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 7 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 6 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 8, tulajdonsagNoveles: Tulajdonsag2E.Ero },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 4 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 9 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 5 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 6, tulajdonsagNoveles: Tulajdonsag2E.Intelligencia },
|
||||
],
|
||||
tolvajKepzettsegek: [],
|
||||
varazslatok: [],
|
||||
};
|
||||
|
||||
const store = createStore();
|
||||
store.dispatch(setCharacter(karakter));
|
||||
|
||||
const sut = render(
|
||||
<Provider store={store}>
|
||||
<KarakterKepzettsegek />
|
||||
</Provider>
|
||||
);
|
||||
|
||||
const selectors = sut.container.querySelectorAll('[data-testid^="kepzettseg-"]');
|
||||
expect(selectors).toHaveLength(6);
|
||||
});
|
||||
|
||||
it("shows one more kepzettseg selector when INT modifier increases at level 12", () => {
|
||||
const karakter: Karakter2E = {
|
||||
...DefaultKarakter,
|
||||
szint: 12,
|
||||
tulajdonsagok: {
|
||||
...DefaultKarakter.tulajdonsagok,
|
||||
t_int: 17,
|
||||
},
|
||||
szintlepesek: [
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 10 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 7 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 6 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 8, tulajdonsagNoveles: Tulajdonsag2E.Ero },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 4 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 9 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 5 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 6, tulajdonsagNoveles: Tulajdonsag2E.Egeszseg },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 3 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 7 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 5 },
|
||||
{ osztaly: Osztaly2E.Harcos, HProll: 4, tulajdonsagNoveles: Tulajdonsag2E.Intelligencia },
|
||||
],
|
||||
tolvajKepzettsegek: [],
|
||||
varazslatok: [],
|
||||
};
|
||||
|
||||
const store = createStore();
|
||||
store.dispatch(setCharacter(karakter));
|
||||
|
||||
const sut = render(
|
||||
<Provider store={store}>
|
||||
<KarakterKepzettsegek />
|
||||
</Provider>
|
||||
);
|
||||
|
||||
const selectors = sut.container.querySelectorAll('[data-testid^="kepzettseg-"]');
|
||||
expect(selectors).toHaveLength(7);
|
||||
});
|
||||
});
|
||||
@@ -13,7 +13,7 @@ import {arraySetN} from "../../util";
|
||||
import {useDispatch, useSelector} from "react-redux";
|
||||
import {AppDispatch, RootState} from "../../store";
|
||||
import {characterSelector, setKepzettsegek, setTolvajKepzettsegek} from "../domain-models/characterSlice";
|
||||
import {TulajdonsagokTotal} from "../domain-models/tulajdonsag2E";
|
||||
import {TulajdonsagokFajjal} from "../domain-models/faj2E";
|
||||
|
||||
function InternalKepzettsegekSelector(props: {
|
||||
title: string,
|
||||
@@ -70,8 +70,8 @@ function KarakterKepzettsegek () {
|
||||
const karakter = useSelector.withTypes<RootState>()(characterSelector);
|
||||
const dispatch = useDispatch.withTypes<AppDispatch>()();
|
||||
|
||||
const tulajdonsagokTotal = TulajdonsagokTotal(karakter)
|
||||
const numberOfKepzettsegek = GetNumberOfKepzettsegek(tulajdonsagokTotal.t_int, karakter.faj)
|
||||
const tulajdonsagokFajjal = TulajdonsagokFajjal(karakter.tulajdonsagok, karakter.faj)
|
||||
const numberOfKepzettsegek = GetNumberOfKepzettsegek(tulajdonsagokFajjal.t_int, karakter.faj)
|
||||
const kepzettsegek = karakter.kepzettsegek
|
||||
const fajError = karakter.kepzettsegFajError
|
||||
const osztalyError = karakter.kepzettsegOsztalyError
|
||||
|
||||
@@ -13,8 +13,7 @@ function availableKezpettsegListFajjal(faj: Faj2E, ...osztalyok: Osztaly2E[]): K
|
||||
}
|
||||
|
||||
export function GetNumberOfKepzettsegek(t_int: number, faj: Faj2E, max: number = 11) {
|
||||
// Default cap is 11. Base calculation is 3 + 1 (human) + 3 (max ability modifier) = 7;
|
||||
// thief-specific extra selections are handled elsewhere and are not part of this default max.
|
||||
//max = 3 + 1 + 3 + 5 = 12 // 3 base, 1 human, 3 from max ability modifier, 4 from Thief +1 at 9th level
|
||||
let numberOfKepzettseg = 3 + Modifier(t_int) + (faj === Faj2E.Ember ? 1 : 0)
|
||||
|
||||
if (numberOfKepzettseg < 1) {
|
||||
|
||||
+2
-14
@@ -2915,16 +2915,11 @@ workbox-cacheable-response@^7.1.0:
|
||||
dependencies:
|
||||
workbox-core "7.1.0"
|
||||
|
||||
workbox-core@7.1.0:
|
||||
workbox-core@7.1.0, workbox-core@^7.1.0:
|
||||
version "7.1.0"
|
||||
resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-7.1.0.tgz#1867576f994f20d9991b71a7d0b2581af22db170"
|
||||
integrity sha512-5KB4KOY8rtL31nEF7BfvU7FMzKT4B5TkbYa2tzkS+Peqj0gayMT9SytSFtNzlrvMaWgv6y/yvP9C0IbpFjV30Q==
|
||||
|
||||
workbox-core@7.4.0, workbox-core@^7.1.0:
|
||||
version "7.4.0"
|
||||
resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-7.4.0.tgz#5cb59ae7655f2727423268fb1ba698f37809189d"
|
||||
integrity sha512-6BMfd8tYEnN4baG4emG9U0hdXM4gGuDU3ectXuVHnj71vwxTFI7WOpQJC4siTOlVtGqCUtj0ZQNsrvi6kZZTAQ==
|
||||
|
||||
workbox-expiration@^7.1.0:
|
||||
version "7.1.0"
|
||||
resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-7.1.0.tgz#c9d348ffc8c3d1ffdddaf6c37bf5be830a69073e"
|
||||
@@ -2966,20 +2961,13 @@ workbox-range-requests@^7.1.0:
|
||||
dependencies:
|
||||
workbox-core "7.1.0"
|
||||
|
||||
workbox-routing@7.1.0:
|
||||
workbox-routing@7.1.0, workbox-routing@^7.1.0:
|
||||
version "7.1.0"
|
||||
resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-7.1.0.tgz#c44bda350d1c5eb633ee97a660e64ce5473250c4"
|
||||
integrity sha512-oOYk+kLriUY2QyHkIilxUlVcFqwduLJB7oRZIENbqPGeBP/3TWHYNNdmGNhz1dvKuw7aqvJ7CQxn27/jprlTdg==
|
||||
dependencies:
|
||||
workbox-core "7.1.0"
|
||||
|
||||
workbox-routing@^7.4.0:
|
||||
version "7.4.0"
|
||||
resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-7.4.0.tgz#4b5bc90256515dc5cf49b356b101721fd135d013"
|
||||
integrity sha512-C/ooj5uBWYAhAqwmU8HYQJdOjjDKBp9MzTQ+otpMmd+q0eF59K+NuXUek34wbL0RFrIXe/KKT+tUWcZcBqxbHQ==
|
||||
dependencies:
|
||||
workbox-core "7.4.0"
|
||||
|
||||
workbox-strategies@7.1.0, workbox-strategies@^7.1.0:
|
||||
version "7.1.0"
|
||||
resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-7.1.0.tgz#a589f2adc0df8f33049c7f4d4cdf4c9556715918"
|
||||
|
||||
Reference in New Issue
Block a user