diff --git a/components/Weapons/Arrow7.tscn b/components/Weapons/Arrow7.tscn deleted file mode 100644 index 16f2f2e..0000000 --- a/components/Weapons/Arrow7.tscn +++ /dev/null @@ -1,30 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://ct2p0fbd5ktof"] - -[ext_resource type="PackedScene" uid="uid://ckq2cq6m23hq3" path="res://components/Abstracts/WeaponCardBase.tscn" id="1_ra1fw"] -[ext_resource type="Script" path="res://scripts/Contents/Weapons/Arrow7.gd" id="2_a7w7h"] -[ext_resource type="Texture2D" uid="uid://chq2rnqi00nbj" path="res://resources/bullets/light-express/Prismatic_Bolt.webp" id="2_vwdyb"] - -[node name="Arrow7" instance=ExtResource("1_ra1fw")] -script = ExtResource("2_a7w7h") -avatarTexture = ExtResource("2_vwdyb") -displayName = "七彩矢" -typeTopic = 3 -store = { -"atk": 10, -"count": 20 -} -storeType = { -"atk": 1, -"count": 1 -} -descriptionTemplate = "发射$count支七彩矢,每支造成$atk点伤害。" - -[node name="avatar" parent="container/info" index="0"] -texture = ExtResource("2_vwdyb") - -[node name="name" parent="container/info" index="2"] -displayName = "七彩矢" -typeTopic = 3 - -[node name="description" parent="container" index="2"] -text = "[center]发射[color=cyan]20[/color]支七彩矢,每支造成[color=cyan]10[/color]点伤害。[/center]" diff --git a/components/Weapons/BigLaser.tscn b/components/Weapons/BigLaser.tscn index 4e25ae1..2477743 100644 --- a/components/Weapons/BigLaser.tscn +++ b/components/Weapons/BigLaser.tscn @@ -11,6 +11,7 @@ avatarTexture = ExtResource("2_qe8gb") displayName = "湮灭激光" quality = 2 typeTopic = 1 +costBeachball = 300 store = { "atk": 40, "time": 0.1 @@ -38,4 +39,4 @@ quality = 2 typeTopic = 1 [node name="description" parent="container" index="2"] -text = "[center]每[color=cyan]0.10[/color]秒造成[color=cyan]40[/color]点伤害。[/center]" +text = "[center]每[color=cyan]0.10[/color]→[color=yellow]0.10[/color]秒造成[color=cyan]40[/color]→[color=yellow]45[/color]点伤害。[/center]" diff --git a/components/Weapons/LGBT.tscn b/components/Weapons/LGBT.tscn index 36e0fc1..89797e4 100644 --- a/components/Weapons/LGBT.tscn +++ b/components/Weapons/LGBT.tscn @@ -12,6 +12,7 @@ avatarTexture = ExtResource("2_ou6jo") displayName = "彩虹旗" quality = 4 typeTopic = 3 +costBeachball = 200 store = { "angle": 30.0, "atk": 20.0, @@ -29,7 +30,6 @@ storeType = { descriptionTemplate = "每$angle发射1/$count条以$power效率追踪$trace秒的[b]七彩光标[/b],每条造成$atk点伤害。" needEnergy = 50.0 cooldown = 1000.0 -debugRebuild = true [node name="attack" parent="sounds" index="0"] stream = ExtResource("4_c5xse") @@ -47,5 +47,5 @@ typeTopic = 3 [node name="description" parent="container" index="2"] size_flags_vertical = 3 -text = "[center]每[color=cyan]30.0°[/color]发射1/[color=cyan]7[/color]条以[color=cyan]25%[/color]效率追踪[color=cyan]2.00[/color]秒的[b]七彩光标[/b],每条造成[color=cyan]20[/color]点伤害。[/center]" +text = "[center]每[color=cyan]30.0°[/color]→[color=yellow]28.6°[/color]发射1/[color=cyan]7[/color]→[color=yellow]8[/color]条以[color=cyan]25%[/color]→[color=yellow]30%[/color]效率追踪[color=cyan]2.00[/color]→[color=yellow]2.25[/color]秒的[b]七彩光标[/b],每条造成[color=cyan]20[/color]→[color=yellow]25[/color]点伤害。[/center]" autowrap_mode = 2 diff --git a/components/Weapons/MushroomPickaxe.tscn b/components/Weapons/MushroomPickaxe.tscn index 9663307..aa15738 100644 --- a/components/Weapons/MushroomPickaxe.tscn +++ b/components/Weapons/MushroomPickaxe.tscn @@ -20,7 +20,6 @@ storeType = { } descriptionTemplate = "命中时造成$atk点伤害,有$rate概率挖出1~$count个随机物品。" needEnergy = 1.0 -debugRebuild = true [node name="avatar" parent="container/info" index="0"] texture = ExtResource("2_u2d30") @@ -32,4 +31,4 @@ text = "1.0" displayName = "蘑菇矿挖爪" [node name="description" parent="container" index="2"] -text = "[center]命中时造成[color=cyan]1[/color]点伤害,有[color=cyan]15%[/color]概率挖出1~[color=cyan]5[/color]个随机物品。[/center]" +text = "[center]命中时造成[color=cyan]1[/color]→[color=yellow]2[/color]点伤害,有[color=cyan]15%[/color]→[color=yellow]19%[/color]概率挖出1~[color=cyan]5[/color]→[color=yellow]6[/color]个随机物品。[/center]" diff --git a/scripts/Contents/Weapons/Arrow7.gd b/scripts/Contents/Weapons/Arrow7.gd deleted file mode 100644 index 1fee0f7..0000000 --- a/scripts/Contents/Weapons/Arrow7.gd +++ /dev/null @@ -1,15 +0,0 @@ -@tool -extends Weapon -class_name Arrow7Weapon - -func update(to: int, origin: Dictionary, _entity: EntityBase): - origin["atk"] += 5 * to - origin["count"] += 1 * to - return origin -func attack(entity: EntityBase): - var weaponPos = entity.findWeaponAnchor("normal") - for i in range(readStore("count")): - for bullet in BulletBase.generate(preload("res://components/Bullets/BossAttack/Bear/ArrowSeven.tscn"), entity, weaponPos, deg_to_rad(randf_range(0, 360))): - bullet.damage = readStore("atk") - bullet.tracer = EntityTool.findClosetEntity(entity.position, get_tree(), false, true) - return true diff --git a/scripts/Contents/Weapons/BigLaser.gd b/scripts/Contents/Weapons/BigLaser.gd index 6257357..e226881 100644 --- a/scripts/Contents/Weapons/BigLaser.gd +++ b/scripts/Contents/Weapons/BigLaser.gd @@ -5,7 +5,6 @@ class_name BigLaserWeapon func update(to: int, origin: Dictionary, _entity: EntityBase): origin["atk"] += 5 * to * soulLevel origin["time"] /= 1 + 0.05 * to * soulLevel - needEnergy += 5 return origin func attack(entity: EntityBase): var weaponPos = entity.findWeaponAnchor("normal") diff --git a/scripts/Contents/Weapons/LGBTWeapon.gd b/scripts/Contents/Weapons/LGBTWeapon.gd index 876c9e9..09f21b1 100644 --- a/scripts/Contents/Weapons/LGBTWeapon.gd +++ b/scripts/Contents/Weapons/LGBTWeapon.gd @@ -8,7 +8,6 @@ func update(to: int, origin: Dictionary, _entity: EntityBase): origin["power"] += 0.05 * to * soulLevel origin["trace"] += 0.25 * to * soulLevel origin["angle"] /= 1 + 0.05 * to * soulLevel - needEnergy += 1 return origin func attack(entity: EntityBase): var weaponPos = entity.findWeaponAnchor("normal") diff --git a/scripts/Contents/Weapons/MushroomPickaxe.gd b/scripts/Contents/Weapons/MushroomPickaxe.gd index 29268f2..c2c3f44 100644 --- a/scripts/Contents/Weapons/MushroomPickaxe.gd +++ b/scripts/Contents/Weapons/MushroomPickaxe.gd @@ -5,7 +5,6 @@ func update(to: int, origin: Dictionary, _entity: EntityBase): origin["atk"] += 1 * to * soulLevel origin["rate"] += 0.04 * to * soulLevel origin["count"] += 1 * to * soulLevel - needEnergy += 0.5 return origin func attack(entity: EntityBase): var weaponPos = entity.findWeaponAnchor("normal") diff --git a/scripts/Contents/Weapons/VectorStarWeapon.gd b/scripts/Contents/Weapons/VectorStarWeapon.gd index 08060f5..b969975 100644 --- a/scripts/Contents/Weapons/VectorStarWeapon.gd +++ b/scripts/Contents/Weapons/VectorStarWeapon.gd @@ -7,7 +7,6 @@ func update(to: int, origin: Dictionary, _entity: EntityBase): origin["forwardtime"] /= 1 + 0.05 * to * soulLevel origin["mincount"] += 0.5 * to * soulLevel origin["maxcount"] += 1.5 * to * soulLevel - needEnergy += 2 return origin func attack(entity: EntityBase): var weaponPos = entity.findWeaponAnchor("normal")