Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jsonize vehicle parts requiring other vehicle parts to be installed #37453

Merged
merged 32 commits into from
Apr 2, 2020
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ff5c40a
jsonize vehicle part requir
Hirmuolio Jan 28, 2020
8e9af0b
json changes
Hirmuolio Jan 28, 2020
47e9802
Merge branch 'master' into Hirmuolio-vehicle-jsonize
Hirmuolio Jan 28, 2020
240aaf2
change json file
Hirmuolio Jan 28, 2020
e3f4764
remove test thing
Hirmuolio Jan 28, 2020
d184c3b
minor text changes
Hirmuolio Jan 28, 2020
444ae28
translate thing
Hirmuolio Jan 28, 2020
4e9b667
translate thing
Hirmuolio Jan 28, 2020
d425a6e
Update src/veh_type.h
Hirmuolio Jan 28, 2020
4c92f96
empty check
Hirmuolio Jan 28, 2020
2ba3b74
Update src/vehicle.cpp
Hirmuolio Jan 28, 2020
41d554f
translations.h
Hirmuolio Jan 28, 2020
9a8e1f6
extract_json_strings.py
Hirmuolio Jan 28, 2020
f9d19aa
documentation
Hirmuolio Feb 3, 2020
2b960cb
documentation
Hirmuolio Feb 3, 2020
a615253
Merge branch 'master' into Hirmuolio-vehicle-jsonize
Hirmuolio Feb 9, 2020
99a0d65
revert translation change
Hirmuolio Feb 9, 2020
67dcc17
revert translation change
Hirmuolio Feb 9, 2020
f145a24
display part that prevents removal
Hirmuolio Feb 11, 2020
9f0903e
remove stray thing
Hirmuolio Feb 11, 2020
77f0e31
remove stray thing
Hirmuolio Feb 11, 2020
5786bb4
period
Hirmuolio Feb 11, 2020
9408d11
change alternator flag
Hirmuolio Feb 12, 2020
3139799
remove unnecessary check
Hirmuolio Feb 12, 2020
72c842f
Merge branch 'master' into Hirmuolio-vehicle-jsonize
Hirmuolio Feb 12, 2020
8696724
adjust alternator flag
Hirmuolio Feb 12, 2020
65a2017
adjust alternator flag
Hirmuolio Feb 12, 2020
643ecf1
Merge branch 'Hirmuolio-vehicle-jsonize' of https://github.com/Hirmuo…
Hirmuolio Feb 12, 2020
eab295d
removed thing from doc
Hirmuolio Feb 12, 2020
32ca02d
Merge branch 'master' into Hirmuolio-vehicle-jsonize
Hirmuolio Mar 23, 2020
08971a2
rename window requiring flag
Hirmuolio Mar 26, 2020
bbe2b53
rename window requiring flag
Hirmuolio Mar 26, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adjust alternator flag
Hirmuolio committed Feb 12, 2020
commit 8696724fe417f36d6f10e3847649506413182c08
9 changes: 2 additions & 7 deletions data/json/vehicleparts/vp_flags.json
Original file line number Diff line number Diff line change
@@ -3,7 +3,8 @@
"id": "ALTERNATOR",
"type": "json_flag",
"context": [ "vehicle_part" ],
"info": "An alternator. When mounted on a gasoline or diesel engine and the engine is on, will produce electrical power that can be stored in a battery."
"info": "An alternator. When mounted on a gasoline or diesel engine and the engine is on, will produce electrical power that can be stored in a battery.",
"requires_flag": "E_ALTERNATOR"
},
{
"id": "AISLE",
@@ -228,11 +229,5 @@
"type": "json_flag",
"context": [ "vehicle_part" ],
"requires_flag": "ROOF"
},
{
"id": "NEEDS_ENGINE",
"type": "json_flag",
"context": [ "vehicle_part" ],
"requires_flag": "ENGINE"
}
]
2 changes: 1 addition & 1 deletion doc/JSON_FLAGS.md
Original file line number Diff line number Diff line change
@@ -1308,7 +1308,7 @@ Those flags are added by the game code to specific items (that specific welder,
- ```AUTOPILOT``` This part will enable a vehicle to have a simple autopilot.
- ```AISLE_LIGHT```
- ```AISLE``` Player can move over this part with less speed penalty than normal.
- ```ALTERNATOR``` Recharges batteries installed on the vehicle.
- ```ALTERNATOR``` Recharges batteries installed on the vehicle. Can only be installed on a part with ```E_ALTERNATOR``` flag.
- ```ANCHOR_POINT``` Allows secure seatbelt attachment.
- ```ANIMAL_CTRL``` Can harness an animal, need HARNESS_bodytype flag to specify bodytype of animal.
- ```ARMOR``` Protects the other vehicle parts it's installed over during collisions.