salinecitrine · ashleybaldock · May 25, 2023 · May 25, 2023 · May 25, 2023 · May 25, 2023
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,3 @@
-src/app/calc/evaluate_lua/__generated__
+src/app/calc/evaluate_lua/__generated__
+
+src/app/calc/__generated__/*.ts
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@
 
 # misc
 .DS_Store
+**/.DS_Store
 .env.local
 .env.development.local
 .env.test.local

diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v16
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ## Branches
 
-* `master` is deployed to https://noita-wand-simulator.salinecitrine.com/
-* `develop` is deployed to https://beta.noita-wand-simulator.salinecitrine.com/
+- `master` is deployed to https://noita-wand-simulator.salinecitrine.com/
+- `develop` is deployed to https://beta.noita-wand-simulator.salinecitrine.com/
 
 ## Available Scripts
 
@@ -30,20 +30,61 @@ Your app is ready to be deployed!
 
 See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
 
-### `generate-actions`
+## Automatic code generation
 
-Generate Typescript spell functions from the source Lua code. This requires that you have 'data/scripts/gun/gun_actions.lua' present.
+These scripts convert the files the game uses into forms easily consumed by TypeScript. Uses the following files:
+
+From the main game files:
+
+```
+data_base/translations/common.csv
+```
+
+From the modding data export:
+
+```
+data/scripts/gun/gun_actions.lua
+```
+
+If versions of these files containing the 'beta' suffix are found, the additional spells are included behind a 'beta content' toggle in the sim. E.g.:
+
+```
+data_base/translations/common.beta.csv
+data/scripts/gun/gun_actions.beta.lua
+```
+
+Get a diff of release and beta with:
 
+```
+diff --suppress-common-lines -trb gun_actions.ts gun_actions.beta.ts
+diff --suppress-common-lines -trb -I 'spawn_' gun_actions.ts gun_actions.beta.ts
+```
+
+With those files in place, you can run this command to generate the necessary files:
+
+```
+yarn generate
+```
+
+Or, individually:
+
+```
+yarn generate-actions
+```
+
+Generate Typescript spell functions from the source Lua code. This requires that you have 'data/scripts/gun/gun_actions.lua' present.
 Runs `scripts/generate_gun_actions.py`.
 
-### `generate-entity-map`
+```
+yarn generate-entity-map
+```
 
 Generate a Typescript map from projectile definitions to spells that use them, based on the source Lua code. This requires that you have 'data/scripts/gun/gun_actions.lua' present.
-
 Runs `scripts/generate_entity_map.py`.
 
-### `generate-translations`
+```
+yarn generate-translations
+```
 
 Generate display strings from IDs based on the game's translation file. This requires that you have './data_base/translations/common.csv' present.
-
 Runs `scripts/generate_translations.py`.
diff --git a/package.json b/package.json
@@ -21,18 +21,19 @@
     "react-dnd-html5-backend": "^14.0.0",
     "react-dom": "^17.0.2",
     "react-redux": "^7.2.4",
-    "react-scripts": "4.0.3",
+    "react-scripts": "5.0.1",
     "redux-undo": "^1.0.1",
     "styled-components": "^5.3.0",
     "typescript": "^4.1.2",
     "web-vitals": "^2.1.0"
   },
   "scripts": {
-    "start": "BROWSER=none react-scripts --openssl-legacy-provider start",
+    "start": "BROWSER=none react-scripts start",
     "build": "CI= react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "serve": "npx serve -s build",
+    "generate": "yarn generate-actions && yarn generate-entity-map && yarn generate-translations",
     "generate-actions": "python scripts/generate_gun_actions.py",
     "generate-translations": "python scripts/generate_translations.py",
     "generate-entity-map": "python scripts/generate_entity_map.py"
@@ -62,6 +63,7 @@
     ]
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "serve": "^12.0.0"
   }
 }
