Skip to content

Commit 841854a

Browse files
DysochDysoch
committed
Moved Plasma to Core, Added resistance to all configs
1 parent 9d0a133 commit 841854a

File tree

8 files changed

+61
-9
lines changed

8 files changed

+61
-9
lines changed

‎CORE-DyTech-Core/data.lua

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ require("prototypes.tile.noise-layers")
7272
require("prototypes.categories.ammo-category")
7373
require("prototypes.categories.recipe-category")
7474
require("prototypes.categories.resource-category")
75+
require("prototypes.damage-type")
7576

7677
-- Autoplace Control
7778
require("prototypes.autoplace-controls")

‎CORE-DyTech-Core/prototypes/damage-type.lua

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
data:extend(
2+
{
3+
{
4+
type = "damage-type",
5+
name = "plasma"
6+
},
7+
{
8+
type = "damage-type",
9+
name = "radiation"
10+
},
11+
{
12+
type = "damage-type",
13+
name = "lightning"
14+
},
15+
{
16+
type = "damage-type",
17+
name = "lava"
18+
},
19+
}
20+
)

‎CORE-DyTech-Core/prototypes/internal-config.lua

+10
Original file line numberDiff line numberDiff line change
@@ -20,69 +20,79 @@ Resistances = {
2020
{type = "impact", decrease = 0, percent = 0},
2121
{type = "explosion", decrease = 0, percent = 0},
2222
{type = "acid", decrease = 0, percent = 0},
23+
{type = "plasma", decrease = 0, percent = 0},
2324
{type = "laser", decrease = 0, percent = 0}},
2425
Tier2 = {
2526
{type = "fire", decrease = 0, percent = 20},
2627
{type = "physical", decrease = 0, percent = 0},
2728
{type = "impact", decrease = 0, percent = 0},
2829
{type = "explosion", decrease = 0, percent = 5},
2930
{type = "acid", decrease = 0, percent = 0},
31+
{type = "plasma", decrease = 0, percent = 0},
3032
{type = "laser", decrease = 0, percent = 0}},
3133
Tier3 = {
3234
{type = "fire", decrease = 0, percent = 25},
3335
{type = "physical", decrease = 0, percent = 5},
3436
{type = "impact", decrease = 0, percent = 5},
3537
{type = "explosion", decrease = 0, percent = 10},
3638
{type = "acid", decrease = 0, percent = 5},
39+
{type = "plasma", decrease = 0, percent = 0},
3740
{type = "laser", decrease = 0, percent = 5}},
3841
Tier4 = {
3942
{type = "fire", decrease = 2.5, percent = 40},
4043
{type = "physical", decrease = 0, percent = 10},
4144
{type = "impact", decrease = 0, percent = 10},
4245
{type = "explosion", decrease = 0, percent = 15},
4346
{type = "acid", decrease = 0, percent = 10},
47+
{type = "plasma", decrease = 0, percent = 0},
4448
{type = "laser", decrease = 0, percent = 10}},
4549
Tier5 = {
4650
{type = "fire", decrease = 5, percent = 60},
4751
{type = "physical", decrease = 2.5, percent = 15},
4852
{type = "impact", decrease = 2.5, percent = 15},
4953
{type = "explosion", decrease = 0, percent = 25},
5054
{type = "acid", decrease = 0, percent = 15},
55+
{type = "plasma", decrease = 0, percent = 0},
5156
{type = "laser", decrease = 0, percent = 25}},
5257
Tier6 = {
5358
{type = "fire", decrease = 10, percent = 75},
5459
{type = "physical", decrease = 5, percent = 25},
5560
{type = "impact", decrease = 5, percent = 25},
5661
{type = "explosion", decrease = 4, percent = 25},
5762
{type = "acid", decrease = 5, percent = 25},
63+
{type = "plasma", decrease = 15, percent = 10},
5864
{type = "laser", decrease = 10, percent = 40}},
5965
Tier7 = {
6066
{type = "fire", decrease = 15, percent = 90},
6167
{type = "physical", decrease = 10, percent = 37.5},
6268
{type = "impact", decrease = 12.5, percent = 37.5},
6369
{type = "explosion", decrease = 6, percent = 37.5},
6470
{type = "acid", decrease = 15, percent = 37.5},
71+
{type = "plasma", decrease = 30, percent = 20},
6572
{type = "laser", decrease = 25, percent = 45}},
6673
Tier8 = {
6774
{type = "fire", decrease = 0, percent = 100},
6875
{type = "physical", decrease = 22.5, percent = 50},
6976
{type = "impact", decrease = 20, percent = 50},
7077
{type = "explosion", decrease = 12.5, percent = 50},
7178
{type = "acid", decrease = 25, percent = 50},
79+
{type = "plasma", decrease = 45, percent = 30},
7280
{type = "laser", decrease = 40, percent = 50}},
7381
Tier9 = {
7482
{type = "fire", decrease = 0, percent = 100},
7583
{type = "physical", decrease = 35, percent = 65},
7684
{type = "impact", decrease = 25, percent = 65},
7785
{type = "explosion", decrease = 25, percent = 65},
7886
{type = "acid", decrease = 35, percent = 65},
87+
{type = "plasma", decrease = 60, percent = 40},
7988
{type = "laser", decrease = 55, percent = 60}},
8089
Tier10 = {
8190
{type = "fire", decrease = 0, percent = 100},
8291
{type = "physical", decrease = 50, percent = 80},
8392
{type = "impact", decrease = 35, percent = 80},
8493
{type = "explosion", decrease = 40, percent = 80},
8594
{type = "acid", decrease = 45, percent = 80},
95+
{type = "plasma", decrease = 75, percent = 50},
8696
{type = "laser", decrease = 75, percent = 85}},
8797
Fire = {
8898
{type = "fire", decrease = 0, percent = 75}},

