From d741554ca0cd17f83ad7a8c9860debf55da0af97 Mon Sep 17 00:00:00 2001 From: komiko44240BB Date: Sat, 12 Oct 2024 00:49:44 +0200 Subject: [PATCH] perks update Perks are now working properly, but they, as training, do not yet impact the item's stats --- CMakeLists.txt | 18 +++--- Perk_data/event_Rarity_Item.csv | 2 +- Perk_data/event_epic_all_cannons.csv | 2 +- Perk_data/event_epic_all_incendiary_items.csv | 2 +- Perk_data/event_epic_all_missiles.csv | 2 +- Perk_data/event_epic_all_mortars.csv | 2 +- Perk_data/event_epic_all_repair_items.csv | 2 +- Perk_data/event_epic_all_shields.csv | 2 +- Perk_data/event_epic_all_torpedoes.csv | 2 +- Perk_data/event_epic_ballpark_mortar.csv | 2 +- Perk_data/event_epic_big_bandage.csv | 2 +- Perk_data/event_epic_big_berta.csv | 2 +- Perk_data/event_epic_big_torpedo.csv | 2 +- Perk_data/event_epic_blast_cannon.csv | 2 +- Perk_data/event_epic_cannon.csv | 2 +- Perk_data/event_epic_carronade.csv | 2 +- Perk_data/event_epic_duct_tape.csv | 2 +- Perk_data/event_epic_explosive_cannon.csv | 2 +- Perk_data/event_epic_fire_bomb.csv | 2 +- Perk_data/event_epic_flare_gun.csv | 2 +- Perk_data/event_epic_freeze_items.csv | 2 +- Perk_data/event_epic_frost_blaster.csv | 2 +- Perk_data/event_epic_gatling_gun.csv | 2 +- Perk_data/event_epic_grenades.csv | 2 +- Perk_data/event_epic_long_range_mortar.csv | 2 +- Perk_data/event_epic_mines.csv | 2 +- Perk_data/event_epic_missiles.csv | 2 +- Perk_data/event_epic_napalm.csv | 2 +- Perk_data/event_epic_none.csv | 2 +- Perk_data/event_epic_railguns.csv | 2 +- Perk_data/event_epic_repair_bolt.csv | 2 +- Perk_data/event_epic_repair_box.csv | 2 +- Perk_data/event_epic_repair_plasma.csv | 2 +- Perk_data/event_epic_repair_pulse.csv | 2 +- Perk_data/event_epic_sniper_cannon.csv | 2 +- Perk_data/event_epic_standard_mortar.csv | 2 +- Perk_data/event_epic_standard_torpedo.csv | 2 +- Perk_data/event_epic_swift_torpedo.csv | 2 +- Perk_data/event_epic_tesla_bolt.csv | 2 +- Perk_data/event_epic_tesla_shield.csv | 2 +- Perk_data/event_epic_triple_torpedo.csv | 2 +- Perk_data/event_epic_turbo.csv | 2 +- Perk_data/event_legendary_all_cannons.csv | 2 +- .../event_legendary_all_incendiary_items.csv | 2 +- Perk_data/event_legendary_all_missiles.csv | 2 +- Perk_data/event_legendary_all_mortars.csv | 2 +- .../event_legendary_all_repair_items.csv | 2 +- Perk_data/event_legendary_all_shields.csv | 2 +- Perk_data/event_legendary_all_torpedoes.csv | 2 +- Perk_data/event_legendary_ballpark_mortar.csv | 2 +- Perk_data/event_legendary_big_bandage.csv | 2 +- Perk_data/event_legendary_big_berta.csv | 2 +- Perk_data/event_legendary_big_torpedo.csv | 2 +- Perk_data/event_legendary_blast_cannon.csv | 2 +- Perk_data/event_legendary_cannon.csv | 2 +- Perk_data/event_legendary_carronade.csv | 2 +- Perk_data/event_legendary_duct_tape.csv | 2 +- .../event_legendary_explosive_cannon.csv | 2 +- Perk_data/event_legendary_fire_bomb.csv | 2 +- Perk_data/event_legendary_flare_gun.csv | 2 +- Perk_data/event_legendary_freeze_items.csv | 2 +- Perk_data/event_legendary_frost_blaster.csv | 2 +- Perk_data/event_legendary_gatling_gun.csv | 2 +- Perk_data/event_legendary_grenades.csv | 2 +- .../event_legendary_long_range_mortar.csv | 2 +- Perk_data/event_legendary_mines.csv | 2 +- Perk_data/event_legendary_missiles.csv | 2 +- Perk_data/event_legendary_napalm.csv | 2 +- Perk_data/event_legendary_none.csv | 2 +- Perk_data/event_legendary_railguns.csv | 2 +- Perk_data/event_legendary_repair_bolt.csv | 2 +- Perk_data/event_legendary_repair_box.csv | 2 +- Perk_data/event_legendary_repair_plasma.csv | 2 +- Perk_data/event_legendary_repair_pulse.csv | 2 +- Perk_data/event_legendary_sniper_cannon.csv | 2 +- Perk_data/event_legendary_standard_mortar.csv | 2 +- .../event_legendary_standard_torpedo.csv | 2 +- Perk_data/event_legendary_swift_torpedo.csv | 2 +- Perk_data/event_legendary_tesla_bolt.csv | 2 +- Perk_data/event_legendary_tesla_shield.csv | 2 +- Perk_data/event_legendary_triple_torpedo.csv | 2 +- Perk_data/event_legendary_turbo.csv | 2 +- Perk_data/event_rare_all_cannons.csv | 2 +- Perk_data/event_rare_all_incendiary_items.csv | 2 +- Perk_data/event_rare_all_missiles.csv | 2 +- Perk_data/event_rare_all_mortars.csv | 2 +- Perk_data/event_rare_all_repair_items.csv | 2 +- Perk_data/event_rare_all_shields.csv | 2 +- Perk_data/event_rare_all_torpedoes.csv | 2 +- Perk_data/event_rare_ballpark_mortar.csv | 2 +- Perk_data/event_rare_big_bandage.csv | 2 +- Perk_data/event_rare_big_berta.csv | 2 +- Perk_data/event_rare_big_torpedo.csv | 2 +- Perk_data/event_rare_blast_cannon.csv | 2 +- Perk_data/event_rare_cannon.csv | 2 +- Perk_data/event_rare_carronade.csv | 2 +- Perk_data/event_rare_duct_tape.csv | 2 +- Perk_data/event_rare_explosive_cannon.csv | 2 +- Perk_data/event_rare_fire_bomb.csv | 2 +- Perk_data/event_rare_flare_gun.csv | 2 +- Perk_data/event_rare_freeze_items.csv | 2 +- Perk_data/event_rare_frost_blaster.csv | 2 +- Perk_data/event_rare_gatling_gun.csv | 2 +- Perk_data/event_rare_grenades.csv | 2 +- Perk_data/event_rare_long_range_mortar.csv | 2 +- Perk_data/event_rare_mines.csv | 2 +- Perk_data/event_rare_missiles.csv | 2 +- Perk_data/event_rare_napalm.csv | 2 +- Perk_data/event_rare_none.csv | 2 +- Perk_data/event_rare_railguns.csv | 2 +- Perk_data/event_rare_repair_bolt.csv | 2 +- Perk_data/event_rare_repair_box.csv | 2 +- Perk_data/event_rare_repair_plasma.csv | 2 +- Perk_data/event_rare_repair_pulse.csv | 2 +- Perk_data/event_rare_sniper_cannon.csv | 2 +- Perk_data/event_rare_standard_mortar.csv | 2 +- Perk_data/event_rare_standard_torpedo.csv | 2 +- Perk_data/event_rare_swift_torpedo.csv | 2 +- Perk_data/event_rare_tesla_bolt.csv | 2 +- Perk_data/event_rare_tesla_shield.csv | 2 +- Perk_data/event_rare_triple_torpedo.csv | 2 +- Perk_data/event_rare_turbo.csv | 2 +- Perk_data/event_uncommon_all_cannons.csv | 2 +- .../event_uncommon_all_incendiary_items.csv | 2 +- Perk_data/event_uncommon_all_missiles.csv | 2 +- Perk_data/event_uncommon_all_mortars.csv | 2 +- Perk_data/event_uncommon_all_repair_items.csv | 2 +- Perk_data/event_uncommon_all_shields.csv | 2 +- Perk_data/event_uncommon_all_torpedoes.csv | 2 +- Perk_data/event_uncommon_ballpark_mortar.csv | 2 +- Perk_data/event_uncommon_big_bandage.csv | 2 +- Perk_data/event_uncommon_big_berta.csv | 2 +- Perk_data/event_uncommon_big_torpedo.csv | 2 +- Perk_data/event_uncommon_blast_cannon.csv | 2 +- Perk_data/event_uncommon_cannon.csv | 2 +- Perk_data/event_uncommon_carronade.csv | 2 +- Perk_data/event_uncommon_duct_tape.csv | 2 +- Perk_data/event_uncommon_explosive_cannon.csv | 2 +- Perk_data/event_uncommon_fire_bomb.csv | 2 +- Perk_data/event_uncommon_flare_gun.csv | 2 +- Perk_data/event_uncommon_freeze_items.csv | 2 +- Perk_data/event_uncommon_frost_blaster.csv | 2 +- Perk_data/event_uncommon_gatling_gun.csv | 2 +- Perk_data/event_uncommon_grenades.csv | 2 +- .../event_uncommon_long_range_mortar.csv | 2 +- Perk_data/event_uncommon_mines.csv | 2 +- Perk_data/event_uncommon_missiles.csv | 2 +- Perk_data/event_uncommon_napalm.csv | 2 +- Perk_data/event_uncommon_none.csv | 2 +- Perk_data/event_uncommon_railguns.csv | 2 +- Perk_data/event_uncommon_repair_bolt.csv | 2 +- Perk_data/event_uncommon_repair_box.csv | 2 +- Perk_data/event_uncommon_repair_plasma.csv | 2 +- Perk_data/event_uncommon_repair_pulse.csv | 2 +- Perk_data/event_uncommon_sniper_cannon.csv | 2 +- Perk_data/event_uncommon_standard_mortar.csv | 2 +- Perk_data/event_uncommon_standard_torpedo.csv | 2 +- Perk_data/event_uncommon_swift_torpedo.csv | 2 +- Perk_data/event_uncommon_tesla_bolt.csv | 2 +- Perk_data/event_uncommon_tesla_shield.csv | 2 +- Perk_data/event_uncommon_triple_torpedo.csv | 2 +- Perk_data/event_uncommon_turbo.csv | 2 +- Perk_data/event_uncommon_uncommon.csv | 2 +- perks.c | 61 +++++++++++-------- perks.h | 8 +-- readobjects.c | 9 ++- scriptspy/perks_.c | 34 ++++++++--- 167 files changed, 240 insertions(+), 214 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8191d7b..16ef72f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,15 +17,15 @@ link_directories(${XLSXWRITER_LIBRARY_DIRS}) add_executable(BattleBay_tool - #main.c - #menu.c - #objects.c - #perks.c - #readobjects.c - #ships.c - #readtraining.c - #clear_input.c - scriptspy/perks_.c + main.c + menu.c + objects.c + perks.c + readobjects.c + ships.c + readtraining.c + clear_input.c + #scriptspy/perks_.c ) include_directories("/usr/local/include/xlsxio") diff --git a/Perk_data/event_Rarity_Item.csv b/Perk_data/event_Rarity_Item.csv index 36a7e6a..ea76589 100644 --- a/Perk_data/event_Rarity_Item.csv +++ b/Perk_data/event_Rarity_Item.csv @@ -1,4 +1,4 @@ 1st,Bonus,2nd,Bonus 1st,Bonus,2nd,Bonus 1st,Bonus,2nd,Bonus -1st,Bonus,2nd,Bonus +1st,Bonus,2nd,Bonus \ No newline at end of file diff --git a/Perk_data/event_epic_all_cannons.csv b/Perk_data/event_epic_all_cannons.csv index 17dfe2a..141203b 100644 --- a/Perk_data/event_epic_all_cannons.csv +++ b/Perk_data/event_epic_all_cannons.csv @@ -1,4 +1,4 @@ 0.08,DAMAGE,0.10,PROJECTILE_SPEED 0.04,CRITICAL_HIT_CHANCE,0.08,DAMAGE 0.08,DAMAGE,0.10,RANGE -0.08,FIRE_DAMAGE,0.08,COOL_DOWN +0.08,FIRE_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_epic_all_incendiary_items.csv b/Perk_data/event_epic_all_incendiary_items.csv index 1fe1f20..ae659f6 100644 --- a/Perk_data/event_epic_all_incendiary_items.csv +++ b/Perk_data/event_epic_all_incendiary_items.csv @@ -1,2 +1,2 @@ 1.5,DURATION,0.06,COOL_DOWN -0.08,DAMAGE,0.06,COOL_DOWN +0.08,DAMAGE,0.06,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_epic_all_missiles.csv b/Perk_data/event_epic_all_missiles.csv index c44cd1f..ea0fe61 100644 --- a/Perk_data/event_epic_all_missiles.csv +++ b/Perk_data/event_epic_all_missiles.csv @@ -1,3 +1,3 @@ 0.08,DAMAGE,0.12,RANGE 0.08,DAMAGE,0.05,COOL_DOWN -0.08,DAMAGE,0.13,PROJECTILE_SPEED +0.08,DAMAGE,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_epic_all_mortars.csv b/Perk_data/event_epic_all_mortars.csv index c9482d1..a5605d4 100644 --- a/Perk_data/event_epic_all_mortars.csv +++ b/Perk_data/event_epic_all_mortars.csv @@ -1,3 +1,3 @@ 0.07,DAMAGE,0.10,RANGE 0.10,RANGE,0.08,COOL_DOWN -0.12,FROST_DAMAGE,0.07,DAMAGE +0.12,FROST_DAMAGE,0.07,DAMAGE \ No newline at end of file diff --git a/Perk_data/event_epic_all_repair_items.csv b/Perk_data/event_epic_all_repair_items.csv index 2d5c99b..77e9033 100644 --- a/Perk_data/event_epic_all_repair_items.csv +++ b/Perk_data/event_epic_all_repair_items.csv @@ -1 +1 @@ -0.07,HEALING,0.08,COOL_DOWN +0.07,HEALING,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_epic_all_shields.csv b/Perk_data/event_epic_all_shields.csv index 38e5402..43f5d40 100644 --- a/Perk_data/event_epic_all_shields.csv +++ b/Perk_data/event_epic_all_shields.csv @@ -1,2 +1,2 @@ 150,HIT_POINT,12,DEFENCE -150,HIT_POINT,0.02,DAMAGE +150,HIT_POINT,0.02,DAMAGE \ No newline at end of file diff --git a/Perk_data/event_epic_all_torpedoes.csv b/Perk_data/event_epic_all_torpedoes.csv index 644b3a0..188bacb 100644 --- a/Perk_data/event_epic_all_torpedoes.csv +++ b/Perk_data/event_epic_all_torpedoes.csv @@ -1,2 +1,2 @@ 0.08,PROJECTILE_SPEED,0.08,COOL_DOWN -0.07,DAMAGE,0.17,CRITICAL_HIT_CHANCE +0.07,DAMAGE,0.17,CRITICAL_HIT_CHANCE \ No newline at end of file diff --git a/Perk_data/event_epic_ballpark_mortar.csv b/Perk_data/event_epic_ballpark_mortar.csv index 364d83c..c634b97 100644 --- a/Perk_data/event_epic_ballpark_mortar.csv +++ b/Perk_data/event_epic_ballpark_mortar.csv @@ -1 +1 @@ -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_epic_big_bandage.csv b/Perk_data/event_epic_big_bandage.csv index f4f3a2c..6a46d77 100644 --- a/Perk_data/event_epic_big_bandage.csv +++ b/Perk_data/event_epic_big_bandage.csv @@ -1 +1 @@ -0.06,HEALINGs,120,HIT_POINT +0.06,HEALINGs,120,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_epic_big_berta.csv b/Perk_data/event_epic_big_berta.csv index 880a1f9..6502706 100644 --- a/Perk_data/event_epic_big_berta.csv +++ b/Perk_data/event_epic_big_berta.csv @@ -1,2 +1,2 @@ 0.12,FROST_DAMAGE,0.08,COOL_DOWN -0.12,FROST_DAMAGE,0.12,RANGE +0.12,FROST_DAMAGE,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_epic_big_torpedo.csv b/Perk_data/event_epic_big_torpedo.csv index f3916da..99708a8 100644 --- a/Perk_data/event_epic_big_torpedo.csv +++ b/Perk_data/event_epic_big_torpedo.csv @@ -1,2 +1,2 @@ 0.07,DAMAGE,0.08,PROJECTILE_SPEED -0.12,FROST_DAMAGE,0.06,COOL_DOWN +0.12,FROST_DAMAGE,0.06,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_epic_blast_cannon.csv b/Perk_data/event_epic_blast_cannon.csv index 12ee7ae..2a449fb 100644 --- a/Perk_data/event_epic_blast_cannon.csv +++ b/Perk_data/event_epic_blast_cannon.csv @@ -1 +1 @@ -0.12,FIRE_DAMAGE,0.10,RANGE +0.12,FIRE_DAMAGE,0.10,RANGE \ No newline at end of file diff --git a/Perk_data/event_epic_cannon.csv b/Perk_data/event_epic_cannon.csv index 12ee7ae..2a449fb 100644 --- a/Perk_data/event_epic_cannon.csv +++ b/Perk_data/event_epic_cannon.csv @@ -1 +1 @@ -0.12,FIRE_DAMAGE,0.10,RANGE +0.12,FIRE_DAMAGE,0.10,RANGE \ No newline at end of file diff --git a/Perk_data/event_epic_carronade.csv b/Perk_data/event_epic_carronade.csv index 6aebcfb..7f856db 100644 --- a/Perk_data/event_epic_carronade.csv +++ b/Perk_data/event_epic_carronade.csv @@ -1,3 +1,3 @@ 0.06,COOL_DOWN,0.12,RANGE 9,DAMAGE,0.08,COOL_DOWN -9,DAMAGE,0.10,RANGE +9,DAMAGE,0.10,RANGE \ No newline at end of file diff --git a/Perk_data/event_epic_duct_tape.csv b/Perk_data/event_epic_duct_tape.csv index 6987460..096b3c1 100644 --- a/Perk_data/event_epic_duct_tape.csv +++ b/Perk_data/event_epic_duct_tape.csv @@ -1 +1 @@ -0.07,HEALING,160,HIT_POINT +0.07,HEALING,160,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_epic_explosive_cannon.csv b/Perk_data/event_epic_explosive_cannon.csv index 12ee7ae..2a449fb 100644 --- a/Perk_data/event_epic_explosive_cannon.csv +++ b/Perk_data/event_epic_explosive_cannon.csv @@ -1 +1 @@ -0.12,FIRE_DAMAGE,0.10,RANGE +0.12,FIRE_DAMAGE,0.10,RANGE \ No newline at end of file diff --git a/Perk_data/event_epic_fire_bomb.csv b/Perk_data/event_epic_fire_bomb.csv index 4bfbe5f..efeecf5 100644 --- a/Perk_data/event_epic_fire_bomb.csv +++ b/Perk_data/event_epic_fire_bomb.csv @@ -1,2 +1,2 @@ 0.08,DAMAGE,0.10,RANGE -0.06,COOL_DOWN,0.07,PROJECTILE_SPEED +0.06,COOL_DOWN,0.07,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_epic_flare_gun.csv b/Perk_data/event_epic_flare_gun.csv index f042c81..bf5f17f 100644 --- a/Perk_data/event_epic_flare_gun.csv +++ b/Perk_data/event_epic_flare_gun.csv @@ -1,3 +1,3 @@ 1.5,DURATION,0.10,PROJECTILE_SPEED 0.08,DAMAGE,0.13,PROJECTILE_SPEED -0.06,COOL_DOWN,0.13,PROJECTILE_SPEED +0.06,COOL_DOWN,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_epic_freeze_items.csv b/Perk_data/event_epic_freeze_items.csv index e775eab..9c53b74 100644 --- a/Perk_data/event_epic_freeze_items.csv +++ b/Perk_data/event_epic_freeze_items.csv @@ -1 +1 @@ -1,DURATION,0.06,COOL_DOWN +1,DURATION,0.06,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_epic_frost_blaster.csv b/Perk_data/event_epic_frost_blaster.csv index 2c0286e..8525a05 100644 --- a/Perk_data/event_epic_frost_blaster.csv +++ b/Perk_data/event_epic_frost_blaster.csv @@ -1 +1 @@ -0.06,COOL_DOWN,0.13,PROJECTILE_SPEED +0.06,COOL_DOWN,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_epic_gatling_gun.csv b/Perk_data/event_epic_gatling_gun.csv index 05a8c26..921710d 100644 --- a/Perk_data/event_epic_gatling_gun.csv +++ b/Perk_data/event_epic_gatling_gun.csv @@ -1,3 +1,3 @@ 0.08,DAMAGE,0.12,RANGE 0.08,DAMAGE,0.13,PROJECTILE_SPEED -0.12,FIRE_DAMAGE,0.13,PROJECTILE_SPEED +0.12,FIRE_DAMAGE,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_epic_grenades.csv b/Perk_data/event_epic_grenades.csv index 9ae74dc..08b01f6 100644 --- a/Perk_data/event_epic_grenades.csv +++ b/Perk_data/event_epic_grenades.csv @@ -1,4 +1,4 @@ 0.12,CRITICAL_HIT_CHANCE,0.10,RANGE 0.08,COOL_DOWN,0.12,RANGE 0.10,DAMAGE,0.10,RANGE -0.12,CRITICAL_HIT_CHANCE,0.08,DAMAGE +0.12,CRITICAL_HIT_CHANCE,0.08,DAMAGE \ No newline at end of file diff --git a/Perk_data/event_epic_long_range_mortar.csv b/Perk_data/event_epic_long_range_mortar.csv index 870b07d..cc52c2c 100644 --- a/Perk_data/event_epic_long_range_mortar.csv +++ b/Perk_data/event_epic_long_range_mortar.csv @@ -1 +1 @@ -0.10,RANGE,0.08,COOL_DOWN +0.10,RANGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_epic_mines.csv b/Perk_data/event_epic_mines.csv index 19d3df2..2f993db 100644 --- a/Perk_data/event_epic_mines.csv +++ b/Perk_data/event_epic_mines.csv @@ -1,3 +1,3 @@ 0.10,DAMAGE,0.12,RANGE 0.10,DAMAGE,0.06,COOL_DOWN -0.06,COOL_DOWN,0.12,RANGE +0.06,COOL_DOWN,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_epic_missiles.csv b/Perk_data/event_epic_missiles.csv index ff8c69a..297e196 100644 --- a/Perk_data/event_epic_missiles.csv +++ b/Perk_data/event_epic_missiles.csv @@ -1 +1 @@ -0.04,COOL_DOWN,0.12,RANGE +0.04,COOL_DOWN,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_epic_napalm.csv b/Perk_data/event_epic_napalm.csv index dba1d3d..3644ea2 100644 --- a/Perk_data/event_epic_napalm.csv +++ b/Perk_data/event_epic_napalm.csv @@ -1,2 +1,2 @@ 0.07,DAMAGE,0.10,PROJECTILE_SPEED -1.5,DURATION,0.13,PROJECTILE_SPEED +1.5,DURATION,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_epic_none.csv b/Perk_data/event_epic_none.csv index 4b0d95b..f1084bc 100644 --- a/Perk_data/event_epic_none.csv +++ b/Perk_data/event_epic_none.csv @@ -1 +1 @@ -,,, +,,, \ No newline at end of file diff --git a/Perk_data/event_epic_railguns.csv b/Perk_data/event_epic_railguns.csv index 5cc228d..c5035c4 100644 --- a/Perk_data/event_epic_railguns.csv +++ b/Perk_data/event_epic_railguns.csv @@ -1,3 +1,3 @@ 0.08,DAMAGE,0.08,STUN_CHANCE 0.08,COOL_DOWN,0.08,STUN_CHANCE -0.08,COOL_DOWN,0.10,FROST_DAMAGE +0.08,COOL_DOWN,0.10,FROST_DAMAGE \ No newline at end of file diff --git a/Perk_data/event_epic_repair_bolt.csv b/Perk_data/event_epic_repair_bolt.csv index fdd59d8..18100a8 100644 --- a/Perk_data/event_epic_repair_bolt.csv +++ b/Perk_data/event_epic_repair_bolt.csv @@ -1,2 +1,2 @@ 0.10,PROJECTILE_SPEED,0.25,INVULNERABILITY -0.04,COOL_DOWN,0.13,PROJECTILE_SPEED +0.04,COOL_DOWN,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_epic_repair_box.csv b/Perk_data/event_epic_repair_box.csv index 941c7b9..8395df9 100644 --- a/Perk_data/event_epic_repair_box.csv +++ b/Perk_data/event_epic_repair_box.csv @@ -1,2 +1,2 @@ 0.04,COOL_DOWN,0.10,CRITICAL_HIT_CHANCE -0.07,HEALING,0.12,RANGE +0.07,HEALING,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_epic_repair_plasma.csv b/Perk_data/event_epic_repair_plasma.csv index 5a741eb..d06a21a 100644 --- a/Perk_data/event_epic_repair_plasma.csv +++ b/Perk_data/event_epic_repair_plasma.csv @@ -1 +1 @@ -0.07,HEALING,0.10,RANGE +0.07,HEALING,0.10,RANGE \ No newline at end of file diff --git a/Perk_data/event_epic_repair_pulse.csv b/Perk_data/event_epic_repair_pulse.csv index 438c7af..a0e3f49 100644 --- a/Perk_data/event_epic_repair_pulse.csv +++ b/Perk_data/event_epic_repair_pulse.csv @@ -1 +1 @@ -0.06,COOL_DOWN,160,HIT_POINT +0.06,COOL_DOWN,160,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_epic_sniper_cannon.csv b/Perk_data/event_epic_sniper_cannon.csv index 25c67e3..099b1ff 100644 --- a/Perk_data/event_epic_sniper_cannon.csv +++ b/Perk_data/event_epic_sniper_cannon.csv @@ -1,2 +1,2 @@ 0.06,DAMAGE,0.08,COOL_DOWN -0.12,FIRE_DAMAGE,0.06,COOL_DOWN +0.12,FIRE_DAMAGE,0.06,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_epic_standard_mortar.csv b/Perk_data/event_epic_standard_mortar.csv index 364d83c..c634b97 100644 --- a/Perk_data/event_epic_standard_mortar.csv +++ b/Perk_data/event_epic_standard_mortar.csv @@ -1 +1 @@ -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_epic_standard_torpedo.csv b/Perk_data/event_epic_standard_torpedo.csv index 1adbe17..74d1eb8 100644 --- a/Perk_data/event_epic_standard_torpedo.csv +++ b/Perk_data/event_epic_standard_torpedo.csv @@ -1 +1 @@ -0.12,FROST_DAMAGE,0.10,PROJECTILE_SPEED +0.12,FROST_DAMAGE,0.10,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_epic_swift_torpedo.csv b/Perk_data/event_epic_swift_torpedo.csv index c18caee..5fd5aae 100644 --- a/Perk_data/event_epic_swift_torpedo.csv +++ b/Perk_data/event_epic_swift_torpedo.csv @@ -1,2 +1,2 @@ 0.07,DAMAGE,0.08,PROJECTILE_SPEED -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_epic_tesla_bolt.csv b/Perk_data/event_epic_tesla_bolt.csv index 47bec16..4e91637 100644 --- a/Perk_data/event_epic_tesla_bolt.csv +++ b/Perk_data/event_epic_tesla_bolt.csv @@ -1 +1 @@ -0.8,STUN_DURATION,0.13,PROJECTILE_SPEED +0.8,STUN_DURATION,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_epic_tesla_shield.csv b/Perk_data/event_epic_tesla_shield.csv index f4a80e4..29b1116 100644 --- a/Perk_data/event_epic_tesla_shield.csv +++ b/Perk_data/event_epic_tesla_shield.csv @@ -1 +1 @@ -0.8,DURATION,75,SHIELD_HIT_POINT +0.8,DURATION,75,SHIELD_HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_epic_triple_torpedo.csv b/Perk_data/event_epic_triple_torpedo.csv index e7dd86d..bb42735 100644 --- a/Perk_data/event_epic_triple_torpedo.csv +++ b/Perk_data/event_epic_triple_torpedo.csv @@ -1,3 +1,3 @@ 0.12,FROST_DAMAGE,0.08,COOL_DOWN 0.06,DAMAGE,0.08,COOL_DOWN -0.07,DAMAGE,0.10,PROJECTILE_SPEED +0.07,DAMAGE,0.10,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_epic_turbo.csv b/Perk_data/event_epic_turbo.csv index 4e7404c..a35a813 100644 --- a/Perk_data/event_epic_turbo.csv +++ b/Perk_data/event_epic_turbo.csv @@ -1,2 +1,2 @@ 0.20,SPEED,0.01,DAMAGE -0.20,SPEED,160,HIT_POINT +0.20,SPEED,160,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_legendary_all_cannons.csv b/Perk_data/event_legendary_all_cannons.csv index 56c84cc..d4402b5 100644 --- a/Perk_data/event_legendary_all_cannons.csv +++ b/Perk_data/event_legendary_all_cannons.csv @@ -1,4 +1,4 @@ 0.08,DAMAGE,0.13,PROJECTILE_SPEED 0.04,CRITICAL_HIT_CHANCE,0.08,DAMAGE 0.08,DAMAGE,0.12,RANGE -0.10,FIRE_DAMAGE,0.08,COOL_DOWN +0.10,FIRE_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_legendary_all_incendiary_items.csv b/Perk_data/event_legendary_all_incendiary_items.csv index c07133d..25cf02c 100644 --- a/Perk_data/event_legendary_all_incendiary_items.csv +++ b/Perk_data/event_legendary_all_incendiary_items.csv @@ -1,2 +1,2 @@ 1.5,DURATION,0.08,COOL_DOWN -0.08,DAMAGE,0.08,COOL_DOWN +0.08,DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_legendary_all_missiles.csv b/Perk_data/event_legendary_all_missiles.csv index c44cd1f..ea0fe61 100644 --- a/Perk_data/event_legendary_all_missiles.csv +++ b/Perk_data/event_legendary_all_missiles.csv @@ -1,3 +1,3 @@ 0.08,DAMAGE,0.12,RANGE 0.08,DAMAGE,0.05,COOL_DOWN -0.08,DAMAGE,0.13,PROJECTILE_SPEED +0.08,DAMAGE,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_legendary_all_mortars.csv b/Perk_data/event_legendary_all_mortars.csv index 8ea055a..42a4aa4 100644 --- a/Perk_data/event_legendary_all_mortars.csv +++ b/Perk_data/event_legendary_all_mortars.csv @@ -1,3 +1,3 @@ 0.07,DAMAGE,0.12,RANGE 0.10,RANGE,0.08,COOL_DOWN -0.12,FROST_DAMAGE,0.07,DAMAGE +0.12,FROST_DAMAGE,0.07,DAMAGE \ No newline at end of file diff --git a/Perk_data/event_legendary_all_repair_items.csv b/Perk_data/event_legendary_all_repair_items.csv index 2d5c99b..77e9033 100644 --- a/Perk_data/event_legendary_all_repair_items.csv +++ b/Perk_data/event_legendary_all_repair_items.csv @@ -1 +1 @@ -0.07,HEALING,0.08,COOL_DOWN +0.07,HEALING,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_legendary_all_shields.csv b/Perk_data/event_legendary_all_shields.csv index 38e5402..43f5d40 100644 --- a/Perk_data/event_legendary_all_shields.csv +++ b/Perk_data/event_legendary_all_shields.csv @@ -1,2 +1,2 @@ 150,HIT_POINT,12,DEFENCE -150,HIT_POINT,0.02,DAMAGE +150,HIT_POINT,0.02,DAMAGE \ No newline at end of file diff --git a/Perk_data/event_legendary_all_torpedoes.csv b/Perk_data/event_legendary_all_torpedoes.csv index f0906a3..c255af2 100644 --- a/Perk_data/event_legendary_all_torpedoes.csv +++ b/Perk_data/event_legendary_all_torpedoes.csv @@ -1,2 +1,2 @@ 0.08,PROJECTILE_SPEED,0.08,COOL_DOWN -0.07,DAMAGE,0.20,CRITICAL_HIT_CHANCE +0.07,DAMAGE,0.20,CRITICAL_HIT_CHANCE \ No newline at end of file diff --git a/Perk_data/event_legendary_ballpark_mortar.csv b/Perk_data/event_legendary_ballpark_mortar.csv index 364d83c..c634b97 100644 --- a/Perk_data/event_legendary_ballpark_mortar.csv +++ b/Perk_data/event_legendary_ballpark_mortar.csv @@ -1 +1 @@ -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_legendary_big_bandage.csv b/Perk_data/event_legendary_big_bandage.csv index 386d4a5..17dd647 100644 --- a/Perk_data/event_legendary_big_bandage.csv +++ b/Perk_data/event_legendary_big_bandage.csv @@ -1 +1 @@ -0.06,HEALINGs,160,HIT_POINT +0.06,HEALINGs,160,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_legendary_big_berta.csv b/Perk_data/event_legendary_big_berta.csv index 880a1f9..6502706 100644 --- a/Perk_data/event_legendary_big_berta.csv +++ b/Perk_data/event_legendary_big_berta.csv @@ -1,2 +1,2 @@ 0.12,FROST_DAMAGE,0.08,COOL_DOWN -0.12,FROST_DAMAGE,0.12,RANGE +0.12,FROST_DAMAGE,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_legendary_big_torpedo.csv b/Perk_data/event_legendary_big_torpedo.csv index 1878638..e22ec57 100644 --- a/Perk_data/event_legendary_big_torpedo.csv +++ b/Perk_data/event_legendary_big_torpedo.csv @@ -1,2 +1,2 @@ 0.07,DAMAGE,0.10,PROJECTILE_SPEED -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_legendary_blast_cannon.csv b/Perk_data/event_legendary_blast_cannon.csv index 6961c98..9258ad0 100644 --- a/Perk_data/event_legendary_blast_cannon.csv +++ b/Perk_data/event_legendary_blast_cannon.csv @@ -1 +1 @@ -0.12,FIRE_DAMAGE,0.12,RANGE +0.12,FIRE_DAMAGE,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_legendary_cannon.csv b/Perk_data/event_legendary_cannon.csv index 6961c98..9258ad0 100644 --- a/Perk_data/event_legendary_cannon.csv +++ b/Perk_data/event_legendary_cannon.csv @@ -1 +1 @@ -0.12,FIRE_DAMAGE,0.12,RANGE +0.12,FIRE_DAMAGE,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_legendary_carronade.csv b/Perk_data/event_legendary_carronade.csv index 2f0da1a..0753e03 100644 --- a/Perk_data/event_legendary_carronade.csv +++ b/Perk_data/event_legendary_carronade.csv @@ -1,3 +1,3 @@ 0.06,COOL_DOWN,0.12,RANGE 9,DAMAGE,0.08,COOL_DOWN -9,DAMAGE,0.12,RANGE +9,DAMAGE,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_legendary_duct_tape.csv b/Perk_data/event_legendary_duct_tape.csv index 6987460..096b3c1 100644 --- a/Perk_data/event_legendary_duct_tape.csv +++ b/Perk_data/event_legendary_duct_tape.csv @@ -1 +1 @@ -0.07,HEALING,160,HIT_POINT +0.07,HEALING,160,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_legendary_explosive_cannon.csv b/Perk_data/event_legendary_explosive_cannon.csv index 6961c98..9258ad0 100644 --- a/Perk_data/event_legendary_explosive_cannon.csv +++ b/Perk_data/event_legendary_explosive_cannon.csv @@ -1 +1 @@ -0.12,FIRE_DAMAGE,0.12,RANGE +0.12,FIRE_DAMAGE,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_legendary_fire_bomb.csv b/Perk_data/event_legendary_fire_bomb.csv index 8354726..f40feac 100644 --- a/Perk_data/event_legendary_fire_bomb.csv +++ b/Perk_data/event_legendary_fire_bomb.csv @@ -1,2 +1,2 @@ 0.08,DAMAGE,0.12,RANGE -0.06,COOL_DOWN,0.13,PROJECTILE_SPEED +0.06,COOL_DOWN,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_legendary_flare_gun.csv b/Perk_data/event_legendary_flare_gun.csv index c515adb..9e110ed 100644 --- a/Perk_data/event_legendary_flare_gun.csv +++ b/Perk_data/event_legendary_flare_gun.csv @@ -1,3 +1,3 @@ 1.5,DURATION,0.13,PROJECTILE_SPEED 0.08,DAMAGE,0.13,PROJECTILE_SPEED -0.06,COOL_DOWN,0.13,PROJECTILE_SPEED +0.06,COOL_DOWN,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_legendary_freeze_items.csv b/Perk_data/event_legendary_freeze_items.csv index 5631a08..9dbf1d0 100644 --- a/Perk_data/event_legendary_freeze_items.csv +++ b/Perk_data/event_legendary_freeze_items.csv @@ -1 +1 @@ -1,DURATION,0.08,COOL_DOWN +1,DURATION,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_legendary_frost_blaster.csv b/Perk_data/event_legendary_frost_blaster.csv index 2c0286e..8525a05 100644 --- a/Perk_data/event_legendary_frost_blaster.csv +++ b/Perk_data/event_legendary_frost_blaster.csv @@ -1 +1 @@ -0.06,COOL_DOWN,0.13,PROJECTILE_SPEED +0.06,COOL_DOWN,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_legendary_gatling_gun.csv b/Perk_data/event_legendary_gatling_gun.csv index 05a8c26..921710d 100644 --- a/Perk_data/event_legendary_gatling_gun.csv +++ b/Perk_data/event_legendary_gatling_gun.csv @@ -1,3 +1,3 @@ 0.08,DAMAGE,0.12,RANGE 0.08,DAMAGE,0.13,PROJECTILE_SPEED -0.12,FIRE_DAMAGE,0.13,PROJECTILE_SPEED +0.12,FIRE_DAMAGE,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_legendary_grenades.csv b/Perk_data/event_legendary_grenades.csv index 6f94db8..47831b5 100644 --- a/Perk_data/event_legendary_grenades.csv +++ b/Perk_data/event_legendary_grenades.csv @@ -1,4 +1,4 @@ 0.12,CRITICAL_HIT_CHANCE,0.12,RANGE 0.08,COOL_DOWN,0.12,RANGE 0.10,DAMAGE,0.12,RANGE -0.12,CRITICAL_HIT_CHANCE,0.10,DAMAGE +0.12,CRITICAL_HIT_CHANCE,0.10,DAMAGE \ No newline at end of file diff --git a/Perk_data/event_legendary_long_range_mortar.csv b/Perk_data/event_legendary_long_range_mortar.csv index 870b07d..cc52c2c 100644 --- a/Perk_data/event_legendary_long_range_mortar.csv +++ b/Perk_data/event_legendary_long_range_mortar.csv @@ -1 +1 @@ -0.10,RANGE,0.08,COOL_DOWN +0.10,RANGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_legendary_mines.csv b/Perk_data/event_legendary_mines.csv index 1acd60c..5a7e9c6 100644 --- a/Perk_data/event_legendary_mines.csv +++ b/Perk_data/event_legendary_mines.csv @@ -1,3 +1,3 @@ 0.10,DAMAGE,0.12,RANGE 0.10,DAMAGE,0.08,COOL_DOWN -0.06,COOL_DOWN,0.12,RANGE +0.06,COOL_DOWN,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_legendary_missiles.csv b/Perk_data/event_legendary_missiles.csv index ff8c69a..297e196 100644 --- a/Perk_data/event_legendary_missiles.csv +++ b/Perk_data/event_legendary_missiles.csv @@ -1 +1 @@ -0.04,COOL_DOWN,0.12,RANGE +0.04,COOL_DOWN,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_legendary_napalm.csv b/Perk_data/event_legendary_napalm.csv index e030a9d..1f367e6 100644 --- a/Perk_data/event_legendary_napalm.csv +++ b/Perk_data/event_legendary_napalm.csv @@ -1,2 +1,2 @@ 0.07,DAMAGE,0.13,PROJECTILE_SPEED -1.5,DURATION,0.13,PROJECTILE_SPEED +1.5,DURATION,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_legendary_none.csv b/Perk_data/event_legendary_none.csv index 4b0d95b..f1084bc 100644 --- a/Perk_data/event_legendary_none.csv +++ b/Perk_data/event_legendary_none.csv @@ -1 +1 @@ -,,, +,,, \ No newline at end of file diff --git a/Perk_data/event_legendary_railguns.csv b/Perk_data/event_legendary_railguns.csv index 4ff1a72..3f0fcfb 100644 --- a/Perk_data/event_legendary_railguns.csv +++ b/Perk_data/event_legendary_railguns.csv @@ -1,3 +1,3 @@ 0.08,DAMAGE,0.10,STUN_CHANCE 0.08,COOL_DOWN,0.10,STUN_CHANCE -0.08,COOL_DOWN,0.10,FROST_DAMAGE +0.08,COOL_DOWN,0.10,FROST_DAMAGE \ No newline at end of file diff --git a/Perk_data/event_legendary_repair_bolt.csv b/Perk_data/event_legendary_repair_bolt.csv index 7d110d9..361a73c 100644 --- a/Perk_data/event_legendary_repair_bolt.csv +++ b/Perk_data/event_legendary_repair_bolt.csv @@ -1,2 +1,2 @@ 0.10,PROJECTILE_SPEED,0.10,INVULNERABILITY -0.04,COOL_DOWN,0.13,PROJECTILE_SPEED +0.04,COOL_DOWN,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_legendary_repair_box.csv b/Perk_data/event_legendary_repair_box.csv index 941c7b9..8395df9 100644 --- a/Perk_data/event_legendary_repair_box.csv +++ b/Perk_data/event_legendary_repair_box.csv @@ -1,2 +1,2 @@ 0.04,COOL_DOWN,0.10,CRITICAL_HIT_CHANCE -0.07,HEALING,0.12,RANGE +0.07,HEALING,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_legendary_repair_plasma.csv b/Perk_data/event_legendary_repair_plasma.csv index 9158bd2..c1dfb26 100644 --- a/Perk_data/event_legendary_repair_plasma.csv +++ b/Perk_data/event_legendary_repair_plasma.csv @@ -1 +1 @@ -0.07,HEALING,0.12,RANGE +0.07,HEALING,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_legendary_repair_pulse.csv b/Perk_data/event_legendary_repair_pulse.csv index 438c7af..a0e3f49 100644 --- a/Perk_data/event_legendary_repair_pulse.csv +++ b/Perk_data/event_legendary_repair_pulse.csv @@ -1 +1 @@ -0.06,COOL_DOWN,160,HIT_POINT +0.06,COOL_DOWN,160,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_legendary_sniper_cannon.csv b/Perk_data/event_legendary_sniper_cannon.csv index 41b87ad..3be5e11 100644 --- a/Perk_data/event_legendary_sniper_cannon.csv +++ b/Perk_data/event_legendary_sniper_cannon.csv @@ -1,2 +1,2 @@ 0.06,DAMAGE,0.08,COOL_DOWN -0.12,FIRE_DAMAGE,0.08,COOL_DOWN +0.12,FIRE_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_legendary_standard_mortar.csv b/Perk_data/event_legendary_standard_mortar.csv index 364d83c..c634b97 100644 --- a/Perk_data/event_legendary_standard_mortar.csv +++ b/Perk_data/event_legendary_standard_mortar.csv @@ -1 +1 @@ -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_legendary_standard_torpedo.csv b/Perk_data/event_legendary_standard_torpedo.csv index 1adbe17..74d1eb8 100644 --- a/Perk_data/event_legendary_standard_torpedo.csv +++ b/Perk_data/event_legendary_standard_torpedo.csv @@ -1 +1 @@ -0.12,FROST_DAMAGE,0.10,PROJECTILE_SPEED +0.12,FROST_DAMAGE,0.10,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_legendary_swift_torpedo.csv b/Perk_data/event_legendary_swift_torpedo.csv index 1878638..e22ec57 100644 --- a/Perk_data/event_legendary_swift_torpedo.csv +++ b/Perk_data/event_legendary_swift_torpedo.csv @@ -1,2 +1,2 @@ 0.07,DAMAGE,0.10,PROJECTILE_SPEED -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_legendary_tesla_bolt.csv b/Perk_data/event_legendary_tesla_bolt.csv index 47bec16..4e91637 100644 --- a/Perk_data/event_legendary_tesla_bolt.csv +++ b/Perk_data/event_legendary_tesla_bolt.csv @@ -1 +1 @@ -0.8,STUN_DURATION,0.13,PROJECTILE_SPEED +0.8,STUN_DURATION,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_legendary_tesla_shield.csv b/Perk_data/event_legendary_tesla_shield.csv index f4a80e4..29b1116 100644 --- a/Perk_data/event_legendary_tesla_shield.csv +++ b/Perk_data/event_legendary_tesla_shield.csv @@ -1 +1 @@ -0.8,DURATION,75,SHIELD_HIT_POINT +0.8,DURATION,75,SHIELD_HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_legendary_triple_torpedo.csv b/Perk_data/event_legendary_triple_torpedo.csv index e7dd86d..bb42735 100644 --- a/Perk_data/event_legendary_triple_torpedo.csv +++ b/Perk_data/event_legendary_triple_torpedo.csv @@ -1,3 +1,3 @@ 0.12,FROST_DAMAGE,0.08,COOL_DOWN 0.06,DAMAGE,0.08,COOL_DOWN -0.07,DAMAGE,0.10,PROJECTILE_SPEED +0.07,DAMAGE,0.10,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_legendary_turbo.csv b/Perk_data/event_legendary_turbo.csv index b3748e8..a6b1042 100644 --- a/Perk_data/event_legendary_turbo.csv +++ b/Perk_data/event_legendary_turbo.csv @@ -1,2 +1,2 @@ 0.20,SPEED,0.02,DAMAGE -0.20,SPEED,160,HIT_POINT +0.20,SPEED,160,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_rare_all_cannons.csv b/Perk_data/event_rare_all_cannons.csv index 8d27a24..40db25e 100644 --- a/Perk_data/event_rare_all_cannons.csv +++ b/Perk_data/event_rare_all_cannons.csv @@ -1,4 +1,4 @@ 0.06,DAMAGE,0.07,PROJECTILE_SPEED 0.02,CRITICAL_HIT_CHANCE,0.05,DAMAGE 0.06,DAMAGE,0.12,RANGE -0.10,FIRE_DAMAGE,0.08,COOL_DOWN +0.10,FIRE_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_rare_all_incendiary_items.csv b/Perk_data/event_rare_all_incendiary_items.csv index 191c274..2f9f5a4 100644 --- a/Perk_data/event_rare_all_incendiary_items.csv +++ b/Perk_data/event_rare_all_incendiary_items.csv @@ -1,2 +1,2 @@ 1,DURATION,0.04,COOL_DOWN -0.05,DAMAGE,0.04,COOL_DOWN +0.05,DAMAGE,0.04,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_rare_all_missiles.csv b/Perk_data/event_rare_all_missiles.csv index b5cebdb..f846fd9 100644 --- a/Perk_data/event_rare_all_missiles.csv +++ b/Perk_data/event_rare_all_missiles.csv @@ -1,3 +1,3 @@ 0.05,DAMAGE,0.12,RANGE 0.08,DAMAGE,0.05,COOL_DOWN -0.08,DAMAGE,0.13,PROJECTILE_SPEED +0.08,DAMAGE,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_rare_all_mortars.csv b/Perk_data/event_rare_all_mortars.csv index c3c9ef0..1e30a17 100644 --- a/Perk_data/event_rare_all_mortars.csv +++ b/Perk_data/event_rare_all_mortars.csv @@ -1,3 +1,3 @@ 0.05,DAMAGE,0.08,RANGE 0.08,RANGE,0.04,COOL_DOWN -0.09,FROST_DAMAGE,0.07,DAMAGE +0.09,FROST_DAMAGE,0.07,DAMAGE \ No newline at end of file diff --git a/Perk_data/event_rare_all_repair_items.csv b/Perk_data/event_rare_all_repair_items.csv index 9f68dc2..6f9f85a 100644 --- a/Perk_data/event_rare_all_repair_items.csv +++ b/Perk_data/event_rare_all_repair_items.csv @@ -1 +1 @@ -0.05,HEALING,0.03,COOL_DOWN +0.05,HEALING,0.03,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_rare_all_shields.csv b/Perk_data/event_rare_all_shields.csv index 39c19d8..a950447 100644 --- a/Perk_data/event_rare_all_shields.csv +++ b/Perk_data/event_rare_all_shields.csv @@ -1,2 +1,2 @@ 100,HIT_POINT,7,DEFENCE -100,HIT_POINT,0.01,DAMAGE +100,HIT_POINT,0.01,DAMAGE \ No newline at end of file diff --git a/Perk_data/event_rare_all_torpedoes.csv b/Perk_data/event_rare_all_torpedoes.csv index f2c40f6..747097e 100644 --- a/Perk_data/event_rare_all_torpedoes.csv +++ b/Perk_data/event_rare_all_torpedoes.csv @@ -1,2 +1,2 @@ 0.08,PROJECTILE_SPEED,0.08,COOL_DOWN -0.05,DAMAGE,0.15,CRITICAL_HIT_CHANCE +0.05,DAMAGE,0.15,CRITICAL_HIT_CHANCE \ No newline at end of file diff --git a/Perk_data/event_rare_ballpark_mortar.csv b/Perk_data/event_rare_ballpark_mortar.csv index 364d83c..c634b97 100644 --- a/Perk_data/event_rare_ballpark_mortar.csv +++ b/Perk_data/event_rare_ballpark_mortar.csv @@ -1 +1 @@ -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_rare_big_bandage.csv b/Perk_data/event_rare_big_bandage.csv index 386d4a5..17dd647 100644 --- a/Perk_data/event_rare_big_bandage.csv +++ b/Perk_data/event_rare_big_bandage.csv @@ -1 +1 @@ -0.06,HEALINGs,160,HIT_POINT +0.06,HEALINGs,160,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_rare_big_berta.csv b/Perk_data/event_rare_big_berta.csv index 8914f1f..9b9a802 100644 --- a/Perk_data/event_rare_big_berta.csv +++ b/Perk_data/event_rare_big_berta.csv @@ -1,2 +1,2 @@ 0.09,FROST_DAMAGE,0.04,COOL_DOWN -0.12,FROST_DAMAGE,0.12,RANGE +0.12,FROST_DAMAGE,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_rare_big_torpedo.csv b/Perk_data/event_rare_big_torpedo.csv index 92f7a57..253ee09 100644 --- a/Perk_data/event_rare_big_torpedo.csv +++ b/Perk_data/event_rare_big_torpedo.csv @@ -1,2 +1,2 @@ 0.07,DAMAGE,0.10,PROJECTILE_SPEED -0.09,FROST_DAMAGE,0.04,COOL_DOWN +0.09,FROST_DAMAGE,0.04,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_rare_blast_cannon.csv b/Perk_data/event_rare_blast_cannon.csv index 6961c98..9258ad0 100644 --- a/Perk_data/event_rare_blast_cannon.csv +++ b/Perk_data/event_rare_blast_cannon.csv @@ -1 +1 @@ -0.12,FIRE_DAMAGE,0.12,RANGE +0.12,FIRE_DAMAGE,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_rare_cannon.csv b/Perk_data/event_rare_cannon.csv index 63a200a..ee21d5f 100644 --- a/Perk_data/event_rare_cannon.csv +++ b/Perk_data/event_rare_cannon.csv @@ -1 +1 @@ -0.09,FIRE_DAMAGE,0.08,RANGE +0.09,FIRE_DAMAGE,0.08,RANGE \ No newline at end of file diff --git a/Perk_data/event_rare_carronade.csv b/Perk_data/event_rare_carronade.csv index c349fee..8059636 100644 --- a/Perk_data/event_rare_carronade.csv +++ b/Perk_data/event_rare_carronade.csv @@ -1,3 +1,3 @@ 0.06,COOL_DOWN,0.12,RANGE 9,DAMAGE,0.08,COOL_DOWN -6,DAMAGE,0.08,RANGE +6,DAMAGE,0.08,RANGE \ No newline at end of file diff --git a/Perk_data/event_rare_duct_tape.csv b/Perk_data/event_rare_duct_tape.csv index 6987460..096b3c1 100644 --- a/Perk_data/event_rare_duct_tape.csv +++ b/Perk_data/event_rare_duct_tape.csv @@ -1 +1 @@ -0.07,HEALING,160,HIT_POINT +0.07,HEALING,160,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_rare_explosive_cannon.csv b/Perk_data/event_rare_explosive_cannon.csv index 63a200a..ee21d5f 100644 --- a/Perk_data/event_rare_explosive_cannon.csv +++ b/Perk_data/event_rare_explosive_cannon.csv @@ -1 +1 @@ -0.09,FIRE_DAMAGE,0.08,RANGE +0.09,FIRE_DAMAGE,0.08,RANGE \ No newline at end of file diff --git a/Perk_data/event_rare_fire_bomb.csv b/Perk_data/event_rare_fire_bomb.csv index df9fab0..d5177ad 100644 --- a/Perk_data/event_rare_fire_bomb.csv +++ b/Perk_data/event_rare_fire_bomb.csv @@ -1,2 +1,2 @@ 0.05,DAMAGE,0.08,RANGE -0.04,COOL_DOWN,0.07,PROJECTILE_SPEED +0.04,COOL_DOWN,0.07,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_rare_flare_gun.csv b/Perk_data/event_rare_flare_gun.csv index 753e471..224257e 100644 --- a/Perk_data/event_rare_flare_gun.csv +++ b/Perk_data/event_rare_flare_gun.csv @@ -1,3 +1,3 @@ 1.5,DURATION,0.13,PROJECTILE_SPEED 0.08,DAMAGE,0.13,PROJECTILE_SPEED -0.04,COOL_DOWN,0.07,PROJECTILE_SPEED +0.04,COOL_DOWN,0.07,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_rare_freeze_items.csv b/Perk_data/event_rare_freeze_items.csv index 985e461..b9069d7 100644 --- a/Perk_data/event_rare_freeze_items.csv +++ b/Perk_data/event_rare_freeze_items.csv @@ -1 +1 @@ -0.7,DURATION,0.08,COOL_DOWN +0.7,DURATION,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_rare_frost_blaster.csv b/Perk_data/event_rare_frost_blaster.csv index 4030d95..b73479a 100644 --- a/Perk_data/event_rare_frost_blaster.csv +++ b/Perk_data/event_rare_frost_blaster.csv @@ -1 +1 @@ -0.04,COOL_DOWN,0.07,PROJECTILE_SPEED +0.04,COOL_DOWN,0.07,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_rare_gatling_gun.csv b/Perk_data/event_rare_gatling_gun.csv index 05a8c26..921710d 100644 --- a/Perk_data/event_rare_gatling_gun.csv +++ b/Perk_data/event_rare_gatling_gun.csv @@ -1,3 +1,3 @@ 0.08,DAMAGE,0.12,RANGE 0.08,DAMAGE,0.13,PROJECTILE_SPEED -0.12,FIRE_DAMAGE,0.13,PROJECTILE_SPEED +0.12,FIRE_DAMAGE,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_rare_grenades.csv b/Perk_data/event_rare_grenades.csv index 12b1846..2228ecd 100644 --- a/Perk_data/event_rare_grenades.csv +++ b/Perk_data/event_rare_grenades.csv @@ -1,4 +1,4 @@ 0.09,CRITICAL_HIT_CHANCE,0.12,RANGE 0.08,COOL_DOWN,0.12,RANGE 0.10,DAMAGE,0.12,RANGE -0.09,CRITICAL_HIT_CHANCE,0.10,DAMAGE +0.09,CRITICAL_HIT_CHANCE,0.10,DAMAGE \ No newline at end of file diff --git a/Perk_data/event_rare_long_range_mortar.csv b/Perk_data/event_rare_long_range_mortar.csv index 356e01a..6281df8 100644 --- a/Perk_data/event_rare_long_range_mortar.csv +++ b/Perk_data/event_rare_long_range_mortar.csv @@ -1 +1 @@ -0.08,RANGE,0.04,COOL_DOWN +0.08,RANGE,0.04,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_rare_mines.csv b/Perk_data/event_rare_mines.csv index 27e789e..0b8089b 100644 --- a/Perk_data/event_rare_mines.csv +++ b/Perk_data/event_rare_mines.csv @@ -1,3 +1,3 @@ 0.07,DAMAGE,0.08,RANGE 0.07,DAMAGE,0.04,COOL_DOWN -0.04,COOL_DOWN,0.08,RANGE +0.04,COOL_DOWN,0.08,RANGE \ No newline at end of file diff --git a/Perk_data/event_rare_missiles.csv b/Perk_data/event_rare_missiles.csv index fc2ac59..64f6612 100644 --- a/Perk_data/event_rare_missiles.csv +++ b/Perk_data/event_rare_missiles.csv @@ -1 +1 @@ -0.03,COOL_DOWN,0.08,RANGE +0.03,COOL_DOWN,0.08,RANGE \ No newline at end of file diff --git a/Perk_data/event_rare_napalm.csv b/Perk_data/event_rare_napalm.csv index 9128ded..6b10b1e 100644 --- a/Perk_data/event_rare_napalm.csv +++ b/Perk_data/event_rare_napalm.csv @@ -1,2 +1,2 @@ 0.07,DAMAGE,0.13,PROJECTILE_SPEED -1,DURATION,0.07,PROJECTILE_SPEED +1,DURATION,0.07,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_rare_none.csv b/Perk_data/event_rare_none.csv index 4b0d95b..f1084bc 100644 --- a/Perk_data/event_rare_none.csv +++ b/Perk_data/event_rare_none.csv @@ -1 +1 @@ -,,, +,,, \ No newline at end of file diff --git a/Perk_data/event_rare_railguns.csv b/Perk_data/event_rare_railguns.csv index 17b0a6f..c3025a5 100644 --- a/Perk_data/event_rare_railguns.csv +++ b/Perk_data/event_rare_railguns.csv @@ -1,3 +1,3 @@ 0.05,DAMAGE,0.06,STUN_CHANCE 0.08,COOL_DOWN,0.06,STUN_CHANCE -0.08,COOL_DOWN,0.10,FROST_DAMAGE +0.08,COOL_DOWN,0.10,FROST_DAMAGE \ No newline at end of file diff --git a/Perk_data/event_rare_repair_bolt.csv b/Perk_data/event_rare_repair_bolt.csv index fdd59d8..18100a8 100644 --- a/Perk_data/event_rare_repair_bolt.csv +++ b/Perk_data/event_rare_repair_bolt.csv @@ -1,2 +1,2 @@ 0.10,PROJECTILE_SPEED,0.25,INVULNERABILITY -0.04,COOL_DOWN,0.13,PROJECTILE_SPEED +0.04,COOL_DOWN,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_rare_repair_box.csv b/Perk_data/event_rare_repair_box.csv index 2e64186..aff3518 100644 --- a/Perk_data/event_rare_repair_box.csv +++ b/Perk_data/event_rare_repair_box.csv @@ -1,2 +1,2 @@ 0.03,COOL_DOWN,0.05,CRITICAL_HIT_CHANCE -0.05,HEALING,0.08,RANGE +0.05,HEALING,0.08,RANGE \ No newline at end of file diff --git a/Perk_data/event_rare_repair_plasma.csv b/Perk_data/event_rare_repair_plasma.csv index 2f41865..362169b 100644 --- a/Perk_data/event_rare_repair_plasma.csv +++ b/Perk_data/event_rare_repair_plasma.csv @@ -1 +1 @@ -0.05,HEALING,0.08,RANGE +0.05,HEALING,0.08,RANGE \ No newline at end of file diff --git a/Perk_data/event_rare_repair_pulse.csv b/Perk_data/event_rare_repair_pulse.csv index 438c7af..a0e3f49 100644 --- a/Perk_data/event_rare_repair_pulse.csv +++ b/Perk_data/event_rare_repair_pulse.csv @@ -1 +1 @@ -0.06,COOL_DOWN,160,HIT_POINT +0.06,COOL_DOWN,160,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_rare_sniper_cannon.csv b/Perk_data/event_rare_sniper_cannon.csv index d7a4528..f73389f 100644 --- a/Perk_data/event_rare_sniper_cannon.csv +++ b/Perk_data/event_rare_sniper_cannon.csv @@ -1,2 +1,2 @@ 0.06,DAMAGE,0.08,COOL_DOWN -0.09,FIRE_DAMAGE,0.04,COOL_DOWN +0.09,FIRE_DAMAGE,0.04,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_rare_standard_mortar.csv b/Perk_data/event_rare_standard_mortar.csv index 364d83c..c634b97 100644 --- a/Perk_data/event_rare_standard_mortar.csv +++ b/Perk_data/event_rare_standard_mortar.csv @@ -1 +1 @@ -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_rare_standard_torpedo.csv b/Perk_data/event_rare_standard_torpedo.csv index 1adbe17..74d1eb8 100644 --- a/Perk_data/event_rare_standard_torpedo.csv +++ b/Perk_data/event_rare_standard_torpedo.csv @@ -1 +1 @@ -0.12,FROST_DAMAGE,0.10,PROJECTILE_SPEED +0.12,FROST_DAMAGE,0.10,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_rare_swift_torpedo.csv b/Perk_data/event_rare_swift_torpedo.csv index 34f0dd1..fac57ee 100644 --- a/Perk_data/event_rare_swift_torpedo.csv +++ b/Perk_data/event_rare_swift_torpedo.csv @@ -1,2 +1,2 @@ 0.05,DAMAGE,0.06,PROJECTILE_SPEED -0.09,FROST_DAMAGE,0.04,COOL_DOWN +0.09,FROST_DAMAGE,0.04,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_rare_tesla_bolt.csv b/Perk_data/event_rare_tesla_bolt.csv index 97a4a06..dc31025 100644 --- a/Perk_data/event_rare_tesla_bolt.csv +++ b/Perk_data/event_rare_tesla_bolt.csv @@ -1 +1 @@ -0.5,STUN_DURATION,0.13,PROJECTILE_SPEED +0.5,STUN_DURATION,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_rare_tesla_shield.csv b/Perk_data/event_rare_tesla_shield.csv index 866d85f..8314559 100644 --- a/Perk_data/event_rare_tesla_shield.csv +++ b/Perk_data/event_rare_tesla_shield.csv @@ -1 +1 @@ -0.3,DURATION,30,SHIELD_HIT_POINT +0.3,DURATION,30,SHIELD_HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_rare_triple_torpedo.csv b/Perk_data/event_rare_triple_torpedo.csv index a405540..d0e8f1b 100644 --- a/Perk_data/event_rare_triple_torpedo.csv +++ b/Perk_data/event_rare_triple_torpedo.csv @@ -1,3 +1,3 @@ 0.12,FROST_DAMAGE,0.08,COOL_DOWN 0.06,DAMAGE,0.08,COOL_DOWN -0.05,DAMAGE,0.10,PROJECTILE_SPEED +0.05,DAMAGE,0.10,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_rare_turbo.csv b/Perk_data/event_rare_turbo.csv index 547d2c6..2b5f8e3 100644 --- a/Perk_data/event_rare_turbo.csv +++ b/Perk_data/event_rare_turbo.csv @@ -1,2 +1,2 @@ 0.15,SPEED,0.01,DAMAGE -0.15,SPEED,80,HIT_POINT +0.15,SPEED,80,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_uncommon_all_cannons.csv b/Perk_data/event_uncommon_all_cannons.csv index 1c7b251..6b978b8 100644 --- a/Perk_data/event_uncommon_all_cannons.csv +++ b/Perk_data/event_uncommon_all_cannons.csv @@ -1,4 +1,4 @@ 0.03,DAMAGE,0.13,PROJECTILE_SPEED 0.01,CRITICAL_HIT_CHANCE,0.08,DAMAGE 0.03,DAMAGE,0.12,RANGE -0.10,FIRE_DAMAGE,0.08,COOL_DOWN +0.10,FIRE_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_uncommon_all_incendiary_items.csv b/Perk_data/event_uncommon_all_incendiary_items.csv index 0b8cbac..efc15cc 100644 --- a/Perk_data/event_uncommon_all_incendiary_items.csv +++ b/Perk_data/event_uncommon_all_incendiary_items.csv @@ -1,2 +1,2 @@ 0.5,DURATION,0.02,COOL_DOWN -0.03,DAMAGE,0.02,COOL_DOWN +0.03,DAMAGE,0.02,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_uncommon_all_missiles.csv b/Perk_data/event_uncommon_all_missiles.csv index e8ea71f..6862d6b 100644 --- a/Perk_data/event_uncommon_all_missiles.csv +++ b/Perk_data/event_uncommon_all_missiles.csv @@ -1,3 +1,3 @@ 0.03,DAMAGE,0.05,RANGE 0.08,DAMAGE,0.05,COOL_DOWN -0.08,DAMAGE,0.13,PROJECTILE_SPEED +0.08,DAMAGE,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_uncommon_all_mortars.csv b/Perk_data/event_uncommon_all_mortars.csv index a98f06c..a29d52d 100644 --- a/Perk_data/event_uncommon_all_mortars.csv +++ b/Perk_data/event_uncommon_all_mortars.csv @@ -1,3 +1,3 @@ 0.03,DAMAGE,0.05,RANGE 0.10,RANGE,0.08,COOL_DOWN -0.04,FROST_DAMAGE,0.07,DAMAGE +0.04,FROST_DAMAGE,0.07,DAMAGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_all_repair_items.csv b/Perk_data/event_uncommon_all_repair_items.csv index 7c8dbd6..ed5f624 100644 --- a/Perk_data/event_uncommon_all_repair_items.csv +++ b/Perk_data/event_uncommon_all_repair_items.csv @@ -1 +1 @@ -0.03,HEALING,0.02,COOL_DOWN +0.03,HEALING,0.02,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_uncommon_all_shields.csv b/Perk_data/event_uncommon_all_shields.csv index 7c2416a..898fe63 100644 --- a/Perk_data/event_uncommon_all_shields.csv +++ b/Perk_data/event_uncommon_all_shields.csv @@ -1,2 +1,2 @@ 50,HIT_POINT,12,DEFENCE -50,HIT_POINT,0.01,DAMAGE +50,HIT_POINT,0.01,DAMAGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_all_torpedoes.csv b/Perk_data/event_uncommon_all_torpedoes.csv index 1a4f262..77dfae2 100644 --- a/Perk_data/event_uncommon_all_torpedoes.csv +++ b/Perk_data/event_uncommon_all_torpedoes.csv @@ -1,2 +1,2 @@ 0.05,PROJECTILE_SPEED,0.02,COOL_DOWN -0.03,DAMAGE,0.12,CRITICAL_HIT_CHANCE +0.03,DAMAGE,0.12,CRITICAL_HIT_CHANCE \ No newline at end of file diff --git a/Perk_data/event_uncommon_ballpark_mortar.csv b/Perk_data/event_uncommon_ballpark_mortar.csv index 364d83c..c634b97 100644 --- a/Perk_data/event_uncommon_ballpark_mortar.csv +++ b/Perk_data/event_uncommon_ballpark_mortar.csv @@ -1 +1 @@ -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_uncommon_big_bandage.csv b/Perk_data/event_uncommon_big_bandage.csv index d60bcf0..f0aad9e 100644 --- a/Perk_data/event_uncommon_big_bandage.csv +++ b/Perk_data/event_uncommon_big_bandage.csv @@ -1 +1 @@ -0.02,HEALINGs,40,HIT_POINT +0.02,HEALINGs,40,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_uncommon_big_berta.csv b/Perk_data/event_uncommon_big_berta.csv index 880a1f9..6502706 100644 --- a/Perk_data/event_uncommon_big_berta.csv +++ b/Perk_data/event_uncommon_big_berta.csv @@ -1,2 +1,2 @@ 0.12,FROST_DAMAGE,0.08,COOL_DOWN -0.12,FROST_DAMAGE,0.12,RANGE +0.12,FROST_DAMAGE,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_big_torpedo.csv b/Perk_data/event_uncommon_big_torpedo.csv index 1878638..e22ec57 100644 --- a/Perk_data/event_uncommon_big_torpedo.csv +++ b/Perk_data/event_uncommon_big_torpedo.csv @@ -1,2 +1,2 @@ 0.07,DAMAGE,0.10,PROJECTILE_SPEED -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_uncommon_blast_cannon.csv b/Perk_data/event_uncommon_blast_cannon.csv index 6961c98..9258ad0 100644 --- a/Perk_data/event_uncommon_blast_cannon.csv +++ b/Perk_data/event_uncommon_blast_cannon.csv @@ -1 +1 @@ -0.12,FIRE_DAMAGE,0.12,RANGE +0.12,FIRE_DAMAGE,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_cannon.csv b/Perk_data/event_uncommon_cannon.csv index 7f8ffdc..c4367c4 100644 --- a/Perk_data/event_uncommon_cannon.csv +++ b/Perk_data/event_uncommon_cannon.csv @@ -1 +1 @@ -0.04,FIRE_DAMAGE,0.05,RANGE +0.04,FIRE_DAMAGE,0.05,RANGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_carronade.csv b/Perk_data/event_uncommon_carronade.csv index ea8e33a..b0589ae 100644 --- a/Perk_data/event_uncommon_carronade.csv +++ b/Perk_data/event_uncommon_carronade.csv @@ -1,3 +1,3 @@ 0.02,COOL_DOWN,0.05,RANGE 3,DAMAGE,0.02,COOL_DOWN -3,DAMAGE,0.05,RANGE +3,DAMAGE,0.05,RANGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_duct_tape.csv b/Perk_data/event_uncommon_duct_tape.csv index a116e1d..aa89e31 100644 --- a/Perk_data/event_uncommon_duct_tape.csv +++ b/Perk_data/event_uncommon_duct_tape.csv @@ -1 +1 @@ -0.03,HEALING,40,HIT_POINT +0.03,HEALING,40,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_uncommon_explosive_cannon.csv b/Perk_data/event_uncommon_explosive_cannon.csv index 6961c98..9258ad0 100644 --- a/Perk_data/event_uncommon_explosive_cannon.csv +++ b/Perk_data/event_uncommon_explosive_cannon.csv @@ -1 +1 @@ -0.12,FIRE_DAMAGE,0.12,RANGE +0.12,FIRE_DAMAGE,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_fire_bomb.csv b/Perk_data/event_uncommon_fire_bomb.csv index 96a45c4..6db51ad 100644 --- a/Perk_data/event_uncommon_fire_bomb.csv +++ b/Perk_data/event_uncommon_fire_bomb.csv @@ -1,2 +1,2 @@ 0.03,DAMAGE,0.05,RANGE -0.02,COOL_DOWN,0.05,PROJECTILE_SPEED +0.02,COOL_DOWN,0.05,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_uncommon_flare_gun.csv b/Perk_data/event_uncommon_flare_gun.csv index 9cf5164..f33c2e6 100644 --- a/Perk_data/event_uncommon_flare_gun.csv +++ b/Perk_data/event_uncommon_flare_gun.csv @@ -1,3 +1,3 @@ 0.5,DURATION,0.05,PROJECTILE_SPEED 0.03,DAMAGE,0.05,PROJECTILE_SPEED -0.06,COOL_DOWN,0.05,PROJECTILE_SPEED +0.06,COOL_DOWN,0.05,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_uncommon_freeze_items.csv b/Perk_data/event_uncommon_freeze_items.csv index 439547d..3ca896c 100644 --- a/Perk_data/event_uncommon_freeze_items.csv +++ b/Perk_data/event_uncommon_freeze_items.csv @@ -1 +1 @@ -0.4,DURATION,0.08,COOL_DOWN +0.4,DURATION,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_uncommon_frost_blaster.csv b/Perk_data/event_uncommon_frost_blaster.csv index 3b260f4..03611bf 100644 --- a/Perk_data/event_uncommon_frost_blaster.csv +++ b/Perk_data/event_uncommon_frost_blaster.csv @@ -1 +1 @@ -0.02,COOL_DOWN,0.05,PROJECTILE_SPEED +0.02,COOL_DOWN,0.05,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_uncommon_gatling_gun.csv b/Perk_data/event_uncommon_gatling_gun.csv index a7c429b..1e5fe3c 100644 --- a/Perk_data/event_uncommon_gatling_gun.csv +++ b/Perk_data/event_uncommon_gatling_gun.csv @@ -1,3 +1,3 @@ 0.08,DAMAGE,0.12,RANGE 0.08,DAMAGE,0.13,PROJECTILE_SPEED -0.04,FIRE_DAMAGE,0.05,PROJECTILE_SPEED +0.04,FIRE_DAMAGE,0.05,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_uncommon_grenades.csv b/Perk_data/event_uncommon_grenades.csv index 3ccca4e..3f2a011 100644 --- a/Perk_data/event_uncommon_grenades.csv +++ b/Perk_data/event_uncommon_grenades.csv @@ -1,4 +1,4 @@ 0.06,CRITICAL_HIT_CHANCE,0.12,RANGE 0.08,COOL_DOWN,0.12,RANGE 0.06,DAMAGE,0.05,RANGE -0.06,CRITICAL_HIT_CHANCE,0.03,DAMAGE +0.06,CRITICAL_HIT_CHANCE,0.03,DAMAGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_long_range_mortar.csv b/Perk_data/event_uncommon_long_range_mortar.csv index 870b07d..cc52c2c 100644 --- a/Perk_data/event_uncommon_long_range_mortar.csv +++ b/Perk_data/event_uncommon_long_range_mortar.csv @@ -1 +1 @@ -0.10,RANGE,0.08,COOL_DOWN +0.10,RANGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_uncommon_mines.csv b/Perk_data/event_uncommon_mines.csv index 84e4b01..2c12e0f 100644 --- a/Perk_data/event_uncommon_mines.csv +++ b/Perk_data/event_uncommon_mines.csv @@ -1,3 +1,3 @@ 0.05,DAMAGE,0.05,RANGE 0.05,DAMAGE,0.02,COOL_DOWN -0.02,COOL_DOWN,0.05,RANGE +0.02,COOL_DOWN,0.05,RANGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_missiles.csv b/Perk_data/event_uncommon_missiles.csv index ff8c69a..297e196 100644 --- a/Perk_data/event_uncommon_missiles.csv +++ b/Perk_data/event_uncommon_missiles.csv @@ -1 +1 @@ -0.04,COOL_DOWN,0.12,RANGE +0.04,COOL_DOWN,0.12,RANGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_napalm.csv b/Perk_data/event_uncommon_napalm.csv index 04d65cc..d4d5198 100644 --- a/Perk_data/event_uncommon_napalm.csv +++ b/Perk_data/event_uncommon_napalm.csv @@ -1,2 +1,2 @@ 0.03,DAMAGE,0.05,PROJECTILE_SPEED -0.5,DURATION,0.05,PROJECTILE_SPEED +0.5,DURATION,0.05,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_uncommon_none.csv b/Perk_data/event_uncommon_none.csv index 4b0d95b..f1084bc 100644 --- a/Perk_data/event_uncommon_none.csv +++ b/Perk_data/event_uncommon_none.csv @@ -1 +1 @@ -,,, +,,, \ No newline at end of file diff --git a/Perk_data/event_uncommon_railguns.csv b/Perk_data/event_uncommon_railguns.csv index 3238253..841890d 100644 --- a/Perk_data/event_uncommon_railguns.csv +++ b/Perk_data/event_uncommon_railguns.csv @@ -1,3 +1,3 @@ 0.03,DAMAGE,0.05,STUN_CHANCE 0.04,COOL_DOWN,0.05,STUN_CHANCE -0.04,COOL_DOWN,0.04,FROST_DAMAGE +0.04,COOL_DOWN,0.04,FROST_DAMAGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_repair_bolt.csv b/Perk_data/event_uncommon_repair_bolt.csv index fdd59d8..18100a8 100644 --- a/Perk_data/event_uncommon_repair_bolt.csv +++ b/Perk_data/event_uncommon_repair_bolt.csv @@ -1,2 +1,2 @@ 0.10,PROJECTILE_SPEED,0.25,INVULNERABILITY -0.04,COOL_DOWN,0.13,PROJECTILE_SPEED +0.04,COOL_DOWN,0.13,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_uncommon_repair_box.csv b/Perk_data/event_uncommon_repair_box.csv index b211ba7..cb0a25f 100644 --- a/Perk_data/event_uncommon_repair_box.csv +++ b/Perk_data/event_uncommon_repair_box.csv @@ -1,2 +1,2 @@ 0.03,COOL_DOWN,0.10,CRITICAL_HIT_CHANCE -0.03,HEALING,0.05,RANGE +0.03,HEALING,0.05,RANGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_repair_plasma.csv b/Perk_data/event_uncommon_repair_plasma.csv index e135e0b..5f4d463 100644 --- a/Perk_data/event_uncommon_repair_plasma.csv +++ b/Perk_data/event_uncommon_repair_plasma.csv @@ -1 +1 @@ -0.03,HEALING,0.05,RANGE +0.03,HEALING,0.05,RANGE \ No newline at end of file diff --git a/Perk_data/event_uncommon_repair_pulse.csv b/Perk_data/event_uncommon_repair_pulse.csv index 438c7af..a0e3f49 100644 --- a/Perk_data/event_uncommon_repair_pulse.csv +++ b/Perk_data/event_uncommon_repair_pulse.csv @@ -1 +1 @@ -0.06,COOL_DOWN,160,HIT_POINT +0.06,COOL_DOWN,160,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_uncommon_sniper_cannon.csv b/Perk_data/event_uncommon_sniper_cannon.csv index 895c7b6..0844f0f 100644 --- a/Perk_data/event_uncommon_sniper_cannon.csv +++ b/Perk_data/event_uncommon_sniper_cannon.csv @@ -1,2 +1,2 @@ 0.06,DAMAGE,0.08,COOL_DOWN -0.04,FIRE_DAMAGE,0.02,COOL_DOWN +0.04,FIRE_DAMAGE,0.02,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_uncommon_standard_mortar.csv b/Perk_data/event_uncommon_standard_mortar.csv index 364d83c..c634b97 100644 --- a/Perk_data/event_uncommon_standard_mortar.csv +++ b/Perk_data/event_uncommon_standard_mortar.csv @@ -1 +1 @@ -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_uncommon_standard_torpedo.csv b/Perk_data/event_uncommon_standard_torpedo.csv index a5247c7..666cb5a 100644 --- a/Perk_data/event_uncommon_standard_torpedo.csv +++ b/Perk_data/event_uncommon_standard_torpedo.csv @@ -1 +1 @@ -0.04,FROST_DAMAGE,0.03,PROJECTILE_SPEED +0.04,FROST_DAMAGE,0.03,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_uncommon_swift_torpedo.csv b/Perk_data/event_uncommon_swift_torpedo.csv index 1878638..e22ec57 100644 --- a/Perk_data/event_uncommon_swift_torpedo.csv +++ b/Perk_data/event_uncommon_swift_torpedo.csv @@ -1,2 +1,2 @@ 0.07,DAMAGE,0.10,PROJECTILE_SPEED -0.12,FROST_DAMAGE,0.08,COOL_DOWN +0.12,FROST_DAMAGE,0.08,COOL_DOWN \ No newline at end of file diff --git a/Perk_data/event_uncommon_tesla_bolt.csv b/Perk_data/event_uncommon_tesla_bolt.csv index 9d32ee5..a2b1374 100644 --- a/Perk_data/event_uncommon_tesla_bolt.csv +++ b/Perk_data/event_uncommon_tesla_bolt.csv @@ -1 +1 @@ -0.3,STUN_DURATION,0.05,PROJECTILE_SPEED +0.3,STUN_DURATION,0.05,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_uncommon_tesla_shield.csv b/Perk_data/event_uncommon_tesla_shield.csv index 8b64c73..d58d2ce 100644 --- a/Perk_data/event_uncommon_tesla_shield.csv +++ b/Perk_data/event_uncommon_tesla_shield.csv @@ -1 +1 @@ -0.3,DURATION,15,SHIELD_HIT_POINT +0.3,DURATION,15,SHIELD_HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_uncommon_triple_torpedo.csv b/Perk_data/event_uncommon_triple_torpedo.csv index 1f12509..41d8d19 100644 --- a/Perk_data/event_uncommon_triple_torpedo.csv +++ b/Perk_data/event_uncommon_triple_torpedo.csv @@ -1,3 +1,3 @@ 0.12,FROST_DAMAGE,0.08,COOL_DOWN 0.06,DAMAGE,0.08,COOL_DOWN -0.03,DAMAGE,0.03,PROJECTILE_SPEED +0.03,DAMAGE,0.03,PROJECTILE_SPEED \ No newline at end of file diff --git a/Perk_data/event_uncommon_turbo.csv b/Perk_data/event_uncommon_turbo.csv index fa0fcb2..346f959 100644 --- a/Perk_data/event_uncommon_turbo.csv +++ b/Perk_data/event_uncommon_turbo.csv @@ -1,2 +1,2 @@ 0.10,SPEED,0.01,DAMAGE -0.10,SPEED,40,HIT_POINT +0.10,SPEED,40,HIT_POINT \ No newline at end of file diff --git a/Perk_data/event_uncommon_uncommon.csv b/Perk_data/event_uncommon_uncommon.csv index 6d2eac4..4f75701 100644 --- a/Perk_data/event_uncommon_uncommon.csv +++ b/Perk_data/event_uncommon_uncommon.csv @@ -1 +1 @@ -uncommon,,uncommon, +uncommon,,uncommon, \ No newline at end of file diff --git a/perks.c b/perks.c index 5093fbd..3063f5a 100644 --- a/perks.c +++ b/perks.c @@ -6,7 +6,7 @@ #include "clear_input.h" #define MAX_LINE_SIZE 1024 -struct Perk* createPerk(char* first_boost_type,char* second_boost_type, int first_boost_value,int second_boost_value) { +struct Perk* createPerk(char* first_boost_type,char* second_boost_type, float first_boost_value,float second_boost_value) { struct Perk* p = malloc(sizeof(struct Perk)); p->first_boost_type = strdup(first_boost_type); p->second_boost_type = strdup(second_boost_type); @@ -62,17 +62,17 @@ void addPerks(struct Object* o) { return; } bool perk_choice = true; - bool is_event = false; + bool is_event = true; int number_of_perks = numberOfPerks(o); for(int i = 0; i perk_iter) { if (fgets(line, sizeof(line), file) == NULL) { printf("Error reading line from file \"%s\"\n", perks_full_path[file_number]); @@ -259,12 +257,14 @@ struct Perk* displayAndChooseAvailablePerks(char** perk_list, bool is_event) { } perk_iter++; } + fgets(line, sizeof(line), file); - if (fgets(line, sizeof(line), file) == NULL) { + if (line == NULL) { printf("Error reading chosen perk line from file \"%s\"\n", perks_full_path[file_number]); fclose(file); return NULL; } + printf("\n %s \n",line); char* copiedline = strdup(line); char* token = strtok(copiedline, ","); @@ -286,7 +286,7 @@ struct Perk* displayAndChooseAvailablePerks(char** perk_list, bool is_event) { for (int i = 0; i < num_files; i++) { free(perks_full_path[i]); } - + displayPerk(*p); return p; } @@ -365,4 +365,13 @@ char** perkLists(struct Object* o) { } } return files_names; +} + + +void displayPerk(struct Perk p ) { + printf("Is Event: %s\n", p.is_event ? "True" : "False"); + printf("First Boost Value: %.2f\n", p.first_boost_value); + printf("First Boost Type: %s\n", p.first_boost_type); + printf("Second Boost Value: %.2f\n", p.second_boost_value); + printf("Second Boost Type: %s\n", p.second_boost_type); } \ No newline at end of file diff --git a/perks.h b/perks.h index 5070d73..7233097 100644 --- a/perks.h +++ b/perks.h @@ -5,13 +5,13 @@ struct Perk { bool is_event; - unsigned int first_boost_value; + float first_boost_value; char* first_boost_type; - unsigned int second_boost_value; + float second_boost_value; char* second_boost_type; }; -struct Perk* createPerk(char* first_boost_type,char* second_boost_type, int first_boost_value,int second_boost_value); +struct Perk* createPerk(char* first_boost_type,char* second_boost_type, float first_boost_value,float second_boost_value); int numberOfPerks(struct Object* o); void addPerks(struct Object* o); @@ -19,5 +19,5 @@ char** perkLists(struct Object* o); struct Perk* displayAndChooseAvailablePerks(char** perk_list, bool is_event); void updateEvent(struct Perk* p,bool is_event); - +void displayPerk(struct Perk p ); #endif diff --git a/readobjects.c b/readobjects.c index 69f3583..9474930 100644 --- a/readobjects.c +++ b/readobjects.c @@ -27,7 +27,7 @@ struct Object* readObjectFile(unsigned int object_type, char* object_name, char* return NULL; } // Loop to prompt user for object level until a valid input is provided - /*while (true){ + while (true){ printf("What level is the object ?\n"); printf("(Between 1 and 50)\n"); printf("------------------------\n"); @@ -38,8 +38,7 @@ struct Object* readObjectFile(unsigned int object_type, char* object_name, char* // Validate the level input if(object_lvl < 0 || object_lvl > 50){ printf("Invalid choice, please try again\n"); - }else{*/ - int object_lvl = 10; + }else{ // Allocate memory for the filename using object name and rarity char* object_file_name = malloc(sizeof(char)*(strlen(object_name) + strlen(rarity) + 16 + 1 + 5 + 1)); if(object_file_name == NULL){ @@ -115,5 +114,5 @@ struct Object* readObjectFile(unsigned int object_type, char* object_name, char* // Return the newly created object return o; } - /*} -}*/ \ No newline at end of file + } +} \ No newline at end of file diff --git a/scriptspy/perks_.c b/scriptspy/perks_.c index 6359d82..8a2e521 100644 --- a/scriptspy/perks_.c +++ b/scriptspy/perks_.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include @@ -149,20 +150,37 @@ void parse_bonus(const char *bonus, char *value, char *name) { void write_to_csv(const char *output_path, ItemNode* head) { ItemNode* current = head; + char filename[MAX_PATH]; + char current_filename[MAX_PATH] = ""; + FILE *fp = NULL; + while (current != NULL) { - char filename[MAX_PATH]; snprintf(filename, sizeof(filename), "%sevent_%s_%s.csv", output_path, current->item.rarity, current->item.object_name); - FILE *fp = fopen(filename, "a"); - if (fp == NULL) { - perror("fopen"); - return; + if (strcmp(filename, current_filename) != 0) { + if (fp != NULL) { + fclose(fp); + } + strcpy(current_filename, filename); + fp = fopen(filename, "a"); + if (fp == NULL) { + perror("fopen"); + return; + } } - fprintf(fp, "%s,%s,%s,%s\n", current->item.first_bonus_value, current->item.first_bonus_name, current->item.second_bonus_value, current->item.second_bonus_name); - - fclose(fp); + if (ftell(fp) == 0) { + // File is empty, don't write newline + fprintf(fp, "%s,%s,%s,%s", current->item.first_bonus_value, current->item.first_bonus_name, current->item.second_bonus_value, current->item.second_bonus_name); + } else { + // File is not empty, write newline + fprintf(fp, "\n%s,%s,%s,%s", current->item.first_bonus_value, current->item.first_bonus_name, current->item.second_bonus_value, current->item.second_bonus_name); + } current = current->next; } + + if (fp != NULL) { + fclose(fp); + } } \ No newline at end of file