Skip to content

Commit a2db544

Browse files
authored
add tamayuratei no ohanashi (#2365)
* add tamayuratei no ohanashi * fix event name
1 parent 79d2500 commit a2db544

File tree

11 files changed

+186
-0
lines changed

11 files changed

+186
-0
lines changed

internal/services/assets/weapons_gen.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package_name: tamayuratei
2+
genshin_id: 13432
3+
key: tamayurateinoohanashi
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
id: 13432
2+
key: "tamayurateinoohanashi"
3+
rarity: 4
4+
weapon_class: WEAPON_POLE
5+
image_name: "UI_EquipIcon_Pole_Aoandon"
6+
base_stats: {
7+
base_props: {
8+
prop_type: FIGHT_PROP_BASE_ATTACK
9+
initial_value: 43.7349
10+
curve: GROW_CURVE_ATTACK_202
11+
}
12+
base_props: {
13+
prop_type: FIGHT_PROP_CHARGE_EFFICIENCY
14+
initial_value: 0.066667
15+
curve: GROW_CURVE_CRITICAL_201
16+
}
17+
promo_data: {
18+
max_level: 20
19+
}
20+
promo_data: {
21+
max_level: 40
22+
add_props: {
23+
prop_type: FIGHT_PROP_BASE_ATTACK
24+
value: 25.9
25+
}
26+
}
27+
promo_data: {
28+
max_level: 50
29+
add_props: {
30+
prop_type: FIGHT_PROP_BASE_ATTACK
31+
value: 51.9
32+
}
33+
}
34+
promo_data: {
35+
max_level: 60
36+
add_props: {
37+
prop_type: FIGHT_PROP_BASE_ATTACK
38+
value: 77.8
39+
}
40+
}
41+
promo_data: {
42+
max_level: 70
43+
add_props: {
44+
prop_type: FIGHT_PROP_BASE_ATTACK
45+
value: 103.7
46+
}
47+
}
48+
promo_data: {
49+
max_level: 80
50+
add_props: {
51+
prop_type: FIGHT_PROP_BASE_ATTACK
52+
value: 129.7
53+
}
54+
}
55+
promo_data: {
56+
max_level: 90
57+
add_props: {
58+
prop_type: FIGHT_PROP_BASE_ATTACK
59+
value: 155.6
60+
}
61+
}
62+
}
63+
name_text_hash_map: 486513155
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package tamayuratei
2+
3+
import (
4+
"fmt"
5+
6+
"github.com/genshinsim/gcsim/pkg/core"
7+
"github.com/genshinsim/gcsim/pkg/core/attributes"
8+
"github.com/genshinsim/gcsim/pkg/core/event"
9+
"github.com/genshinsim/gcsim/pkg/core/info"
10+
"github.com/genshinsim/gcsim/pkg/core/keys"
11+
"github.com/genshinsim/gcsim/pkg/core/player/character"
12+
"github.com/genshinsim/gcsim/pkg/modifier"
13+
)
14+
15+
func init() {
16+
core.RegisterWeaponFunc(keys.TamayurateiNoOhanashi, NewWeapon)
17+
}
18+
19+
type Weapon struct {
20+
Index int
21+
}
22+
23+
func (w *Weapon) SetIndex(idx int) { w.Index = idx }
24+
func (w *Weapon) Init() error { return nil }
25+
26+
// Increase ATK by 20% and Movement SPD by 10% for 10s when using an Elemental Skill.
27+
func NewWeapon(c *core.Core, char *character.CharWrapper, p info.WeaponProfile) (info.Weapon, error) {
28+
w := &Weapon{}
29+
r := p.Refine
30+
31+
m := make([]float64, attributes.EndStatType)
32+
m[attributes.ATKP] = 0.15 + float64(r)*0.05
33+
34+
c.Events.Subscribe(event.OnSkill, func(args ...interface{}) bool {
35+
if c.Player.Active() != char.Index {
36+
return false
37+
}
38+
char.AddStatMod(character.StatMod{
39+
Base: modifier.NewBaseWithHitlag("tamayuratei", 10*60),
40+
Amount: func() ([]float64, bool) {
41+
return m, true
42+
},
43+
})
44+
45+
return false
46+
}, fmt.Sprintf("tamayuratei-%v", char.Base.Key.String()))
47+
48+
return w, nil
49+
}

internal/weapons/spear/tamayuratei/tamayuratei_gen.go

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/core/keys/weapon.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ var weaponNames = []string{
201201
"swordofdescension",
202202
"swordofnarzissenkreuz",
203203
"talkingstick",
204+
"tamayurateinoohanashi",
204205
"thealleyflash",
205206
"thebell",
206207
"theblacksword",
@@ -408,6 +409,7 @@ const (
408409
SwordOfDescension
409410
SwordOfNarzissenkreuz
410411
TalkingStick
412+
TamayurateiNoOhanashi
411413
TheAlleyFlash
412414
TheBell
413415
TheBlackSword

pkg/shortcut/weapons.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,8 @@ var WeaponNameToKey = map[string]keys.Weapon{
304304
"swordofnarzissenkreuz": keys.SwordOfNarzissenkreuz,
305305
"narzissenkreuz": keys.SwordOfNarzissenkreuz,
306306
"talkingstick": keys.TalkingStick,
307+
"tamayurateinoohanashi": keys.TamayurateiNoOhanashi,
308+
"tamayuratei": keys.TamayurateiNoOhanashi,
307309
"thealleyflash": keys.TheAlleyFlash,
308310
"alleyflash": keys.TheAlleyFlash,
309311
"thebell": keys.TheBell,

pkg/simulation/imports.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ import (
214214
_ "github.com/genshinsim/gcsim/internal/weapons/spear/royal"
215215
_ "github.com/genshinsim/gcsim/internal/weapons/spear/scarletsands"
216216
_ "github.com/genshinsim/gcsim/internal/weapons/spear/skyward"
217+
_ "github.com/genshinsim/gcsim/internal/weapons/spear/tamayuratei"
217218
_ "github.com/genshinsim/gcsim/internal/weapons/spear/vortex"
218219
_ "github.com/genshinsim/gcsim/internal/weapons/spear/wavebreaker"
219220
_ "github.com/genshinsim/gcsim/internal/weapons/spear/whitetassel"
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
title: Tamayuratei no Ohanashi
3+
---
4+
5+
import AoETable from "@site/src/components/AoE/AoETable";
6+
import IssuesTable from "@site/src/components/Issues/IssuesTable";
7+
import NamesList from "@site/src/components/Names/NamesList";
8+
import ParamsTable from "@site/src/components/Params/ParamsTable";
9+
import FieldsTable from "@site/src/components/Fields/FieldsTable";
10+
11+
## AoE Data
12+
13+
<AoETable item_key="tamayurateinoohanashi" data_src="weapon" />
14+
15+
## Known issues
16+
17+
<IssuesTable item_key="tamayurateinoohanashi" data_src="weapon" />
18+
19+
## Names
20+
21+
<NamesList item_key="tamayurateinoohanashi" data_src="weapon" />
22+
23+
## Params
24+
25+
<ParamsTable item_key="tamayurateinoohanashi" data_src="weapon" />
26+
27+
## Fields
28+
29+
<FieldsTable item_key="tamayurateinoohanashi" data_src="weapon" />

ui/packages/docs/src/components/Names/weapon_data.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,9 @@
398398
"swordofnarzissenkreuz": [
399399
"narzissenkreuz"
400400
],
401+
"tamayurateinoohanashi": [
402+
"tamayuratei"
403+
],
401404
"talkingstick": [],
402405
"thealleyflash": [
403406
"alleyflash"

0 commit comments

Comments
 (0)