‎MAIN-DyTech-Machine/prototypes/internal-config.lua

+10
Original file line numberDiff line numberDiff line change
@@ -28,69 +28,79 @@ Resistances = {
2828
{type = "impact", decrease = 0, percent = 0},
2929
{type = "explosion", decrease = 0, percent = 0},
3030
{type = "acid", decrease = 0, percent = 0},
31+
{type = "plasma", decrease = 0, percent = 0},
3132
{type = "laser", decrease = 0, percent = 0}},
3233
Tier2 = {
3334
{type = "fire", decrease = 0, percent = 20},
3435
{type = "physical", decrease = 0, percent = 0},
3536
{type = "impact", decrease = 0, percent = 0},
3637
{type = "explosion", decrease = 0, percent = 5},
3738
{type = "acid", decrease = 0, percent = 0},
39+
{type = "plasma", decrease = 0, percent = 0},
3840
{type = "laser", decrease = 0, percent = 0}},
3941
Tier3 = {
4042
{type = "fire", decrease = 0, percent = 25},
4143
{type = "physical", decrease = 0, percent = 5},
4244
{type = "impact", decrease = 0, percent = 5},
4345
{type = "explosion", decrease = 0, percent = 10},
4446
{type = "acid", decrease = 0, percent = 5},
47+
{type = "plasma", decrease = 0, percent = 0},
4548
{type = "laser", decrease = 0, percent = 5}},
4649
Tier4 = {
4750
{type = "fire", decrease = 2.5, percent = 40},
4851
{type = "physical", decrease = 0, percent = 10},
4952
{type = "impact", decrease = 0, percent = 10},
5053
{type = "explosion", decrease = 0, percent = 15},
5154
{type = "acid", decrease = 0, percent = 10},
55+
{type = "plasma", decrease = 0, percent = 0},
5256
{type = "laser", decrease = 0, percent = 10}},
5357
Tier5 = {
5458
{type = "fire", decrease = 5, percent = 60},
5559
{type = "physical", decrease = 2.5, percent = 15},
5660
{type = "impact", decrease = 2.5, percent = 15},
5761
{type = "explosion", decrease = 0, percent = 25},
5862
{type = "acid", decrease = 0, percent = 15},
63+
{type = "plasma", decrease = 0, percent = 0},
5964
{type = "laser", decrease = 0, percent = 25}},
6065
Tier6 = {
6166
{type = "fire", decrease = 10, percent = 75},
6267
{type = "physical", decrease = 5, percent = 25},
6368
{type = "impact", decrease = 5, percent = 25},
6469
{type = "explosion", decrease = 4, percent = 25},
6570
{type = "acid", decrease = 5, percent = 25},
71+
{type = "plasma", decrease = 15, percent = 10},
6672
{type = "laser", decrease = 10, percent = 40}},
6773
Tier7 = {
6874
{type = "fire", decrease = 15, percent = 90},
6975
{type = "physical", decrease = 10, percent = 37.5},
7076
{type = "impact", decrease = 12.5, percent = 37.5},
7177
{type = "explosion", decrease = 6, percent = 37.5},
7278
{type = "acid", decrease = 15, percent = 37.5},
79+
{type = "plasma", decrease = 30, percent = 20},
7380
{type = "laser", decrease = 25, percent = 45}},
7481
Tier8 = {
7582
{type = "fire", decrease = 0, percent = 100},
7683
{type = "physical", decrease = 22.5, percent = 50},
7784
{type = "impact", decrease = 20, percent = 50},
7885
{type = "explosion", decrease = 12.5, percent = 50},
7986
{type = "acid", decrease = 25, percent = 50},
87+
{type = "plasma", decrease = 45, percent = 30},
8088
{type = "laser", decrease = 40, percent = 50}},
8189
Tier9 = {
8290
{type = "fire", decrease = 0, percent = 100},
8391
{type = "physical", decrease = 35, percent = 65},
8492
{type = "impact", decrease = 25, percent = 65},
8593
{type = "explosion", decrease = 25, percent = 65},
8694
{type = "acid", decrease = 35, percent = 65},
95+
{type = "plasma", decrease = 60, percent = 40},
8796
{type = "laser", decrease = 55, percent = 60}},
8897
Tier10 = {
8998
{type = "fire", decrease = 0, percent = 100},
9099
{type = "physical", decrease = 50, percent = 80},
91100
{type = "impact", decrease = 35, percent = 80},
92101
{type = "explosion", decrease = 40, percent = 80},
93102
{type = "acid", decrease = 45, percent = 80},
103+
{type = "plasma", decrease = 75, percent = 50},
94104
{type = "laser", decrease = 75, percent = 85}},
95105
Fire = {
96106
{type = "fire", decrease = 0, percent = 75}},

