Skip to content

Commit f7f7668

Browse files
MyNameIsTrezMyNameIsTrez
committed
Created Lua.json. Fixed bmp -> png bug.
1 parent 1c2a101 commit f7f7668

File tree

4 files changed

+34
-23
lines changed

4 files changed

+34
-23
lines changed

‎ConversionRules/Lua.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"Base.rte/Actors/AI/CrabAI.lua": "Base.rte/AI/CrabAI.lua",
3+
"Base.rte/Actors/AI/HumanAI.lua": "Base.rte/AI/HumanAI.lua",
4+
"Base.rte/Actors/AI/RocketAI.lua": "Base.rte/AI/RocketAI.lua",
5+
"Base.rte/Actors/AI/DropShipAI.lua": "Base.rte/AI/DropShipAI.lua",
6+
"Base.rte/Actors/AI/TurretAI.lua": "Base.rte/AI/TurretAI.lua",
7+
"Ronin.rte/Actors/RoninSoldier/Head.lua": "Base.rte/Scripts/Shared/RandomFrame.lua",
8+
"Base.rte/Scripts/defaultHuman.lua": "Base.rte/AI/HumanAI.lua",
9+
"Base.rte/Scripts/ShotgunReload.lua": "Base.rte/Devices/Shared/Scripts/ShotgunReload.lua",
10+
"Browncoats.rte/Devices/Weapons/FlamerFlame.lua": "Base.rte/Devices/Shared/Scripts/FlamerFlame.lua",
11+
"Coalition.rte/Devices/Weapons/FlamerFlame.lua": "Base.rte/Devices/Shared/Scripts/FlamerFlame.lua",
12+
"Coalition.rte/Devices/Weapons/SmokeTrail.lua": "Base.rte/Scripts/Shared/SmokeTrail.lua",
13+
"Base.rte/Effects/Pyro/GroundFlame.lua": "Base.rte/Effects/Pyro/Flame/Flame.lua",
14+
"Base.rte/Devices/Constructor/ConstructorCollect.lua": "Base.rte/Devices/Tools/Constructor/ConstructorCollect.lua",
15+
"Base.rte/Devices/Constructor/ConstructorCollectGold.lua": "Base.rte/Devices/Tools/Constructor/ConstructorCollectGold.lua",
16+
"Ronin.rte/Devices/Weapons/Shotgun.lua": "Base.rte/Devices/Weapons/Shotgun/Shotgun.lua",
17+
"Imperatus.rte/Devices/Weapons/HeavySniperRound.lua": "Base.rte/Scripts/Shared/SmokeTrail.lua",
18+
"Base.rte/Actors/Medic Drone/Medic.lua": "Base.rte/Actors/Mecha/Medic/Medic.lua",
19+
"Base.rte/Scripts/TrajectoryGuide.lua": "Base.rte/Devices/Shared/Scripts/TrajectoryGuide.lua",
20+
}

