diff --git a/components/Characters/Rooster.tscn b/components/Characters/Rooster.tscn index 639b752..fa820b4 100644 --- a/components/Characters/Rooster.tscn +++ b/components/Characters/Rooster.tscn @@ -5,8 +5,8 @@ [ext_resource type="Texture2D" uid="uid://fn8qx72clh38" path="res://resources/characters/cock/rooster-a.svg" id="2_q0j6j"] [ext_resource type="AudioStream" uid="uid://dclinyhu256xi" path="res://resources/sounds/effect/Low Whoosh.mp3" id="3_4syso"] [ext_resource type="Texture2D" uid="uid://ci2ik43ce82uy" path="res://resources/characters/cock/rooster-b.svg" id="3_b0fgx"] -[ext_resource type="PackedScene" uid="uid://dlaks67h2osms" path="res://components/Weapons/ChainGun.tscn" id="3_inwol"] [ext_resource type="PackedScene" uid="uid://c0n3igy4hucrg" path="res://components/Weapons/PurpleCrystal.tscn" id="3_ms5sq"] +[ext_resource type="PackedScene" uid="uid://frwt0fgrpskb" path="res://components/Weapons/Meowmere.tscn" id="3_pbssk"] [ext_resource type="AudioStream" uid="uid://cdrevrq7n6yqa" path="res://resources/sounds/effect/Boing.mp3" id="4_66s6c"] [ext_resource type="AudioStream" uid="uid://benyec5bqni0b" path="res://resources/sounds/effect/Chomp.wav" id="4_k0yme"] [ext_resource type="AudioStream" uid="uid://dmxh3bpk8vyy5" path="res://resources/sounds/effect/Coin.mp3" id="5_xnbhq"] @@ -46,8 +46,8 @@ displayName = "公鸡" [node name="weaponStore" parent="." index="0"] process_mode = 4 -[node name="ChainGun" parent="weaponStore" index="0" instance=ExtResource("3_inwol")] -offset_bottom = 352.0 +[node name="Meowmere" parent="weaponStore" index="0" instance=ExtResource("3_pbssk")] +offset_bottom = 374.0 [node name="PurpleCrystal" parent="weaponStore" index="1" instance=ExtResource("3_ms5sq")] debugRebuild = false diff --git a/components/Weapons/Meowmere.tscn b/components/Weapons/Meowmere.tscn index b409401..d2d0152 100644 --- a/components/Weapons/Meowmere.tscn +++ b/components/Weapons/Meowmere.tscn @@ -12,8 +12,8 @@ quality = 2 typeTopic = 3 costBeachball = 600 store = { -"atk": 15, -"childatk": 10, +"atk": 10, +"childatk": 12.5, "count": 1.0, "reduce": 0.25 } @@ -38,4 +38,4 @@ quality = 2 typeTopic = 3 [node name="description" parent="container" index="2"] -text = "[center]发射[color=cyan]1[/color]→[color=yellow]1[/color]只伤害以[color=cyan]25%[/color]→[color=yellow]23%[/color]衰减的造成[color=cyan]5[/color]→[color=yellow]7[/color]点伤害的[b]彩虹猫[/b]的同时挥舞造成[color=cyan]10[/color]→[color=yellow]13[/color]点伤害。[/center]" +text = "[center]发射[color=cyan]1[/color]→[color=yellow]1[/color]只伤害以[color=cyan]25%[/color]→[color=yellow]23%[/color]衰减的造成[color=cyan]10[/color]→[color=yellow]12[/color]点伤害的[b]彩虹猫[/b]的同时挥舞造成[color=cyan]15[/color]→[color=yellow]18[/color]点伤害。[/center]" diff --git a/scripts/Contents/Weapons/ChainGun.gd b/scripts/Contents/Weapons/ChainGun.gd index 7b1c609..7ea29fa 100644 --- a/scripts/Contents/Weapons/ChainGun.gd +++ b/scripts/Contents/Weapons/ChainGun.gd @@ -10,4 +10,4 @@ func attack(entity: EntityBase): for i in BulletBase.generate(ComponentManager.getBullet("ChainGun"), entity, entity.texture.global_position, (get_global_mouse_position() - entity.texture.global_position).angle()): i.damage = readStore("atk") i.count = floor(readStore("count")) - i.split = readStore("split") + i.splits = readStore("split") diff --git a/scripts/Contents/Weapons/Meowmere.gd b/scripts/Contents/Weapons/Meowmere.gd index ea7cae0..9281e8f 100644 --- a/scripts/Contents/Weapons/Meowmere.gd +++ b/scripts/Contents/Weapons/Meowmere.gd @@ -4,7 +4,7 @@ extends Weapon func update(to, origin, _entity): origin["atk"] += 3 * to * soulLevel origin["count"] = 1 * soulLevel - origin["childatk"] += 2 * to * soulLevel + origin["childatk"] += 1.25 * origin["atk"] origin["reduce"] /= 1 + 0.05 * to * soulLevel return origin func attack(entity: EntityBase):