‎MAIN-DyTech-Science/prototypes/internal-config.lua

+10
Original file line numberDiff line numberDiff line change
@@ -48,69 +48,79 @@ Resistances = {
4848
{type = "impact", decrease = 0, percent = 0},
4949
{type = "explosion", decrease = 0, percent = 0},
5050
{type = "acid", decrease = 0, percent = 0},
51+
{type = "plasma", decrease = 0, percent = 0},
5152
{type = "laser", decrease = 0, percent = 0}},
5253
Tier2 = {
5354
{type = "fire", decrease = 0, percent = 20},
5455
{type = "physical", decrease = 0, percent = 0},
5556
{type = "impact", decrease = 0, percent = 0},
5657
{type = "explosion", decrease = 0, percent = 5},
5758
{type = "acid", decrease = 0, percent = 0},
59+
{type = "plasma", decrease = 0, percent = 0},
5860
{type = "laser", decrease = 0, percent = 0}},
5961
Tier3 = {
6062
{type = "fire", decrease = 0, percent = 25},
6163
{type = "physical", decrease = 0, percent = 5},
6264
{type = "impact", decrease = 0, percent = 5},
6365
{type = "explosion", decrease = 0, percent = 10},
6466
{type = "acid", decrease = 0, percent = 5},
67+
{type = "plasma", decrease = 0, percent = 0},
6568
{type = "laser", decrease = 0, percent = 5}},
6669
Tier4 = {
6770
{type = "fire", decrease = 2.5, percent = 40},
6871
{type = "physical", decrease = 0, percent = 10},
6972
{type = "impact", decrease = 0, percent = 10},
7073
{type = "explosion", decrease = 0, percent = 15},
7174
{type = "acid", decrease = 0, percent = 10},
75+
{type = "plasma", decrease = 0, percent = 0},
7276
{type = "laser", decrease = 0, percent = 10}},
7377
Tier5 = {
7478
{type = "fire", decrease = 5, percent = 60},
7579
{type = "physical", decrease = 2.5, percent = 15},
7680
{type = "impact", decrease = 2.5, percent = 15},
7781
{type = "explosion", decrease = 0, percent = 25},
7882
{type = "acid", decrease = 0, percent = 15},
83+
{type = "plasma", decrease = 0, percent = 0},
7984
{type = "laser", decrease = 0, percent = 25}},
8085
Tier6 = {
8186
{type = "fire", decrease = 10, percent = 75},
8287
{type = "physical", decrease = 5, percent = 25},
8388
{type = "impact", decrease = 5, percent = 25},
8489
{type = "explosion", decrease = 4, percent = 25},
8590
{type = "acid", decrease = 5, percent = 25},
91+
{type = "plasma", decrease = 15, percent = 10},
8692
{type = "laser", decrease = 10, percent = 40}},
8793
Tier7 = {
8894
{type = "fire", decrease = 15, percent = 90},
8995
{type = "physical", decrease = 10, percent = 37.5},
9096
{type = "impact", decrease = 12.5, percent = 37.5},
9197
{type = "explosion", decrease = 6, percent = 37.5},
9298
{type = "acid", decrease = 15, percent = 37.5},
99+
{type = "plasma", decrease = 30, percent = 20},
93100
{type = "laser", decrease = 25, percent = 45}},
94101
Tier8 = {
95102
{type = "fire", decrease = 0, percent = 100},
96103
{type = "physical", decrease = 22.5, percent = 50},
97104
{type = "impact", decrease = 20, percent = 50},
98105
{type = "explosion", decrease = 12.5, percent = 50},
99106
{type = "acid", decrease = 25, percent = 50},
107+
{type = "plasma", decrease = 45, percent = 30},
100108
{type = "laser", decrease = 40, percent = 50}},
101109
Tier9 = {
102110
{type = "fire", decrease = 0, percent = 100},
103111
{type = "physical", decrease = 35, percent = 65},
104112
{type = "impact", decrease = 25, percent = 65},
105113
{type = "explosion", decrease = 25, percent = 65},
106114
{type = "acid", decrease = 35, percent = 65},
115+
{type = "plasma", decrease = 60, percent = 40},
107116
{type = "laser", decrease = 55, percent = 60}},
108117
Tier10 = {
109118
{type = "fire", decrease = 0, percent = 100},
110119
{type = "physical", decrease = 50, percent = 80},
111120
{type = "impact", decrease = 35, percent = 80},
112121
{type = "explosion", decrease = 40, percent = 80},
113122
{type = "acid", decrease = 45, percent = 80},
123+
{type = "plasma", decrease = 75, percent = 50},
114124
{type = "laser", decrease = 75, percent = 85}},
115125
Fire = {
116126
{type = "fire", decrease = 0, percent = 75}},