‎ConversionRules/Misc.json

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
"Particle Napalm Bomb 1": "Particle Napalm Bomb",
1818
"Particle Napalm Bomb 2": "Particle Napalm Bomb",
1919
"Particle Napalm Bomb 3": "Particle Napalm Bomb",
20-
"Base.rte/Actors/AI/CrabAI.lua": "Base.rte/AI/CrabAI.lua",
21-
"Base.rte/Actors/AI/HumanAI.lua": "Base.rte/AI/HumanAI.lua",
22-
"Base.rte/Actors/AI/RocketAI.lua": "Base.rte/AI/RocketAI.lua",
23-
"Base.rte/Actors/AI/DropShipAI.lua": "Base.rte/AI/DropShipAI.lua",
24-
"Base.rte/Actors/AI/TurretAI.lua": "Base.rte/AI/TurretAI.lua",
2520
"CopyOf = Atom Group Null": "CopyOf = Null AtomGroup",
2621
"CopyOf = HandGroup": "CopyOf = Human Hand",
2722
"CopyOf = Foot\n": "CopyOf = Human Foot\n",
@@ -62,13 +57,10 @@
6257
"Ronin Soldier Misc Gib B": "Coalition Soldier Misc Gib B",
6358
"Ronin Soldier Misc Gib C": "Coalition Soldier Misc Gib C",
6459
"Ronin Soldier Misc Gib D": "Coalition Soldier Misc Gib D",
65-
"Ronin.rte/Actors/RoninSoldier/Head.lua": "Base.rte/Scripts/Shared/RandomFrame.lua",
6660
"Horiz Terrain": "Zekarra Lowlands Terrain",
6761
"AffectedByPitch": "AffectedByGlobalPitch",
68-
"Base.rte/Scripts/defaultHuman.lua": "Base.rte/AI/HumanAI.lua",
6962
"CopyOf = Muzzle Flash Shovel": "CopyOf = Muzzle Flash Ronin Shovel",
7063
"= Brain Gib A": "= Brain Gib",
71-
"Base.rte/Scripts/ShotgunReload.lua": "Base.rte/Devices/Shared/Scripts/ShotgunReload.lua",
7264
"Muzzle Flash Laser": "Muzzle Flash Techion Laser",
7365
"CopyOf = Bullet M60": "CopyOf = Bullet Ronin M60",
7466
"Particle Coalition Flamer Light 1": "Spark Yellow 1",
@@ -77,8 +69,6 @@
7769
"Particle FT-200 Flamer Light 2": "Spark Yellow 1",
7870
"GibParticle = AEmitter\n\t\t\tCopyOf = Fuel Fire Trace Black": "GibParticle = PEmitter\n\t\t\tCopyOf = Fuel Fire Trace Black",
7971
"Shell = AEmitter\n\t\tCopyOf = Cannon Casing": "Shell = AEmitter\n\t\tCopyOf = Smoking Cannon Casing",
80-
"Browncoats.rte/Devices/Weapons/FlamerFlame.lua": "Base.rte/Devices/Shared/Scripts/FlamerFlame.lua",
81-
"Coalition.rte/Devices/Weapons/FlamerFlame.lua": "Base.rte/Devices/Shared/Scripts/FlamerFlame.lua",
8272
"Drop Ship Hull Panel Gib A": "Dropship Hull Panel Gib A",
8373
"Drop Ship Hull Panel Gib B": "Dropship Hull Panel Gib B",
8474
"Drop Ship Hull Panel Gib C": "Dropship Hull Panel Gib C",
@@ -106,10 +96,8 @@
10696
"CopyOf = Coalition Gatling Drone Turret Stationary\n": "CopyOf = Coalition Gatling Drone Turret\n",
10797
"Coalition Shell Smoke Trail": "Smoke Trail Medium",
10898
"Coalition Uber Shell Smoke Trail": "Smoke Trail Heavy",
109-
"Coalition.rte/Devices/Weapons/SmokeTrail.lua": "Base.rte/Scripts/Shared/SmokeTrail.lua",
11099
"Magazine Blunderpop": "Magazine Uzira Blunderpop",
111100
"Magazine AK-47": "Magazine Ronin AK-47",
112-
"Base.rte/Effects/Pyro/GroundFlame.lua": "Base.rte/Effects/Pyro/Flame/Flame.lua",
113101
"EmittedParticle = MOPixel\n\t\t\tCopyOf = Null\n": "EmittedParticle = MOPixel\n\t\t\tCopyOf = Null Bullet\n",
114102
"Small Turret Leg": "Null Leg",
115103
"InstanceName": "PresetName",
@@ -157,11 +145,6 @@
157145
"Dummy Dropship Door Gib B": "Dummy Dropship Hatch Gib B",
158146
"Round M16": "Round Ronin M16",
159147
"Tracer M16": "Tracer Ronin M16",
160-
"Base.rte/Devices/Constructor/ConstructorCollect.lua": "Base.rte/Devices/Tools/Constructor/ConstructorCollect.lua",
161-
"Base.rte/Devices/Constructor/ConstructorCollectGold.lua": "Base.rte/Devices/Tools/Constructor/ConstructorCollectGold.lua",
162-
"Ronin.rte/Devices/Weapons/Shotgun.lua": "Base.rte/Devices/Weapons/Shotgun/Shotgun.lua",
163-
"Imperatus.rte/Devices/Weapons/HeavySniperRound.lua": "Base.rte/Scripts/Shared/SmokeTrail.lua",
164-
"Base.rte/Actors/Medic Drone/Medic.lua": "Base.rte/Actors/Mecha/Medic/Medic.lua",
165148
"Base.rte/Scenes/Textures/Snow.bmp": "Base.rte/Scenes/Textures/Snow.png",
166149
"CopyOf = Glock": "CopyOf = Luger P08",
167150
"CopyOf = Pumpgun": "CopyOf = Model 590",
@@ -201,4 +184,8 @@
201184
"Base.rte/Effects/Pyro/Fireball03": "Base.rte/Effects/Pyro/FireBallC",
202185
"Base.rte/Effects/Pyro/Fireball04": "Base.rte/Effects/Pyro/FireBallD",
203186
"Coalition.rte/Actors/Soldier": "Coalition.rte/Actors/Infantry",
187+
"Ronin RPC Thruster": "Particle Ronin RPC Shot",
188+
"Muzzle Flash Heavy Sniper": "Muzzle Flash Shotgun",
189+
"Magazine Dummy Laser Cannon": "Magazine Dummy Annihilator",
190+
"Particle Browncoat Incendiary Shot": "Spark Yellow 1",
204191
}