diff --git a/public/data/arrowhead.png b/public/data/arrowhead.png
diff --git a/public/data/arrowhead_down.png b/public/data/arrowhead_down.png
diff --git a/public/data/arrowhead_downleft.png b/public/data/arrowhead_downleft.png
diff --git a/public/data/arrowhead_downright.png b/public/data/arrowhead_downright.png
diff --git a/public/data/arrowhead_left.png b/public/data/arrowhead_left.png
diff --git a/public/data/arrowhead_leftup.png b/public/data/arrowhead_leftup.png
diff --git a/public/data/arrowhead_right.png b/public/data/arrowhead_right.png
diff --git a/public/data/arrowhead_up.png b/public/data/arrowhead_up.png
diff --git a/public/data/arrowhead_upright.png b/public/data/arrowhead_upright.png
diff --git a/public/data/border_active.png b/public/data/border_active.png
diff --git a/public/data/border_inactive.png b/public/data/border_inactive.png
diff --git a/public/data/config/die2.png b/public/data/config/die2.png
diff --git a/public/data/config/goldnugget2.png b/public/data/config/goldnugget2.png
diff --git a/public/data/config/heart2.png b/public/data/config/heart2.png
diff --git a/public/data/fonts/NoitaGlyphScaled.ttf b/public/data/fonts/NoitaGlyphScaled.ttf
diff --git a/public/data/fonts/NoitaPixel.ttf b/public/data/fonts/NoitaPixel.ttf
diff --git a/public/data/inventory/action_tree_box.png b/public/data/inventory/action_tree_box.png
diff --git a/public/data/inventory/background.png b/public/data/inventory/background.png
diff --git a/public/data/inventory/full_inventory_box.png b/public/data/inventory/full_inventory_box.png
diff --git a/public/data/inventory/full_inventory_box_highlight.png b/public/data/inventory/full_inventory_box_highlight.png
diff --git a/public/data/inventory/grid_box.png b/public/data/inventory/grid_box.png
diff --git a/public/data/inventory/grid_box_unknown.png b/public/data/inventory/grid_box_unknown.png
diff --git a/public/data/inventory/grid_highlight_new.png b/public/data/inventory/grid_highlight_new.png
diff --git a/public/data/inventory/highlight.png b/public/data/inventory/highlight.png
diff --git a/public/data/inventory/hover_info_empty_slot.png b/public/data/inventory/hover_info_empty_slot.png
diff --git a/public/data/inventory/inventory_box.png b/public/data/inventory/inventory_box.png
diff --git a/public/data/inventory/inventory_box_inactive_overlay.png b/public/data/inventory/inventory_box_inactive_overlay.png
diff --git a/public/data/inventory/item_bg_purchase_1.png b/public/data/inventory/item_bg_purchase_1.png
diff --git a/public/data/inventory/item_bg_purchase_2.png b/public/data/inventory/item_bg_purchase_2.png
diff --git a/public/data/noita_logo.png b/public/data/noita_logo.png
diff --git a/public/data/requirement.png b/public/data/requirement.png
diff --git a/public/data/sampo-config.png b/public/data/sampo-config.png
diff --git a/public/data/spelltypes/item_bg_draw_many.png b/public/data/spelltypes/item_bg_draw_many.png
diff --git a/public/data/spelltypes/item_bg_material.png b/public/data/spelltypes/item_bg_material.png
diff --git a/public/data/spelltypes/item_bg_modifier.png b/public/data/spelltypes/item_bg_modifier.png
diff --git a/public/data/spelltypes/item_bg_other.png b/public/data/spelltypes/item_bg_other.png
diff --git a/public/data/spelltypes/item_bg_passive.png b/public/data/spelltypes/item_bg_passive.png
diff --git a/public/data/spelltypes/item_bg_projectile.png b/public/data/spelltypes/item_bg_projectile.png
diff --git a/public/data/spelltypes/item_bg_static_projectile.png b/public/data/spelltypes/item_bg_static_projectile.png
diff --git a/public/data/spelltypes/item_bg_utility.png b/public/data/spelltypes/item_bg_utility.png
diff --git a/public/data/status/bloody.png b/public/data/status/bloody.png
diff --git a/public/data/status/burning.png b/public/data/status/burning.png
diff --git a/public/data/status/oiled.png b/public/data/status/oiled.png
diff --git a/public/data/status/wet.png b/public/data/status/wet.png
diff --git a/public/data/textlog.png b/public/data/textlog.png
diff --git a/public/data/trail/trail_acid.png b/public/data/trail/trail_acid.png
diff --git a/public/data/trail/trail_alcohol.png b/public/data/trail/trail_alcohol.png
diff --git a/public/data/trail/trail_fire.png b/public/data/trail/trail_fire.png
diff --git a/public/data/trail/trail_gunpowder.png b/public/data/trail/trail_gunpowder.png
diff --git a/public/data/trail/trail_lava.png b/public/data/trail/trail_lava.png
diff --git a/public/data/trail/trail_oil.png b/public/data/trail/trail_oil.png
diff --git a/public/data/trail/trail_poison.png b/public/data/trail/trail_poison.png
diff --git a/public/data/trail/trail_water.png b/public/data/trail/trail_water.png
diff --git a/public/data/ui_gfx/gun_actions/2_cards_on_death.png b/public/data/ui_gfx/gun_actions/2_cards_on_death.png
diff --git a/public/data/ui_gfx/gun_actions/3_cards_on_death.png b/public/data/ui_gfx/gun_actions/3_cards_on_death.png
diff --git a/public/data/ui_gfx/gun_actions/_unidentified.png b/public/data/ui_gfx/gun_actions/_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/accelerating_shot.png b/public/data/ui_gfx/gun_actions/accelerating_shot.png
diff --git a/public/data/ui_gfx/gun_actions/acid.png b/public/data/ui_gfx/gun_actions/acid.png
diff --git a/public/data/ui_gfx/gun_actions/acid_trail.png b/public/data/ui_gfx/gun_actions/acid_trail.png
diff --git a/public/data/ui_gfx/gun_actions/acid_trail_unidentified.png b/public/data/ui_gfx/gun_actions/acid_trail_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/acidshot.png b/public/data/ui_gfx/gun_actions/acidshot.png
diff --git a/public/data/ui_gfx/gun_actions/acidshot_unidentified.png b/public/data/ui_gfx/gun_actions/acidshot_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/air_bullet.png b/public/data/ui_gfx/gun_actions/air_bullet.png
diff --git a/public/data/ui_gfx/gun_actions/air_bullet_unidentified.png b/public/data/ui_gfx/gun_actions/air_bullet_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/alcohol_blast.png b/public/data/ui_gfx/gun_actions/alcohol_blast.png
diff --git a/public/data/ui_gfx/gun_actions/all_acid.png b/public/data/ui_gfx/gun_actions/all_acid.png
diff --git a/public/data/ui_gfx/gun_actions/all_blackholes.png b/public/data/ui_gfx/gun_actions/all_blackholes.png
diff --git a/public/data/ui_gfx/gun_actions/all_deathcrosses.png b/public/data/ui_gfx/gun_actions/all_deathcrosses.png
diff --git a/public/data/ui_gfx/gun_actions/all_discs.png b/public/data/ui_gfx/gun_actions/all_discs.png
diff --git a/public/data/ui_gfx/gun_actions/all_nukes.png b/public/data/ui_gfx/gun_actions/all_nukes.png
diff --git a/public/data/ui_gfx/gun_actions/all_rockets.png b/public/data/ui_gfx/gun_actions/all_rockets.png
diff --git a/public/data/ui_gfx/gun_actions/all_spells.png b/public/data/ui_gfx/gun_actions/all_spells.png
diff --git a/public/data/ui_gfx/gun_actions/alpha.png b/public/data/ui_gfx/gun_actions/alpha.png
diff --git a/public/data/ui_gfx/gun_actions/anti_homing.png b/public/data/ui_gfx/gun_actions/anti_homing.png
diff --git a/public/data/ui_gfx/gun_actions/arc_electric.png b/public/data/ui_gfx/gun_actions/arc_electric.png
diff --git a/public/data/ui_gfx/gun_actions/arc_electric_unidentified.png b/public/data/ui_gfx/gun_actions/arc_electric_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/arc_fire.png b/public/data/ui_gfx/gun_actions/arc_fire.png
diff --git a/public/data/ui_gfx/gun_actions/arc_fire_unidentified.png b/public/data/ui_gfx/gun_actions/arc_fire_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/arc_gunpowder.png b/public/data/ui_gfx/gun_actions/arc_gunpowder.png
diff --git a/public/data/ui_gfx/gun_actions/arc_poison.png b/public/data/ui_gfx/gun_actions/arc_poison.png
diff --git a/public/data/ui_gfx/gun_actions/area_damage.png b/public/data/ui_gfx/gun_actions/area_damage.png
diff --git a/public/data/ui_gfx/gun_actions/arrow.png b/public/data/ui_gfx/gun_actions/arrow.png
diff --git a/public/data/ui_gfx/gun_actions/arrow_unidentified.png b/public/data/ui_gfx/gun_actions/arrow_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/autoaim.png b/public/data/ui_gfx/gun_actions/autoaim.png
diff --git a/public/data/ui_gfx/gun_actions/avoiding_arc.png b/public/data/ui_gfx/gun_actions/avoiding_arc.png
diff --git a/public/data/ui_gfx/gun_actions/baab_all.png b/public/data/ui_gfx/gun_actions/baab_all.png
diff --git a/public/data/ui_gfx/gun_actions/baab_empty.png b/public/data/ui_gfx/gun_actions/baab_empty.png
diff --git a/public/data/ui_gfx/gun_actions/baab_is.png b/public/data/ui_gfx/gun_actions/baab_is.png
diff --git a/public/data/ui_gfx/gun_actions/baab_lava.png b/public/data/ui_gfx/gun_actions/baab_lava.png
diff --git a/public/data/ui_gfx/gun_actions/baab_love.png b/public/data/ui_gfx/gun_actions/baab_love.png
diff --git a/public/data/ui_gfx/gun_actions/baab_poop.png b/public/data/ui_gfx/gun_actions/baab_poop.png
diff --git a/public/data/ui_gfx/gun_actions/baab_water.png b/public/data/ui_gfx/gun_actions/baab_water.png
diff --git a/public/data/ui_gfx/gun_actions/ball_lightning.png b/public/data/ui_gfx/gun_actions/ball_lightning.png
diff --git a/public/data/ui_gfx/gun_actions/bee.png b/public/data/ui_gfx/gun_actions/bee.png
diff --git a/public/data/ui_gfx/gun_actions/berserk.png b/public/data/ui_gfx/gun_actions/berserk.png
diff --git a/public/data/ui_gfx/gun_actions/berserk_field.png b/public/data/ui_gfx/gun_actions/berserk_field.png
diff --git a/public/data/ui_gfx/gun_actions/berserk_field_unidentified.png b/public/data/ui_gfx/gun_actions/berserk_field_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/big_magic_shield.png b/public/data/ui_gfx/gun_actions/big_magic_shield.png
diff --git a/public/data/ui_gfx/gun_actions/black_hole.png b/public/data/ui_gfx/gun_actions/black_hole.png
diff --git a/public/data/ui_gfx/gun_actions/black_hole_big.png b/public/data/ui_gfx/gun_actions/black_hole_big.png
diff --git a/public/data/ui_gfx/gun_actions/black_hole_big_unidentified.png b/public/data/ui_gfx/gun_actions/black_hole_big_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/black_hole_giga.png b/public/data/ui_gfx/gun_actions/black_hole_giga.png
diff --git a/public/data/ui_gfx/gun_actions/black_hole_timer.png b/public/data/ui_gfx/gun_actions/black_hole_timer.png
diff --git a/public/data/ui_gfx/gun_actions/black_hole_unidentified.png b/public/data/ui_gfx/gun_actions/black_hole_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/blindness.png b/public/data/ui_gfx/gun_actions/blindness.png
diff --git a/public/data/ui_gfx/gun_actions/blood_magic.png b/public/data/ui_gfx/gun_actions/blood_magic.png
diff --git a/public/data/ui_gfx/gun_actions/blood_punch.png b/public/data/ui_gfx/gun_actions/blood_punch.png
diff --git a/public/data/ui_gfx/gun_actions/blood_to_acid.png b/public/data/ui_gfx/gun_actions/blood_to_acid.png
diff --git a/public/data/ui_gfx/gun_actions/blood_trail.png b/public/data/ui_gfx/gun_actions/blood_trail.png
diff --git a/public/data/ui_gfx/gun_actions/bloodlust.png b/public/data/ui_gfx/gun_actions/bloodlust.png
diff --git a/public/data/ui_gfx/gun_actions/bloodtentacle.png b/public/data/ui_gfx/gun_actions/bloodtentacle.png
diff --git a/public/data/ui_gfx/gun_actions/bloomshot.png b/public/data/ui_gfx/gun_actions/bloomshot.png
diff --git a/public/data/ui_gfx/gun_actions/bomb.png b/public/data/ui_gfx/gun_actions/bomb.png
diff --git a/public/data/ui_gfx/gun_actions/bomb_cart.png b/public/data/ui_gfx/gun_actions/bomb_cart.png
diff --git a/public/data/ui_gfx/gun_actions/bomb_holy.png b/public/data/ui_gfx/gun_actions/bomb_holy.png
diff --git a/public/data/ui_gfx/gun_actions/bomb_holy_giga.png b/public/data/ui_gfx/gun_actions/bomb_holy_giga.png
diff --git a/public/data/ui_gfx/gun_actions/bomb_trailer.png b/public/data/ui_gfx/gun_actions/bomb_trailer.png
diff --git a/public/data/ui_gfx/gun_actions/bomb_unidentified.png b/public/data/ui_gfx/gun_actions/bomb_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/bounce.png b/public/data/ui_gfx/gun_actions/bounce.png
diff --git a/public/data/ui_gfx/gun_actions/bounce_explosion.png b/public/data/ui_gfx/gun_actions/bounce_explosion.png
diff --git a/public/data/ui_gfx/gun_actions/bounce_hole.png b/public/data/ui_gfx/gun_actions/bounce_hole.png
diff --git a/public/data/ui_gfx/gun_actions/bounce_larpa.png b/public/data/ui_gfx/gun_actions/bounce_larpa.png
diff --git a/public/data/ui_gfx/gun_actions/bounce_laser.png b/public/data/ui_gfx/gun_actions/bounce_laser.png
diff --git a/public/data/ui_gfx/gun_actions/bounce_laser_emitter.png b/public/data/ui_gfx/gun_actions/bounce_laser_emitter.png
diff --git a/public/data/ui_gfx/gun_actions/bounce_lightning.png b/public/data/ui_gfx/gun_actions/bounce_lightning.png
diff --git a/public/data/ui_gfx/gun_actions/bounce_small_explosion.png b/public/data/ui_gfx/gun_actions/bounce_small_explosion.png
diff --git a/public/data/ui_gfx/gun_actions/bounce_spark.png b/public/data/ui_gfx/gun_actions/bounce_spark.png
diff --git a/public/data/ui_gfx/gun_actions/bounce_unidentified.png b/public/data/ui_gfx/gun_actions/bounce_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/bouncy_orb.png b/public/data/ui_gfx/gun_actions/bouncy_orb.png
diff --git a/public/data/ui_gfx/gun_actions/bouncy_orb_timer.png b/public/data/ui_gfx/gun_actions/bouncy_orb_timer.png
diff --git a/public/data/ui_gfx/gun_actions/bouncy_orb_timer_2.png b/public/data/ui_gfx/gun_actions/bouncy_orb_timer_2.png
diff --git a/public/data/ui_gfx/gun_actions/broken_spell.png b/public/data/ui_gfx/gun_actions/broken_spell.png
diff --git a/public/data/ui_gfx/gun_actions/bubbleshot.png b/public/data/ui_gfx/gun_actions/bubbleshot.png
diff --git a/public/data/ui_gfx/gun_actions/bubbleshot_trigger.png b/public/data/ui_gfx/gun_actions/bubbleshot_trigger.png
diff --git a/public/data/ui_gfx/gun_actions/bubbleshot_trigger_unidentified.png b/public/data/ui_gfx/gun_actions/bubbleshot_trigger_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/bubbleshot_unidentified.png b/public/data/ui_gfx/gun_actions/bubbleshot_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/buckshot.png b/public/data/ui_gfx/gun_actions/buckshot.png
diff --git a/public/data/ui_gfx/gun_actions/building_back_wall_rock.png b/public/data/ui_gfx/gun_actions/building_back_wall_rock.png
diff --git a/public/data/ui_gfx/gun_actions/building_board_wood.png b/public/data/ui_gfx/gun_actions/building_board_wood.png
diff --git a/public/data/ui_gfx/gun_actions/building_physics_templedoor.png b/public/data/ui_gfx/gun_actions/building_physics_templedoor.png
diff --git a/public/data/ui_gfx/gun_actions/building_pressure_plate.png b/public/data/ui_gfx/gun_actions/building_pressure_plate.png
diff --git a/public/data/ui_gfx/gun_actions/bullet.png b/public/data/ui_gfx/gun_actions/bullet.png
diff --git a/public/data/ui_gfx/gun_actions/bullet_timer.png b/public/data/ui_gfx/gun_actions/bullet_timer.png
diff --git a/public/data/ui_gfx/gun_actions/bullet_timer_unidentified.png b/public/data/ui_gfx/gun_actions/bullet_timer_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/bullet_trigger.png b/public/data/ui_gfx/gun_actions/bullet_trigger.png
diff --git a/public/data/ui_gfx/gun_actions/bullet_trigger_unidentified.png b/public/data/ui_gfx/gun_actions/bullet_trigger_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/bullet_unidentified.png b/public/data/ui_gfx/gun_actions/bullet_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/burn_trail.png b/public/data/ui_gfx/gun_actions/burn_trail.png
diff --git a/public/data/ui_gfx/gun_actions/burn_trail_unidentified.png b/public/data/ui_gfx/gun_actions/burn_trail_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/burning_critical.png b/public/data/ui_gfx/gun_actions/burning_critical.png
diff --git a/public/data/ui_gfx/gun_actions/burst_2.png b/public/data/ui_gfx/gun_actions/burst_2.png
diff --git a/public/data/ui_gfx/gun_actions/burst_2_unidentified.png b/public/data/ui_gfx/gun_actions/burst_2_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/burst_3.png b/public/data/ui_gfx/gun_actions/burst_3.png
diff --git a/public/data/ui_gfx/gun_actions/burst_3_unidentified.png b/public/data/ui_gfx/gun_actions/burst_3_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/burst_4.png b/public/data/ui_gfx/gun_actions/burst_4.png
diff --git a/public/data/ui_gfx/gun_actions/burst_4_unidentified.png b/public/data/ui_gfx/gun_actions/burst_4_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/burst_8.png b/public/data/ui_gfx/gun_actions/burst_8.png
diff --git a/public/data/ui_gfx/gun_actions/burst_x.png b/public/data/ui_gfx/gun_actions/burst_x.png
diff --git a/public/data/ui_gfx/gun_actions/caster_cast.png b/public/data/ui_gfx/gun_actions/caster_cast.png
diff --git a/public/data/ui_gfx/gun_actions/cement.png b/public/data/ui_gfx/gun_actions/cement.png
diff --git a/public/data/ui_gfx/gun_actions/chain_bolt.png b/public/data/ui_gfx/gun_actions/chain_bolt.png
diff --git a/public/data/ui_gfx/gun_actions/chain_shot.png b/public/data/ui_gfx/gun_actions/chain_shot.png
diff --git a/public/data/ui_gfx/gun_actions/chainsaw.png b/public/data/ui_gfx/gun_actions/chainsaw.png
diff --git a/public/data/ui_gfx/gun_actions/chainsaw_unidentified.png b/public/data/ui_gfx/gun_actions/chainsaw_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/chaos_polymorph_field.png b/public/data/ui_gfx/gun_actions/chaos_polymorph_field.png
diff --git a/public/data/ui_gfx/gun_actions/chaos_polymorph_field_unidentified.png b/public/data/ui_gfx/gun_actions/chaos_polymorph_field_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/chaotic_arc.png b/public/data/ui_gfx/gun_actions/chaotic_arc.png
diff --git a/public/data/ui_gfx/gun_actions/charm.png b/public/data/ui_gfx/gun_actions/charm.png
diff --git a/public/data/ui_gfx/gun_actions/charm_field.png b/public/data/ui_gfx/gun_actions/charm_field.png
diff --git a/public/data/ui_gfx/gun_actions/charm_on_burning.png b/public/data/ui_gfx/gun_actions/charm_on_burning.png
diff --git a/public/data/ui_gfx/gun_actions/charm_on_toxic.png b/public/data/ui_gfx/gun_actions/charm_on_toxic.png
diff --git a/public/data/ui_gfx/gun_actions/circle_acid.png b/public/data/ui_gfx/gun_actions/circle_acid.png
diff --git a/public/data/ui_gfx/gun_actions/circle_fire.png b/public/data/ui_gfx/gun_actions/circle_fire.png
diff --git a/public/data/ui_gfx/gun_actions/circle_oil.png b/public/data/ui_gfx/gun_actions/circle_oil.png
diff --git a/public/data/ui_gfx/gun_actions/circle_shape.png b/public/data/ui_gfx/gun_actions/circle_shape.png
diff --git a/public/data/ui_gfx/gun_actions/circle_shape_unidentified.png b/public/data/ui_gfx/gun_actions/circle_shape_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/circle_water.png b/public/data/ui_gfx/gun_actions/circle_water.png
diff --git a/public/data/ui_gfx/gun_actions/cleaning_tool.png b/public/data/ui_gfx/gun_actions/cleaning_tool.png
diff --git a/public/data/ui_gfx/gun_actions/clipping_shot.png b/public/data/ui_gfx/gun_actions/clipping_shot.png
diff --git a/public/data/ui_gfx/gun_actions/cloud_acid.png b/public/data/ui_gfx/gun_actions/cloud_acid.png
diff --git a/public/data/ui_gfx/gun_actions/cloud_blood.png b/public/data/ui_gfx/gun_actions/cloud_blood.png
diff --git a/public/data/ui_gfx/gun_actions/cloud_oil.png b/public/data/ui_gfx/gun_actions/cloud_oil.png
diff --git a/public/data/ui_gfx/gun_actions/cloud_thunder.png b/public/data/ui_gfx/gun_actions/cloud_thunder.png
diff --git a/public/data/ui_gfx/gun_actions/cloud_water.png b/public/data/ui_gfx/gun_actions/cloud_water.png
diff --git a/public/data/ui_gfx/gun_actions/cloud_water_unidentified.png b/public/data/ui_gfx/gun_actions/cloud_water_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/colour_blue.png b/public/data/ui_gfx/gun_actions/colour_blue.png
diff --git a/public/data/ui_gfx/gun_actions/colour_green.png b/public/data/ui_gfx/gun_actions/colour_green.png
diff --git a/public/data/ui_gfx/gun_actions/colour_invis.png b/public/data/ui_gfx/gun_actions/colour_invis.png
diff --git a/public/data/ui_gfx/gun_actions/colour_orange.png b/public/data/ui_gfx/gun_actions/colour_orange.png
diff --git a/public/data/ui_gfx/gun_actions/colour_purple.png b/public/data/ui_gfx/gun_actions/colour_purple.png
diff --git a/public/data/ui_gfx/gun_actions/colour_rainbow.png b/public/data/ui_gfx/gun_actions/colour_rainbow.png
diff --git a/public/data/ui_gfx/gun_actions/colour_red.png b/public/data/ui_gfx/gun_actions/colour_red.png
diff --git a/public/data/ui_gfx/gun_actions/colour_yellow.png b/public/data/ui_gfx/gun_actions/colour_yellow.png
diff --git a/public/data/ui_gfx/gun_actions/commander_bullet.png b/public/data/ui_gfx/gun_actions/commander_bullet.png
diff --git a/public/data/ui_gfx/gun_actions/critical_blood.png b/public/data/ui_gfx/gun_actions/critical_blood.png
diff --git a/public/data/ui_gfx/gun_actions/critical_hit.png b/public/data/ui_gfx/gun_actions/critical_hit.png
diff --git a/public/data/ui_gfx/gun_actions/critical_oil.png b/public/data/ui_gfx/gun_actions/critical_oil.png
diff --git a/public/data/ui_gfx/gun_actions/critical_water.png b/public/data/ui_gfx/gun_actions/critical_water.png
diff --git a/public/data/ui_gfx/gun_actions/critical_wet.png b/public/data/ui_gfx/gun_actions/critical_wet.png
diff --git a/public/data/ui_gfx/gun_actions/crumbling_earth.png b/public/data/ui_gfx/gun_actions/crumbling_earth.png
diff --git a/public/data/ui_gfx/gun_actions/crumbling_earth_projectile.png b/public/data/ui_gfx/gun_actions/crumbling_earth_projectile.png
diff --git a/public/data/ui_gfx/gun_actions/curse.png b/public/data/ui_gfx/gun_actions/curse.png
diff --git a/public/data/ui_gfx/gun_actions/curse_wither_electricity.png b/public/data/ui_gfx/gun_actions/curse_wither_electricity.png
diff --git a/public/data/ui_gfx/gun_actions/curse_wither_explosion.png b/public/data/ui_gfx/gun_actions/curse_wither_explosion.png
diff --git a/public/data/ui_gfx/gun_actions/curse_wither_melee.png b/public/data/ui_gfx/gun_actions/curse_wither_melee.png
diff --git a/public/data/ui_gfx/gun_actions/curse_wither_projectile.png b/public/data/ui_gfx/gun_actions/curse_wither_projectile.png
diff --git a/public/data/ui_gfx/gun_actions/cursed_orb.png b/public/data/ui_gfx/gun_actions/cursed_orb.png
diff --git a/public/data/ui_gfx/gun_actions/damage.png b/public/data/ui_gfx/gun_actions/damage.png
diff --git a/public/data/ui_gfx/gun_actions/damage_forever.png b/public/data/ui_gfx/gun_actions/damage_forever.png
diff --git a/public/data/ui_gfx/gun_actions/damage_friendly.png b/public/data/ui_gfx/gun_actions/damage_friendly.png
diff --git a/public/data/ui_gfx/gun_actions/damage_friendly_unidentified.png b/public/data/ui_gfx/gun_actions/damage_friendly_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/damage_random.png b/public/data/ui_gfx/gun_actions/damage_random.png
diff --git a/public/data/ui_gfx/gun_actions/damage_unidentified.png b/public/data/ui_gfx/gun_actions/damage_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/damage_x2.png b/public/data/ui_gfx/gun_actions/damage_x2.png
diff --git a/public/data/ui_gfx/gun_actions/damage_x2_unidentified.png b/public/data/ui_gfx/gun_actions/damage_x2_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/damage_x5.png b/public/data/ui_gfx/gun_actions/damage_x5.png
diff --git a/public/data/ui_gfx/gun_actions/darkflame.png b/public/data/ui_gfx/gun_actions/darkflame.png
diff --git a/public/data/ui_gfx/gun_actions/darkflame_unidentified.png b/public/data/ui_gfx/gun_actions/darkflame_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/death_cross.png b/public/data/ui_gfx/gun_actions/death_cross.png
diff --git a/public/data/ui_gfx/gun_actions/death_cross_big.png b/public/data/ui_gfx/gun_actions/death_cross_big.png
diff --git a/public/data/ui_gfx/gun_actions/death_cross_unidentified.png b/public/data/ui_gfx/gun_actions/death_cross_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/death_trigger.png b/public/data/ui_gfx/gun_actions/death_trigger.png
diff --git a/public/data/ui_gfx/gun_actions/decelerating_shot.png b/public/data/ui_gfx/gun_actions/decelerating_shot.png
diff --git a/public/data/ui_gfx/gun_actions/decoy.png b/public/data/ui_gfx/gun_actions/decoy.png
diff --git a/public/data/ui_gfx/gun_actions/decoy_trigger.png b/public/data/ui_gfx/gun_actions/decoy_trigger.png
diff --git a/public/data/ui_gfx/gun_actions/decoy_trigger_unidentified.png b/public/data/ui_gfx/gun_actions/decoy_trigger_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/decoy_unidentified.png b/public/data/ui_gfx/gun_actions/decoy_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/delayed_spell.png b/public/data/ui_gfx/gun_actions/delayed_spell.png
diff --git a/public/data/ui_gfx/gun_actions/destruction.png b/public/data/ui_gfx/gun_actions/destruction.png
diff --git a/public/data/ui_gfx/gun_actions/digger.png b/public/data/ui_gfx/gun_actions/digger.png
diff --git a/public/data/ui_gfx/gun_actions/digger_unidentified.png b/public/data/ui_gfx/gun_actions/digger_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/disc_bullet.png b/public/data/ui_gfx/gun_actions/disc_bullet.png
diff --git a/public/data/ui_gfx/gun_actions/disc_bullet_big.png b/public/data/ui_gfx/gun_actions/disc_bullet_big.png
diff --git a/public/data/ui_gfx/gun_actions/disc_bullet_unidentified.png b/public/data/ui_gfx/gun_actions/disc_bullet_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/divide_10.png b/public/data/ui_gfx/gun_actions/divide_10.png
diff --git a/public/data/ui_gfx/gun_actions/divide_2.png b/public/data/ui_gfx/gun_actions/divide_2.png
diff --git a/public/data/ui_gfx/gun_actions/divide_3.png b/public/data/ui_gfx/gun_actions/divide_3.png
diff --git a/public/data/ui_gfx/gun_actions/divide_4.png b/public/data/ui_gfx/gun_actions/divide_4.png
diff --git a/public/data/ui_gfx/gun_actions/draw_3_random.png b/public/data/ui_gfx/gun_actions/draw_3_random.png
diff --git a/public/data/ui_gfx/gun_actions/draw_random.png b/public/data/ui_gfx/gun_actions/draw_random.png
diff --git a/public/data/ui_gfx/gun_actions/draw_random_x3.png b/public/data/ui_gfx/gun_actions/draw_random_x3.png
diff --git a/public/data/ui_gfx/gun_actions/drone.png b/public/data/ui_gfx/gun_actions/drone.png
diff --git a/public/data/ui_gfx/gun_actions/duck.png b/public/data/ui_gfx/gun_actions/duck.png
diff --git a/public/data/ui_gfx/gun_actions/duck_2.png b/public/data/ui_gfx/gun_actions/duck_2.png
diff --git a/public/data/ui_gfx/gun_actions/duplicate.png b/public/data/ui_gfx/gun_actions/duplicate.png
diff --git a/public/data/ui_gfx/gun_actions/duplicate_on_death.png b/public/data/ui_gfx/gun_actions/duplicate_on_death.png
diff --git a/public/data/ui_gfx/gun_actions/dynamite.png b/public/data/ui_gfx/gun_actions/dynamite.png
diff --git a/public/data/ui_gfx/gun_actions/dynamite_unidentified.png b/public/data/ui_gfx/gun_actions/dynamite_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/electric_charge.png b/public/data/ui_gfx/gun_actions/electric_charge.png
diff --git a/public/data/ui_gfx/gun_actions/electric_charge_unidentified.png b/public/data/ui_gfx/gun_actions/electric_charge_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/electrocution_field.png b/public/data/ui_gfx/gun_actions/electrocution_field.png
diff --git a/public/data/ui_gfx/gun_actions/electrocution_field_unidentified.png b/public/data/ui_gfx/gun_actions/electrocution_field_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/empty.png b/public/data/ui_gfx/gun_actions/empty.png
diff --git a/public/data/ui_gfx/gun_actions/energy_shield.png b/public/data/ui_gfx/gun_actions/energy_shield.png
diff --git a/public/data/ui_gfx/gun_actions/energy_shield_sector.png b/public/data/ui_gfx/gun_actions/energy_shield_sector.png
diff --git a/public/data/ui_gfx/gun_actions/energy_shield_sector_unidentified.png b/public/data/ui_gfx/gun_actions/energy_shield_sector_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/energy_shield_shot.png b/public/data/ui_gfx/gun_actions/energy_shield_shot.png
diff --git a/public/data/ui_gfx/gun_actions/energy_shield_unidentified.png b/public/data/ui_gfx/gun_actions/energy_shield_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/enlarge.png b/public/data/ui_gfx/gun_actions/enlarge.png
diff --git a/public/data/ui_gfx/gun_actions/essence_to_power.png b/public/data/ui_gfx/gun_actions/essence_to_power.png
diff --git a/public/data/ui_gfx/gun_actions/expanding_orb.png b/public/data/ui_gfx/gun_actions/expanding_orb.png
diff --git a/public/data/ui_gfx/gun_actions/explode_on_alcohol.png b/public/data/ui_gfx/gun_actions/explode_on_alcohol.png
diff --git a/public/data/ui_gfx/gun_actions/explode_on_alcohol_giga.png b/public/data/ui_gfx/gun_actions/explode_on_alcohol_giga.png
diff --git a/public/data/ui_gfx/gun_actions/explode_on_slime.png b/public/data/ui_gfx/gun_actions/explode_on_slime.png
diff --git a/public/data/ui_gfx/gun_actions/explode_on_slime_giga.png b/public/data/ui_gfx/gun_actions/explode_on_slime_giga.png
diff --git a/public/data/ui_gfx/gun_actions/exploding_deer.png b/public/data/ui_gfx/gun_actions/exploding_deer.png
diff --git a/public/data/ui_gfx/gun_actions/exploding_deer_unidentified.png b/public/data/ui_gfx/gun_actions/exploding_deer_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/explosion.png b/public/data/ui_gfx/gun_actions/explosion.png
diff --git a/public/data/ui_gfx/gun_actions/explosion_light.png b/public/data/ui_gfx/gun_actions/explosion_light.png
diff --git a/public/data/ui_gfx/gun_actions/explosion_remove.png b/public/data/ui_gfx/gun_actions/explosion_remove.png
diff --git a/public/data/ui_gfx/gun_actions/explosion_tiny.png b/public/data/ui_gfx/gun_actions/explosion_tiny.png
diff --git a/public/data/ui_gfx/gun_actions/explosion_unidentified.png b/public/data/ui_gfx/gun_actions/explosion_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/explosive_projectile.png b/public/data/ui_gfx/gun_actions/explosive_projectile.png
diff --git a/public/data/ui_gfx/gun_actions/explosive_projectile_unidentified.png b/public/data/ui_gfx/gun_actions/explosive_projectile_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/fire_blast.png b/public/data/ui_gfx/gun_actions/fire_blast.png
diff --git a/public/data/ui_gfx/gun_actions/fire_blast_unidentified.png b/public/data/ui_gfx/gun_actions/fire_blast_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/fire_trail.png b/public/data/ui_gfx/gun_actions/fire_trail.png
diff --git a/public/data/ui_gfx/gun_actions/fire_trail_unidentified.png b/public/data/ui_gfx/gun_actions/fire_trail_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/fireball.png b/public/data/ui_gfx/gun_actions/fireball.png
diff --git a/public/data/ui_gfx/gun_actions/fireball_ray.png b/public/data/ui_gfx/gun_actions/fireball_ray.png
diff --git a/public/data/ui_gfx/gun_actions/fireball_ray_enemy.png b/public/data/ui_gfx/gun_actions/fireball_ray_enemy.png
diff --git a/public/data/ui_gfx/gun_actions/fireball_ray_line.png b/public/data/ui_gfx/gun_actions/fireball_ray_line.png
diff --git a/public/data/ui_gfx/gun_actions/fireball_unidentified.png b/public/data/ui_gfx/gun_actions/fireball_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/firebomb.png b/public/data/ui_gfx/gun_actions/firebomb.png
diff --git a/public/data/ui_gfx/gun_actions/firebomb_unidentified.png b/public/data/ui_gfx/gun_actions/firebomb_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/fireworks.png b/public/data/ui_gfx/gun_actions/fireworks.png
diff --git a/public/data/ui_gfx/gun_actions/fish.png b/public/data/ui_gfx/gun_actions/fish.png
diff --git a/public/data/ui_gfx/gun_actions/fizzle.png b/public/data/ui_gfx/gun_actions/fizzle.png
diff --git a/public/data/ui_gfx/gun_actions/flamethrower.png b/public/data/ui_gfx/gun_actions/flamethrower.png
diff --git a/public/data/ui_gfx/gun_actions/flamethrower_unidentified.png b/public/data/ui_gfx/gun_actions/flamethrower_unidentified.png
diff --git a/public/data/ui_gfx/gun_actions/floating_arc.png b/public/data/ui_gfx/gun_actions/floating_arc.png
diff --git a/public/data/ui_gfx/gun_actions/flowershot.png b/public/data/ui_gfx/gun_actions/flowershot.png
diff --git a/public/data/ui_gfx/gun_actions/fly_downwards.png b/public/data/ui_gfx/gun_actions/fly_downwards.png
diff --git a/public/data/ui_gfx/gun_actions/fly_upwards.png b/public/data/ui_gfx/gun_actions/fly_upwards.png
diff --git a/public/data/ui_gfx/gun_actions/freeze.png b/public/data/ui_gfx/gun_actions/freeze.png