‎MAIN-DyTech-War/data.lua

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ require "config"
22

33
--[[ Mandatory Stuff ]]--
44
require("prototypes.functions.projectiles")
5-
require("prototypes.damage-type")
65

76
--[[ EnemiesBaseEdit Check ]]--
87
if EnemiesBaseEdit then

‎MAIN-DyTech-War/prototypes/damage-type.lua

-8
This file was deleted.

‎MAIN-DyTech-War/prototypes/internal-config.lua

+10
Original file line numberDiff line numberDiff line change
@@ -83,69 +83,79 @@ Resistances = {
8383
{type = "impact", decrease = 0, percent = 0},
8484
{type = "explosion", decrease = 0, percent = 0},
8585
{type = "acid", decrease = 0, percent = 0},
86+
{type = "plasma", decrease = 0, percent = 0},
8687
{type = "laser", decrease = 0, percent = 0}},
8788
Tier2 = {
8889
{type = "fire", decrease = 0, percent = 20},
8990
{type = "physical", decrease = 0, percent = 0},
9091
{type = "impact", decrease = 0, percent = 0},
9192
{type = "explosion", decrease = 0, percent = 5},
9293
{type = "acid", decrease = 0, percent = 0},
94+
{type = "plasma", decrease = 0, percent = 0},
9395
{type = "laser", decrease = 0, percent = 0}},
9496
Tier3 = {
9597
{type = "fire", decrease = 0, percent = 25},
9698
{type = "physical", decrease = 0, percent = 5},
9799
{type = "impact", decrease = 0, percent = 5},
98100
{type = "explosion", decrease = 0, percent = 10},
99101
{type = "acid", decrease = 0, percent = 5},
102+
{type = "plasma", decrease = 0, percent = 0},
100103
{type = "laser", decrease = 0, percent = 5}},
101104
Tier4 = {
102105
{type = "fire", decrease = 2.5, percent = 40},
103106
{type = "physical", decrease = 0, percent = 10},
104107
{type = "impact", decrease = 0, percent = 10},
105108
{type = "explosion", decrease = 0, percent = 15},
106109
{type = "acid", decrease = 0, percent = 10},
110+
{type = "plasma", decrease = 0, percent = 0},
107111
{type = "laser", decrease = 0, percent = 10}},
108112
Tier5 = {
109113
{type = "fire", decrease = 5, percent = 60},
110114
{type = "physical", decrease = 2.5, percent = 15},
111115
{type = "impact", decrease = 2.5, percent = 15},
112116
{type = "explosion", decrease = 0, percent = 25},
113117
{type = "acid", decrease = 0, percent = 15},
118+
{type = "plasma", decrease = 0, percent = 0},
114119
{type = "laser", decrease = 0, percent = 25}},
115120
Tier6 = {
116121
{type = "fire", decrease = 10, percent = 75},
117122
{type = "physical", decrease = 5, percent = 25},
118123
{type = "impact", decrease = 5, percent = 25},
119124
{type = "explosion", decrease = 4, percent = 25},
120125
{type = "acid", decrease = 5, percent = 25},
126+
{type = "plasma", decrease = 15, percent = 10},
121127
{type = "laser", decrease = 10, percent = 40}},
122128
Tier7 = {
123129
{type = "fire", decrease = 15, percent = 90},
124130
{type = "physical", decrease = 10, percent = 37.5},
125131
{type = "impact", decrease = 12.5, percent = 37.5},
126132
{type = "explosion", decrease = 6, percent = 37.5},
127133
{type = "acid", decrease = 15, percent = 37.5},
134+
{type = "plasma", decrease = 30, percent = 20},
128135
{type = "laser", decrease = 25, percent = 45}},
129136
Tier8 = {
130137
{type = "fire", decrease = 0, percent = 100},
131138
{type = "physical", decrease = 22.5, percent = 50},
132139
{type = "impact", decrease = 20, percent = 50},
133140
{type = "explosion", decrease = 12.5, percent = 50},
134141
{type = "acid", decrease = 25, percent = 50},
142+
{type = "plasma", decrease = 45, percent = 30},
135143
{type = "laser", decrease = 40, percent = 50}},
136144
Tier9 = {
137145
{type = "fire", decrease = 0, percent = 100},
138146
{type = "physical", decrease = 35, percent = 65},
139147
{type = "impact", decrease = 25, percent = 65},
140148
{type = "explosion", decrease = 25, percent = 65},
141149
{type = "acid", decrease = 35, percent = 65},
150+
{type = "plasma", decrease = 60, percent = 40},
142151
{type = "laser", decrease = 55, percent = 60}},
143152
Tier10 = {
144153
{type = "fire", decrease = 0, percent = 100},
145154
{type = "physical", decrease = 50, percent = 80},
146155
{type = "impact", decrease = 35, percent = 80},
147156
{type = "explosion", decrease = 40, percent = 80},
148157
{type = "acid", decrease = 45, percent = 80},
158+
{type = "plasma", decrease = 75, percent = 50},
149159
{type = "laser", decrease = 75, percent = 85}},
150160
Fire = {
151161
{type = "fire", decrease = 0, percent = 75}},

0 commit comments

Comments
 (0)