‎ConversionRules/Sounds.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,5 +141,7 @@
141141
"Ronin.rte/Effects/Sounds/ThumperFire.wav": "Ronin.rte/Devices/Weapons/M79/Sounds/Fire1.flac",
142142
"Coalition.rte/Effects/Sounds/AutoCannonFire.wav": "Coalition.rte/Devices/Weapons/AutoCannon/Sounds/Fire1.flac",
143143
"Base.rte/Sounds/LightFlamerFire.wav": "Browncoats.rte/Devices/Weapons/Heatlance/Sounds/Loop.flac",
144-
"Base.rte/Sounds/EmptyClick3.wav": "Base.rte/Sounds/Devices/EmptyClick1.flac"
144+
"Base.rte/Sounds/EmptyClick3.wav": "Base.rte/Sounds/Devices/EmptyClick1.flac",
145+
"Ronin.rte/Effects/Sounds/BazookaFire.wav": "Base.rte/Sounds/Devices/MissileFire.flac",
146+
"Base.rte/Sounds/MissileFire.wav": "Base.rte/Sounds/Devices/MissileFire.flac",
145147
}

‎Python/convert.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,14 @@ def create_converted_file(input_file_path, output_file_path, input_folder_path):
134134

135135
all_lines = "".join(all_lines_list)
136136

137-
# Conversion rules can contain newlines, so they can't be applied per-line.
138-
# Splitting the extension means it's fine that bmp -> png already happened.
137+
# Conversion rules can contain newlines, so they can't be applied on a per-line basis.
139138
for old_str, new_str in conversion_rules.items():
140-
old_str_base = os.path.splitext(old_str)[0]
141-
new_str_base = os.path.splitext(new_str)[0]
142-
all_lines = all_lines.replace(old_str_base, new_str_base)
139+
old_str_parts = os.path.splitext(old_str)
140+
# Because bmp -> png already happened on all_lines we'll make all old_str conversion rules png.
141+
if old_str_parts[1] == ".bmp":
142+
all_lines = all_lines.replace(old_str_parts[0] + ".png", new_str)
143+
else:
144+
all_lines = all_lines.replace(old_str, new_str)
143145

144146
all_lines = regex_rules.regex_replace(all_lines)
145147
file_out.write(regex_rules.regex_replace_wavs(all_lines))

0 commit comments

Comments
 (0)